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

creating new files

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-11-03 13:37:30 +01:00
parent b7ead7e61e
commit 54458f0af0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1574,7 +1574,7 @@ int UDPStandardImplementation::createNewFile(int ithread){
//Print packet loss and filenames //Print packet loss and filenames
if(!totalWritingPacketCount[ithread]){ if(!totalWritingPacketCount[ithread]){
frameNumberInPreviousFile[ithread] = -1; frameNumberInPreviousFile[ithread] = -1;
printf("Thread:%d File:%s\n",ithread,completeFileName[ithread]); //printf("Thread:%d File:%s\n",ithread,completeFileName[ithread]);
}else{ }else{
if(frameNumberInPreviousFile[ithread] == -1) if(frameNumberInPreviousFile[ithread] == -1)
frameNumberInPreviousFile[ithread] = startFrameIndex -1; frameNumberInPreviousFile[ithread] = startFrameIndex -1;
@ -2881,10 +2881,11 @@ void UDPStandardImplementation::handleWithoutMissingPackets(int ithread, char* w
uint64_t tempframenumber; uint64_t tempframenumber;
tempframenumber = (*((uint32_t*)(wbuffer+HEADER_SIZE_NUM_TOT_PACKETS))); tempframenumber = (*((uint32_t*)(wbuffer+HEADER_SIZE_NUM_TOT_PACKETS)));
tempframenumber -= startFrameIndex; tempframenumber -= startFrameIndex;
currentFrameNumber[ithread] = tempframenumber;
//cout<<"handling: frame number:"<<tempframenumber<<endl; //cout<<"handling: frame number:"<<tempframenumber<<endl;
if (cbAction < DO_EVERYTHING) if (cbAction < DO_EVERYTHING)
rawDataReadyCallBack((int)tempframenumber, wbuffer, npackets * onePacketSize, rawDataReadyCallBack((int)currentFrameNumber, wbuffer, npackets * onePacketSize,
sfilefd[ithread], latestData[ithread],pRawDataReady);//know which thread from sfilefd sfilefd[ithread], latestData[ithread],pRawDataReady);//know which thread from sfilefd
@ -2892,7 +2893,6 @@ void UDPStandardImplementation::handleWithoutMissingPackets(int ithread, char* w
if(npackets > 0){ if(npackets > 0){
if((fileWriteEnable) && (sfilefd[ithread])){ if((fileWriteEnable) && (sfilefd[ithread])){
if(tempframenumber && (tempframenumber%maxFramesPerFile) == 0){ if(tempframenumber && (tempframenumber%maxFramesPerFile) == 0){
cout<<"going to create new file: frame number:"<<tempframenumber<<endl;
createNewFile(ithread); createNewFile(ithread);
} }
fwrite(wbuffer + HEADER_SIZE_NUM_TOT_PACKETS, 1, oneDataSize*packetsPerFrame+fifoBufferHeaderSize-HEADER_SIZE_NUM_TOT_PACKETS, sfilefd[ithread]); fwrite(wbuffer + HEADER_SIZE_NUM_TOT_PACKETS, 1, oneDataSize*packetsPerFrame+fifoBufferHeaderSize-HEADER_SIZE_NUM_TOT_PACKETS, sfilefd[ithread]);
@ -2901,7 +2901,6 @@ void UDPStandardImplementation::handleWithoutMissingPackets(int ithread, char* w
totalPacketsInFile[ithread] += npackets; totalPacketsInFile[ithread] += npackets;
totalWritingPacketCount[ithread] += npackets; totalWritingPacketCount[ithread] += npackets;
lastFrameNumberInFile[ithread] = tempframenumber; lastFrameNumberInFile[ithread] = tempframenumber;
currentFrameNumber[ithread] = tempframenumber;
if(numberofWriterThreads > 1) if(numberofWriterThreads > 1)
pthread_mutex_lock(&writeMutex); pthread_mutex_lock(&writeMutex);