From 26c0520c10a937b4c9a0ac82fa565bc4ead9e3e9 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Thu, 6 Feb 2014 17:25:18 +0000
Subject: [PATCH] semaphore just to check when it is over

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@734 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp | 12 ++++++++++--
 .../slsDetectorAnalysis/postProcessing.cpp           |  6 +++++-
 .../slsDetectorAnalysis/postProcessing.h             |  5 ++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
index d77b6bc84..ed6543250 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
@@ -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
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
index 23acee602..b74d9a9c9 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
@@ -37,7 +37,6 @@ postProcessing::postProcessing(): expTime(NULL), ang(NULL), val(NULL), err(NULL)
   rawDataReady = 0;
   pRawDataArg = 0;
 
- /* sem_init(&queue_mutex,0,0);*/
 
 #ifdef VERBOSE
   registerDataCallback(&defaultDataReadyFunc,  NULL);
@@ -407,6 +406,11 @@ void* postProcessing::processData(int delflag) {
 				}
 			}
 
+			/** IF detector acquisition is done, let the acquire() thread know to finish up and force join thread */
+			if(acquiringDone){
+				sem_post(&sem_queue);
+			}
+
 			/* IF THERE ARE NO DATA look if acquisition is finished */
 			if (checkJoinThread()) {
 				if (dataQueueSize()==0) {
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
index bf7b97953..7de4eb7b7 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
@@ -296,7 +296,10 @@ s
   int queuesize;
 
   /** queue mutex */
-  /*sem_t queue_mutex;*/
+  sem_t sem_queue;
+
+  /** set when detector finishes acquiring */
+  int acquiringDone;
 
 
   /**