diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index e41ce7dce..cf12b2dee 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsReceiverSoftware/src/ClientInterface.cpp b/slsReceiverSoftware/src/ClientInterface.cpp index 1d82296b4..8a213c074 100755 --- a/slsReceiverSoftware/src/ClientInterface.cpp +++ b/slsReceiverSoftware/src/ClientInterface.cpp @@ -268,7 +268,7 @@ void ClientInterface::VerifyLock() { void ClientInterface::VerifyIdle(Interface &socket) { if (impl()->getStatus() != IDLE) { std::ostringstream oss; - oss << "Can not execute " << GetFunctionNameFromEnum((enum detFuncs)fnum) + oss << "Can not execute " << getFunctionNameFromEnum((enum detFuncs)fnum) << " when receiver is not idle"; throw sls::SocketError(oss.str()); } @@ -286,7 +286,7 @@ int ClientInterface::exec_command(Interface &socket) { if (!pipe) { throw RuntimeError("Executing Command failed\n"); } else { - while (!feof(pipe.Get())) { + while (!feof(pipe.get())) { if (fgets(temp.data(), tempsize, pipe.get()) != nullptr) sresult += temp.data(); } diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index 7d74bb647..98907e54d 100755 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -159,10 +159,13 @@ void DataProcessor::SetThreadPriority(int priority) { struct sched_param param; param.sched_priority = priority; if (pthread_setschedparam(thread, SCHED_FIFO, ¶m) == EPERM) { - throw sls::RuntimeError("Could not prioritize dataprocessing threads. " - "(No Root Privileges?)"); + if (!index) { + FILE_LOG(logWARNING) << "Could not prioritize dataprocessing thread. " + "(No Root Privileges?)"; + } + } else { + FILE_LOG(logINFO) << "Priorities set - DataProcessor: " << priority; } - FILE_LOG(logINFO) << "Processor Thread Priority set to " << priority; } diff --git a/slsReceiverSoftware/src/DataStreamer.cpp b/slsReceiverSoftware/src/DataStreamer.cpp index f79c4010a..cd4a95302 100755 --- a/slsReceiverSoftware/src/DataStreamer.cpp +++ b/slsReceiverSoftware/src/DataStreamer.cpp @@ -108,10 +108,13 @@ void DataStreamer::SetThreadPriority(int priority) { struct sched_param param; param.sched_priority = priority; if (pthread_setschedparam(thread, SCHED_FIFO, ¶m) == EPERM) { - throw sls::RuntimeError("Could not prioritize datastreaming threads. " - "(No Root Privileges?)"); + if (!index) { + FILE_LOG(logWARNING) << "Could not prioritize datastreaming thread. " + "(No Root Privileges?)"; + } + } else { + FILE_LOG(logINFO) << "Priorities set - DataStreamer: " << priority; } - FILE_LOG(logINFO) << "Streamer Thread Priority set to " << priority; } void DataStreamer::SetNumberofDetectors(int* nd) { diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 4cfc103ad..e8dd2d98d 100755 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -161,16 +161,9 @@ void Implementation::SetLocalNetworkParameters() { void Implementation::SetThreadPriorities() { FILE_LOG(logDEBUG3) << __SHORT_AT__ << " called"; - for (const auto &it : listener) { it->SetThreadPriority(LISTENER_PRIORITY); } - std::ostringstream osfn; - osfn << "Priorities set - " - "Listener:" - << LISTENER_PRIORITY; - - FILE_LOG(logINFO) << osfn.str(); } void Implementation::SetupFifoStructure() { diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index 7ef2f9e88..88957077c 100755 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/slsReceiverSoftware/src/Listener.cpp @@ -157,10 +157,13 @@ void Listener::SetThreadPriority(int priority) { struct sched_param param; param.sched_priority = priority; if (pthread_setschedparam(thread, SCHED_FIFO, ¶m) == EPERM) { - throw sls::RuntimeError("Could not prioritize listener threads. " - "(No Root Privileges?)"); + if (!index) { + FILE_LOG(logWARNING) << "Could not prioritize listener thread. " + "(No Root Privileges?)"; + } + } else { + FILE_LOG(logINFO) << "Priorities set - Listener: " << priority; } - FILE_LOG(logINFO) << "Listener Thread Priority set to " << priority; } void Listener::CreateUDPSockets() { diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index e0d66833f..2f676c084 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -4,9 +4,9 @@ #define APIRECEIVER 0x190722 #define APIGUI 0x190723 #define APIMOENCH 0x190820 -#define APIEIGER 0x191111 #define APIGOTTHARD2 0x191127 #define APIMYTHEN3 0x191127 #define APICTB 0x191127 #define APIGOTTHARD 0x191127 #define APIJUNGFRAU 0x191127 +#define APIEIGER 0x191129