db/DatabaseLock: add ScopeDatabaseLock::unlock()

7dd3b72a · Max Kellermann · aeccccb3 · 7dd3b72a
Commit 7dd3b72a authored Dec 15, 2015 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

DatabaseLock.hxx src/db/DatabaseLock.hxx +13 -0

No files found.
--- a/src/db/DatabaseLock.hxx
+++ b/src/db/DatabaseLock.hxx
@@ -84,13 +84,26 @@ db_unlock(void)
 }

 class ScopeDatabaseLock {
+	bool locked = true;
+
 public:
 	ScopeDatabaseLock() {
 		db_lock();
 	}

 	~ScopeDatabaseLock() {
+		if (locked)
+			db_unlock();
+	}
+
+	/**
+	 * Unlock the mutex now, making the destructor a no-op.
+	 */
+	void unlock() {
+		assert(locked);
+
 		db_unlock();
+		locked = false;
 	}
 };