X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fstore-kv.cc;h=38051430ac32089ad5bb667eb1a78d866b4bd510;hb=HEAD;hp=de16832d50d30718f1b72b967728144419dca6c1;hpb=2901c11f2a4adfa9b3db422692bb9e2232be0a04;p=bluesky.git

diff --git a/bluesky/store-kv.cc b/bluesky/store-kv.cc
index de16832..3805143 100644
--- a/bluesky/store-kv.cc
+++ b/bluesky/store-kv.cc
@@ -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.
  */
 
 /* Interface to John McCullough's simple key/value store. */
@@ -39,6 +61,8 @@ static void kvstore_task(gpointer a, gpointer b)
                                                     value.length()),
                                             value.length());
             async->result = 0;
+        } else {
+            g_warning("Failed to fetch key %s from kvstore", async->key);
         }
         break;
     }
@@ -46,7 +70,9 @@ static void kvstore_task(gpointer a, gpointer b)
     case STORE_OP_PUT:
     {
         string value(async->data->data, async->data->len);
-        client->Put(async->key, value);
+        if (!client->Put(async->key, value)) {
+            g_warning("Failed to store key %s to kvstore", async->key);
+        }
         break;
     }
 
@@ -75,7 +101,8 @@ static gpointer kvstore_new(const gchar *path)
 
     static volatile gsize once = 0;
     if (g_once_init_enter(&once)) {
-        thread_pool = g_thread_pool_new(kvstore_task, NULL, -1, FALSE, NULL);
+        thread_pool = g_thread_pool_new(kvstore_task, NULL,
+                                        bluesky_max_threads, FALSE, NULL);
         g_once_init_leave(&once, 1);
     }