Merge branch 'developer' into g225gui

slsReceiverSoftware/src/Arping.cpp

@@ -6,6 +6,12 @@
 #include <chrono>
 #include <unistd.h>
 
+// gettid added in glibc 2.30
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
+#include <sys/syscall.h>
+#define gettid() syscall(SYS_gettid)
+#endif
+
 void Arping::SetInterfacesAndIps(const int index, const std::string &interface,
                                  const std::string &ip) {
 

slsReceiverSoftware/src/ClientInterface.cpp

@@ -27,6 +27,12 @@ using sls::RuntimeError;
 using sls::SocketError;
 using Interface = sls::ServerInterface;
 
+// gettid added in glibc 2.30
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
+#include <sys/syscall.h>
+#define gettid() syscall(SYS_gettid)
+#endif
+
 ClientInterface::~ClientInterface() {
     killTcpThread = true;
     LOG(logINFO) << "Shutting down TCP Socket on port " << portNumber;

slsReceiverSoftware/src/MultiReceiverApp.cpp

@@ -14,6 +14,12 @@
 #include <sys/wait.h> //wait
 #include <unistd.h>
 
+// gettid added in glibc 2.30
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
+#include <sys/syscall.h>
+#define gettid() syscall(SYS_gettid)
+#endif
+
 /** Define Colors to print data call back in different colors for different
  * recievers */
 #define PRINT_IN_COLOR(c, f, ...)                                              \

slsReceiverSoftware/src/Receiver.cpp

@@ -16,6 +16,12 @@
 #include <string>
 #include <unistd.h>
 
+// gettid added in glibc 2.30
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
+#include <sys/syscall.h>
+#define gettid() syscall(SYS_gettid)
+#endif
+
 namespace sls {
 
 Receiver::~Receiver() = default;

slsReceiverSoftware/src/ReceiverApp.cpp

@@ -10,6 +10,12 @@
 #include <semaphore.h>
 #include <unistd.h>
 
+// gettid added in glibc 2.30
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
+#include <sys/syscall.h>
+#define gettid() syscall(SYS_gettid)
+#endif
+
 sem_t semaphore;
 
 void sigInterruptHandler(int p) { sem_post(&semaphore); }

slsReceiverSoftware/src/ThreadObject.cpp

@@ -10,6 +10,12 @@
 #include <iostream>
 #include <unistd.h>
 
+// gettid added in glibc 2.30
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
+#include <sys/syscall.h>
+#define gettid() syscall(SYS_gettid)
+#endif
+
 ThreadObject::ThreadObject(int threadIndex, std::string threadType)
     : index(threadIndex), type(threadType) {
     LOG(logDEBUG) << type << " thread created: " << index;