X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fcloudlog.c;h=ec168e82380aaaa4f94234c8d65bded9c3c157ab;hb=7daddca3715fee8a3bfff417e769ff08dd7f4cbf;hp=5d14fc68a6693a6786fa63a221438136dac86539;hpb=827d4b966414c7804057e1c5352b2bcbe192d3c4;p=bluesky.git

diff --git a/bluesky/cloudlog.c b/bluesky/cloudlog.c
index 5d14fc6..ec168e8 100644
--- a/bluesky/cloudlog.c
+++ b/bluesky/cloudlog.c
@@ -147,7 +147,10 @@ void bluesky_cloudlog_unref(BlueSkyCloudLog *log)
             return;
         }
 
-        g_hash_table_remove(fs->locations, &log->id);
+        if (!g_hash_table_remove(fs->locations, &log->id)) {
+            if (bluesky_verbose)
+                g_warning("Could not find and remove cloud log item from hash table!");
+        }
         g_mutex_unlock(fs->lock);
 
         bluesky_cloudlog_stats_update(log, -1);
@@ -165,6 +168,33 @@ void bluesky_cloudlog_unref(BlueSkyCloudLog *log)
     }
 }
 
+/* For locking reasons cloudlog unrefs may sometimes need to be performed in
+ * the future.  We launch a thread for handling these delayed unreference
+ * requests. */
+static gpointer cloudlog_unref_thread(gpointer q)
+{
+    GAsyncQueue *queue = (GAsyncQueue *)q;
+
+    while (TRUE) {
+        BlueSkyCloudLog *item = (BlueSkyCloudLog *)g_async_queue_pop(queue);
+        bluesky_cloudlog_unref(item);
+    }
+
+    return NULL;
+}
+
+void bluesky_cloudlog_unref_delayed(BlueSkyCloudLog *log)
+{
+    if (log != NULL)
+        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
@@ -175,6 +205,9 @@ void bluesky_cloudlog_erase(BlueSkyCloudLog *log)
 {
     g_assert(log->data_lock_count == 0);
 
+    if (log->type == LOGTYPE_UNKNOWN)
+        return;
+
     log->type = LOGTYPE_UNKNOWN;
     log->data_size = 0;
     bluesky_string_unref(log->data);
@@ -206,7 +239,7 @@ void bluesky_cloudlog_insert_locked(BlueSkyCloudLog *log)
 void bluesky_cloudlog_insert(BlueSkyCloudLog *log)
 {
     g_mutex_lock(log->fs->lock);
-    bluesky_cloudlog_insert(log);
+    bluesky_cloudlog_insert_locked(log);
     g_mutex_unlock(log->fs->lock);
 }
 
@@ -226,7 +259,7 @@ BlueSkyCloudLog *bluesky_cloudlog_get(BlueSkyFS *fs, BlueSkyCloudID id)
     item = g_hash_table_lookup(fs->locations, &id);
     if (item == NULL) {
         item = bluesky_cloudlog_new(fs, &id);
-        g_hash_table_insert(fs->locations, &id, item);
+        bluesky_cloudlog_insert_locked(item);
     } else {
         bluesky_cloudlog_ref(item);
     }
@@ -356,8 +389,6 @@ BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
         g_mutex_lock(fs->lock);
         InodeMapEntry *entry = bluesky_inode_map_lookup(fs->inode_map,
                                                         log->inum, 1);
-        entry->id = log->id;
-        entry->location = log->location;
         entry->item = log;
         bluesky_cloudlog_ref(entry->item);
         g_mutex_unlock(fs->lock);