Changeset 4266

Timestamp:

08/21/08 11:25:06 (3 months ago)

Author:

martin

Message:

added sqlite busy handler: retries on locking conflicts

Files:

• trunk/src/libstrongswan/plugins/sqlite/sqlite_database.c (modified) (3 diffs)

trunk/src/libstrongswan/plugins/sqlite/sqlite_database.c

@@ -19 +19 @@
-
-#include <sqlite3.h>
+#include <unistd.h>
-#include <library.h>
-#include <debug.h>
@@ -291 +292 @@
-
-/**
+ * Busy handler implementation
+ */
+static int busy_handler(private_sqlite_database_t *this, int count)
+{
+    /* add an sleep, exponentially longer on every try */
+    usleep(count * count * 1000);
+    /* always retry */
+    return 1;
+}
+
+/**
- * Implementation of database_t.destroy
- */
@@ -334 +346 @@
-    }
-    
+    sqlite3_busy_handler(this->db, (void*)busy_handler, this);
+    
-    return &this->public;
-}