diff --git a/slsReceiverSoftware/include/UDPStandardImplementation.h b/slsReceiverSoftware/include/UDPStandardImplementation.h index 1909d45ef..0352dee45 100644 --- a/slsReceiverSoftware/include/UDPStandardImplementation.h +++ b/slsReceiverSoftware/include/UDPStandardImplementation.h @@ -831,8 +831,6 @@ private: /** Progress (currentFrameNumber) Mutex */ pthread_mutex_t progressMutex; - char streambuf[MAX_NUMBER_OF_WRITER_THREADS][MAX_STR_LENGTH]; - char cstreambuf[MAX_STR_LENGTH]; }; diff --git a/slsReceiverSoftware/include/logger.h b/slsReceiverSoftware/include/logger.h index 6d4bd3004..35d48473d 100644 --- a/slsReceiverSoftware/include/logger.h +++ b/slsReceiverSoftware/include/logger.h @@ -14,7 +14,7 @@ #elif VERYVERBOSE #define FILELOG_MAX_LEVEL logDEBUG4 #elif VERBOSE -#define FILELOG_MAX_LEVEL logDEBUG +#define FILELOG_MAX_LEVEL logDEBUG1 #endif #ifndef FILELOG_MAX_LEVEL @@ -31,11 +31,14 @@ class Logger { public: Logger(){}; - enum TLogLevel {logERROR, logWARNING, logINFO, logDEBUG, logDEBUG1, logDEBUG2, logDEBUG3, logDEBUG4, logDEBUG5}; + enum TLogLevel {logERROR, logWARNING, logINFO, logDEBUG1, logDEBUG2, logDEBUG3, logDEBUG4, logDEBUG5}; - static void FILE_LOG(TLogLevel level, char* msg) + static void FILE_LOG(TLogLevel level, char const* msg) { + + if(level > FILELOG_MAX_LEVEL) return; + char buffer[11]; const int buffer_len = sizeof(buffer); time_t t; @@ -70,10 +73,10 @@ public: */ switch(level){ - case logERROR: cprintf(RED BOLD, "- %s ERROR: %s", result, msg); break; - case logWARNING: cprintf(YELLOW BOLD,"- %s WARNING: %s", result, msg); break; - case logINFO: cprintf(GRAY, "- %s INFO: %s", result, msg); break; - default: break; + case logERROR: cprintf(RED BOLD, "- %s ERROR: %s \n", result, msg); break; + case logWARNING: cprintf(YELLOW BOLD,"- %s WARNING: %s \n", result, msg); break; + case logINFO: cprintf(GRAY, "- %s INFO: %s \n", result, msg); break; + default: cprintf(GRAY, "- %s DEBUG: %s \n", result, msg); break; } diff --git a/slsReceiverSoftware/src/UDPBaseImplementation.cpp b/slsReceiverSoftware/src/UDPBaseImplementation.cpp index dfae32bc2..2235e480d 100644 --- a/slsReceiverSoftware/src/UDPBaseImplementation.cpp +++ b/slsReceiverSoftware/src/UDPBaseImplementation.cpp @@ -206,9 +206,7 @@ int UDPBaseImplementation::getActivate() const{ return activated;} /**initial parameters***/ void UDPBaseImplementation::configure(map config_map){ - ostringstream os; - os << " must be overridden by child classes"; - string message(os.str()); FILE_LOG(logERROR, message); + FILE_LOG(logERROR, " must be overridden by child classes"); } void UDPBaseImplementation::setFlippedData(int axis, int enable){ @@ -216,9 +214,9 @@ void UDPBaseImplementation::setFlippedData(int axis, int enable){ if(axis<0 || axis>1) return; flippedData[axis] = enable==0?0:1; - ostringstream os; - os << "Flipped Data: " << flippedData[0] << " , " << flippedData[1]; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Flipped Data: %d , %d ", flippedData[0], flippedData[1]); + FILE_LOG(logINFO, cstreambuf); } @@ -228,14 +226,13 @@ void UDPBaseImplementation::setFileName(const char c[]){ if(strlen(c)) strcpy(fileName, c); - ostringstream os; - os << "File name:" << fileName; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "File name: %s ", fileName); + FILE_LOG(logINFO, cstreambuf); } void UDPBaseImplementation::setFilePath(const char c[]){ - if(strlen(c)){ //check if filepath exists struct stat st; @@ -243,69 +240,67 @@ void UDPBaseImplementation::setFilePath(const char c[]){ strcpy(filePath,c); else{ strcpy(filePath,""); - ostringstream os; - os << "FilePath does not exist:" << filePath; - string message(os.str()); FILE_LOG(logWARNING, message); + + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "FilePath does not exist: %s ", filePath); + FILE_LOG(logWARNING, cstreambuf); } strcpy(filePath, c); } - /*FILE_LOG(logDEBUG) << "Info: File path:" << filePath;*/ + /*{ + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "File path:: %s ", filePath); + FILE_LOG(logDEBUG, cstreambuf); + }*/ } void UDPBaseImplementation::setFileIndex(const uint64_t i){ - fileIndex = i; - ostringstream os; - os << "File Index:" << fileIndex; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "File Index: %lu ", fileIndex); + FILE_LOG(logINFO, cstreambuf); } //FIXME: needed? void UDPBaseImplementation::setScanTag(const int i){ - scanTag = i; - ostringstream os; - os << "Scan Tag:" << scanTag; - string message(os.str()); FILE_LOG(logINFO, message); - + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Scan Tag: %d ", scanTag); + FILE_LOG(logINFO, cstreambuf); } void UDPBaseImplementation::setFrameIndexEnable(const bool b){ - frameIndexEnable = b; - ostringstream os; - os << "Frame Index Enable: " << stringEnable(frameIndexEnable); - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Frame Index Enable: %s ", stringEnable(frameIndexEnable).c_str()); + FILE_LOG(logINFO, cstreambuf); } void UDPBaseImplementation::setFileWriteEnable(const bool b){ - fileWriteEnable = b; - ostringstream os; - os << "File Write Enable: " << stringEnable(fileWriteEnable); - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "File Write Enable: %s ", stringEnable(fileWriteEnable).c_str()); + FILE_LOG(logINFO, cstreambuf); } void UDPBaseImplementation::setOverwriteEnable(const bool b){ - overwriteEnable = b; - ostringstream os; - os << "Overwrite Enable: " << stringEnable(overwriteEnable); - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Overwrite Enable: %s ", stringEnable(overwriteEnable).c_str()); + FILE_LOG(logINFO, cstreambuf); } int UDPBaseImplementation::setDataCompressionEnable(const bool b){ - dataCompressionEnable = b; - ostringstream os; - os << "Data Compression : " << stringEnable(dataCompressionEnable); - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Data Compression: %s ", stringEnable(dataCompressionEnable).c_str()); + FILE_LOG(logINFO, cstreambuf); //overridden methods might return FAIL return OK; @@ -315,49 +310,44 @@ int UDPBaseImplementation::setDataCompressionEnable(const bool b){ /***connection parameters***/ void UDPBaseImplementation::setUDPPortNumber(const uint32_t i){ - udpPortNum[0] = i; - ostringstream os; - os << "UDP Port Number[0]:" << udpPortNum[0]; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "UDP Port Number[0]: %u ", udpPortNum[0]); + FILE_LOG(logINFO, cstreambuf); } void UDPBaseImplementation::setUDPPortNumber2(const uint32_t i){ - udpPortNum[1] = i; - ostringstream os; - os << "UDP Port Number[1]:" << udpPortNum[1]; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "UDP Port Number[1]: %u ", udpPortNum[1]); + FILE_LOG(logINFO, cstreambuf); } void UDPBaseImplementation::setEthernetInterface(const char* c){ - strcpy(eth, c); - ostringstream os; - os << "Ethernet Interface: " << eth; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Ethernet Interface: %s ", eth); + FILE_LOG(logINFO, cstreambuf); } /***acquisition parameters***/ void UDPBaseImplementation::setShortFrameEnable(const int i){ - shortFrameEnable = i; - ostringstream os; - os << "Short Frame Enable: " << stringEnable(shortFrameEnable); - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Short Frame Enable: %d ", shortFrameEnable); + FILE_LOG(logINFO, cstreambuf); } int UDPBaseImplementation::setFrameToGuiFrequency(const uint32_t freq){ - frameToGuiFrequency = freq; - ostringstream os; - os << "Frame To Gui Frequency:" << frameToGuiFrequency; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Frame To Gui Frequency: %u ", frameToGuiFrequency); + FILE_LOG(logINFO, cstreambuf); //overrridden child classes might return FAIL return OK; @@ -365,21 +355,19 @@ int UDPBaseImplementation::setFrameToGuiFrequency(const uint32_t freq){ void UDPBaseImplementation::setFrameToGuiTimer(const uint32_t time_in_ms){ - frameToGuiTimerinMS = time_in_ms; - ostringstream os; - os << "Frame To Gui Timer:" << frameToGuiTimerinMS; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Frame To Gui Timer: %u ", frameToGuiTimerinMS); + FILE_LOG(logINFO, cstreambuf); } uint32_t UDPBaseImplementation::setDataStreamEnable(const uint32_t enable){ - dataStreamEnable = enable; - ostringstream os; - os << "Streaming Data from Receiver:" << dataStreamEnable; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Streaming Data from Receiver: %d ", dataStreamEnable); + FILE_LOG(logINFO, cstreambuf); //overrridden child classes might return FAIL return OK; @@ -388,11 +376,10 @@ uint32_t UDPBaseImplementation::setDataStreamEnable(const uint32_t enable){ int UDPBaseImplementation::setAcquisitionPeriod(const uint64_t i){ - acquisitionPeriod = i; - ostringstream os; - os << "Acquisition Period:" << (double)acquisitionPeriod/(1E9) << "s"; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Acquisition Period: %f s ", (double)acquisitionPeriod/(1E9)); + FILE_LOG(logINFO, cstreambuf); //overrridden child classes might return FAIL return OK; @@ -400,11 +387,10 @@ int UDPBaseImplementation::setAcquisitionPeriod(const uint64_t i){ int UDPBaseImplementation::setAcquisitionTime(const uint64_t i){ - acquisitionTime = i; - ostringstream os; - os << "Acquisition Time:" << (double)acquisitionTime/(1E9) << "s"; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Acquisition Time: %f s ", (double)acquisitionTime/(1E9)); + FILE_LOG(logINFO, cstreambuf); //overrridden child classes might return FAIL return OK; @@ -412,11 +398,10 @@ int UDPBaseImplementation::setAcquisitionTime(const uint64_t i){ int UDPBaseImplementation::setNumberOfFrames(const uint64_t i){ - numberOfFrames = i; - ostringstream os; - os << "Number of Frames:" << numberOfFrames; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Number of Frames: %lu ", numberOfFrames); + FILE_LOG(logINFO, cstreambuf); //overrridden child classes might return FAIL return OK; @@ -424,11 +409,10 @@ int UDPBaseImplementation::setNumberOfFrames(const uint64_t i){ int UDPBaseImplementation::setDynamicRange(const uint32_t i){ - dynamicRange = i; - ostringstream os; - os << "Dynamic Range:" << dynamicRange; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Dynamic Range: %u ", dynamicRange); + FILE_LOG(logINFO, cstreambuf); //overrridden child classes might return FAIL return OK; @@ -436,11 +420,10 @@ int UDPBaseImplementation::setDynamicRange(const uint32_t i){ int UDPBaseImplementation::setTenGigaEnable(const bool b){ - tengigaEnable = b; - ostringstream os; - os << "Ten Giga Enable: " << stringEnable(tengigaEnable); - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Ten Giga Enable: %s ", stringEnable(tengigaEnable).c_str()); + FILE_LOG(logINFO, cstreambuf); //overridden functions might return FAIL return OK; @@ -448,11 +431,10 @@ int UDPBaseImplementation::setTenGigaEnable(const bool b){ int UDPBaseImplementation::setFifoDepth(const uint32_t i){ - fifoDepth = i; - ostringstream os; - os << "Fifo Depth: " << i; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Fifo Depth: %u ", i); + FILE_LOG(logINFO, cstreambuf); //overridden functions might return FAIL return OK; @@ -467,23 +449,23 @@ int UDPBaseImplementation::setFifoDepth(const uint32_t i){ /***initial functions***/ int UDPBaseImplementation::setDetectorType(const detectorType d){ - myDetectorType = d; //if eiger, set numberofListeningThreads = 2; - ostringstream os; - os << "Detector Type:" << getDetectorType(d); - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Detector Type: %s ", getDetectorType(d).c_str()); + FILE_LOG(logINFO, cstreambuf); + return OK; } void UDPBaseImplementation::initialize(const char *c){ - if(strlen(c)) strcpy(detHostname, c); - ostringstream os; - os << "Detector Hostname:" << detHostname; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Detector Hostname: %s ", detHostname); + FILE_LOG(logINFO, cstreambuf); + } @@ -492,68 +474,62 @@ void UDPBaseImplementation::resetAcquisitionCount(){ totalPacketsCaught = 0; - ostringstream os; - os << "totalPacketsCaught:" << totalPacketsCaught; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Total Packets Caught: %lu ", totalPacketsCaught); + FILE_LOG(logINFO, cstreambuf); } int UDPBaseImplementation::startReceiver(char *c){ - ostringstream os; - os << " must be overridden by child classes"; - string message(os.str()); FILE_LOG(logERROR, message); + + FILE_LOG(logERROR, " must be overridden by child classes"); + return OK; } void UDPBaseImplementation::stopReceiver(){ - ostringstream os; - os << " must be overridden by child classes"; - string message(os.str()); FILE_LOG(logERROR, message); + + FILE_LOG(logERROR, " must be overridden by child classes"); } void UDPBaseImplementation::startReadout(){ - ostringstream os; - os << " must be overridden by child classes"; - string message(os.str()); FILE_LOG(logERROR, message); + + FILE_LOG(logERROR, " must be overridden by child classes"); } int UDPBaseImplementation::shutDownUDPSockets(){ - ostringstream os; - os << " must be overridden by child classes"; - string message(os.str()); FILE_LOG(logERROR, message); + + FILE_LOG(logERROR, " must be overridden by child classes"); //overridden functions might return FAIL return OK; } void UDPBaseImplementation::readFrame(int ithread, char* c,char** raw, int64_t &startAcquisitionIndex, int64_t &startFrameIndex){ - ostringstream os; - os << " must be overridden by child classes"; - string message(os.str()); FILE_LOG(logERROR, message); + + FILE_LOG(logERROR, " must be overridden by child classes"); } //FIXME: needed, isnt stopReceiver enough? void UDPBaseImplementation::abort(){ - ostringstream os; - os << " must be overridden by child classes"; - string message(os.str()); FILE_LOG(logERROR, message); + + FILE_LOG(logERROR, " must be overridden by child classes"); } void UDPBaseImplementation::closeFile(int ithread){ - ostringstream os; - os << " must be overridden by child classes"; - string message(os.str()); FILE_LOG(logERROR, message); + + FILE_LOG(logERROR, " must be overridden by child classes"); } int UDPBaseImplementation::setActivate(int enable){ - if(enable != -1){ activated = enable; - ostringstream os; - os << "Activation: " << stringEnable(activated); - string message(os.str()); FILE_LOG(logINFO, message); + + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Activation: %s ", stringEnable(activated).c_str()); + FILE_LOG(logINFO, cstreambuf); } return activated; diff --git a/slsReceiverSoftware/src/UDPInterface.cpp b/slsReceiverSoftware/src/UDPInterface.cpp index 749be3b71..193c6e3e3 100644 --- a/slsReceiverSoftware/src/UDPInterface.cpp +++ b/slsReceiverSoftware/src/UDPInterface.cpp @@ -22,24 +22,21 @@ using namespace std; UDPInterface * UDPInterface::create(string receiver_type){ + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Starting %s ", receiver_type.c_str()); + if (receiver_type == "standard"){ - ostringstream os; - os << "Starting " << receiver_type; - string message(os.str()); FILE_LOG(logINFO, message); + FILE_LOG(logINFO, cstreambuf); return new UDPStandardImplementation(); } #ifdef REST else if (receiver_type == "REST"){ - ostringstream os; - os << "Starting " << receiver_type; - string message(os.str()); FILE_LOG(logINFO, message); + FILE_LOG(logINFO, cstreambuf); return new UDPRESTImplementation(); } #endif else{ - ostringstream os; - os << "[ERROR] UDP interface not supported, using standard implementation"; - string message(os.str()); FILE_LOG(logWARNING, message); + FILE_LOG(logWARNING, "[ERROR] UDP interface not supported, using standard implementation"); return new UDPBaseImplementation(); } } diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp index ee8bf034e..820ed2706 100644 --- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp +++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp @@ -3,9 +3,6 @@ * @short does all the functions for a receiver, set/get parameters, start/stop etc. ***********************************************/ -sprintf(cstreambuf, "%s", " \0"); -FILE_LOG(logDEBUG, cstreambuf); - #include "UDPStandardImplementation.h" #include "moench02ModuleData.h" @@ -38,10 +35,6 @@ UDPStandardImplementation::UDPStandardImplementation(){ initializeMembers(); - for(int i= 0; i < MAX_NUMBER_OF_WRITER_THREADS; ++i) - memset(streambuf[i], 0, MAX_STR_LENGTH ); - memset(cstreambuf, 0, MAX_STR_LENGTH ); - //***mutex*** pthread_mutex_init(&statusMutex,NULL); pthread_mutex_init(&writeMutex,NULL); @@ -51,11 +44,9 @@ UDPStandardImplementation::UDPStandardImplementation(){ //to increase socket receiver buffer size and max length of input queue by changing kernel settings if(myDetectorType == EIGER); else if(system("echo $((100*1024*1024)) > /proc/sys/net/core/rmem_max")){ - sprintf(cstreambuf, "%s", "Warning: No root permission to change socket receiver buffer size in file /proc/sys/net/core/rmem_max \0"); - FILE_LOG(logDEBUG, cstreambuf); + FILE_LOG(logDEBUG1, "Warning: No root permission to change socket receiver buffer size in file /proc/sys/net/core/rmem_max"); }else if(system("echo 250000 > /proc/sys/net/core/netdev_max_backlog")){ - sprintf(cstreambuf, "%s", "Warning: No root permission to change max length of input queue in file /proc/sys/net/core/netdev_max_backlog \0"); - FILE_LOG(logDEBUG, cstreambuf); + FILE_LOG(logDEBUG1, "Warning: No root permission to change max length of input queue in file /proc/sys/net/core/netdev_max_backlog "); } /** permanent setting by heiner @@ -84,8 +75,7 @@ UDPStandardImplementation::~UDPStandardImplementation(){ /***initial parameters***/ void UDPStandardImplementation::deleteMembers(){ - sprintf(cstreambuf, "%s", "Deleting member pointers \0"); - FILE_LOG(logDEBUG, cstreambuf); + FILE_LOG(logDEBUG1, "Deleting member pointers "); shutDownUDPSockets(); for(int i=0;iShutDownSocket(); - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); - { - ostringstream os; - os << "Shut down UDP Socket " << i; - string message(os.str()); FILE_LOG(logINFO, message); - } + + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Shut down UDP Sock %d ", i); + FILE_LOG(logINFO, cstreambuf); + delete udpSocket[i]; udpSocket[i] = 0; } @@ -1321,14 +1190,8 @@ int UDPStandardImplementation::shutDownUDPSockets(){ * Post:udp sockets closed, status is transmitting * */ void UDPStandardImplementation::startReadout(){ - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); - { - ostringstream os; - os << "Transmitting last data"; - string message(os.str()); FILE_LOG(logDEBUG, message); - } + FILE_LOG(logDEBUG1, "Transmitting last data "); if(status == RUNNING){ @@ -1353,7 +1216,7 @@ void UDPStandardImplementation::startReadout(){ //(as one listens to many at a time, shouldnt cut off in between) while((prev != totalP) || (prevReceivedInBuffer!= currentReceivedInBuffer)){ #ifdef DEBUG5 - cprintf(MAGENTA,"waiting for all packets prevP:%d totalP:%d PrevBuffer:%d currentBuffer:%d\n",prev,totalP,prevReceivedInBuffer,currentReceivedInBuffer); + cprintf(MAGENTA,"waiting for all packets prevP:%d totalP:%d PrevBuffer:%d currentBuffer:\n",prev,totalP,prevReceivedInBuffer,currentReceivedInBuffer); #endif //usleep(2*1000*1000); @@ -1380,13 +1243,9 @@ void UDPStandardImplementation::startReadout(){ pthread_mutex_lock(&statusMutex); status = TRANSMITTING; pthread_mutex_unlock(&statusMutex); - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); - { - ostringstream os; - os << "Status: Transmitting"; - string message(os.str()); FILE_LOG(logINFO, message); - } + + FILE_LOG(logINFO, "Status: Transmitting "); + } //shut down udp sockets and make listeners push dummy (end) packets for writers @@ -1407,13 +1266,9 @@ void UDPStandardImplementation::closeFile(int ithread){ //normal if(!dataCompressionEnable){ if(sfilefd[ithread]){ - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); - { - ostringstream os; - os << "Going to close file: " << fileno(sfilefd[ithread]); - string message(os.str()); FILE_LOG(logDEBUG4, message); - } + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Going to close file: %d ", fileno(sfilefd[ithread])); + FILE_LOG(logDEBUG4, cstreambuf); fflush(sfilefd[ithread]); fclose(sfilefd[ithread]); @@ -1425,13 +1280,10 @@ void UDPStandardImplementation::closeFile(int ithread){ else{ #if (defined(MYROOT1) && defined(ALLFILE_DEBUG)) || !defined(MYROOT1) if(sfilefd[0]){ - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); - { - ostringstream os; - os << "sfilefd: " << fileno(sfilefd[0]); - string message(os.str()); FILE_LOG(logDEBUG4, message); - } + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "sfilefd: %d ", fileno(sfilefd[0])); + FILE_LOG(logDEBUG4, cstreambuf); + fclose(sfilefd[0]); sfilefd[0] = 0; } @@ -1471,13 +1323,9 @@ int UDPStandardImplementation::setActivate(int enable){ if(enable != -1){ activated = enable; - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); - { - ostringstream os; - os << "Activation: " << stringEnable(activated); - string message(os.str()); FILE_LOG(logINFO, message); - } + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Activation: %s ", stringEnable(activated).c_str()); + FILE_LOG(logINFO, cstreambuf); } for(int i=0; inewDataSet(); if(myFile[ithread]==NULL){ - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); - { - ostringstream os; - os << "File Null"; - string message(os.str()); FILE_LOG(logERROR, message); - } + FILE_LOG(logERROR, "File Null "); return FAIL; } if(!myFile[ithread]->IsOpen()){ - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); - { - ostringstream os; - os << "File Not Open"; - string message(os.str()); FILE_LOG(logERROR, message); - } + FILE_LOG(logERROR, "File Not Open "); return FAIL; } return OK; @@ -2179,15 +1891,12 @@ void UDPStandardImplementation::startDataCallback(){ //zmq_setsockopt(zmqsocket,ZMQ_SNDHWM,&val,sizeof(val)); //set SEND HIGH WATER MARK (8-9ms slower) zmq_bind(zmqsocket,hostName); // bind - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); { - ostringstream os; - os << "Thread" << ithread << ": ZMQ Server at " << hostName; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Thread %d: ZMQ Server at %s ", ithread, hostName); + FILE_LOG(logINFO, cstreambuf); } - int headersize=0; switch(myDetectorType){ case EIGER: @@ -2207,17 +1916,7 @@ void UDPStandardImplementation::startDataCallback(){ int oneframesize = oneDataSize * packetsPerFrame; char* buffer = new char[packetsPerFrame*oneDataSize](); memset(buffer,0xFF,oneframesize); - int size = 0; - int offset = 0; - uint32_t currentfnum = 0; - uint64_t fnum = 0; - uint32_t pnum = 0; - uint32_t snum = 0; - uint64_t bid = 0; bool randomSendNow = true; - bool newFrame = false; - - //header details const char *jsonFmt ="{" @@ -2241,7 +1940,7 @@ void UDPStandardImplementation::startDataCallback(){ "\"roundRNumber\":%u, " "\"detType\":%u, " "\"version\":%u" - "}\0"; + "}\n"; int npixelsx=0, npixelsy=0; switch(myDetectorType) { case JUNGFRAU: npixelsx = JFRAU_PIXELS_IN_ONE_ROW; npixelsy = JFRAU_PIXELS_IN_ONE_COL; break; @@ -2253,7 +1952,6 @@ void UDPStandardImplementation::startDataCallback(){ #ifdef DEBUG int oldpnum = -1; #endif - int datapacketscaught = 0; /* inner loop - loop for each buffer */ //until mask reset (dummy pcaket got by writer) @@ -2277,14 +1975,14 @@ void UDPStandardImplementation::startDataCallback(){ acquisitionIndex = -1; { char buf[1000]="";memset(buf,0,1000); - int len = sprintf(buf,jsonFmt, + sprintf(buf,jsonFmt, SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread], 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); zmq_send(zmqsocket, buf,1000, 0); } //send final data - zmq_send (zmqsocket, "end\0", 4, 0); + zmq_send (zmqsocket, "end\n", 4, 0); pthread_mutex_lock(&statusMutex); dataCallbackThreadsMask^=(1<frameNumber, header->expLength, header->packetNumber, header->bunchId, header->timestamp, header->modId, header->xCoord, header->yCoord, header->zCoord, header->debug, header->roundRNumber, header->detType, header->version); @@ -2410,12 +2108,10 @@ void UDPStandardImplementation::startListening(){ //udpsocket doesnt exist if(activated && !udpSocket[ithread]){ - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); { - ostringstream os; - os << "Listening_Thread " << ithread << ": UDP Socket not created or shut down earlier"; - string message(os.str()); FILE_LOG(logERROR, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Listening_Thread %d: UDP Socket not created or shut down earlier ", ithread); + FILE_LOG(logERROR, cstreambuf); } stopListening(ithread,0); continue; @@ -2744,13 +2440,9 @@ void UDPStandardImplementation::stopListening(int ithread, int numbytes){ //free empty buffer if(numbytes <= 0){ - sprintf(cstreambuf, "%s", " \0"); - FILE_LOG(logDEBUG, cstreambuf); - { - ostringstream os; - os << "Listening "<< ithread << ": End of Acquisition"; - string message(os.str()); FILE_LOG(logINFO, message); - } + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Listening %d: End of Acquisition", ithread); + FILE_LOG(logINFO, cstreambuf); while(!fifoFree[ithread]->push(buffer[ithread])); } @@ -2784,12 +2476,10 @@ void UDPStandardImplementation::stopListening(int ithread, int numbytes){ listeningThreadsMask^=(1<packetNumber))-1; - ostringstream os; - os << "Fifo "<< ithread << ": Frame Number is still zero from firmware. and pnum:" << packetnumber << "udp port num:" << udpPortNum[ithread]; - string message(os.str()); FILE_LOG(logERROR, message); - - } return FAIL; } packetnumber = (*( (uint16_t*) footer->packetNumber))-1; diff --git a/slsReceiverSoftware/src/slsReceiver.cpp b/slsReceiverSoftware/src/slsReceiver.cpp index 1f1678c6c..343cd8559 100644 --- a/slsReceiverSoftware/src/slsReceiver.cpp +++ b/slsReceiverSoftware/src/slsReceiver.cpp @@ -106,31 +106,32 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success){ if( !fname.empty() ){ try{ - ostringstream os; - os << "config file name " << fname; - string message(os.str()); FILE_LOG(logDEBUG, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "config file name : %s ",fname.c_str()); + FILE_LOG(logDEBUG1, cstreambuf); + success = read_config_file(fname, &tcpip_port_no, &configuration_map); //VERBOSE_PRINT("Read configuration file of " + iline + " lines"); } catch(...){ - ostringstream os; - os << "Error opening configuration file " << fname ; - string message(os.str()); FILE_LOG(logERROR, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Error opening configuration file : %s ",fname.c_str()); + FILE_LOG(logERROR, cstreambuf); + success = FAIL; } } if(success != OK){ - ostringstream os; - os << "Failed: see output above for more information " ; - string message(os.str()); FILE_LOG(logERROR, message); + FILE_LOG(logERROR, "Failed: see output above for more information "); } if (success==OK){ - ostringstream os; - os << "SLS Receiver starting " << udp_interface_type << " on port " << tcpip_port_no << endl; - string message(os.str()); FILE_LOG(logDEBUG, message); + + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "SLS Receiver starting %s on port %d ",udp_interface_type.c_str(), tcpip_port_no); + FILE_LOG(logDEBUG1, cstreambuf); #ifdef REST udp_interface = UDPInterface::create(udp_interface_type); udp_interface->configure(configuration_map); diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index ea68631fd..1840f7715 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -126,22 +126,17 @@ int slsReceiverTCPIPInterface::setPortNumber(int pn){ int slsReceiverTCPIPInterface::start(){ - { - ostringstream os; - os << "Creating TCP Server Thread" << endl; - string message(os.str()); FILE_LOG(logDEBUG, message); - } + + FILE_LOG(logDEBUG1, "Creating TCP Server Thread"); + killTCPServerThread = 0; if(pthread_create(&TCPServer_thread, NULL,startTCPServerThread, (void*) this)){ cout << "Could not create TCP Server thread" << endl; return FAIL; } //#ifdef VERYVERBOSE - { - ostringstream os; - os << "TCP Server thread created successfully." << endl; - string message(os.str()); FILE_LOG(logDEBUG, message); - } + FILE_LOG(logDEBUG1, "TCP Server thread created successfully."); + //#endif return OK; } @@ -402,20 +397,20 @@ int slsReceiverTCPIPInterface::set_detector_type(){ } } - //#ifdef VERYVERBOSE +//#ifdef VERYVERBOSE if(ret!=FAIL) { - ostringstream os; - os << "detector type " << dr; - string message(os.str()); FILE_LOG(logDEBUG, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Detector Type %d ", (int)dr); + FILE_LOG(logDEBUG1, cstreambuf); } else cprintf(RED, "%s\n", mess); - //#endif +//#endif #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -482,7 +477,7 @@ int slsReceiverTCPIPInterface::set_file_name() { if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -557,7 +552,7 @@ int slsReceiverTCPIPInterface::set_file_dir() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -629,7 +624,7 @@ int slsReceiverTCPIPInterface::set_file_index() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -707,7 +702,7 @@ int slsReceiverTCPIPInterface::set_frame_index() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -772,15 +767,15 @@ int slsReceiverTCPIPInterface::setup_udp(){ //setup udpip //get ethernet interface or IP to listen to { - ostringstream os; - os << "Receiver UDP IP: " << args[0]; - string message(os.str()); FILE_LOG(logINFO, message); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Receiver UDP IP: %s ",args[0]); + FILE_LOG(logINFO, cstreambuf); } temp = genericSocket::ipToName(args[0]); if(temp=="none"){ ret = FAIL; strcpy(mess, "Failed to get ethernet interface or IP\n"); - FILE_LOG(logERROR, string(mess)); + FILE_LOG(logERROR, "Failed to get ethernet interface or IP "); } else{ strcpy(eth,temp.c_str()); @@ -801,9 +796,10 @@ int slsReceiverTCPIPInterface::setup_udp(){ } else{ strcpy(retval,temp.c_str()); - ostringstream os; - os << "Reciever MAC Address: " << retval; - string message(os.str()); FILE_LOG(logINFO, message); + + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "Reciever MAC Address: %s ",retval); + FILE_LOG(logINFO, cstreambuf); } } } @@ -811,14 +807,16 @@ int slsReceiverTCPIPInterface::setup_udp(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } // send answer mySock->SendDataOnly(&ret,sizeof(ret)); if(ret==FAIL){ - FILE_LOG(logERROR, string(mess)); + char cstreambuf[MAX_STR_LENGTH]; memset(cstreambuf, 0, MAX_STR_LENGTH); + sprintf(cstreambuf, "%s ", mess); + FILE_LOG(logERROR, cstreambuf); mySock->SendDataOnly(mess,sizeof(mess)); } mySock->SendDataOnly(retval,MAX_STR_LENGTH); @@ -867,7 +865,7 @@ int slsReceiverTCPIPInterface::start_receiver(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -915,7 +913,7 @@ int slsReceiverTCPIPInterface::stop_receiver(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -946,7 +944,7 @@ int slsReceiverTCPIPInterface::get_status(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -977,7 +975,7 @@ int slsReceiverTCPIPInterface::get_frames_caught(){ }else retval=receiverBase->getTotalFramesCaught(); #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -1009,7 +1007,7 @@ int slsReceiverTCPIPInterface::get_frame_index(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -1054,7 +1052,7 @@ int slsReceiverTCPIPInterface::reset_frames_caught(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -1123,7 +1121,7 @@ int slsReceiverTCPIPInterface::set_short_frame() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -1305,7 +1303,7 @@ int slsReceiverTCPIPInterface::moench_read_frame(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -1486,7 +1484,7 @@ int slsReceiverTCPIPInterface::gotthard_read_frame(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -1640,7 +1638,7 @@ int slsReceiverTCPIPInterface::propix_read_frame(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -1907,7 +1905,7 @@ int slsReceiverTCPIPInterface::eiger_read_frame(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2070,7 +2068,7 @@ int slsReceiverTCPIPInterface::jungfrau_read_frame(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2148,7 +2146,7 @@ int slsReceiverTCPIPInterface::set_read_frequency(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2214,7 +2212,7 @@ int slsReceiverTCPIPInterface::set_read_receiver_timer(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2277,7 +2275,7 @@ int slsReceiverTCPIPInterface::set_data_stream_enable(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2337,7 +2335,7 @@ int slsReceiverTCPIPInterface::enable_file_write(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2365,7 +2363,7 @@ int slsReceiverTCPIPInterface::get_id(){ #endif if(mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2413,7 +2411,7 @@ else{ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2501,7 +2499,7 @@ int slsReceiverTCPIPInterface::set_timer() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2573,7 +2571,7 @@ int slsReceiverTCPIPInterface::enable_compression() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2639,7 +2637,7 @@ int slsReceiverTCPIPInterface::set_detector_hostname() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2740,7 +2738,7 @@ int slsReceiverTCPIPInterface::set_dynamic_range() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2808,7 +2806,7 @@ int slsReceiverTCPIPInterface::enable_overwrite() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2878,7 +2876,7 @@ int slsReceiverTCPIPInterface::enable_tengiga() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -2950,7 +2948,7 @@ int slsReceiverTCPIPInterface::set_fifo_depth() { #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -3024,7 +3022,7 @@ int slsReceiverTCPIPInterface::set_activate() { if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; } @@ -3088,7 +3086,7 @@ int slsReceiverTCPIPInterface::set_flipped_data(){ #endif if(ret==OK && mySock->differentClients){ - FILE_LOG(logDEBUG,"Force update" ); + FILE_LOG(logDEBUG1,"Force update" ); ret=FORCE_UPDATE; }