Revision: 14469
Author: adrian.chadd
Date: Sun Mar 21 20:57:06 2010
Log: Log what the progress message is actually sending back.


http://code.google.com/p/lusca-cache/source/detail?r=14469

Modified:
 /branches/LUSCA_HEAD/src/fs/aufs/store_rebuild_aufs.c

=======================================
--- /branches/LUSCA_HEAD/src/fs/aufs/store_rebuild_aufs.c Wed Jul 22 07:37:20 2009 +++ /branches/LUSCA_HEAD/src/fs/aufs/store_rebuild_aufs.c Sun Mar 21 20:57:06 2010
@@ -262,6 +262,7 @@
        /* squidaioinfo_t *aioinfo = (squidaioinfo_t *) sd->fsdata; */
        int r, i;
        storeSwapLogData s;
+       int t, p;

        assert(fd == rb->helper.r_fd);
debug(47, 5) ("storeAufsRebuildHelperRead: %s: ready for helper read\n", sd->path);
@@ -286,8 +287,10 @@
                        case SWAP_LOG_VERSION:
                                break;
                        case SWAP_LOG_PROGRESS:
-                               storeRebuildProgress(rb->sd->index,
- ((storeSwapLogProgress *)(&s))->total, ((storeSwapLogProgress *)(&s))->progress);
+                               t = ((storeSwapLogProgress *)(&s))->total;
+                               p =  ((storeSwapLogProgress *)(&s))->progress;
+ debug(47, 1) ("storeAufsRebuildHelperRead: %s: SWAP_LOG_PROGRESS: total %d objects, progress %d objects\n", sd->path, t, p);
+                               storeRebuildProgress(rb->sd->index, t, p);
                                break;
                        case SWAP_LOG_COMPLETED:
                                debug(47, 1) ("  %s: completed rebuild\n", 
sd->path);
@@ -300,7 +303,7 @@
                }
                i += sizeof(storeSwapLogData);
        }
- debug(47, 5) ("storeAufsRebuildHelperRead: %s: read %d entries\n", sd->path, i / sizeof(storeSwapLogData)); + debug(47, 5) ("storeAufsRebuildHelperRead: %s: read %d entries\n", sd->path, i / (int) sizeof(storeSwapLogData));

        /* Shuffle what is left to the beginning of the buffer */
        if (i < rb->rbuf.used) {

--
You received this message because you are subscribed to the Google Groups 
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/lusca-commit?hl=en.

Reply via email to