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

almost done

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-08-03 16:29:59 +02:00
parent d766d1ff37
commit 902ab36705
2 changed files with 236 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsReceiverSoftware/include/UDPBaseImplementation.h
View File

@ -567,16 +567,19 @@ protected:
uint32_t frameIndex; uint32_t frameIndex;
/** Frames Caught for each real time acquisition (eg. for each scan) */ /** Frames Caught for each real time acquisition (eg. for each scan) */
int packetsCaught; uint32_t packetsCaught;
/** Total packets caught for an entire acquisition (including all scans) */ /** Total packets caught for an entire acquisition (including all scans) */
int totalPacketsCaught; uint32_t totalPacketsCaught;
/** Pckets currently in current file, starts new file when it reaches max */ /** Pckets currently in current file, starts new file when it reaches max */
int packetsInFile; uint32_t packetsInFile;
/** Number of missing packets in file (sometimes packetsinFile is incorrect due to padded packets for eiger)*/ /** Number of missing packets in file (sometimes packetsinFile is incorrect due to padded packets for eiger)*/
int numTotMissingPacketsInFile; uint32_t numTotMissingPacketsInFile;
/** Number of missing packets in an acquisition(sometimes packetsinFile is incorrect due to padded packets for eiger)*/
uint32_t numMissingPackets;
/** Frame index at start of an entire acquisition (including all scans) */ /** Frame index at start of an entire acquisition (including all scans) */
uint32_t startAcquisitionIndex; uint32_t startAcquisitionIndex;

368
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -123,6 +123,7 @@ void UDPStandardImplementation::initializeMembers(){
totalPacketsCaught = 0; totalPacketsCaught = 0;
packetsInFile = 0; packetsInFile = 0;
numTotMissingPacketsInFile = 0; numTotMissingPacketsInFile = 0;
numMissingPackets = 0;
startAcquisitionIndex = 0; startAcquisitionIndex = 0;
acquisitionIndex = 0; acquisitionIndex = 0;
packetsPerFrame = 0; packetsPerFrame = 0;
@ -1278,6 +1279,7 @@ int UDPStandardImplementation::setupWriter(){
//reset writing thread variables //reset writing thread variables
packetsInFile=0; packetsInFile=0;
numTotMissingPacketsInFile = 0; numTotMissingPacketsInFile = 0;
numMissingPackets = 0;
packetsCaught=0; packetsCaught=0;
frameIndex=0; frameIndex=0;
if(sfilefd) sfilefd=NULL; if(sfilefd) sfilefd=NULL;
@ -1936,16 +1938,37 @@ int UDPStandardImplementation::startWriting(){
int ret,i,j; int ret,i,j;
char* tofree[packetsPerFrame] ;
int tofreeoffset[packetsPerFrame];
char* tempbuffer[packetsPerFrame]; char* tempbuffer[packetsPerFrame];
char* blankframe[packetsPerFrame]; char* blankframe[packetsPerFrame];
int blankoffset; int blankoffset;
int tempoffset[numListeningThreads]; int tempoffset[numListeningThreads];
if(myDetectorType == EIGER) if(myDetectorType == EIGER){
for(i=0;i<packetsPerFrame;++i){ for(i=0;i<packetsPerFrame;++i){
tempbuffer[i] = 0; tempbuffer[i] = 0;
blankframe[i] = 0; tofree[i] = 0;
blankframe[i] =new char[onePacketSize];
for(j=0;j<onePacketSize;++j)
(*((uint8_t*)((char*)(blankframe[i])+j))) = 0xFF;
if((*(uint8_t*)(((eiger_packet_header *)((char*)(blankframe[i])))->num3)) != 0xFF)
cprintf(RED,"blank frame header is not FF\n");
cprintf(GREEN,"packet %d blank frame 0x%x\n",i,(void*)(blankframe[i]));
} }
//last packet numbers for different dynamic ranges
switch(dynamicRange){
case 4: LAST_PACKET_VALUE = 0x40; break;
case 8: LAST_PACKET_VALUE = 0x80; break;
case 16: LAST_PACKET_VALUE = 0xff; break;
case 32: LAST_PACKET_VALUE = 0xff; break;
default: break;
}
}
while(1){ while(1){
@ -1972,6 +1995,7 @@ int UDPStandardImplementation::startWriting(){
popready[i] = true; popready[i] = true;
startdatapacket[i] = false; startdatapacket[i] = false;
tempoffset[i] = (i*packetsPerFrame/numListeningThreads); tempoffset[i] = (i*packetsPerFrame/numListeningThreads);
tofreeoffset[i] = (i*packetsPerFrame/numListeningThreads);
blankoffset = 0; blankoffset = 0;
lastpacketheader[i] = -1; lastpacketheader[i] = -1;
currentpacketheader[i] = -1; currentpacketheader[i] = -1;
@ -1983,34 +2007,6 @@ int UDPStandardImplementation::startWriting(){
if(myDetectorType == EIGER){
for(i=0;i<packetsPerFrame;++i){
//if (tempbuffer[i]) {delete [] tempbuffer[i]; tempbuffer[i]=0;}
if (blankframe[i]) {delete [] blankframe[i]; blankframe[i]=0;}
}
//filling blank frames
for(i=0;i<packetsPerFrame;++i){
blankframe[i] = new char[onePacketSize];
for(j=0;j<onePacketSize;++j)
(*((uint8_t*)(blankframe[i]+j))) = 0xFF;
}
//last packet numbers for different dynamic ranges
switch(dynamicRange){
case 4: LAST_PACKET_VALUE = 0x40; break;
case 8: LAST_PACKET_VALUE = 0x80; break;
case 16: LAST_PACKET_VALUE = 0xff; break;
case 32: LAST_PACKET_VALUE = 0xff; break;
default: break;
}
}
while((1<<ithread)&writerthreads_mask){ while((1<<ithread)&writerthreads_mask){
@ -2024,15 +2020,21 @@ int UDPStandardImplementation::startWriting(){
#endif #endif
fifo[i]->pop(wbuf[i]); fifo[i]->pop(wbuf[i]);
#ifdef FIFO_DEBUG #ifdef FIFO_DEBUG
cprintf(GREEN,"%d writer poped from fifo %x\n", ithread, (void*)(wbuf[i])); cprintf(GREEN,"%d writer poped 0x%x from fifo %d\n", ithread, (void*)(wbuf[i]), i);
#endif #endif
numpackets[i] = (uint32_t)(*((uint32_t*)wbuf[i])); numpackets[i] = (uint32_t)(*((uint32_t*)wbuf[i]));
#ifdef VERYDEBUG #ifdef VERYDEBUG
cprintf(GREEN,"%d numpackets: %d for fifo :%d\n", ithread, numpackets[i], i); cprintf(GREEN,"%d numpackets: %d for fifo :%d\n", ithread, numpackets[i], i);
#endif #endif
//dont pop again if dummy packet //dont pop again if dummy packet
if(!numpackets[i]) if(!numpackets[i]){
popready[i] = false; popready[i] = false;
cprintf(RED,"%d dummy frame popped out of fifo %d",ithread, i);
}else{
tofree[tofreeoffset[i]] = wbuf[i];
tofreeoffset[i]++;
}
} }
} }
@ -2040,11 +2042,31 @@ int UDPStandardImplementation::startWriting(){
//end of acquisition //end of acquisition
if((!numpackets[0])&& (!numpackets[1])){ if((!numpackets[0])&& (!numpackets[1])){
#ifdef VERYDEBUG //#ifdef VERYDEBUG
cprintf(GREEN,"%d End of Acquisition in Writing Thread\n", ithread); cprintf(GREEN,"%d Both dummy frames\n", ithread);
#endif //#endif
stopWriting(ithread,wbuf); //remaning packets to be written
continue; if((myDetectorType == EIGER) &&
((tempoffset[0]!=0) || (tempoffset[1]!=(packetsPerFrame/numListeningThreads)))){
cprintf(RED,"**missing packets and end of acquisition\n");
for(i=0;i<numListeningThreads;++i){
//add missing packets
numberofmissingpackets[i] = (LAST_PACKET_VALUE - lastpacketheader[i]);
//to decrement from packetsInFile to calculate packet loss
for(j=0;j<numberofmissingpackets[i];++j){
tempbuffer[tempoffset[i]] = blankframe[blankoffset];
tempoffset[i] ++;
blankoffset ++;
}
//set fullframe and dont let fifo pop over it until written
fullframe[i] = true;
popready[i] = false;
}
}else{
stopWriting(ithread,wbuf);
continue;
}
} }
@ -2054,86 +2076,102 @@ int UDPStandardImplementation::startWriting(){
if(myDetectorType == EIGER){ if(myDetectorType == EIGER){
//trying to find a full frame if(!fullframe[0] || !fullframe[1]){
for(i=0;i<numListeningThreads;++i){
//trying to find a full frame
for(i=0;i<numListeningThreads;++i){
//offset outside boundaries, also eliminates dummy packet //offset outside boundaries, also eliminates dummy packet
if((numpackets[i] != EIGER_HEADER_LENGTH) && (numpackets[i] != onePacketSize)){ if((numpackets[i] != EIGER_HEADER_LENGTH) && (numpackets[i] != onePacketSize)){
if(numpackets[i]) if(numpackets[i]){
cprintf(RED, "WARNING: Got a weird packet size: %d from fifo %d\n", numpackets[i],i); cprintf(RED, "WARNING: Got a weird packet size: %d from fifo %d\n", numpackets[i],i);
#ifdef VERBOSE if(numpackets[i] == 16)
else cprintf(RED,"weird packet, x%x\n",(*(uint16_t*)((uint16_t *)((char*)(wbuf[i] + HEADER_SIZE_NUM_TOT_PACKETS)))));
cprintf(RED, "WARNING: Dummy packet: %d from fifo %d\n", numpackets[i],i);
#endif
continue;
}
//not dummy buffer and not after getting a full frame
if(numpackets[i] && (!fullframe[i])){
//header packet
if( 0x01 == (*(uint8_t*)(((eiger_image_header *)((char*)(wbuf[i] + HEADER_SIZE_NUM_TOT_PACKETS)))->header_confirm))){
//new frame (no datapacket received yet), update frame num and corrected for fnum reset for scans
if(!startdatapacket[i]){
tempframenum[i] = htonl(*(unsigned int*)((eiger_image_header *)((char*)(wbuf[ithread] + HEADER_SIZE_NUM_TOT_PACKETS)))->fnum)+(startFrameIndex-1);
//#ifdef VERYVERBOSE
cprintf(GREEN,"**tempfraemnum of %d: %d\n",i,tempframenum[i]);
//#endif
}//next frame, leave
else{
cprintf(RED,"**missing packets and got header\n");
//add missing packets
numberofmissingpackets[i] = (LAST_PACKET_VALUE - lastpacketheader[i]);
//to decrement from packetsInFile to calculate packet loss
numTotMissingPacketsInFile += numberofmissingpackets[i];
for(j=0;j<numberofmissingpackets[i];++j){
tempbuffer[tempoffset[i]] = blankframe[blankoffset];
tempoffset[i] ++;
blankoffset ++;
}
//set fullframe and dont let fifo pop over it until written
fullframe[i] = true;
popready[i] = false;
} }
} #ifdef VERBOSE
//data packet else
else{ cprintf(RED, "WARNING: Dummy packet: %d from fifo %d\n", numpackets[i],i);
//update current packet
currentpacketheader[i] = ((*(uint8_t*)(((eiger_packet_header *)((char*)(wbuf[i] + HEADER_SIZE_NUM_TOT_PACKETS)))->num4)));
#ifdef VERYVERBOSE
cprintf(GREEN,"** got current packet header of %d: %d lastpacketheader %d\n",i,currentpacketheader[i],lastpacketheader[i]);
#endif #endif
//same frame packet - continue building frame if(numpackets[i]){
if(currentpacketheader[i] > lastpacketheader[i]){ while(!fifoFree[i]->push((wbuf[i])));
//add missing packets //#ifdef FIFO_DEBUG
numberofmissingpackets[i] = (currentpacketheader[i] - lastpacketheader[i] -1); cprintf(GREEN,"%d writer freed unknown length pushed into fifofree %x for listener %d\n",ithread, (void*)(wbuf[i]),i);
//to decrement from packetsInFile to calculate packet loss //#endif
numTotMissingPacketsInFile += numberofmissingpackets[i]; }
for(j=0;j<numberofmissingpackets[i];++j){ continue;
tempbuffer[tempoffset[i]] = blankframe[blankoffset]; }
tempoffset[i] ++;
blankoffset ++; //not dummy buffer and not after getting a full frame
} if(numpackets[i] && (!fullframe[i])){
//add current packet
tempbuffer[tempoffset[i]] = wbuf[i] + HEADER_SIZE_NUM_TOT_PACKETS; //header packet
tempoffset[i] ++; if( 0x01 == (*(uint8_t*)(((eiger_image_header *)((char*)(wbuf[i] + HEADER_SIZE_NUM_TOT_PACKETS)))->header_confirm))){
//update last packet
lastpacketheader[i] = currentpacketheader[i]; //new frame (no datapacket received yet), update frame num and corrected for fnum reset for scans
//last frame got, this will save time and also for last frames, it doesnt wait for stop receiver if(!startdatapacket[i]){
if(currentpacketheader[i] == LAST_PACKET_VALUE){ tempframenum[i] = (htonl(*(unsigned int*)((eiger_image_header *)((char*)(wbuf[i] + HEADER_SIZE_NUM_TOT_PACKETS)))->fnum));
cout<<"last value"<<endl; if(!tempframenum[i])
cprintf(RED,"**VERY WEIRD frame numbers for fifo %d: %d\n",i,tempframenum[i]);
tempframenum[i] += (startFrameIndex-1);
//#ifdef VERYVERBOSE
cprintf(GREEN,"**tempfraemnum of %d: %d\n",i,tempframenum[i]);
//#endif
}//next frame, leave
else{
cprintf(RED,"**missing packets and got header\n");
//add missing packets
numberofmissingpackets[i] = (LAST_PACKET_VALUE - lastpacketheader[i]);
//to decrement from packetsInFile to calculate packet loss
for(j=0;j<numberofmissingpackets[i];++j){
tempbuffer[tempoffset[i]] = blankframe[blankoffset];
tempoffset[i] ++;
blankoffset ++;
}
//set fullframe and dont let fifo pop over it until written
fullframe[i] = true; fullframe[i] = true;
popready[i] = false; popready[i] = false;
} }
} }
//next frame packet - leave //data packet
else{cout<<"abnormal next frame packet!! "<<endl; else{
startdatapacket[i] = true;
//update current packet
currentpacketheader[i] = ((*(uint8_t*)(((eiger_packet_header *)((char*)(wbuf[i] + HEADER_SIZE_NUM_TOT_PACKETS)))->num4)));
#ifdef VERYVERBOSE
cprintf(GREEN,"**fifo:%d currentpacketheader: %d lastpacketheader %d\n",i,currentpacketheader[i],lastpacketheader[i]);
#endif
//same frame packet - continue building frame
if(currentpacketheader[i] > lastpacketheader[i]){
//add missing packets
numberofmissingpackets[i] = (currentpacketheader[i] - lastpacketheader[i] -1);
//to decrement from packetsInFile to calculate packet loss
for(j=0;j<numberofmissingpackets[i];++j){
tempbuffer[tempoffset[i]] = blankframe[blankoffset];
tempoffset[i] ++;
blankoffset ++;
}
//add current packet
tempbuffer[tempoffset[i]] = wbuf[i] + HEADER_SIZE_NUM_TOT_PACKETS;
tempoffset[i] ++;
//update last packet
lastpacketheader[i] = currentpacketheader[i];
//last frame got, this will save time and also for last frames, it doesnt wait for stop receiver
if(currentpacketheader[i] == LAST_PACKET_VALUE){
cout<<"last value"<<endl;
fullframe[i] = true;
popready[i] = false;
}
}
//next frame packet - leave
else{cout<<"abnormal next frame packet!! "<<endl;
//add missing packets //add missing packets
numberofmissingpackets[i] = (LAST_PACKET_VALUE = lastpacketheader[i]); cprintf(RED,"LAST_PACKET_VALUE:%d lastpacketheader[%d]:%d\n",LAST_PACKET_VALUE,i,lastpacketheader[i]);
numberofmissingpackets[i] = (LAST_PACKET_VALUE - lastpacketheader[i]);
cprintf(RED, "fifo:%d abrupt missing packets:%d\n",i,numberofmissingpackets[i]);
//to decrement from packetsInFile to calculate packet loss //to decrement from packetsInFile to calculate packet loss
numTotMissingPacketsInFile += numberofmissingpackets[i];
for(j=0;j<numberofmissingpackets[i];++j){ for(j=0;j<numberofmissingpackets[i];++j){
tempbuffer[tempoffset[i]] = blankframe[blankoffset]; tempbuffer[tempoffset[i]] = blankframe[blankoffset];
tempoffset[i] ++; tempoffset[i] ++;
@ -2142,13 +2180,15 @@ int UDPStandardImplementation::startWriting(){
//set fullframe and dont let fifo pop over it until written //set fullframe and dont let fifo pop over it until written
fullframe[i] = true; fullframe[i] = true;
popready[i] = false; popready[i] = false;
}
} }
} }
}
}
} }
//check if a full frame received //check if a full frame received
if(fullframe[0] && fullframe[1]){ if(fullframe[0] && fullframe[1]){
@ -2158,25 +2198,64 @@ int UDPStandardImplementation::startWriting(){
currframenum = tempframenum[0]; currframenum = tempframenum[0];
//#ifdef EIGER_DEBUG2 //#ifdef EIGER_DEBUG2
cprintf(GREEN,"%d **fnum:%d**\n",currframenum); cprintf(GREEN,"%d **fnum:%d**\n",currframenum);
if(numberofmissingpackets[0])
cprintf(RED, "fifo 0 missing packets:%d\n",numberofmissingpackets[0]);
if(numberofmissingpackets[1])
cprintf(RED, "fifo 1 missing packets:%d\n",numberofmissingpackets[1]);
//#endif //#endif
if(blankoffset) if(blankoffset)
cprintf(RED, "missing packets:%d\n",blankoffset); cprintf(RED, "blankoffset:%d\n",blankoffset);
numMissingPackets += (numberofmissingpackets[0]+numberofmissingpackets[1]);
if(numMissingPackets)
cprintf(RED, "numMissingPackets:%d\n",numMissingPackets);
numTotMissingPacketsInFile += numMissingPackets;
/*if(numTotMissingPacketsInFile)
cprintf(RED, "numTotMissingPacketsInFile:%d\n",numTotMissingPacketsInFile);*/
//write and copy to gui
handleWithoutDataCompression(ithread,tempbuffer,packetsPerFrame);
//freeing
for(j=0;j<tofreeoffset[0];++j){
while(!fifoFree[0]->push(tofree[j]));
#ifdef FIFO_DEBUG
cprintf(GREEN,"%d writer freed pushed into fifofree %x for listener %d\n",ithread, (void*)(tofree[j]),0);
#endif
}
for(j=(packetsPerFrame/numListeningThreads);j<tofreeoffset[1];++j){
while(!fifoFree[1]->push(tofree[j]));
#ifdef FIFO_DEBUG
cprintf(GREEN,"%d writer freed pushed into fifofree %x for listener %d\n",ithread, (void*)(tofree[j]),1);
#endif
}
//#ifdef VERYDEBUG
cprintf(GREEN,"finished freeing\n");
//#endif
//reset a few stuff //reset a few stuff
for(int i=0;i<numListeningThreads;i++){ for(int i=0;i<numListeningThreads;i++){
fullframe[i] = false; fullframe[i] = false;
popready[i] = true; //only if no dummy frames got in between
if((numpackets[0])|| (numpackets[1]))
popready[i] = true;
startdatapacket[i] = false; startdatapacket[i] = false;
tempoffset[i] = (i*packetsPerFrame/numListeningThreads); tempoffset[i] = (i*packetsPerFrame/numListeningThreads);
tofreeoffset[i] = (i*packetsPerFrame/numListeningThreads);
blankoffset = 0; blankoffset = 0;
lastpacketheader[i] = -1; lastpacketheader[i] = -1;
currentpacketheader[i] = -1; currentpacketheader[i] = -1;
numberofmissingpackets[i] = 0; numberofmissingpackets[i] = 0;
} }
//write and copy to gui
handleWithoutDataCompression(ithread,tempbuffer,packetsPerFrame);
} }
@ -2439,9 +2518,9 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer[]){
//free fifo //free fifo
for(i=0;i<numListeningThreads;++i){ for(i=0;i<numListeningThreads;++i){
while(!fifoFree[i]->push(wbuffer[i])); while(!fifoFree[i]->push(wbuffer[i]));
#ifdef FIFO_DEBUG //#ifdef FIFO_DEBUG
cprintf(GREEN,"%d writer free dummy pushed into fifofree %x for listener %d\n", ithread,(void*)(wbuffer[i]),i); cprintf(GREEN,"%d writer free dummy pushed into fifofree %x for listener %d\n", ithread,(void*)(wbuffer[i]),i);
#endif //#endif
} }
@ -2480,8 +2559,8 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer[]){
cprintf(GREEN, "Status: Run Finished\n"); cprintf(GREEN, "Status: Run Finished\n");
if(!totalPacketsCaught){ if(!totalPacketsCaught){
cprintf(GREEN, "Total Packets Caught:%d\n", totalPacketsCaught); cprintf(RED, "Total Packets Caught: 0\n");
cprintf(GREEN, "Total Frames Caught:%d\n",(totalPacketsCaught/packetsPerFrame)); cprintf(RED, "Total Frames Caught: 0\n");
}else{ }else{
cprintf(GREEN, "Total Packets Caught:%d\n", totalPacketsCaught); cprintf(GREEN, "Total Packets Caught:%d\n", totalPacketsCaught);
cprintf(GREEN, "Total Frames Caught:%d\n",(totalPacketsCaught/packetsPerFrame)); cprintf(GREEN, "Total Frames Caught:%d\n",(totalPacketsCaught/packetsPerFrame));
@ -2505,7 +2584,7 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer[]){
void UDPStandardImplementation::writeToFile_withoutCompression(char* buf[],int numpackets, uint32_t framenum){ void UDPStandardImplementation::writeToFile_withoutCompression(char* buf[],int numpackets, uint32_t framenum){
FILE_LOG(logDEBUG) << __AT__ << " called"; FILE_LOG(logDEBUG) << __AT__ << " called";
cout<<"in write to file numpackets:"<<numpackets<<endl;
int packetsToSave, offset,lastpacket,i; int packetsToSave, offset,lastpacket,i;
uint32_t tempframenum = framenum; uint32_t tempframenum = framenum;
@ -2589,18 +2668,22 @@ void UDPStandardImplementation::writeToFile_withoutCompression(char* buf[],int n
if(packetsToSave > numpackets) if(packetsToSave > numpackets)
packetsToSave = numpackets; packetsToSave = numpackets;
/**next time offset is still plus header length*/ /**next time offset is still plus header length*/
if(myDetectorType == EIGER) if(myDetectorType == EIGER){
for(i=0;i<packetsToSave;++i) for(i=0;i<packetsToSave;++i)
fwrite((void*)buf[i], 1, onePacketSize, sfilefd); fwrite((void*)buf[i], 1, onePacketSize, sfilefd);
//fwrite((void*)buf, 1, packetsToSave * onePacketSize, sfilefd); //fwrite((void*)buf, 1, packetsToSave * onePacketSize, sfilefd);
else }else
fwrite(buf[0]+offset, 1, packetsToSave * onePacketSize, sfilefd); fwrite(buf[0]+offset, 1, packetsToSave * onePacketSize, sfilefd);
packetsInFile += packetsToSave; packetsInFile += packetsToSave;
packetsCaught += packetsToSave; cout<<"packetscaught earlier:"<<packetsCaught <<" totalPacketsCaught earlier:"<<totalPacketsCaught<<endl;
totalPacketsCaught += packetsToSave; cout<<"packetstosave:"<<packetsToSave<<" numMissingPackets:"<<numMissingPackets<< " adding on:"<< (packetsToSave - numMissingPackets)<<endl;
#ifdef VERYDEBUG packetsCaught += (packetsToSave - numMissingPackets);
cout << "/totalPacketsCaught:" << dec << totalPacketsCaught <<endl; totalPacketsCaught += (packetsToSave - numMissingPackets);
#endif numMissingPackets = 0;
//#ifdef VERYDEBUG
cprintf(GREEN,"packetscaught:%d\n", packetsCaught);
cprintf(GREEN,"totalPacketsCaught:%d\n", totalPacketsCaught);
//#endif
//new file //new file
if(packetsInFile >= maxPacketsPerFile){ if(packetsInFile >= maxPacketsPerFile){
@ -2641,8 +2724,9 @@ void UDPStandardImplementation::writeToFile_withoutCompression(char* buf[],int n
if(numWriterThreads > 1) if(numWriterThreads > 1)
pthread_mutex_lock(&write_mutex); pthread_mutex_lock(&write_mutex);
packetsInFile += numpackets; packetsInFile += numpackets;
packetsCaught += numpackets; packetsCaught += (numpackets - numMissingPackets);
totalPacketsCaught += numpackets; totalPacketsCaught += (numpackets - numMissingPackets);
numMissingPackets = 0;
if(numWriterThreads > 1) if(numWriterThreads > 1)
pthread_mutex_unlock(&write_mutex); pthread_mutex_unlock(&write_mutex);
} }
@ -2734,16 +2818,22 @@ void UDPStandardImplementation::handleWithoutDataCompression(int ithread, char*
cprintf(GREEN,"copied frame\n"); cprintf(GREEN,"copied frame\n");
//#endif //#endif
for(i=0;i<numListeningThreads;++i){ /*
for(j=0;j<packetsPerFrame/2;++j){ for(j=0;j<packetsPerFrame;++j){
//free those not blank packets if((*(uint8_t*)(((eiger_packet_header *)((char*)(wbuffer[j])))->num3)) != 0xFF){
if((*(uint8_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num3)) != 0xFF)
while(!fifoFree[i]->push(wbuffer[j+i*(packetsPerFrame/2)])); while(!fifoFree[(j/(packetsPerFrame/2))]->push(&(wbuffer[j] - HEADER_SIZE_NUM_TOT_PACKETS)));
#ifdef FIFO_DEBUG
cprintf(GREEN,"%d writer freed pushed into fifofree %x for listener %d\n",ithread, (void*)(wbuffer[j+i*(packetsPerFrame/2)])); //#ifdef FIFO_DEBUG
#endif cprintf(GREEN,"%d writer freed pushed into fifofree %x for listener %d\n",ithread, (void*)(wbuffer[j]- HEADER_SIZE_NUM_TOT_PACKETS),(j/(packetsPerFrame/2)));
} //#endif
}else cprintf(GREEN,"blank frame 0x%x\n",(void*)(wbuffer[j]));
} }
//#ifdef VERYDEBUG
cprintf(GREEN,"finished freeing\n");
//#endif
*/
} }
else{ else{
//copy to gui //copy to gui