Changeset 2119

Timestamp:

29/03/2008 01:56:39 (9 months ago)

Author:

chris

Message:

Replace all remaining use of TRACEx() macros with logging framework.

Remove the old TRACEx macros to catch any remaining uses.

Location:

box/trunk

Files:

• bin/bbackupd/BackupClientDirectoryRecord.cpp (modified) (2 diffs)
• bin/bbstored/BBStoreDHousekeeping.cpp (modified) (1 diff)
• bin/bbstored/BackupContext.cpp (modified) (1 diff)
• lib/backupclient/BackupStoreFileDiff.cpp (modified) (8 diffs)
• lib/backupclient/BackupStoreFilenameClear.cpp (modified) (2 diffs)
• lib/backupclient/BackupStoreObjectDump.cpp (modified) (2 diffs)
• lib/backupstore/BackupStoreCheck.cpp (modified) (1 diff)
• lib/backupstore/BackupStoreCheck2.cpp (modified) (9 diffs)
• lib/backupstore/BackupStoreCheckData.cpp (modified) (1 diff)
• lib/common/Box.h (modified) (2 diffs)
• lib/common/Configuration.cpp (modified) (1 diff)
• lib/common/DebugMemLeakFinder.cpp (modified) (3 diffs)
• lib/common/Logging.h (modified) (2 diffs)
• lib/common/PartialReadStream.cpp (modified) (1 diff)
• lib/common/Utils.cpp (modified) (1 diff)
• lib/compress/Compress.h (modified) (2 diffs)
• lib/compress/CompressStream.cpp (modified) (1 diff)
• lib/crypto/CipherContext.cpp (modified) (4 diffs)
• lib/intercept/intercept.cpp (modified) (2 diffs)
• lib/raidfile/RaidFileWrite.cpp (modified) (3 diffs)
• lib/server/ProtocolUncertainStream.cpp (modified) (1 diff)

box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp

@@ -1015 +1015 @@
         if(mpPendingEntries != 0 && mpPendingEntries->size() == 0)
         {
-                TRACE1("Deleting mpPendingEntries from dir ID %lld\n", mObjectID);
+                BOX_TRACE("Deleting mpPendingEntries from dir ID " <<
+                        BOX_FORMAT_OBJECTID(mObjectID));
                 delete mpPendingEntries;
                 mpPendingEntries = 0;
@@ -1250 +1251 @@
                                                 dirname.GetClearFilename());
 
-                                        TRACE1("Deleted directory record for "
-                                                "%s\n", name.c_str());
+                                        BOX_TRACE("Deleted directory record "
+                                                "for " << name);
                                 }                               
                         }

box/trunk/bin/bbstored/BBStoreDHousekeeping.cpp

@@ -194 +194 @@
         if(mInterProcessComms.GetLine(line, false /* no pre-processing */, MaximumWaitTime))
         {
-                TRACE1("Housekeeping received command '%s' over interprocess comms\n", line.c_str());
+                BOX_TRACE("Housekeeping received command '" << line <<
+                        "' over interprocess comms");
         
                 int account = 0;

box/trunk/bin/bbstored/BackupContext.cpp

@@ -383 +383 @@
                 mSaveStoreInfoDelay = 0;
                 
-                TRACE1("When allocating object ID, found that %lld is already in use\n", id);
+                BOX_WARNING("When allocating object ID, found that " <<
+                        BOX_FORMAT_OBJECTID(id) << " is already in use");
         }
         

box/trunk/lib/backupclient/BackupStoreFileDiff.cpp

@@ -150 +150 @@
         bool canDiffFromThis = false;
         LoadIndex(rDiffFromBlockIndex, DiffFromObjectID, &pindex, blocksInIndex, Timeout, canDiffFromThis);
-        //TRACE1("Diff: Blocks in index: %lld\n", blocksInIndex);
+        // BOX_TRACE("Diff: Blocks in index: " << blocksInIndex);
         
         if(!canDiffFromThis)
@@ -440 +440 @@
                 for(int t = 0; t < BACKUP_FILE_DIFF_MAX_BLOCK_SIZES; ++t)
                 {
-                        TRACE3("Diff block size %d: %d (count = %lld)\n", t, Sizes[t], sizeCounts[t]);
+                        BOX_TRACE("Diff block size " << t << ": " <<
+                                Sizes[t] << " (count = " << 
+                                sizeCounts[t] << ")");
                 }
         }
@@ -775 +777 @@
                         if(pHashTable[hash] != 0)
                         {
-                                //TRACE1("Another hash entry for %d found\n", hash);
+                                //BOX_TRACE("Another hash entry for " << hash << " found");
                                 // Yes -- need to set the pointer in this entry to the current entry to build the linked list
                                 pIndex[b].mpNextInHashList = pHashTable[hash];
@@ -841 +843 @@
         // Then go through the entries in the hash list, comparing with the strong digest calculated
         scan = pFirstInHashList;
-        //TRACE0("second stage match\n");
+        //BOX_TRACE("second stage match");
         while(scan != 0)
         {
-                //TRACE3("scan size %d, block size %d, hash %d\n", scan->mSize, BlockSize, Hash);
+                //BOX_TRACE("scan size " << scan->mSize <<
+                //      ", block size " << BlockSize <<
+                //      ", hash " << Hash);
                 ASSERT(scan->mSize == BlockSize);
                 ASSERT(RollingChecksum::ExtractHashingComponent(scan->mWeakChecksum) == DEBUG_Hash);
@@ -851 +855 @@
                 if(strong.DigestMatches(scan->mStrongChecksum))
                 {
-                        //TRACE0("Match!\n");
+                        //BOX_TRACE("Match!\n");
                         // Found! Add to list of found blocks...
                         int64_t fileOffset = (FileBlockNumber * BlockSize) + Offset;
@@ -913 +917 @@
                 if(BackupStoreFile::TraceDetailsOfDiffProcess)
                 {
-                        TRACE1("Diff: Default recipe generated, %lld bytes of file\n", SizeOfInputFile);
+                        BOX_TRACE("Diff: Default recipe generated, " << 
+                                SizeOfInputFile << " bytes of file");
                 }
                 #endif
@@ -1006 +1011 @@
         // dump out the recipe
 #ifndef NDEBUG
-        TRACE2("Diff: %lld new bytes found, %lld old blocks used\n", debug_NewBytesFound, debug_OldBlocksUsed);
+        BOX_TRACE("Diff: " << 
+                debug_NewBytesFound << " new bytes found, " <<
+                debug_OldBlocksUsed << " old blocks used");
         if(BackupStoreFile::TraceDetailsOfDiffProcess)
         {
-                TRACE1("Diff: Recipe generated (size %d)\n======== ========= ========\nSpace b4 FirstBlk  NumBlks\n", rRecipe.size());
+                BOX_TRACE("Diff: Recipe generated (size " << rRecipe.size());
+                BOX_TRACE("======== ========= ========");
+                BOX_TRACE("Space b4 FirstBlk  NumBlks");
                 {
                         for(unsigned int e = 0; e < rRecipe.size(); ++e)
@@ -1019 +1028 @@
                                 sprintf(b, "%8lld", (int64_t)(rRecipe[e].mpStartBlock - pIndex));
 #endif
-                                TRACE3("%8lld %s %8lld\n", rRecipe[e].mSpaceBefore, (rRecipe[e].mpStartBlock == 0)?"       -":b, (int64_t)rRecipe[e].mBlocks);
-                        }
-                }
-                TRACE0("======== ========= ========\n");
+                                BOX_TRACE(std::setw(8) <<
+                                        rRecipe[e].mSpaceBefore <<
+                                        " " <<
+                                        ((rRecipe[e].mpStartBlock == 0)?"       -":b) <<
+                                        " " << std::setw(8) <<
+                                        rRecipe[e].mBlocks);
+                        }
+                }
+                BOX_TRACE("======== ========= ========");
         }
 #endif

box/trunk/lib/backupclient/BackupStoreFilenameClear.cpp

@@ -168 +168 @@
         {
         case Encoding_Clear:
-                TRACE0("**** BackupStoreFilename encoded with Clear encoding ****\n");
+                BOX_TRACE("**** BackupStoreFilename encoded with "
+                        "Clear encoding ****");
                 mClearFilename.assign(c_str() + 2, size - 2);
                 break;
@@ -194 +195 @@
         {
 #ifndef WIN32
-                TRACE1("Allocating filename encoding/decoding buffer with size %d\n", BufSize);
+                BOX_TRACE("Allocating filename encoding/decoding buffer "
+                        "with size " << BufSize);
 #endif
                 spEncDecBuffer = new MemoryBlockGuard<uint8_t *>(BufSize);

box/trunk/lib/backupclient/BackupStoreObjectDump.cpp

@@ -48 +48 @@
         if(ToTrace)
         {
-                TRACE1("%s", text);
+                BOX_TRACE(text);
         }
 }
@@ -212 +212 @@
                 {
                         nnew++;
-                        TRACE2("%8lld this  s=%8lld\n", b, s);
+                        BOX_TRACE(std::setw(8) << b << " this  s=" <<
+                                std::setw(8) << s);
                 }
                 else
                 {
                         nold++;
-                        TRACE2("%8lld other i=%8lld\n", b, 0 - s);              
-                }
-        }
-        TRACE0("======== ===== ==========\n");
+                        BOX_TRACE(std::setw(8) << b << " other i=" <<
+                                std::setw(8) << 0 - s);
+                }
+        }
+        BOX_TRACE("======== ===== ==========");
 }
 

box/trunk/lib/backupstore/BackupStoreCheck.cpp

@@ -269 +269 @@
         
                 maxDir = CheckObjectsScanDir(0, 1, mStoreRoot);
-                TRACE1("Max dir starting ID is %llx\n", maxDir);
+                BOX_TRACE("Max dir starting ID is " <<
+                        BOX_FORMAT_OBJECTID(maxDir));
         }
         

box/trunk/lib/backupstore/BackupStoreCheck2.cpp

@@ -595 +595 @@
 }
 
+#define FMT_OID(x) BOX_FORMAT_OBJECTID(x)
+#define FMT_i      BOX_FORMAT_OBJECTID((*i)->GetObjectID())
 
 // --------------------------------------------------------------------------
@@ -621 +623 @@
                                 {
                                         // Depends on something, but it isn't there.
-                                        TRACE2("Entry id %llx removed because depends on newer version %llx which doesn't exist\n", (*i)->GetObjectID(), dependsNewer);
+                                        BOX_TRACE("Entry id " << FMT_i <<
+                                                " removed because depends "
+                                                "on newer version " <<
+                                                FMT_OID(dependsNewer) <<
+                                                " which doesn't exist");
                                         
                                         // Remove
@@ -639 +645 @@
                                         {
                                                 // Wrong entry
-                                                TRACE3("Entry id %llx, correcting DependsOlder to %llx, was %llx\n", dependsNewer, (*i)->GetObjectID(), newerEn->GetDependsOlder());
+                                                BOX_TRACE("Entry id " <<
+                                                        FMT_OID(dependsNewer) <<
+                                                        ", correcting DependsOlder to " <<
+                                                        FMT_i <<
+                                                        ", was " <<
+                                                        FMT_OID(newerEn->GetDependsOlder()));
                                                 newerEn->SetDependsOlder((*i)->GetObjectID());
                                                 // Mark as changed
@@ -658 +669 @@
                         {
                                 // Has an older version marked, but this doesn't exist. Remove this mark
-                                TRACE2("Entry id %llx was marked that %llx depended on it, which doesn't exist, dependency info cleared\n", (*i)->GetObjectID(), dependsOlder);
+                                BOX_TRACE("Entry id " << FMT_i <<
+                                        " was marked as depended on by " <<
+                                        FMT_OID(dependsOlder) << ", "
+                                        "which doesn't exist, dependency "
+                                        "info cleared");
 
                                 (*i)->SetDependsOlder(0);
@@ -694 +709 @@
                         if((*i) == 0)
                         {
-                                TRACE0("Remove because null pointer found\n");
+                                BOX_TRACE("Remove because null pointer found");
                                 removeEntry = true;
                         }
@@ -705 +720 @@
                                 {
                                         // Bad! Unset the file flag
-                                        TRACE1("Entry %llx: File flag set when dir flag set\n", (*i)->GetObjectID());
+                                        BOX_TRACE("Entry " << FMT_i <<
+                                                ": File flag and dir flag both set");
                                         (*i)->RemoveFlags(Entry::Flags_File);
                                         changed = true;
@@ -714 +730 @@
                                 {
                                         // ID already seen, or type doesn't match
-                                        TRACE1("Entry %llx: Remove because ID already seen\n", (*i)->GetObjectID());
+                                        BOX_TRACE("Entry " << FMT_i <<
+                                                ": Remove because ID already seen");
                                         removeEntry = true;
                                 }
@@ -731 +748 @@
                                                 {
                                                         // Not set, set it
-                                                        TRACE1("Entry %llx: Set old flag\n", (*i)->GetObjectID());
+                                                        BOX_TRACE("Entry " << FMT_i <<
+                                                                ": Set old flag");
                                                         (*i)->AddFlags(Entry::Flags_OldVersion);
                                                         changed = true;
@@ -742 +760 @@
                                                 {
                                                         // Set, unset it
-                                                        TRACE1("Entry %llx: Old flag unset\n", (*i)->GetObjectID());
+                                                        BOX_TRACE("Entry " << FMT_i <<
+                                                                ": Old flag unset");
                                                         (*i)->RemoveFlags(Entry::Flags_OldVersion);
                                                         changed = true;

box/trunk/lib/backupstore/BackupStoreCheckData.cpp

@@ -190 +190 @@
                 IDBlock *pblock = i->second;
                 int32_t bentries = (pblock == mpInfoLastBlock)?mInfoLastBlockEntries:BACKUPSTORECHECK_BLOCK_SIZE;
-                TRACE2("BLOCK @ 0x%08x, %d entries\n", pblock, bentries);
+                BOX_TRACE("BLOCK @ " << BOX_FORMAT_HEX32(pblock) <<
+                        ", " << bentries << " entries");
                 
                 for(int e = 0; e < bentries; ++e)
                 {
                         uint8_t flags = GetFlags(pblock, e);
-                        TRACE4("id %llx, c %llx, %s, %s\n",
-                                pblock->mID[e], pblock->mContainer[e],
-                                (flags & Flags_IsDir)?"dir":"file",
-                                (flags & Flags_IsContained)?"contained":"unattached");
+                        BOX_TRACE(std::hex << 
+                                "id "  << pblock->mID[e] <<
+                                ", c " << pblock->mContainer[e] <<
+                                ", " << ((flags & Flags_IsDir)?"dir":"file") <<
+                                ", " << ((flags & Flags_IsContained) ? 
+                                        "contained":"unattached"));
                 }
         }

box/trunk/lib/common/Box.h

@@ -53 +53 @@
         int BoxDebug_printf(const char *format, ...);
         int BoxDebugTrace(const char *format, ...);
-        #define TRACE0(msg) {BoxDebugTrace("%s", msg);}
-        #define TRACE1(msg, a0) {BoxDebugTrace(msg, a0);}
-        #define TRACE2(msg, a0, a1) {BoxDebugTrace(msg, a0, a1);}
-        #define TRACE3(msg, a0, a1, a2) {BoxDebugTrace(msg, a0, a1, a2);}
-        #define TRACE4(msg, a0, a1, a2, a3) {BoxDebugTrace(msg, a0, a1, a2, a3);}
-        #define TRACE5(msg, a0, a1, a2, a3, a4) {BoxDebugTrace(msg, a0, a1, a2, a3, a4);}
-        #define TRACE6(msg, a0, a1, a2, a3, a4, a5) {BoxDebugTrace(msg, a0, a1, a2, a3, a4, a5);}
-        #define TRACE7(msg, a0, a1, a2, a3, a4, a5, a6) {BoxDebugTrace(msg, a0, a1, a2, a3, a4, a5, a6);}
-        #define TRACE8(msg, a0, a1, a2, a3, a4, a5, a6, a7) {BoxDebugTrace(msg, a0, a1, a2, a3, a4, a5, a6, a7);}
         
         #ifndef PLATFORM_DISABLE_MEM_LEAK_TESTING
@@ -77 +68 @@
         #define TRACE_TO_STDOUT(x) {}
 
-        #define TRACE0(msg)
-        #define TRACE1(msg, a0)
-        #define TRACE2(msg, a0, a1)
-        #define TRACE3(msg, a0, a1, a2)
-        #define TRACE4(msg, a0, a1, a2, a3)
-        #define TRACE5(msg, a0, a1, a2, a3, a4)
-        #define TRACE6(msg, a0, a1, a2, a3, a4, a5)
-        #define TRACE7(msg, a0, a1, a2, a3, a4, a5, a6)
-        #define TRACE8(msg, a0, a1, a2, a3, a4, a5, a6, a7)
-        
         // Box Backup builds release get extra information for exception logging
         #define EXCEPTION_CODENAMES_EXTENDED

box/trunk/lib/common/Configuration.cpp

@@ -209 +209 @@
                 {
                         // An error occured, return now
-                        //TRACE1("Error message from LoadInto: %s", rErrorMsg.c_str());
-                        TRACE0("Error at Configuration::LoadInfo\n");
+                        BOX_ERROR("Error in Configuration::LoadInfo: " << 
+                                rErrorMsg);
                         delete pconfig;
                         pconfig = 0;

box/trunk/lib/common/DebugMemLeakFinder.cpp

@@ -147 +147 @@
         if(ptr && i == sMallocBlocks.end())
         {
-                TRACE1("Block %x realloc(), but not in list. Error? Or allocated in startup static objects?\n", ptr);
+                BOX_WARNING("Block " << ptr << " realloc()ated, but not "
+                        "in list. Error? Or allocated in startup static "
+                        "objects?");
         }
 
@@ -194 +196 @@
                 else
                 {
-                        TRACE1("Block %p freed, but not known. Error? Or allocated in startup static allocation?\n", ptr);
+                        BOX_WARNING("Block " << ptr << " freed, but not "
+                                "known. Error? Or allocated in startup "
+                                "static allocation?");
                 }
 
@@ -294 +298 @@
                 if(i == sMallocBlocks.end())
                 {
-                        TRACE0("Logical error in section block finding\n");
+                        BOX_WARNING("Logical error in section block finding");
                 }
                 else
                 {
-                        TRACE4("Block %p size %d allocated at %s:%d\n", i->first, i->second.size, i->second.file, i->second.line);
+                        BOX_TRACE("Block " << i->first << " size " <<
+                                i->second.size << " allocated at " <<
+                                i->second.file << ":" << i->second.line);
                 }
         }
         for(std::map<void *, ObjectInfo>::const_iterator i(sSectionObjectBlocks.begin()); i != sSectionObjectBlocks.end(); ++i)
         {
-                TRACE5("Object%s %p size %d allocated at %s:%d\n", i->second.array?" []":"", i->first, i->second.size, i->second.file, i->second.line);
+                BOX_TRACE("Object" << (i->second.array?" []":"") << " " <<
+                        i->first << " size " << i->second.size <<
+                        " allocated at " << i->second.file << 
+                        ":" << i->second.line);
         }
 }

box/trunk/lib/common/Logging.h

@@ -63 +63 @@
 #endif
 
-#define BOX_FORMAT_ACCOUNT(accno) \
+#define BOX_FORMAT_HEX32(number) \
         std::hex << \
         std::showbase << \
@@ -69 +69 @@
         std::setw(10) << \
         std::setfill('0') << \
-        (accno) << \
+        (number) << \
         std::dec
+
+#define BOX_FORMAT_ACCOUNT(accno) \
+        BOX_FORMAT_HEX32(accno)
 
 #define BOX_FORMAT_OBJECTID(objectid) \

box/trunk/lib/common/PartialReadStream.cpp

@@ -45 +45 @@
         if(mBytesLeft != 0)
         {
-                TRACE1("PartialReadStream::~PartialReadStream when mBytesLeft = %d\n", mBytesLeft);
+                BOX_TRACE("PartialReadStream destroyed with " << mBytesLeft <<
+                        " bytes remaining");
         }
 }

box/trunk/lib/common/Utils.cpp

@@ -54 +54 @@
         }
 /*#ifndef NDEBUG
-        TRACE2("Splitting string '%s' on %c\n", String.c_str(), SplitOn);
+        BOX_TRACE("Splitting string '" << String << " on " << (char)SplitOn);
         for(unsigned int l = 0; l < rOutput.size(); ++l)
         {
-                TRACE2("%d = '%s'\n", l, rOutput[l].c_str());
+                BOX_TRACE(l << " = '" << rOutput[l] << "'");
         }
 #endif*/

box/trunk/lib/compress/Compress.h

@@ -53 +53 @@
                         :(inflateEnd(&mStream)))) != Z_OK)
                 {
-                        TRACE1("zlib error code = %d\n", r);
+                        BOX_WARNING("zlib error code = " << r);
                         if(r == Z_DATA_ERROR)
                         {
-                                TRACE0("WARNING: End of compress/decompress without all input being consumed -- possible corruption?\n");
+                                BOX_WARNING("End of compress/decompress "