+ async->notifiers = nl;
+ }
+}
+
+/* Mark an asynchronous operation as complete. This should only be called by
+ * the store implementations. The lock should be held when calling this
+ * function. Any notifier functions will be called, but in a separate thread
+ * and without the lock held. */
+void bluesky_store_async_mark_complete(BlueSkyStoreAsync *async)
+{
+ g_return_if_fail(async->status != ASYNC_COMPLETE);
+
+ bluesky_time_hires elapsed = bluesky_now_hires() - async->start_time;
+
+ g_mutex_lock(async->store->lock);
+ async->store->pending--;
+ if (async->store->pending == 0)
+ g_cond_broadcast(async->store->cond_idle);
+ g_mutex_unlock(async->store->lock);
+
+ async->status = ASYNC_COMPLETE;
+ g_cond_broadcast(async->completion_cond);
+
+ while (async->notifiers != NULL) {
+ struct BlueSkyNotifierList *nl = async->notifiers;
+ async->notifiers = nl->next;
+ g_thread_pool_push(notifier_thread_pool, nl, NULL);
+ }
+
+ g_log("bluesky/store", G_LOG_LEVEL_DEBUG,
+ "[%p] complete: elapsed = %"PRIi64" ns",
+ async, elapsed);
+}
+
+void bluesky_store_async_submit(BlueSkyStoreAsync *async)
+{
+ BlueSkyStore *store = async->store;
+
+ async->start_time = bluesky_now_hires();
+
+ g_log("bluesky/store", G_LOG_LEVEL_DEBUG, "[%p] submit: %s %s",
+ async,
+ async->op == STORE_OP_GET ? "GET"
+ : async->op == STORE_OP_PUT ? "PUT"
+ : async->op == STORE_OP_DELETE ? "DELETE"
+ : async->op == STORE_OP_BARRIER ? "BARRIER" : "???",
+ async->key);
+
+ /* Barriers are handled specially, and not handed down the storage
+ * implementation layer. */
+ if (async->op == STORE_OP_BARRIER) {
+ async->status = ASYNC_RUNNING;
+ if (GPOINTER_TO_INT(async->store_private) == 0)
+ bluesky_store_async_mark_complete(async);
+ return;
+ }
+
+ g_mutex_lock(async->store->lock);
+ async->store->pending++;
+ g_mutex_unlock(async->store->lock);
+
+ store->impl->submit(store->handle, async);
+
+ if (bluesky_options.synchronous_stores)
+ 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);
+ barrier->store_private
+ = GINT_TO_POINTER(GPOINTER_TO_INT(barrier->store_private) + 1);
+ bluesky_store_async_add_notifier(async, op_complete, barrier);
+}
+
+static void notifier_task(gpointer n, gpointer s)
+{
+ struct BlueSkyNotifierList *notifier = (struct BlueSkyNotifierList *)n;
+
+ notifier->func(notifier->async, notifier->user_data);
+ bluesky_store_async_unref(notifier->async);
+ g_free(notifier);
+}
+
+void bluesky_store_sync(BlueSkyStore *store)
+{
+ g_mutex_lock(store->lock);
+ g_print("Waiting for pending store operations to complete...\n");
+ while (store->pending > 0) {
+ g_cond_wait(store->cond_idle, store->lock);