Changing incoming attribute storage from vector to map

grf14003 · May 7, 2020 · 725a42a · 725a42a
1 parent 273a7fd
commit 725a42a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/bfs/include/Attribute.hpp b/bfs/include/Attribute.hpp
@@ -21,20 +21,31 @@ class Attribute
 	size_t length;
 	void* value;
 public:
+	Attribute()
+	{
+		key = "";
+		length = 0;
+		value = NULL;
+	}
 	Attribute(BinaryAttributeStructure bin, void* value) {
 		key = "";
 		for (int i = 0; i < ATTRIB_KEY_SIZE; i++)
 			key += bin.key[i];
 		length = bin.length;
 		this->value = value;
 	}
-
 	Attribute(string key, size_t length, void* value)
 	{
 		this->key = key;
 		this->length = length;
 		this->value = value;
 	}
+	Attribute(const Attribute& toCopy)
+	{
+		this->key = string(toCopy.key);
+		this->length = toCopy.length;
+		this->value = toCopy.value;
+	}
 
 	~Attribute() {
 

diff --git a/bfs/include/DataSyncThread.hpp b/bfs/include/DataSyncThread.hpp
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <vector>
+#include <map>
 #include <iostream>
 #include <ctime>
 
@@ -45,10 +46,10 @@ class DataSyncThread
 	// if this one is still running
 	bool threadRunning = false;
 
-	vector<Attribute> incomingAttributes;
+	map<string, Attribute> incomingAttributes;
 	HANDLE attribMutex;
 public:
-	DataSyncThread(SOCKET s) 
+	DataSyncThread(SOCKET s)
 	{ 
 		sock = s;
 		attribMutex = CreateMutex(NULL, false, NULL);

diff --git a/bfs/src/comms/DataSyncThread.cpp b/bfs/src/comms/DataSyncThread.cpp
@@ -147,7 +147,7 @@ void DataSyncThread::addIncomingAttribute(Attribute attrib)
 {
 	DWORD result = WaitForSingleObject(attribMutex, INFINITE);
 	if (result == WAIT_OBJECT_0) {
-		incomingAttributes.push_back(attrib);
+		incomingAttributes[string(attrib.getKey())] = attrib;
 		ReleaseMutex(attribMutex);
 	}
 	else {
@@ -253,17 +253,17 @@ int DataSyncThread::connectToAlgorithm(char* serverName)
 	}
 }
 
-vector<Attribute> DataSyncThread::getIncomingAttributes()
+vector<Attribute> DataSyncThread :: getIncomingAttributes()
 {
 	vector<Attribute> newAttribVector;
 	if (! areIncomingAttributesAvailable())
 		return newAttribVector;
 
 	DWORD result = WaitForSingleObject(attribMutex, INFINITE);
 	if (result == WAIT_OBJECT_0) {
-		for (Attribute attrib : incomingAttributes)
+		for (auto attrib : incomingAttributes)
 		{
-			newAttribVector.push_back(attrib);
+			newAttribVector.push_back(attrib.second);
 		}
 		incomingAttributes.clear();
 		ReleaseMutex(attribMutex);