diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index cf15fb593..755ed343f 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1365,7 +1365,6 @@ int* multiSlsDetector::readFrame(){ } } dataQueue.push(retval); - sem_post(&queue_mutex); return retval; }; @@ -1401,7 +1400,6 @@ int* multiSlsDetector::readAll(){ //std::cout << "-" << flush; #endif dataQueue.push(retval); - sem_post(&queue_mutex); } for (int id=0; idnumberOfDetectors; id++) { if (detectors[id]) { @@ -1442,7 +1440,6 @@ int* multiSlsDetector::startAndReadAll(){ //std::cout << "-" << flush; #endif dataQueue.push(retval); - sem_post(&queue_mutex); } for (int id=0; idnumberOfDetectors; id++) { @@ -1533,7 +1530,6 @@ slsDetectorDefs::runStatus multiSlsDetector::getRunStatus() { int* multiSlsDetector::popDataQueue() { int *retval=NULL; - sem_wait(&queue_mutex); if( !dataQueue.empty() ) { retval=dataQueue.front(); dataQueue.pop(); @@ -1553,7 +1549,6 @@ detectorData* multiSlsDetector::popFinalDataQueue() { void multiSlsDetector::resetDataQueue() { int *retval=NULL; while( !dataQueue.empty() ) { - sem_wait(&queue_mutex); retval=dataQueue.front(); dataQueue.pop(); delete [] retval; diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 470f0bfbc..4b70951c8 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3237,7 +3237,6 @@ int* slsDetector::readFrame(){ retval=getDataFromDetector(); if (retval) { dataQueue.push(retval); - sem_post(&queue_mutex); controlSocket->Disconnect(); } } @@ -3334,7 +3333,6 @@ int* slsDetector::readAll(){ //std::cout << "-" << flush ; #endif dataQueue.push(retval); - sem_post(&queue_mutex); } controlSocket->Disconnect(); } @@ -3395,7 +3393,6 @@ int* slsDetector::startAndReadAll(){ //std::cout<< "-" << flush; #endif dataQueue.push(retval); - sem_post(&queue_mutex); } controlSocket->Disconnect(); diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp index 35fadb178..23acee602 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp @@ -37,7 +37,7 @@ postProcessing::postProcessing(): expTime(NULL), ang(NULL), val(NULL), err(NULL) rawDataReady = 0; pRawDataArg = 0; - sem_init(&queue_mutex,0,0); + /* sem_init(&queue_mutex,0,0);*/ #ifdef VERBOSE registerDataCallback(&defaultDataReadyFunc, NULL); @@ -583,7 +583,6 @@ int* postProcessing::popDataQueue() { cout << "Pop data queue lock" << endl; #endif - sem_wait(&queue_mutex); pthread_mutex_lock(&mp); if( !dataQueue.empty() ) { retval=dataQueue.front(); @@ -612,7 +611,6 @@ void postProcessing::resetDataQueue() { int *retval=NULL; pthread_mutex_lock(&mp); while( !dataQueue.empty() ) { - sem_wait(&queue_mutex); retval=dataQueue.front(); dataQueue.pop(); delete [] retval; diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h index c7c72c19d..bf7b97953 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h @@ -296,7 +296,7 @@ s int queuesize; /** queue mutex */ - sem_t queue_mutex; + /*sem_t queue_mutex;*/ /**