From 5012ea0c6cc16dc6b28c51057cc1e6d24369a196 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 24 Nov 2015 13:50:42 +0100 Subject: [PATCH] unnecessary lock in acquire --- slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp | 2 +- slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 411d87de9..c438c64ab 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -1247,7 +1247,7 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) { return string("unknown action"); } else if (action==HELP_ACTION) { return helpStatus(narg,args,HELP_ACTION); - } + } runStatus s=myDet->getRunStatus(); return myDet->runStatusType(s); diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index 3b546efb1..a4223a6d0 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -44,14 +44,12 @@ slsDetectorUtils::slsDetectorUtils() { int slsDetectorUtils::acquire(int delflag){ //ensure acquire isnt started multiple times by same client - pthread_mutex_lock(&mp); if(getAcquiringFlag() == false) setAcquiringFlag(true); else{ std::cout << "Error: Acquire has already been started." << std::endl; return FAIL; } - pthread_mutex_unlock(&mp); bool receiver = (setReceiverOnline()==ONLINE_FLAG);