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

some debugs commented out

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@715 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-01-16 10:23:03 +00:00
parent 0df39b24e9
commit 15e1ac8750
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -1065,19 +1065,19 @@ int slsReceiverFunctionList::startWriting(){
//pop //pop
fifo->pop(wbuf); fifo->pop(wbuf);
numpackets = (uint16_t)(*((uint16_t*)wbuf)); numpackets = (uint16_t)(*((uint16_t*)wbuf));
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cout << "numpackets:" << hex << numpackets << endl; cout << "numpackets:" << hex << numpackets << endl;
cout << ithread << "*** popped from fifo " << numpackets << endl; cout << ithread << "*** popped from fifo " << numpackets << endl;
//#endif #endif
//last dummy packet //last dummy packet
if(numpackets == 0xFFFF){ if(numpackets == 0xFFFF){
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cout << "popped last dummy frame:" << (void*)wbuf << endl; cout << "popped last dummy frame:" << (void*)wbuf << endl;
//#endif #endif
//data compression, check if jobs done //data compression, check if jobs done
if(dataCompression){ if(dataCompression){
/*while(!filter->checkIfJobsDone()) /*while(!filter->checkIfJobsDone())
@ -1086,9 +1086,9 @@ int slsReceiverFunctionList::startWriting(){
} }
//free fifo //free fifo
while(!fifoFree->push(wbuf)); while(!fifoFree->push(wbuf));
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cout << "fifo freed:" << (void*)wbuf << endl; cout << "fifo freed:" << (void*)wbuf << endl;
//#endif #endif
//update status //update status
pthread_mutex_lock(&status_mutex); pthread_mutex_lock(&status_mutex);
status = RUN_FINISHED; status = RUN_FINISHED;
@ -1128,9 +1128,9 @@ int slsReceiverFunctionList::startWriting(){
currframenum = tempframenum; currframenum = tempframenum;
pthread_mutex_unlock(&progress_mutex); pthread_mutex_unlock(&progress_mutex);
} }
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cout << ithread << " tempframenum:" << dec << tempframenum << " curframenum:" << currframenum << endl; cout << ithread << " tempframenum:" << dec << tempframenum << " curframenum:" << currframenum << endl;
//#endif #endif
//without datacompression: write datacall back, or write data, free fifo //without datacompression: write datacall back, or write data, free fifo
@ -1145,9 +1145,9 @@ int slsReceiverFunctionList::startWriting(){
pthread_mutex_unlock(&progress_mutex); pthread_mutex_unlock(&progress_mutex);
} }
while(!fifoFree->push(wbuf)); while(!fifoFree->push(wbuf));
//#ifdef VERYVERBOSE #ifdef VERYVERBOSE
cout<<"buf freed:"<<(void*)wbuf<<endl; cout<<"buf freed:"<<(void*)wbuf<<endl;
//#endif #endif
} }
@ -1237,9 +1237,9 @@ int slsReceiverFunctionList::startWriting(){
} }
while(!fifoFree->push(wbuf)); while(!fifoFree->push(wbuf));
//#ifdef VERYVERBOSE #ifdef VERYVERBOSE
cout<<"buf freed:"<<(void*)wbuf<<endl; cout<<"buf freed:"<<(void*)wbuf<<endl;
//#endif #endif
/**********************************/ /**********************************/
#endif #endif
} }