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

stuck when it reachs bunchsize

Browse Source
This commit is contained in:
maliakal_d 2022-06-07 17:23:39 +02:00
parent 23e4dde063
commit 1cfebf667b
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -263,7 +263,7 @@ std::string DataProcessor::CreateMasterFile(
void DataProcessor::ThreadExecution() { void DataProcessor::ThreadExecution() {
char *buffer = nullptr; char *buffer = nullptr;
fifo_->PopAddress(buffer); fifo_->PopAddress(buffer);
LOG(logINFOBLUE) << "DataProcessor " << index << ", " << std::hex LOG(logDEBUG1) << "DataProcessor " << index << ", " << std::hex
<< static_cast<void *>(buffer) << std::dec; << static_cast<void *>(buffer) << std::dec;
char* tempBuffer = buffer; char* tempBuffer = buffer;
@ -271,7 +271,7 @@ void DataProcessor::ThreadExecution() {
// end of acquisition (check dummy) // end of acquisition (check dummy)
auto numBytes = *reinterpret_cast<uint32_t *>(tempBuffer); auto numBytes = *reinterpret_cast<uint32_t *>(tempBuffer);
LOG(logDEBUG1) << "DataProcessor " << index << ", Numbytes:" << numBytes; LOG(logDEBUG1) << "DataProcessor " << index << ", Numbytes:" << numBytes << " " << std::hex << static_cast<void *>(tempBuffer) << std::dec;
if (numBytes == DUMMY_PACKET_VALUE) { if (numBytes == DUMMY_PACKET_VALUE) {
StopProcessing(buffer); StopProcessing(buffer);
return; return;

10
slsReceiverSoftware/src/Implementation.cpp
View File

@ -693,13 +693,15 @@ void Implementation::stopReceiver() {
while (running) { while (running) {
running = false; running = false;
for (const auto &it : listener) for (const auto &it : listener)
if (it->IsRunning()) if (it->IsRunning()) {
running = true; running = true;
LOG(logINFOBLUE) << "listener done"; //LOG(logINFOBLUE) << "listener NOT done";
}
for (const auto &it : dataProcessor) for (const auto &it : dataProcessor)
if (it->IsRunning()) if (it->IsRunning()) {
running = true; running = true;
LOG(logINFOBLUE) << "processor done"; //LOG(logINFOBLUE) << "processor NOT done";
}
std::this_thread::sleep_for(std::chrono::milliseconds(5)); std::this_thread::sleep_for(std::chrono::milliseconds(5));
} }

2
slsReceiverSoftware/src/Listener.cpp
View File

@ -264,7 +264,7 @@ void Listener::ThreadExecution() {
// last check // last check
if ((*status != TRANSMITTING || !udpSocketAlive) && !carryOverFlag) { if ((*status != TRANSMITTING || !udpSocketAlive) && !carryOverFlag) {
LOG(logINFOBLUE) << "Last check "; LOG(logINFOBLUE) << "Last check " << std::hex << static_cast<void *>(tempBuffer) << std::dec;
(*((uint32_t *)tempBuffer)) = DUMMY_PACKET_VALUE; (*((uint32_t *)tempBuffer)) = DUMMY_PACKET_VALUE;
StopListening(buffer); StopListening(buffer);
return; return;