add busyTimeout and set default busy timeout to 1 second

kkaefer · kkaefer · commit 180dde44a782 · 2011-06-22T17:40:44.000+02:00
diff --git a/src/database.cc b/src/database.cc
@@ -157,6 +157,10 @@ int Database::EIO_Open(eio_req *req) {
         sqlite3_close(db->handle);
         db->handle = NULL;
     }
+    else {
+        // Set default database handle values.
+        sqlite3_busy_timeout(db->handle, 1000);
+    }
 
     return 0;
 }
@@ -324,6 +328,17 @@ Handle<Value> Database::Configure(const Arguments& args) {
         Baton* baton = new Baton(db, handle);
         db->Schedule(RegisterProfileCallback, baton);
     }
+    else if (args[0]->Equals(String::NewSymbol("busyTimeout"))) {
+        if (!args[1]->IsInt32()) {
+            return ThrowException(Exception::TypeError(
+                String::New("Value must be an integer"))
+            );
+        }
+        Local<Function> handle;
+        Baton* baton = new Baton(db, handle);
+        baton->status = args[1]->Int32Value();
+        db->Schedule(SetBusyTimeout, baton);
+    }
     else {
         return ThrowException(Exception::Error(String::Concat(
             args[0]->ToString(),
@@ -336,6 +351,16 @@ Handle<Value> Database::Configure(const Arguments& args) {
     return args.This();
 }
 
+void Database::SetBusyTimeout(Baton* baton) {
+    assert(baton->db->open);
+    assert(baton->db->handle);
+
+    // Abuse the status field for passing the timeout.
+    sqlite3_busy_timeout(baton->db->handle, baton->status);
+
+    delete baton;
+}
+
 void Database::RegisterTraceCallback(Baton* baton) {
     assert(baton->db->open);
     assert(baton->db->handle);
diff --git a/src/database.h b/src/database.h
@@ -149,6 +149,8 @@ class Database : public EventEmitter {
 
     static Handle<Value> Configure(const Arguments& args);
 
+    static void SetBusyTimeout(Baton* baton);
+
     static void RegisterTraceCallback(Baton* baton);
     static void TraceCallback(void* db, const char* sql);
     static void TraceCallback(Database* db, std::string* sql);
