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

semaphore just to check when it is over

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@734 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-02-06 17:25:18 +00:00
parent fcacc79f7b
commit 26c0520c10
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -141,7 +141,9 @@ void slsDetectorUtils::acquire(int delflag){
}
if (*threadedProcessing) {
sem_init(&sem_queue,0,0);
startThread(delflag);
}
#ifdef VERBOSE
@ -318,16 +320,21 @@ void slsDetectorUtils::acquire(int delflag){
if(setReceiverOnline()==OFFLINE_FLAG){
pthread_mutex_lock(&mg);
// wait until data processing thread has finished the data
acquiringDone = 1;
if (*threadedProcessing) {
sem_wait(&sem_queue);
acquiringDone = 0;
}
#ifdef VERBOSE
cout << "check data queue size " << endl;
#endif
while (dataQueueSize()){
/*while (dataQueueSize()){
#ifdef VERBOSE
cout << "AAAAAAAAA check data queue size " << endl;
#endif
usleep(100000);
}
}*/
if ((getDetectorsType()==GOTTHARD) || (getDetectorsType()==MOENCH)){
if((*correctionMask)&(1<<WRITE_FILE))
@ -463,6 +470,7 @@ void slsDetectorUtils::acquire(int delflag){
#endif
setJoinThread(1);
pthread_join(dataProcessingThread, &status);
sem_destroy(&sem_queue);
#ifdef VERBOSE
cout << "data processing thread joined" << endl;
#endif