Changeset 1940

Timestamp:

06/12/2007 08:50:32 (13 months ago)

Author:

chris

Message:

Use new logging framework for tracing diffs.

Log each block found and each false match at DEBUG level.

Files:

• box/trunk/lib/backupclient/BackupStoreFileDiff.cpp (modified) (8 diffs)

box/trunk/lib/backupclient/BackupStoreFileDiff.cpp

@@ -19 +19 @@
 #endif
 
+#include "BackupStoreConstants.h"
+#include "BackupStoreException.h"
 #include "BackupStoreFile.h"
+#include "BackupStoreFileCryptVar.h"
+#include "BackupStoreFileEncodeStream.h"
 #include "BackupStoreFileWire.h"
-#include "BackupStoreFileCryptVar.h"
 #include "BackupStoreObjectMagic.h"
-#include "BackupStoreException.h"
-#include "BackupStoreFileEncodeStream.h"
-#include "BackupStoreConstants.h"
+#include "CommonException.h"
 #include "FileStream.h"
+#include "MD5Digest.h"
 #include "RollingChecksum.h"
-#include "MD5Digest.h"
-#include "CommonException.h"
 #include "Timer.h"
 
@@ -486 +486 @@
         }
         
-        // TODO: Use buffered file class
-        // Because we read in the file a scanned block size at a time, it is likely to be
-        // inefficient. Probably will be much better to use a buffering IOStream class which
-        // reads data in at the size of the filesystem block size.
+        // TODO: Because we read in the file a scanned block size at a time,
+        // it is likely to be inefficient. Probably will be much better to
+        // calculate checksums for all block sizes in a single pass.
 
         // Allocate the buffers.
@@ -514 +513 @@
                 {
                         ASSERT(Sizes[s] <= bufSize);
-                        //TRACE2("Diff pass %d, for block size %d\n", s, Sizes[s]);
+                        BOX_TRACE("Diff pass " << s << ", for block size " <<
+                                Sizes[s]);
                         
                         // Check we haven't finished
@@ -553 +553 @@
                                 {
                                         ASSERT(pDiffTimer != NULL);
-                                        TRACE0("MaximumDiffingTime reached - "
-                                                "suspending file diff\n");
+                                        BOX_INFO("MaximumDiffingTime reached - "
+                                                "suspending file diff");
                                         abortSearch = true;
                                         break;
@@ -622 +622 @@
                                                 if(SecondStageMatch(phashTable[hash], rolling, beginnings, endings, offset, Sizes[s], fileBlockNumber, pIndex, rFoundBlocks))
                                                 {
+                                                        BOX_TRACE("Found block match for " << hash << " of " << Sizes[s] << " bytes at offset " << fileOffset);
                                                         goodnessOfFit[fileOffset] = Sizes[s];
 
@@ -646 +647 @@
                                                         // End this loop, so the final byte isn't used again
                                                         break;
+                                                }
+                                                else
+                                                {
+                                                        BOX_TRACE("False alarm match for " << hash << " of " << Sizes[s] << " bytes at offset " << fileOffset);
                                                 }
 
@@ -723 +728 @@
         {
                 // Trace out the found blocks in debug mode
-                TRACE0("Diff: list of found blocks\n======== ======== ======== ========\n  Offset   BlkIdx     Size Movement\n");
+                BOX_TRACE("Diff: list of found blocks");
+                BOX_TRACE("======== ======== ======== ========");
+                BOX_TRACE("  Offset   BlkIdx     Size Movement");
                 for(std::map<int64_t, int64_t>::const_iterator i(rFoundBlocks.begin()); i != rFoundBlocks.end(); ++i)
                 {
@@ -731 +738 @@
                                 orgLoc += pIndex[b].mSize;
                         }
-                        TRACE4("%8lld %8lld %8lld %8lld\n", i->first, i->second,
-                                (int64_t)(pIndex[i->second].mSize), i->first - orgLoc);
-                }
-                TRACE0("======== ======== ======== ========\n");
+                        BOX_TRACE(std::setw(8) << i->first << " " <<
+                                std::setw(8) << i->second << " " <<
+                                std::setw(8) << pIndex[i->second].mSize << 
+                                " " << 
+                                std::setw(8) << (i->first - orgLoc));
+                }
+                BOX_TRACE("======== ======== ======== ========");
         }
 #endif