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

fixed the print file packet loss progress bug

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-20 08:13:42 +02:00
parent 0f8a33d71f
commit 7eafce87f9
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1529,8 +1529,10 @@ int UDPStandardImplementation::createNewFile(int ithread){
FILE_LOG(logDEBUG) << __AT__ << " called"; FILE_LOG(logDEBUG) << __AT__ << " called";
int index = 0; int index = 0;
if(totalWritingPacketCount[ithread]) if(totalWritingPacketCount[ithread]){
index = frameIndex[ithread]; index = frameIndex[ithread];
cout << "\nThread " << ithread << "\tFile:" << completeFileName <<endl;
}
//create file name //create file name
if(!frameIndexEnable) if(!frameIndexEnable)
@ -1567,21 +1569,21 @@ int UDPStandardImplementation::createNewFile(int ithread){
//Print packet loss and filenames //Print packet loss and filenames
if(!totalWritingPacketCount[ithread]){ if(!totalWritingPacketCount[ithread]){
frameNumberInPreviousFile[ithread] = 0; frameNumberInPreviousFile[ithread] = -1;
cout << "Thread " << ithread << " File:" << completeFileName[ithread] << endl; cout << "Thread " << ithread << " File:" << completeFileName[ithread] << endl;
}else{ }else{
if(!ithread) cout << "Thread " << ithread << " File:" << completeFileName[ithread] cout
<< "\tPacket Loss:" << setw(4)<<fixed << setprecision(4) << dec << //<< "Packet Loss:" <<
(int)(( ( (currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread]) - (((double)totalPacketsInFile[ithread])/(double)packetsPerFrame) )/ //setw(4)<<fixed << setprecision(4) <<
(double)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])) *100.000) //dec << (int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/
<< "%\tFrame#:" << currentFrameNumber[ithread] // (double)(currentFrameNumber-1-previousFrameNumber))*100.000)
<< "\tPackets in File: " << totalPacketsInFile[ithread] //<< "%\t"
// << "\t\t frameNumberInPreviousFile:" << frameNumberInPreviousFile[ithread] << "\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-1-frameNumberInPreviousFile[ithread])*packetsPerFrame) -
// << "\tIndex:" << dec << index totalPacketsInFile[ithread])
<< "\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) - << "\tCurrentFrameNumber:" << currentFrameNumber[ithread]
totalPacketsInFile[ithread]) << "\tPreviousFrameNumber:" << frameNumberInPreviousFile[ithread]
//<< "\tIndex:" << dec << index
<< endl; << endl;
} }
//write file header //write file header
@ -1591,7 +1593,7 @@ int UDPStandardImplementation::createNewFile(int ithread){
//reset counters for each new file //reset counters for each new file
if(totalWritingPacketCount[ithread]){ if(totalWritingPacketCount[ithread]){
frameNumberInPreviousFile[ithread] = currentFrameNumber[ithread]; frameNumberInPreviousFile[ithread] = currentFrameNumber[ithread]-1;
totalPacketsInFile[ithread] = 0; totalPacketsInFile[ithread] = 0;
} }
@ -2623,6 +2625,18 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer){
fseek(sfilefd[ithread],0,0); fseek(sfilefd[ithread],0,0);
fwrite((void*)fileHeader[ithread], 1, FILE_HEADER_SIZE, sfilefd[ithread]); fwrite((void*)fileHeader[ithread], 1, FILE_HEADER_SIZE, sfilefd[ithread]);
} }
cout << "\nThread " << ithread << "\tFile:" << completeFileName <<endl;
//<< "Packet Loss:" <<
//setw(4)<<fixed << setprecision(4) <<
//dec << (int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/
// (double)(currentFrameNumber-1-previousFrameNumber))*100.000)
//<< "%\t"
cout << "\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) -
totalPacketsInFile[ithread])
<< "\tCurrentFrameNumber:" << currentFrameNumber[ithread]
<< "\tPreviousFrameNumber:" << frameNumberInPreviousFile[ithread]
//<< "\tIndex:" << dec << index
<< endl;
closeFile(ithread); closeFile(ithread);
pthread_mutex_lock(&statusMutex); pthread_mutex_lock(&statusMutex);
writerThreadsMask^=(1<<ithread); writerThreadsMask^=(1<<ithread);