X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fstore.c;h=f8b3a6dae0e5e4e64ae5d9453341d0c74e1ea99f;hb=8a2ef6b448a40c790e7df154c12b54932f3e62e0;hp=7ca04021d8bafb9b2aca89a50e9ed1b740741e9a;hpb=a4e456f91da9819e5a1517d4e505816bb4aa1007;p=bluesky.git

diff --git a/bluesky/store.c b/bluesky/store.c
index 7ca0402..f8b3a6d 100644
--- a/bluesky/store.c
+++ b/bluesky/store.c
@@ -110,8 +110,6 @@ void bluesky_store_async_unref(BlueSkyStoreAsync *async)
         g_free(async->key);
         bluesky_string_unref(async->data);
         g_free(async);
-        g_log("bluesky/store", G_LOG_LEVEL_DEBUG,
-              "freeing async");
     }
 }
 
@@ -205,7 +203,6 @@ void bluesky_store_async_submit(BlueSkyStoreAsync *async)
 
 static void op_complete(gpointer a, gpointer b)
 {
-    BlueSkyStoreAsync *async = (BlueSkyStoreAsync *)a;
     BlueSkyStoreAsync *barrier = (BlueSkyStoreAsync *)b;
 
     g_mutex_lock(barrier->lock);
@@ -279,7 +276,6 @@ void bluesky_store_put(BlueSkyStore *store,
     bluesky_store_async_unref(async);
 }
 
-#if 0
 /* Simple in-memory data store for test purposes. */
 typedef struct {
     GMutex *lock;
@@ -320,11 +316,37 @@ static void memstore_put(gpointer s, const gchar *key, BlueSkyRCStr *val)
     g_hash_table_insert(store->store, g_strdup(key), val);
 }
 
+static void memstore_submit(gpointer s, BlueSkyStoreAsync *async)
+{
+    g_return_if_fail(async->status == ASYNC_NEW);
+    g_return_if_fail(async->op != STORE_OP_NONE);
+
+    switch (async->op) {
+    case STORE_OP_GET:
+        async->data = memstore_get(s, async->key);
+        break;
+
+    case STORE_OP_PUT:
+        memstore_put(s, async->key, async->data);
+        break;
+
+    default:
+        g_warning("Uknown operation type for MemStore: %d\n", async->op);
+        return;
+    }
+
+    bluesky_store_async_mark_complete(async);
+}
+
+static void memstore_cleanup(gpointer store, BlueSkyStoreAsync *async)
+{
+}
+
 static BlueSkyStoreImplementation memstore_impl = {
     .create = memstore_create,
     .destroy = memstore_destroy,
-    .get = memstore_get,
-    .put = memstore_put,
+    .submit = memstore_submit,
+    .cleanup = memstore_cleanup,
 };
 
 /* Store implementation which writes data as files to disk. */
@@ -337,7 +359,7 @@ static void filestore_destroy()
 {
 }
 
-static BlueSkyRCStr *filestore_get(gpointer s, const gchar *key)
+static BlueSkyRCStr *filestore_get(const gchar *key)
 {
     gchar *contents = NULL;
     gsize length;
@@ -350,24 +372,49 @@ static BlueSkyRCStr *filestore_get(gpointer s, const gchar *key)
     return bluesky_string_new(contents, length);
 }
 
-static void filestore_put(gpointer s, const gchar *key, BlueSkyRCStr *val)
+static void filestore_put(const gchar *key, BlueSkyRCStr *val)
 {
     g_file_set_contents(key, val->data, val->len, NULL);
 }
 
+static void filestore_submit(gpointer s, BlueSkyStoreAsync *async)
+{
+    g_return_if_fail(async->status == ASYNC_NEW);
+    g_return_if_fail(async->op != STORE_OP_NONE);
+
+    switch (async->op) {
+    case STORE_OP_GET:
+        async->data = filestore_get(async->key);
+        break;
+
+    case STORE_OP_PUT:
+        filestore_put(async->key, async->data);
+        break;
+
+    default:
+        g_warning("Uknown operation type for FileStore: %d\n", async->op);
+        return;
+    }
+
+    bluesky_store_async_mark_complete(async);
+}
+
+static void filestore_cleanup(gpointer store, BlueSkyStoreAsync *async)
+{
+}
+
 static BlueSkyStoreImplementation filestore_impl = {
     .create = filestore_create,
     .destroy = filestore_destroy,
-    .get = filestore_get,
-    .put = filestore_put,
+    .submit = filestore_submit,
+    .cleanup = filestore_cleanup,
 };
-#endif
 
 void bluesky_store_init()
 {
     store_implementations = g_hash_table_new(g_str_hash, g_str_equal);
     notifier_thread_pool = g_thread_pool_new(notifier_task, NULL, -1, FALSE,
                                              NULL);
-    //bluesky_store_register(&memstore_impl, "mem");
-    //bluesky_store_register(&filestore_impl, "file");
+    bluesky_store_register(&memstore_impl, "mem");
+    bluesky_store_register(&filestore_impl, "file");
 }