X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fcloudlog.c;h=6e57d0533247d8241aca6fb36624f82fb49a6dbe;hb=83fd6b61a6e092a22d4d5e59ed95f05f5e287f11;hp=134f3d798600f839e8f52e01ba8b958c385800c9;hpb=ddaec40a37a5e65e53546b14632b1b0b35613264;p=bluesky.git

diff --git a/bluesky/cloudlog.c b/bluesky/cloudlog.c
index 134f3d7..6e57d05 100644
--- a/bluesky/cloudlog.c
+++ b/bluesky/cloudlog.c
@@ -93,6 +93,25 @@ BlueSkyCloudLog *bluesky_cloudlog_new(BlueSkyFS *fs)
     return log;
 }
 
+/* Helper function for updating memory usage statistics for a filesystem (the
+ * cache_log_* variables).  This will increment (type=1) or decrement (type=-1)
+ * the counter associated with the current state of the cloud log item.  The
+ * item should be locked or otherwise protected from concurrent access. */
+void bluesky_cloudlog_stats_update(BlueSkyCloudLog *log, int type)
+{
+    BlueSkyFS *fs = log->fs;
+
+    if (log->location_flags & CLOUDLOG_CLOUD) {
+        g_atomic_int_add(&fs->cache_log_cloud, type);
+    } else if (log->location_flags & CLOUDLOG_JOURNAL) {
+        g_atomic_int_add(&fs->cache_log_journal, type);
+    } else if (log->pending_write & CLOUDLOG_JOURNAL) {
+        g_atomic_int_add(&fs->cache_log_journal, type);
+    } else if (log->data != NULL) {
+        g_atomic_int_add(&fs->cache_log_dirty, type);
+    }
+}
+
 /* The reference held by the hash table does not count towards the reference
  * count.  When a new object is created, it initially has a reference count of
  * 1 for the creator, and similarly fetching an item from the hash table will
@@ -128,6 +147,7 @@ void bluesky_cloudlog_unref(BlueSkyCloudLog *log)
         g_hash_table_remove(fs->locations, &log->id);
         g_mutex_unlock(fs->lock);
 
+        bluesky_cloudlog_stats_update(log, -1);
         log->type = LOGTYPE_INVALID;
         g_mutex_free(log->lock);
         g_cond_free(log->cond);
@@ -182,10 +202,12 @@ void bluesky_cloudlog_fetch(BlueSkyCloudLog *log)
     if (log->data != NULL)
         return;
 
-    g_assert(log->location_flags & CLOUDLOG_JOURNAL);
+    g_assert((log->location_flags | log->pending_write) & CLOUDLOG_JOURNAL);
 
+    bluesky_cloudlog_stats_update(log, -1);
     log->data = bluesky_log_map_object(log->fs->log, log->log_seq,
                                        log->log_offset, log->log_size);
+    bluesky_cloudlog_stats_update(log, 1);
 
     g_cond_broadcast(log->cond);
 }
@@ -210,6 +232,8 @@ BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
     bluesky_cloudlog_fetch(log);
     g_assert(log->data != NULL);
 
+    bluesky_cloudlog_stats_update(log, -1);
+
     log->location = state->location;
     log->location.offset = state->data->len;
     log->location.size
@@ -226,6 +250,7 @@ BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
     g_string_append_len(state->data, log->data->data, log->data->len);
 
     log->location_flags |= CLOUDLOG_CLOUD;
+    bluesky_cloudlog_stats_update(log, 1);
     g_mutex_unlock(log->lock);
 
     if (state->data->len > CLOUDLOG_SEGMENT_SIZE)
@@ -234,18 +259,6 @@ BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
     return log->location;
 }
 
-static void find_inodes(gpointer key, gpointer value, gpointer user_data)
-{
-    BlueSkyCloudLogState *state = (BlueSkyCloudLogState *)user_data;
-    BlueSkyCloudLog *item = (BlueSkyCloudLog *)value;
-
-    if (item->type != LOGTYPE_INODE)
-        return;
-
-    bluesky_cloudlog_ref(item);
-    state->inode_list = g_list_prepend(state->inode_list, item);
-}
-
 /* Finish up a partially-written cloud log segment and flush it to storage. */
 void bluesky_cloudlog_flush(BlueSkyFS *fs)
 {
@@ -271,27 +284,3 @@ void bluesky_cloudlog_flush(BlueSkyFS *fs)
     state->location.offset = 0;
     state->data = g_string_new("");
 }
-
-void bluesky_cloudlog_write_log(BlueSkyFS *fs)
-{
-    BlueSkyCloudLogState *state = fs->log_state;
-    if (state->data == NULL)
-        state->data = g_string_new("");
-
-    g_mutex_lock(fs->lock);
-    g_hash_table_foreach(fs->locations, find_inodes, state);
-    g_mutex_unlock(fs->lock);
-
-    while (state->inode_list != NULL) {
-        BlueSkyCloudLog *log = (BlueSkyCloudLog *)state->inode_list->data;
-        bluesky_cloudlog_serialize(log, fs);
-        bluesky_cloudlog_unref(log);
-        state->inode_list = g_list_delete_link(state->inode_list,
-                                               state->inode_list);
-
-        if (state->data->len > CLOUDLOG_SEGMENT_SIZE)
-            bluesky_cloudlog_flush(fs);
-    }
-
-    bluesky_cloudlog_flush(fs);
-}