X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Flog.c;h=772872040cd65c71be67348784c4299ee63406e8;hb=b54d93195121656087794dfd748768cdfd180aed;hp=5a16238666c8ab2c14b15113e5bbdd00316640e4;hpb=9c27547e07bfcadab7584f46185db77c486c1412;p=bluesky.git

diff --git a/bluesky/log.c b/bluesky/log.c
index 5a16238..7728720 100644
--- a/bluesky/log.c
+++ b/bluesky/log.c
@@ -482,8 +482,9 @@ static void cloudlog_partial_fetch_start(BlueSkyCacheFile *cachefile,
                                          size_t offset, size_t length)
 {
     g_atomic_int_inc(&cachefile->refcount);
-    g_print("Starting partial fetch of %s from cloud (%zd + %zd)\n",
-            cachefile->filename, offset, length);
+    if (bluesky_verbose)
+        g_print("Starting partial fetch of %s from cloud (%zd + %zd)\n",
+                cachefile->filename, offset, length);
     BlueSkyStoreAsync *async = bluesky_store_async_new(cachefile->fs->store);
     async->op = STORE_OP_GET;
     async->key = g_strdup(cachefile->filename);
@@ -500,13 +501,15 @@ static void cloudlog_partial_fetch_start(BlueSkyCacheFile *cachefile,
 static void cloudlog_partial_fetch_complete(BlueSkyStoreAsync *async,
                                             BlueSkyCacheFile *cachefile)
 {
-    g_print("Fetch of %s from cloud complete, status = %d\n",
-            async->key, async->result);
+    if (bluesky_verbose || async->result != 0)
+        g_print("Fetch of %s from cloud complete, status = %d\n",
+                async->key, async->result);
 
     g_mutex_lock(cachefile->lock);
     if (async->result >= 0) {
         if (async->len == 0) {
-            g_print("Complete object was fetched.\n");
+            if (bluesky_verbose)
+                g_print("Complete object was fetched.\n");
             cachefile->complete = TRUE;
         }
 
@@ -553,7 +556,7 @@ static void cloudlog_partial_fetch_complete(BlueSkyStoreAsync *async,
 
         bluesky_rangeset_free(items);
     } else {
-        g_print("Error fetching from cloud, retrying...\n");
+        g_print("Error fetching %s from cloud, retrying...\n", async->key);
         cloudlog_partial_fetch_start(cachefile, async->start, async->len);
     }
 
@@ -576,7 +579,8 @@ static void cloudlog_fetch_start(BlueSkyCacheFile *cachefile)
 {
     g_atomic_int_inc(&cachefile->refcount);
     cachefile->fetching = TRUE;
-    g_print("Starting fetch of %s from cloud\n", cachefile->filename);
+    if (bluesky_verbose)
+        g_print("Starting fetch of %s from cloud\n", cachefile->filename);
     BlueSkyStoreAsync *async = bluesky_store_async_new(cachefile->fs->store);
     async->op = STORE_OP_GET;
     async->key = g_strdup(cachefile->filename);
@@ -651,7 +655,8 @@ BlueSkyRCStr *bluesky_log_map_object(BlueSkyCloudLog *item, gboolean map_data)
     BlueSkyRCStr *str = NULL;
     int location = 0;
     size_t file_offset = 0, file_size = 0;
-    gboolean range_request = TRUE;
+    gboolean range_request = bluesky_options.full_segment_fetches
+                              ? FALSE : TRUE;
 
     if (page_size == 0) {
         page_size = getpagesize();
@@ -751,7 +756,7 @@ void bluesky_mmap_unref(BlueSkyCacheFile *mmap)
 
     if (g_atomic_int_dec_and_test(&mmap->mapcount)) {
         g_mutex_lock(mmap->lock);
-        if (mmap->addr != NULL) {
+        if (mmap->addr != NULL && g_atomic_int_get(&mmap->mapcount) == 0) {
             if (bluesky_verbose)
                 g_print("Unmapped log segment %d...\n", mmap->log_seq);
             munmap((void *)mmap->addr, mmap->len);