Use users.db. trackdb* moves to lib/, as it's now used by client.c to

[disorder] / lib / trackdb-int.h

diff --git a/server/trackdb-int.h b/lib/trackdb-int.h
similarity index 84%
rename from server/trackdb-int.h
rename to lib/trackdb-int.h
index 441a056f397da61cca98b9699c79cd94212fe423..1d31cfe83cc646d13cdab3aff7cf1ffda7ea4b5f 100644 (file)
--- a/server/trackdb-int.h
+++ b/lib/trackdb-int.h
@@ -53,6 +53,24 @@ void trackdb_abort_transaction(DB_TXN *tid);
 void trackdb_commit_transaction(DB_TXN *tid);
 /* begin, abort or commit a transaction */
 
 void trackdb_commit_transaction(DB_TXN *tid);
 /* begin, abort or commit a transaction */
 

+/** @brief Evaluate @p expr in a transaction, looping on deadlock
+ *
+ * @c tid will be the transaction handle.  @p e will be the error code.
+ */
+#define WITH_TRANSACTION(expr) do {             \
+  DB_TXN *tid;                                  \
+                                                \
+  tid = trackdb_begin_transaction();            \
+  while((e = (expr)) == DB_LOCK_DEADLOCK) {     \
+    trackdb_abort_transaction(tid);             \
+    tid = trackdb_begin_transaction();          \
+  }                                             \
+  if(e)                                         \
+    trackdb_abort_transaction(tid);             \
+  else                                          \
+    trackdb_commit_transaction(tid);            \
+} while(0)
+

 int trackdb_getdata(DB *db,
                     const char *track,
                     struct kvp **kp,
 int trackdb_getdata(DB *db,
                     const char *track,
                     struct kvp **kp,