X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fstore-multi.c;h=2357e2e6ff29ee4ed990b4222a40e02e7d86d4b9;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=f0b1e5ec9a5dc1e560a8692b2a4464c889ace654;hpb=6e95f90cc53d2a230b9cf22d3b5906a66b4e71de;p=bluesky.git

diff --git a/bluesky/store-multi.c b/bluesky/store-multi.c
index f0b1e5e..2357e2e 100644
--- a/bluesky/store-multi.c
+++ b/bluesky/store-multi.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.
  */
 
 /* A stacked storage implementation which tries to improve performance by
@@ -42,8 +64,6 @@ static void multistore_completion_handler(BlueSkyStoreAsync *async,
 {
     g_mutex_lock(top_async->lock);
 
-    g_print("Completed a subrequest for %s\n", async->key);
-
     /* This might be the second request to finish; in that case we don't do
      * anything. */
     if (top_async->status == ASYNC_RUNNING) {
@@ -69,7 +89,6 @@ static void multistore_submit(gpointer store, BlueSkyStoreAsync *async)
 
     switch (async->op) {
     case STORE_OP_GET:
-        g_print("Received multirequest for %s\n", async->key);
         async->status = ASYNC_RUNNING;
         async->exec_time = bluesky_now_hires();
         for (int i = 0; i < 2; i++) {
@@ -107,6 +126,12 @@ static void multistore_submit(gpointer store, BlueSkyStoreAsync *async)
     }
 }
 
+static char *multistore_lookup_last(gpointer store, const char *prefix)
+{
+    BlueSkyStore *base = (BlueSkyStore *)store;
+    return bluesky_store_lookup_last(base, prefix);
+}
+
 static void multistore_cleanup(gpointer store, BlueSkyStoreAsync *async)
 {
 }
@@ -116,6 +141,7 @@ static BlueSkyStoreImplementation store_impl = {
     .destroy = multistore_destroy,
     .submit = multistore_submit,
     .cleanup = multistore_cleanup,
+    .lookup_last = multistore_lookup_last,
 };
 
 void bluesky_store_init_multi(void)