- handle getting several locks

aschnell · Feb 7, 2024 · f04c208 · f04c208
1 parent c23da18
commit f04c208
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/server/Client.cc b/server/Client.cc
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) [2012-2015] Novell, Inc.
- * Copyright (c) [2016-2023] SUSE LLC
+ * Copyright (c) [2016-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -127,21 +127,23 @@ Client::delete_comparison(list<Comparison*>::iterator it)
 void
 Client::add_lock(const string& config_name)
 {
-    locks.insert(config_name);
+    locks[config_name]++;
 }
 
 
 void
 Client::remove_lock(const string& config_name)
 {
-    locks.erase(config_name);
+    map<string, unsigned int>::iterator it = locks.find(config_name);
+    if (it != locks.end() && --it->second == 0)
+	locks.erase(it);
 }
 
 
 bool
 Client::has_lock(const string& config_name) const
 {
-    return contains(locks, config_name);
+    return locks.find(config_name) != locks.end();
 }
 
 

diff --git a/server/Client.h b/server/Client.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) [2012-2015] Novell, Inc.
- * Copyright (c) [2016-2023] SUSE LLC
+ * Copyright (c) [2016-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -28,7 +28,7 @@
 #include <string>
 #include <list>
 #include <queue>
-#include <set>
+#include <map>
 #include <boost/thread.hpp>
 
 #include <snapper/Snapper.h>
@@ -151,7 +151,7 @@ class Client : private boost::noncopyable
 
     list<Comparison*> comparisons;
 
-    set<string> locks;
+    map<string, unsigned int> locks;
 
     map<pair<string, unsigned int>, unsigned int> mounts;