From 2020407438627f901fbc6db20741d6348468244a Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Mon, 9 Nov 2020 11:23:11 +0100
Subject: [PATCH] adding namespace sls to public receiver api

---
 slsReceiverSoftware/include/sls/CircularFifo.h  | 4 ++++
 slsReceiverSoftware/include/sls/Receiver.h      | 5 +++++
 slsReceiverSoftware/src/Fifo.cpp                | 6 +++---
 slsReceiverSoftware/src/Fifo.h                  | 6 +++---
 slsReceiverSoftware/src/MultiReceiverApp.cpp    | 4 ++--
 slsReceiverSoftware/src/Receiver.cpp            | 4 ++++
 slsReceiverSoftware/src/ReceiverApp.cpp         | 2 +-
 slsReceiverSoftware/tests/test-CircularFifo.cpp | 2 ++
 8 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/slsReceiverSoftware/include/sls/CircularFifo.h b/slsReceiverSoftware/include/sls/CircularFifo.h
index aa464d94b..708692cf0 100644
--- a/slsReceiverSoftware/include/sls/CircularFifo.h
+++ b/slsReceiverSoftware/include/sls/CircularFifo.h
@@ -11,6 +11,8 @@
 #include <semaphore.h>
 #include <vector>
 
+namespace sls{
+
 /** Circular Fifo (a.k.a. Circular Buffer)
  * Thread safe for one reader, and one writer */
 template <typename Element> class CircularFifo {
@@ -127,3 +129,5 @@ size_t CircularFifo<Element>::increment(size_t i) const {
     i = (i + 1) % capacity;
     return i;
 }
+
+}
\ No newline at end of file
diff --git a/slsReceiverSoftware/include/sls/Receiver.h b/slsReceiverSoftware/include/sls/Receiver.h
index f9234dd33..6f5313768 100644
--- a/slsReceiverSoftware/include/sls/Receiver.h
+++ b/slsReceiverSoftware/include/sls/Receiver.h
@@ -4,6 +4,9 @@
 
 class ClientInterface;
 
+namespace sls
+{
+  
 class Receiver : private virtual slsDetectorDefs {
 
   public:
@@ -86,3 +89,5 @@ class Receiver : private virtual slsDetectorDefs {
   private:
     std::unique_ptr<ClientInterface> tcpipInterface;
 };
+
+} // namespace sls
\ No newline at end of file
diff --git a/slsReceiverSoftware/src/Fifo.cpp b/slsReceiverSoftware/src/Fifo.cpp
index a94ad4e77..f8b1460ef 100644
--- a/slsReceiverSoftware/src/Fifo.cpp
+++ b/slsReceiverSoftware/src/Fifo.cpp
@@ -33,9 +33,9 @@ void Fifo::CreateFifos(uint32_t fifoItemSize) {
     DestroyFifos();
 
     // create fifos
-    fifoBound = new CircularFifo<char>(fifoDepth);
-    fifoFree = new CircularFifo<char>(fifoDepth);
-    fifoStream = new CircularFifo<char>(fifoDepth);
+    fifoBound = new sls::CircularFifo<char>(fifoDepth);
+    fifoFree = new sls::CircularFifo<char>(fifoDepth);
+    fifoStream = new sls::CircularFifo<char>(fifoDepth);
     // allocate memory
     size_t mem_len = (size_t)fifoItemSize * (size_t)fifoDepth * sizeof(char);
     memory = (char *)malloc(mem_len);
diff --git a/slsReceiverSoftware/src/Fifo.h b/slsReceiverSoftware/src/Fifo.h
index cd71d0fd3..b777c3628 100644
--- a/slsReceiverSoftware/src/Fifo.h
+++ b/slsReceiverSoftware/src/Fifo.h
@@ -92,13 +92,13 @@ class Fifo : private virtual slsDetectorDefs {
     char *memory;
 
     /** Circular Fifo pointing to addresses of bound data in memory */
-    CircularFifo<char> *fifoBound;
+    sls::CircularFifo<char> *fifoBound;
 
     /** Circular Fifo pointing to addresses of freed data in memory */
-    CircularFifo<char> *fifoFree;
+    sls::CircularFifo<char> *fifoFree;
 
     /** Circular Fifo pointing to addresses of to be streamed data in memory */
-    CircularFifo<char> *fifoStream;
+    sls::CircularFifo<char> *fifoStream;
 
     /** Fifo depth set */
     int fifoDepth;
diff --git a/slsReceiverSoftware/src/MultiReceiverApp.cpp b/slsReceiverSoftware/src/MultiReceiverApp.cpp
index 2b1caecf8..ff95b669c 100644
--- a/slsReceiverSoftware/src/MultiReceiverApp.cpp
+++ b/slsReceiverSoftware/src/MultiReceiverApp.cpp
@@ -216,9 +216,9 @@ int main(int argc, char *argv[]) {
             cprintf(BLUE, "Child process %d [ Tid: %ld ]\n", i,
                     (long)syscall(SYS_gettid));
 
-            std::unique_ptr<Receiver> receiver = nullptr;
+            std::unique_ptr<sls::Receiver> receiver = nullptr;
             try {
-                receiver = sls::make_unique<Receiver>(startTCPPort + i);
+                receiver = sls::make_unique<sls::Receiver>(startTCPPort + i);
             } catch (...) {
                 LOG(logINFOBLUE)
                     << "Exiting Child Process [ Tid: " << syscall(SYS_gettid)
diff --git a/slsReceiverSoftware/src/Receiver.cpp b/slsReceiverSoftware/src/Receiver.cpp
index a7c2a0472..6028029f4 100644
--- a/slsReceiverSoftware/src/Receiver.cpp
+++ b/slsReceiverSoftware/src/Receiver.cpp
@@ -15,6 +15,8 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
+namespace sls{
+
 Receiver::~Receiver() = default;
 
 Receiver::Receiver(int argc, char *argv[]) : tcpipInterface(nullptr) {
@@ -142,3 +144,5 @@ void Receiver::registerCallBackRawDataModifyReady(
     void (*func)(char *, char *, uint32_t &, void *), void *arg) {
     tcpipInterface->registerCallBackRawDataModifyReady(func, arg);
 }
+
+}
\ No newline at end of file
diff --git a/slsReceiverSoftware/src/ReceiverApp.cpp b/slsReceiverSoftware/src/ReceiverApp.cpp
index 6689a7770..fd4aa6116 100644
--- a/slsReceiverSoftware/src/ReceiverApp.cpp
+++ b/slsReceiverSoftware/src/ReceiverApp.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[]) {
     }
 
     try {
-        Receiver r(argc, argv);
+        sls::Receiver r(argc, argv);
         LOG(logINFO) << "[ Press \'Ctrl+c\' to exit ]";
         sem_wait(&semaphore);
         sem_destroy(&semaphore);
diff --git a/slsReceiverSoftware/tests/test-CircularFifo.cpp b/slsReceiverSoftware/tests/test-CircularFifo.cpp
index 66ea86480..d0669e9b1 100644
--- a/slsReceiverSoftware/tests/test-CircularFifo.cpp
+++ b/slsReceiverSoftware/tests/test-CircularFifo.cpp
@@ -2,6 +2,8 @@
 #include "catch.hpp"
 #include <vector>
 
+using sls::CircularFifo;
+
 TEST_CASE("Empty buffer") {
     CircularFifo<char> fifo(0);