X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fcloudlog.c;h=51e35c030fe6c4defbf67fdfb21d3cb6dd49f09a;hb=4d0f19140e01c9119d9e73ba24f8ef04e0434a5a;hp=3e30f021aa6869068fb24455f15b6c2cee364945;hpb=f782ebd939e2d81808ad63da0a6ff36e88938da2;p=bluesky.git

diff --git a/bluesky/cloudlog.c b/bluesky/cloudlog.c
index 3e30f02..51e35c0 100644
--- a/bluesky/cloudlog.c
+++ b/bluesky/cloudlog.c
@@ -192,12 +192,6 @@ void bluesky_cloudlog_unref_delayed(BlueSkyCloudLog *log)
         g_async_queue_push(log->fs->unref_queue, log);
 }
 
-void bluesky_cloudlog_threads_init(BlueSkyFS *fs)
-{
-    fs->unref_queue = g_async_queue_new();
-    g_thread_create(cloudlog_unref_thread, fs->unref_queue, FALSE, NULL);
-}
-
 /* Erase the information contained within the in-memory cloud log
  * representation.  This does not free up the item itself, but frees the data
  * and references to other log items and resets the type back to unknown.  If
@@ -271,6 +265,25 @@ BlueSkyCloudLog *bluesky_cloudlog_get(BlueSkyFS *fs, BlueSkyCloudID id)
     return item;
 }
 
+/* Work to fetch a cloudlog item in a background thread.  The item will be
+ * locked while the fetch is in progress and unlocked when it completes. */
+static GThreadPool *fetch_pool;
+
+static void background_fetch_task(gpointer p, gpointer unused)
+{
+    BlueSkyCloudLog *item = (BlueSkyCloudLog *)p;
+
+    g_mutex_lock(item->lock);
+    g_mutex_unlock(item->lock);
+    bluesky_cloudlog_unref(item);
+}
+
+void bluesky_cloudlog_background_fetch(BlueSkyCloudLog *item)
+{
+    bluesky_cloudlog_ref(item);
+    g_thread_pool_push(fetch_pool, item, NULL);
+}
+
 /* Attempt to prefetch a cloud log item.  This does not guarantee that it will
  * be made available, but does make it more likely that a future call to
  * bluesky_cloudlog_fetch will complete quickly.  Item must be locked? */
@@ -279,6 +292,14 @@ void bluesky_cloudlog_prefetch(BlueSkyCloudLog *item)
     if (item->data != NULL)
         return;
 
+    /* When operating in a non log-structured mode, simply start a background
+     * fetch immediately when asked to prefetch. */
+    if (bluesky_options.disable_aggregation
+        || bluesky_options.disable_read_aggregation) {
+        bluesky_cloudlog_background_fetch(item);
+        return;
+    }
+
     /* TODO: Some of the code here is duplicated with bluesky_log_map_object.
      * Refactor to fix that. */
     BlueSkyFS *fs = item->fs;
@@ -635,3 +656,11 @@ void bluesky_cloudlog_decrypt(char *segment, size_t len,
         remaining_size -= item_size;
     }
 }
+
+void bluesky_cloudlog_threads_init(BlueSkyFS *fs)
+{
+    fs->unref_queue = g_async_queue_new();
+    g_thread_create(cloudlog_unref_thread, fs->unref_queue, FALSE, NULL);
+    fetch_pool = g_thread_pool_new(background_fetch_task, NULL, 40, FALSE,
+                                   NULL);
+}