detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into g225gui

Browse Source
This commit is contained in:
maliakal_d 2022-02-07 15:10:42 +01:00
commit 251f07a9ae
6 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/src/Arping.cpp
View File

@ -6,6 +6,12 @@
#include <chrono> #include <chrono>
#include <unistd.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
void Arping::SetInterfacesAndIps(const int index, const std::string &interface, void Arping::SetInterfacesAndIps(const int index, const std::string &interface,
const std::string &ip) { const std::string &ip) {

6
slsReceiverSoftware/src/ClientInterface.cpp
View File

@ -27,6 +27,12 @@ using sls::RuntimeError;
using sls::SocketError; using sls::SocketError;
using Interface = sls::ServerInterface; 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() { ClientInterface::~ClientInterface() {
killTcpThread = true; killTcpThread = true;
LOG(logINFO) << "Shutting down TCP Socket on port " << portNumber; LOG(logINFO) << "Shutting down TCP Socket on port " << portNumber;

6
slsReceiverSoftware/src/MultiReceiverApp.cpp
View File

@ -14,6 +14,12 @@
#include <sys/wait.h> //wait #include <sys/wait.h> //wait
#include <unistd.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
/** Define Colors to print data call back in different colors for different /** Define Colors to print data call back in different colors for different
* recievers */ * recievers */
#define PRINT_IN_COLOR(c, f, ...) \ #define PRINT_IN_COLOR(c, f, ...) \

6
slsReceiverSoftware/src/Receiver.cpp
View File

@ -16,6 +16,12 @@
#include <string> #include <string>
#include <unistd.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
namespace sls { namespace sls {
Receiver::~Receiver() = default; Receiver::~Receiver() = default;

6
slsReceiverSoftware/src/ReceiverApp.cpp
View File

@ -10,6 +10,12 @@
#include <semaphore.h> #include <semaphore.h>
#include <unistd.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; sem_t semaphore;
void sigInterruptHandler(int p) { sem_post(&semaphore); } void sigInterruptHandler(int p) { sem_post(&semaphore); }

6
slsReceiverSoftware/src/ThreadObject.cpp
View File

@ -10,6 +10,12 @@
#include <iostream> #include <iostream>
#include <unistd.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
ThreadObject::ThreadObject(int threadIndex, std::string threadType) ThreadObject::ThreadObject(int threadIndex, std::string threadType)
: index(threadIndex), type(threadType) { : index(threadIndex), type(threadType) {
LOG(logDEBUG) << type << " thread created: " << index; LOG(logDEBUG) << type << " thread created: " << index;