X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fstore.c;h=888bd1b07b490b6ae305377c2a8c8c1809c8ac9e;hb=8e686a50b321c7d2d154bd6121dd4a1e982f595d;hp=0d542adf3532400d0ab256632efd0f055c2978af;hpb=e28023d2e5189f8902fa8590a3100f185c947f61;p=bluesky.git diff --git a/bluesky/store.c b/bluesky/store.c index 0d542ad..888bd1b 100644 --- a/bluesky/store.c +++ b/bluesky/store.c @@ -45,13 +45,25 @@ BlueSkyStore *bluesky_store_new(const gchar *type) { const BlueSkyStoreImplementation *impl; - impl = g_hash_table_lookup(store_implementations, type); - if (impl == NULL) + gchar *scheme, *path; + scheme = g_strdup(type); + path = strchr(scheme, ':'); + if (path != NULL) { + *path = '\0'; + path++; + } + + impl = g_hash_table_lookup(store_implementations, scheme); + if (impl == NULL) { + g_free(scheme); return NULL; + } - gpointer handle = impl->create(); - if (handle == NULL) + gpointer handle = impl->create(path); + if (handle == NULL) { + g_free(scheme); return NULL; + } BlueSkyStore *store = g_new(BlueSkyStore, 1); store->impl = impl; @@ -59,6 +71,7 @@ BlueSkyStore *bluesky_store_new(const gchar *type) store->lock = g_mutex_new(); store->cond_idle = g_cond_new(); store->pending = 0; + g_free(scheme); return store; } @@ -83,11 +96,18 @@ BlueSkyStoreAsync *bluesky_store_async_new(BlueSkyStore *store) async->data = NULL; async->result = -1; async->notifiers = NULL; + async->notifier_count = 0; + async->barrier = NULL; async->store_private = NULL; return async; } +gpointer bluesky_store_async_get_handle(BlueSkyStoreAsync *async) +{ + return async->store->handle; +} + void bluesky_store_async_ref(BlueSkyStoreAsync *async) { if (async == NULL) @@ -125,7 +145,8 @@ void bluesky_store_async_wait(BlueSkyStoreAsync *async) return; } - while (async->status != ASYNC_COMPLETE) { + while (async->status != ASYNC_COMPLETE + || g_atomic_int_get(&async->notifier_count) > 0) { g_cond_wait(async->completion_cond, async->lock); } @@ -137,15 +158,34 @@ void bluesky_store_async_add_notifier(BlueSkyStoreAsync *async, GFunc func, gpointer user_data) { struct BlueSkyNotifierList *nl = g_new(struct BlueSkyNotifierList, 1); + g_mutex_lock(async->lock); nl->next = async->notifiers; nl->func = func; nl->async = async; bluesky_store_async_ref(async); nl->user_data = user_data; + g_atomic_int_inc(&async->notifier_count); if (async->status == ASYNC_COMPLETE) { g_thread_pool_push(notifier_thread_pool, nl, NULL); } else { async->notifiers = nl; } + g_mutex_unlock(async->lock); +} + +static void op_complete(gpointer a, gpointer b) +{ + BlueSkyStoreAsync *barrier = (BlueSkyStoreAsync *)b; + + bluesky_store_async_ref(barrier); + g_mutex_lock(barrier->lock); + barrier->store_private + = GINT_TO_POINTER(GPOINTER_TO_INT(barrier->store_private) - 1); + if (GPOINTER_TO_INT(barrier->store_private) == 0 + && barrier->status != ASYNC_NEW) { + bluesky_store_async_mark_complete(barrier); + } + g_mutex_unlock(barrier->lock); + bluesky_store_async_unref(barrier); } /* Mark an asynchronous operation as complete. This should only be called by @@ -167,6 +207,9 @@ void bluesky_store_async_mark_complete(BlueSkyStoreAsync *async) async->status = ASYNC_COMPLETE; g_cond_broadcast(async->completion_cond); + if (async->barrier != NULL && async->notifiers == NULL) + op_complete(async, async->barrier); + while (async->notifiers != NULL) { struct BlueSkyNotifierList *nl = async->notifiers; async->notifiers = nl->next; @@ -211,31 +254,26 @@ void bluesky_store_async_submit(BlueSkyStoreAsync *async) bluesky_store_async_wait(async); } -static void op_complete(gpointer a, gpointer b) -{ - BlueSkyStoreAsync *barrier = (BlueSkyStoreAsync *)b; - - bluesky_store_async_ref(barrier); - g_mutex_lock(barrier->lock); - barrier->store_private - = GINT_TO_POINTER(GPOINTER_TO_INT(barrier->store_private) - 1); - if (GPOINTER_TO_INT(barrier->store_private) == 0 - && barrier->status != ASYNC_NEW) { - bluesky_store_async_mark_complete(barrier); - } - g_mutex_unlock(barrier->lock); - bluesky_store_async_unref(barrier); -} - /* Add the given operation to the barrier. The barrier will not complete until * all operations added to it have completed. */ void bluesky_store_add_barrier(BlueSkyStoreAsync *barrier, BlueSkyStoreAsync *async) { g_return_if_fail(barrier->op == STORE_OP_BARRIER); + + g_mutex_lock(barrier->lock); barrier->store_private = GINT_TO_POINTER(GPOINTER_TO_INT(barrier->store_private) + 1); - bluesky_store_async_add_notifier(async, op_complete, barrier); + g_mutex_unlock(barrier->lock); + + g_mutex_lock(async->lock); + if (async->barrier == NULL) { + async->barrier = barrier; + } else { + g_warning("Adding async to more than one barrier!\n"); + bluesky_store_async_add_notifier(async, op_complete, barrier); + } + g_mutex_unlock(async->lock); } static void notifier_task(gpointer n, gpointer s) @@ -243,6 +281,13 @@ static void notifier_task(gpointer n, gpointer s) struct BlueSkyNotifierList *notifier = (struct BlueSkyNotifierList *)n; notifier->func(notifier->async, notifier->user_data); + if (g_atomic_int_dec_and_test(¬ifier->async->notifier_count)) { + g_mutex_lock(notifier->async->lock); + if (notifier->async->barrier != NULL) + op_complete(notifier->async, notifier->async->barrier); + g_cond_broadcast(notifier->async->completion_cond); + g_mutex_unlock(notifier->async->lock); + } bluesky_store_async_unref(notifier->async); g_free(notifier); } @@ -296,7 +341,7 @@ typedef struct { GHashTable *store; } MemStore; -static gpointer memstore_create() +static gpointer memstore_create(const gchar *path) { MemStore *store = g_new(MemStore, 1); store->lock = g_mutex_new(); @@ -362,7 +407,7 @@ static BlueSkyStoreImplementation memstore_impl = { }; /* Store implementation which writes data as files to disk. */ -static gpointer filestore_create() +static gpointer filestore_create(const gchar *path) { return GINT_TO_POINTER(1); } @@ -397,10 +442,12 @@ static void filestore_submit(gpointer s, BlueSkyStoreAsync *async) switch (async->op) { case STORE_OP_GET: async->data = filestore_get(async->key); + async->result = 0; break; case STORE_OP_PUT: filestore_put(async->key, async->data); + async->result = 0; break; default: