correcting impl for generic class inside the .h file

Author: usa-m

src/dds.net-connector-cpp.lib/connector/src/internal/inc/sync_queue.h

@@ -1,11 +1,21 @@
 #ifndef DDS_DOT_NET_CONNECTOR_SRC_INTERNAL_INC_SYNC_QUEUE_H_
 #define DDS_DOT_NET_CONNECTOR_SRC_INTERNAL_INC_SYNC_QUEUE_H_
 
+#include "inc/error.h"
+
 #include "src/internal/inc/sync_queue_reader.h"
 #include "src/internal/inc/sync_queue_writer.h"
 
+#include "src/internal/inc/macros.h"
+
 #include <mutex>
 
+#include <memory.h>
+
+
+#define SLEEP_TIME_MS_WHEN_DATA_CANNOT_BE_DEQUEUED     5
+#define SLEEP_TIME_MS_WHEN_DATA_CANNOT_BE_ENQUEUED     5
+
 
 namespace dds {
   namespace net {
@@ -16,14 +26,121 @@ namespace dds {
         class SyncQueue : public SyncQueueReader<T>, public SyncQueueWriter<T> {
 
         public:
-          SyncQueue(int queueSize = 100);
+          SyncQueue(int queueSize = 100)
+          {
+            this->queueSize = queueSize;
+
+            if (queueSize <= 0)
+            {
+              throw Error("Invalid queue size - the size must be a positive number");
+            }
+
+            queue = new T[queueSize];
+            queueValidity = new bool[queueSize];
+
+            for (int i = 0; i < queueSize; i++)
+            {
+              queueValidity[i] = false;
+            }
+
+            nextWriteIndex = 0;
+            nextReadIndex = 0;
+          }
+
+          bool canDequeue() override
+          {
+            bool ret = false;
+
+            lock.lock();
+
+            ret = queueValidity[nextReadIndex];
+
+            lock.unlock();
+
+            return ret;
+          }
+          T dequeue() override
+          {
+            while (true)
+            {
+              lock.lock();
+
+              if (queueValidity[nextReadIndex] != false)
+              {
+                T data = queue[nextReadIndex];
+                queueValidity[nextReadIndex] = false;
+
+                nextReadIndex++;
+
+                if (nextReadIndex == queueSize)
+                {
+                  nextReadIndex = 0;
+                }
+
+                lock.unlock();
+                return data;
+              }
+
+              lock.unlock();
+
+              sleep_msec(SLEEP_TIME_MS_WHEN_DATA_CANNOT_BE_DEQUEUED);
+            }
+          }
+          
+          bool canEnqueue() override
+          {
+            bool ret = false;
+
+            lock.lock();
+
+            ret = queueValidity[nextWriteIndex] == false;
+
+            lock.unlock();
+
+            return ret;
+          }
+          void enqueue(T data) override
+          {
+            while (true)
+            {
+              lock.lock();
+
+              if (queueValidity[nextWriteIndex] == false)
+              {
+                queue[nextWriteIndex] = data;
+                queueValidity[nextWriteIndex] = true;
+
+                nextWriteIndex++;
+
+                if (nextWriteIndex == queueSize)
+                {
+                  nextWriteIndex = 0;
+                }
+
+                lock.unlock();
+                return;
+              }
+
+              lock.unlock();
+
+              sleep_msec(SLEEP_TIME_MS_WHEN_DATA_CANNOT_BE_ENQUEUED);
+            }
+          }
+
+          void clear()
+          {
+            lock.lock();
+
+            for (int i = 0; i < queueSize; i++)
+            {
+              queueValidity[i] = false;
+            }
 
-          bool canDequeue() override;
-          T dequeue() override;
-          bool canEnqueue() override;
-          void enqueue(T data) override;
+            nextWriteIndex = 0;
+            nextReadIndex = 0;
 
-          void clear();
+            lock.unlock();
+          }
 
 
         private:

src/dds.net-connector-cpp.lib/connector/src/internal/src/sync_queue.cpp

@@ -192,7 +192,6 @@
     <ClCompile Include="connector\src\internal\src\network_client.cpp" />
     <ClCompile Include="connector\src\internal\src\packet_preprocessor.cpp" />
     <ClCompile Include="connector\src\internal\src\string_helper.cpp" />
-    <ClCompile Include="connector\src\internal\src\sync_queue.cpp" />
     <ClCompile Include="connector\src\internal\src\variables\base_primitive.cpp" />
     <ClCompile Include="connector\src\internal\src\variables\enc_dec_primitive.cpp" />
     <ClCompile Include="connector\src\internal\src\variables\var_prim_boolean.cpp" />

src/dds.net-connector-cpp.lib/dds.net-connector-cpp.lib.vcxproj

@@ -137,9 +137,6 @@
     <ClCompile Include="connector\src\internal\src\easy_thread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="connector\src\internal\src\sync_queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="connector\src\internal\src\buffer_manager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>