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

Remove the old TRACEx macros to catch any remaining uses.

3 files changed, 35 insertions, 17 deletions

diff --git a/lib/backupclient/BackupStoreFileDiff.cpp b/lib/backupclient/BackupStoreFileDiff.cpp
index f7842a0b..d550e2ba 100644
--- a/lib/backupclient/BackupStoreFileDiff.cpp
+++ b/lib/backupclient/BackupStoreFileDiff.cpp
@@ -149,7 +149,7 @@ std::auto_ptr<IOStream> BackupStoreFile::EncodeFileDiff
 	int64_t blocksInIndex = 0;
 	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)
 	{
@@ -439,7 +439,9 @@ static void FindMostUsedSizes(BlocksAvailableEntry *pIndex, int64_t NumBlocks, i
 	{
 		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] << ")");
 		}
 	}
 #endif
@@ -774,7 +776,7 @@ static void SetupHashTable(BlocksAvailableEntry *pIndex, int64_t NumBlocks, int3
 			// Already present in table?
 			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];
 			}
@@ -840,17 +842,19 @@ static bool SecondStageMatch(BlocksAvailableEntry *pFirstInHashList, RollingChec
 	
 	// 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);
 	
 		// Compare?
 		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;
 			int64_t blockIndex = (scan - pIndex);	// pointer arthmitic is frowned upon. But most efficient way of doing it here -- alternative is to use more memory
@@ -912,7 +916,8 @@ static void GenerateRecipe(BackupStoreFileEncodeStream::Recipe &rRecipe, BlocksA
 		#ifndef NDEBUG
 		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
 		
@@ -1005,10 +1010,14 @@ static void GenerateRecipe(BackupStoreFileEncodeStream::Recipe &rRecipe, BlocksA
 	
 	// 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)
 			{
@@ -1018,10 +1027,15 @@ static void GenerateRecipe(BackupStoreFileEncodeStream::Recipe &rRecipe, BlocksA
 #else
 				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);
+				BOX_TRACE(std::setw(8) <<
+					rRecipe[e].mSpaceBefore <<
+					" " <<
+					((rRecipe[e].mpStartBlock == 0)?"       -":b) <<
+					" " << std::setw(8) <<
+					rRecipe[e].mBlocks);
 			}
 		}
-		TRACE0("======== ========= ========\n");
+		BOX_TRACE("======== ========= ========");
 	}
 #endif
 }
diff --git a/lib/backupclient/BackupStoreFilenameClear.cpp b/lib/backupclient/BackupStoreFilenameClear.cpp
index 9114fdd1..cf168bfc 100644
--- a/lib/backupclient/BackupStoreFilenameClear.cpp
+++ b/lib/backupclient/BackupStoreFilenameClear.cpp
@@ -167,7 +167,8 @@ void BackupStoreFilenameClear::MakeClearAvailable() const
 	switch(encoding)
 	{
 	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;
 		
@@ -193,7 +194,8 @@ static void EnsureEncDecBufferSize(int BufSize)
 	if(spEncDecBuffer == 0)
 	{
 #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);
 		MEMLEAKFINDER_NOT_A_LEAK(spEncDecBuffer);
diff --git a/lib/backupclient/BackupStoreObjectDump.cpp b/lib/backupclient/BackupStoreObjectDump.cpp
index d3d9cc17..0ad044bb 100644
--- a/lib/backupclient/BackupStoreObjectDump.cpp
+++ b/lib/backupclient/BackupStoreObjectDump.cpp
@@ -47,7 +47,7 @@ static void OutputLine(FILE *file, bool ToTrace, const char *format, ...)
 	}
 	if(ToTrace)
 	{
-		TRACE1("%s", text);
+		BOX_TRACE(text);
 	}
 }
 
@@ -211,14 +211,16 @@ void BackupStoreFile::DumpFile(void *clibFileHandle, bool ToTrace, IOStream &rFi
 		if(s > 0)
 		{
 			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);		
+			BOX_TRACE(std::setw(8) << b << " other i=" <<
+				std::setw(8) << 0 - s);
 		}
 	}
-	TRACE0("======== ===== ==========\n");
+	BOX_TRACE("======== ===== ==========");
 }