Changeset 15041 for trunk/FACT++

Timestamp:

03/13/13 10:48:43 (12 years ago)

Author:

tbretz

Message:

Use the lock guard where appropriate; added GetServiceList member function

Location:

trunk/FACT++/src

Files:

• StateMachineDimControl.cc (modified) (11 diffs)
• StateMachineDimControl.h (modified) (1 diff)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -315 +315 @@
 int StateMachineDimControl::HandleStates(const string &server, DimDescriptions *dim)
 {
-    fMutex.lock();
+    const lock_guard<mutex> guard(fMutex);
 
     const auto is = fCurrentStateList.find(server);
@@ -332 +332 @@
     }
 
-    fMutex.unlock();
-
     return GetCurrentState();
 }
@@ -339 +337 @@
 int StateMachineDimControl::HandleDescriptions(DimDescriptions *dim)
 {
-    fMutex.lock();
+    const lock_guard<mutex> guard(fMutex);
 
     for (auto it=dim->descriptions.begin(); it!=dim->descriptions.end(); it++)
         fServiceDescriptionList[it->front().name].assign(it->begin(), it->end());
-
-    fMutex.unlock();
 
     return GetCurrentState();
@@ -382 +378 @@
     // Make a copy of the list to be able to
     // lock the access to the list
-    fMutex.lock();
+
+    const lock_guard<mutex> guard(fMutex);
     fServerList.insert(server);
-    fMutex.unlock();
 
     return GetCurrentState();
@@ -391 +387 @@
 int StateMachineDimControl::HandleServerRemove(const string &server)
 {
-    fMutex.lock();
+    const lock_guard<mutex> guard(fMutex);
     fServerList.erase(server);
-    fMutex.unlock();
 
     return GetCurrentState();
@@ -402 +397 @@
     vector<string> rc;
 
-    fMutex.lock();
+    const lock_guard<mutex> guard(fMutex);
 
     rc.reserve(fServerList.size());
@@ -408 +403 @@
         rc.push_back(*it);
 
-    fMutex.unlock();
-
     return rc;
 }
@@ -435 +428 @@
     vector<string> rc;
 
-    fMutex.lock();
+    const lock_guard<mutex> guard(fMutex);
 
     for (auto it=fServiceList.begin(); it!=fServiceList.end(); it++)
@@ -441 +434 @@
             rc.push_back(it->server+"/"+it->service);
 
-    fMutex.unlock();
     return rc;
+}
+
+set<Service> StateMachineDimControl::GetServiceList()
+{
+    const lock_guard<mutex> guard(fMutex);
+    return fServiceList;
 }
 
@@ -467 +465 @@
     // Make a copy of the list to be able to
     // lock the access to the list
-    fMutex.lock();
+    const lock_guard<mutex> guard(fMutex);
     fServiceList.insert(svc);
-    fMutex.unlock();
 
     return GetCurrentState();
@@ -476 +473 @@
 bool StateMachineDimControl::HasServer(const std::string &server)
 {
-    fMutex.lock();
-    const bool rc = fServerList.find(server)!=fServerList.end();
-    fMutex.unlock();
-
-    return rc;
+    const lock_guard<mutex> guard(fMutex);
+    return fServerList.find(server)!=fServerList.end();
 }
 

trunk/FACT++/src/StateMachineDimControl.h

@@ -61 +61 @@
     std::vector<Description> GetDescription(const std::string &service);
     std::vector<State>       GetStates(const std::string &server);
-
+    std::set<Service>        GetServiceList();
 
     int PrintStates(std::ostream &out, const std::string &serv="");