X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fstore-bdb.c;h=3fabb2de3685c3079c0060a207cf2ec283b87481;hb=HEAD;hp=57422b979ea5b5b99f11dabe837fb80046ab0c4a;hpb=ee0530e785f7035890b3b54cb3e0cf6800e6a4dd;p=bluesky.git

diff --git a/bluesky/store-bdb.c b/bluesky/store-bdb.c
index 57422b9..3fabb2d 100644
--- a/bluesky/store-bdb.c
+++ b/bluesky/store-bdb.c
@@ -3,7 +3,29 @@
  * Copyright (C) 2009  The Regents of the University of California
  * Written by Michael Vrable <mvrable@cs.ucsd.edu>
  *
- * TODO: Licensing
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #include <stdint.h>
@@ -27,11 +49,23 @@ typedef struct {
 static gpointer bdbstore_thread(gpointer data)
 {
     BDBStore *store = (BDBStore *)data;
+    DB_TXN *txn = NULL;
+
+    // Number of operations in the current transaction
+    int transaction_size = 0;
 
     while (TRUE) {
         int res;
         BlueSkyStoreAsync *async;
 
+        if (txn == NULL) {
+            res = store->env->txn_begin(store->env, NULL, &txn, 0);
+            if (res != 0) {
+                fprintf(stderr, "Unable to begin transaction!\n");
+                return NULL;
+            }
+        }
+
         async = (BlueSkyStoreAsync *)g_async_queue_pop(store->operations);
         async->status = ASYNC_RUNNING;
         async->exec_time = bluesky_now_hires();
@@ -48,7 +82,7 @@ static gpointer bdbstore_thread(gpointer data)
         if (async->op == STORE_OP_GET) {
             value.flags = DB_DBT_MALLOC;
 
-            res = store->db->get(store->db, NULL, &key, &value, 0);
+            res = store->db->get(store->db, txn, &key, &value, 0);
 
             async->result = res;
             async->data = NULL;
@@ -64,7 +98,7 @@ static gpointer bdbstore_thread(gpointer data)
             value.data = async->data->data;
             value.size = async->data->len;
 
-            res = store->db->put(store->db, NULL, &key, &value, 0);
+            res = store->db->put(store->db, txn, &key, &value, 0);
 
             if (res != 0) {
                 fprintf(stderr, "BDB write failure: %s\n", db_strerror(res));
@@ -75,6 +109,13 @@ static gpointer bdbstore_thread(gpointer data)
 
         bluesky_store_async_mark_complete(async);
         bluesky_store_async_unref(async);
+        transaction_size++;
+
+        if (transaction_size >= 64) {
+            txn->commit(txn, 0);
+            txn = NULL;
+            transaction_size = 0;
+        }
     }
 
     return NULL;