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

unnecessary lock in acquire

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-11-24 13:50:42 +01:00
parent 8ae1e812e6
commit 5012ea0c6c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1247,7 +1247,7 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) {
return string("unknown action"); return string("unknown action");
} else if (action==HELP_ACTION) { } else if (action==HELP_ACTION) {
return helpStatus(narg,args,HELP_ACTION); return helpStatus(narg,args,HELP_ACTION);
} }
runStatus s=myDet->getRunStatus(); runStatus s=myDet->getRunStatus();
return myDet->runStatusType(s); return myDet->runStatusType(s);

2
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -44,14 +44,12 @@ slsDetectorUtils::slsDetectorUtils() {
int slsDetectorUtils::acquire(int delflag){ int slsDetectorUtils::acquire(int delflag){
//ensure acquire isnt started multiple times by same client //ensure acquire isnt started multiple times by same client
pthread_mutex_lock(&mp);
if(getAcquiringFlag() == false) if(getAcquiringFlag() == false)
setAcquiringFlag(true); setAcquiringFlag(true);
else{ else{
std::cout << "Error: Acquire has already been started." << std::endl; std::cout << "Error: Acquire has already been started." << std::endl;
return FAIL; return FAIL;
} }
pthread_mutex_unlock(&mp);
bool receiver = (setReceiverOnline()==ONLINE_FLAG); bool receiver = (setReceiverOnline()==ONLINE_FLAG);