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

reverted semaphore

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@733 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-02-06 17:05:09 +00:00
parent 83405b70c8
commit fcacc79f7b
4 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -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;