diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index 5722116a3..e6d869bde 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -263,7 +263,7 @@ std::string DataProcessor::CreateMasterFile( void DataProcessor::ThreadExecution() { char *buffer = nullptr; fifo_->PopAddress(buffer); - LOG(logINFOBLUE) << "DataProcessor " << index << ", " << std::hex + LOG(logDEBUG1) << "DataProcessor " << index << ", " << std::hex << static_cast(buffer) << std::dec; char* tempBuffer = buffer; @@ -271,7 +271,7 @@ void DataProcessor::ThreadExecution() { // end of acquisition (check dummy) auto numBytes = *reinterpret_cast(tempBuffer); - LOG(logDEBUG1) << "DataProcessor " << index << ", Numbytes:" << numBytes; + LOG(logDEBUG1) << "DataProcessor " << index << ", Numbytes:" << numBytes << " " << std::hex << static_cast(tempBuffer) << std::dec; if (numBytes == DUMMY_PACKET_VALUE) { StopProcessing(buffer); return; diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 8a4d36bda..69f37c378 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -693,13 +693,15 @@ void Implementation::stopReceiver() { while (running) { running = false; for (const auto &it : listener) - if (it->IsRunning()) + if (it->IsRunning()) { running = true; - LOG(logINFOBLUE) << "listener done"; + //LOG(logINFOBLUE) << "listener NOT done"; + } for (const auto &it : dataProcessor) - if (it->IsRunning()) + if (it->IsRunning()) { running = true; - LOG(logINFOBLUE) << "processor done"; + //LOG(logINFOBLUE) << "processor NOT done"; + } std::this_thread::sleep_for(std::chrono::milliseconds(5)); } diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index 31a678930..548492988 100644 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/slsReceiverSoftware/src/Listener.cpp @@ -264,7 +264,7 @@ void Listener::ThreadExecution() { // last check if ((*status != TRANSMITTING || !udpSocketAlive) && !carryOverFlag) { - LOG(logINFOBLUE) << "Last check "; + LOG(logINFOBLUE) << "Last check " << std::hex << static_cast(tempBuffer) << std::dec; (*((uint32_t *)tempBuffer)) = DUMMY_PACKET_VALUE; StopListening(buffer); return;