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

put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-08 11:40:07 +01:00
parent bf9905ad2a
commit 40a7b3983a
8 changed files with 28 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1547,6 +1547,7 @@ int multiSlsDetector::startAcquisition(){
int multiSlsDetector::stopAcquisition(){
pthread_mutex_lock(&mg); // locks due to processing thread using threadpool when in use
int i=0;
int ret=OK,ret1=OK;
int posmin=0, posmax=thisMultiDetector->numberOfDetectors;
@ -1591,7 +1592,7 @@ int multiSlsDetector::stopAcquisition(){
}
*stoppedFlag=1;
pthread_mutex_unlock(&mg);
return ret;
};
@ -1840,7 +1841,7 @@ int* multiSlsDetector::startAndReadAll(){
int multiSlsDetector::startAndReadAllNoWait(){
pthread_mutex_lock(&mg); // locks due to processing thread using threadpool when in use
int i=0;
int ret=OK;
int posmin=0, posmax=thisMultiDetector->numberOfDetectors;
@ -1885,7 +1886,7 @@ int multiSlsDetector::startAndReadAllNoWait(){
ret=FAIL;
}
}
pthread_mutex_unlock(&mg);
return ret;
}
@ -6594,19 +6595,3 @@ bool multiSlsDetector::isAcquireReady() {
return OK;
}
int multiSlsDetector::restreamStopFromReceiver() {
int ret=OK, ret1;
for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
if (detectors[idet]) {
ret1=detectors[idet]->restreamStopFromReceiver();
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret1!=OK)
ret=FAIL;
}
}
return ret;
}

8
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1495,14 +1495,6 @@ class multiSlsDetector : public slsDetectorUtils {
*/
bool isAcquireReady();
/**
If data streaming in receiver is enabled,
restream the stop dummy packet from receiver
Used usually for Moench,
in case it is lost in network due to high data rate
\returns OK if success else FAIL
*/
int restreamStopFromReceiver();
private: