diff --git a/slsReceiverSoftware/src/Fifo.cpp b/slsReceiverSoftware/src/Fifo.cpp index 0271f8685..bb37de5f5 100755 --- a/slsReceiverSoftware/src/Fifo.cpp +++ b/slsReceiverSoftware/src/Fifo.cpp @@ -45,13 +45,13 @@ void Fifo::CreateFifos(uint32_t fifoItemSize) { fifoFree = new CircularFifo(fifoDepth); fifoStream = new CircularFifo(fifoDepth); //allocate memory - size_t mem_len = fifoItemSize * fifoDepth * sizeof(char); + size_t mem_len = (size_t)fifoItemSize * (size_t)fifoDepth * sizeof(char); memory = (char*) malloc (mem_len); if (memory == nullptr){ throw sls::RuntimeError("Could not allocate memory for fifos"); } memset(memory, 0, mem_len); - FILE_LOG(logDEBUG) << "Memory Allocated " << index << ": " << mem_len << " bytes"; + FILE_LOG(logDEBUG) << "Memory Allocated " << index << ": " << (double)mem_len/(1000.00 * 1000.00) << " Mb"; { //push free addresses into fifoFree fifo char* buffer = memory; diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 0025d1e80..cfb79773f 100755 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -193,10 +193,10 @@ void Implementation::SetupFifoStructure() { } FILE_LOG(logINFO) << "Memory Allocated Per Fifo: " - << (((generalData->imageSize) + + << (double)(((generalData->imageSize) + (generalData->fifoBufferHeaderSize)) * - fifoDepth) - << " bytes"; + fifoDepth) / (1000.00 * 1000.00) + << " Mb"; FILE_LOG(logINFO) << numThreads << " Fifo structure(s) reconstructed"; }