{
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;
store->lock = g_mutex_new();
store->cond_idle = g_cond_new();
store->pending = 0;
+ g_free(scheme);
return store;
}
async->data = NULL;
async->result = -1;
async->notifiers = NULL;
+ async->notifier_count = 0;
+ async->barrier = NULL;
async->store_private = NULL;
return 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);
}
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
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;
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)
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);
}
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();
};
/* 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);
}