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

some unnecessary printouts

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-01-30 16:49:30 +01:00
parent 2b248eb793
commit 7fd12f97b4
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/src/UDPBaseImplementation.cpp
View File

@ -203,7 +203,9 @@ inline char* UDPBaseImplementation::setFilePath(const char c[]){ FILE_LOG(logDEB
} }
} }
FILE_LOG(logDEBUG) << __AT__ << getFilePath(); FILE_LOG(logDEBUG) << __AT__ << getFilePath();
#ifdef VERBOSE
cout << getFilePath() << " " << filePath << endl; cout << getFilePath() << " " << filePath << endl;
#endif
return getFilePath(); return getFilePath();
} }

48
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -866,7 +866,7 @@ void UDPStandardImplementation::readFrame(char* c,char** raw, uint32_t &fnum, ui
//point to gui data //point to gui data
if (guiData == NULL){ if (guiData == NULL){
guiData = latestData; guiData = latestData;
cout <<"gui data not null anymore" << endl; //cout <<"gui data not null anymore" << endl;
} }
//copy data and filename //copy data and filename
@ -875,22 +875,26 @@ void UDPStandardImplementation::readFrame(char* c,char** raw, uint32_t &fnum, ui
fstartind = getStartFrameIndex(); fstartind = getStartFrameIndex();
//could not get gui data //could not get gui data
if(!guiDataReady){cout<<"gui data not ready"<<endl; if(!guiDataReady){
//cout<<"gui data not ready"<<endl;
*raw = NULL; *raw = NULL;
} }
//data ready, set guidata to receive new data //data ready, set guidata to receive new data
else{cout<<"gui data ready"<<endl; else{
//cout<<"gui data ready"<<endl;
*raw = guiData; *raw = guiData;
guiData = NULL; guiData = NULL;
pthread_mutex_lock(&dataReadyMutex); pthread_mutex_lock(&dataReadyMutex);
guiDataReady = 0; guiDataReady = 0;
pthread_mutex_unlock(&dataReadyMutex); pthread_mutex_unlock(&dataReadyMutex);
if((nFrameToGui) && (writerthreads_mask)){cout<<"gonna post"<<endl; if((nFrameToGui) && (writerthreads_mask)){
//cout<<"gonna post"<<endl;
/*if(nFrameToGui){*/ /*if(nFrameToGui){*/
//release after getting data //release after getting data
sem_post(&smp); sem_post(&smp);
}cout<<"done post"<<endl; }
//cout<<"done post"<<endl;
} }
} }
@ -910,7 +914,8 @@ void UDPStandardImplementation::copyFrameToGui(char* startbuf[], uint32_t fnum,
} }
//random read or nth frame read, gui needs data now //random read or nth frame read, gui needs data now
else{cout <<"gui needs data now"<<endl; else{
//cout <<"gui needs data now"<<endl;
/* /*
//nth frame read, block current process if the guireader hasnt read it yet //nth frame read, block current process if the guireader hasnt read it yet
if(nFrameToGui) if(nFrameToGui)
@ -945,8 +950,10 @@ void UDPStandardImplementation::copyFrameToGui(char* startbuf[], uint32_t fnum,
pthread_mutex_unlock(&dataReadyMutex); pthread_mutex_unlock(&dataReadyMutex);
//nth frame read, block current process if the guireader hasnt read it yet //nth frame read, block current process if the guireader hasnt read it yet
if(nFrameToGui){cout<<"waiting after copying"<<endl; if(nFrameToGui){
sem_wait(&smp);cout<<"done waiting"<<endl; //cout<<"waiting after copying"<<endl;
sem_wait(&smp);
//cout<<"done waiting"<<endl;
} }
} }
@ -1317,8 +1324,9 @@ int UDPStandardImplementation::createNewFile(){
else else
sprintf(savefilename, "%s/%s_f%012d_%d.raw", filePath,fileName,(packetsCaught/packetsPerFrame),fileIndex); sprintf(savefilename, "%s/%s_f%012d_%d.raw", filePath,fileName,(packetsCaught/packetsPerFrame),fileIndex);
#ifdef VERBOSE
cout << filePath << " + " << fileName << endl; cout << filePath << " + " << fileName << endl;
#endif
//if filewrite and we are allowed to write //if filewrite and we are allowed to write
if(enableFileWrite && cbAction > DO_NOTHING){ if(enableFileWrite && cbAction > DO_NOTHING){
@ -1645,7 +1653,7 @@ int UDPStandardImplementation::startListening(){
/* if(!ithread){*/ /* if(!ithread){*/
rc = udpSocket[ithread]->ReceiveDataOnly(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS, maxBufferSize); rc = udpSocket[ithread]->ReceiveDataOnly(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS, maxBufferSize);
cout<<"value:"<<htonl(*(unsigned int*)((eiger_image_header *)((char*)(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS)))->fnum)<<endl; //cout<<"value:"<<htonl(*(unsigned int*)((eiger_image_header *)((char*)(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS)))->fnum)<<endl;
expected = maxBufferSize; expected = maxBufferSize;
/*}else{ /*}else{
while(1) usleep(100000000); while(1) usleep(100000000);
@ -1847,7 +1855,7 @@ int loop;
#endif #endif
//pop //pop
for(i=0;i<numListeningThreads;++i){ for(i=0;i<numListeningThreads;++i){
cout<<"writer gonna pop from fifo:"<<i<<endl; //cout<<"writer gonna pop from fifo:"<<i<<endl;
fifo[i]->pop(wbuf[i]); fifo[i]->pop(wbuf[i]);
numpackets = (uint16_t)(*((uint16_t*)wbuf[i])); numpackets = (uint16_t)(*((uint16_t*)wbuf[i]));
//#ifdef VERYDEBUG //#ifdef VERYDEBUG
@ -1855,11 +1863,11 @@ int loop;
//#endif //#endif
} }
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cout << ithread << " numpackets:" << dec << numpackets << endl; cout << ithread << " numpackets:" << dec << numpackets << endl;
cout << ithread << " *** writer popped from fifo " << (void*) wbuf[0]<< endl; cout << ithread << " *** writer popped from fifo " << (void*) wbuf[0]<< endl;
cout << ithread << " *** writer popped from fifo " << (void*) wbuf[1]<< endl; cout << ithread << " *** writer popped from fifo " << (void*) wbuf[1]<< endl;
//#endif #endif
//last dummy packet //last dummy packet
@ -1910,8 +1918,10 @@ int loop;
} }
if(myDetectorType == EIGER) {cout<<"gonna copy frame"<<endl; if(myDetectorType == EIGER) {
copyFrameToGui(wbuf,currframenum);cout<<"copied frame"<<endl; //cout<<"gonna copy frame"<<endl;
copyFrameToGui(wbuf,currframenum);
//cout<<"copied frame"<<endl;
for(i=0;i<numListeningThreads;++i){ for(i=0;i<numListeningThreads;++i){
while(!fifoFree[i]->push(wbuf[i])); while(!fifoFree[i]->push(wbuf[i]));
#ifdef VERYDEBUG #ifdef VERYDEBUG
@ -2080,9 +2090,9 @@ int i;
cout << ithread << " going to push in dummy buffer:" << (void*)buffer[ithread] << " with num packets:"<< (*((uint16_t*)(buffer[ithread]))) << endl; cout << ithread << " going to push in dummy buffer:" << (void*)buffer[ithread] << " with num packets:"<< (*((uint16_t*)(buffer[ithread]))) << endl;
#endif #endif
while(!fifo[ithread]->push(buffer[ithread])); while(!fifo[ithread]->push(buffer[ithread]));
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cout << ithread << " pushed in dummy buffer:" << (void*)buffer[ithread] << endl; cout << ithread << " pushed in dummy buffer:" << (void*)buffer[ithread] << endl;
//#endif #endif
} }
//reset mask and exit loop //reset mask and exit loop
@ -2128,9 +2138,9 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer[]){
FILE_LOG(logDEBUG) << __AT__ << " called"; FILE_LOG(logDEBUG) << __AT__ << " called";
int i,j; int i,j;
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cout << ithread << " **********************popped last dummy frame:" << (void*)wbuffer[0] << endl; cout << ithread << " **********************popped last dummy frame:" << (void*)wbuffer[0] << endl;
//#endif #endif
//free fifo //free fifo
for(i=0;i<numListeningThreads;++i){ for(i=0;i<numListeningThreads;++i){