Changeset 2127

Timestamp:

04/04/2008 23:11:45 (4 years ago)

Author:

chris

Message:

Undo mangling by tailor

Location:

box/trunk

Files:

• bin/bbackupd/BackupClientContext.cpp (modified) (4 diffs)
• bin/bbackupd/BackupClientContext.h (modified) (2 diffs)
• bin/bbackupd/BackupClientDirectoryRecord.cpp (modified) (2 diffs)
• bin/bbackupd/BackupDaemon.cpp (modified) (5 diffs)
• bin/bbackupd/Win32ServiceFunctions.cpp (modified) (2 diffs)
• bin/bbackupd/bbackupd-config.in (modified) (1 diff)
• bin/bbackupquery/BackupQueries.cpp (modified) (7 diffs)
• bin/bbackupquery/bbackupquery.cpp (modified) (2 diffs)
• bin/bbstoreaccounts/bbstoreaccounts.cpp (modified) (3 diffs)
• bin/bbstored/BBStoreDHousekeeping.cpp (modified) (1 diff)
• bin/bbstored/BackupContext.cpp (modified) (1 diff)
• bin/bbstored/bbstored-config.in (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• documentation/bbackupctl.xml (modified) (4 diffs)
• documentation/bbackupquery.xml (modified) (4 diffs)
• documentation/bbstoreaccounts.xml (modified) (4 diffs)
• documentation/bbstored-certs.xml (modified) (4 diffs)
• documentation/bbstored-config.xml (modified) (3 diffs)
• documentation/raidfile-config.xml (modified) (4 diffs)
• lib/backupclient/BackupClientRestore.cpp (modified) (4 diffs)
• lib/backupclient/BackupDaemonConfigVerify.cpp (modified) (2 diffs)
• 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/backupstore/BackupStoreConfigVerify.cpp (modified) (2 diffs)
• lib/common/Box.h (modified) (2 diffs)
• lib/common/BoxTime.cpp (modified) (1 diff)
• lib/common/Configuration.cpp (modified) (23 diffs)
• lib/common/Configuration.h (modified) (3 diffs)
• lib/common/DebugMemLeakFinder.cpp (modified) (3 diffs)
• lib/common/EventWatchFilesystemObject.cpp (modified) (5 diffs)
• lib/common/FileStream.cpp (modified) (6 diffs)
• lib/common/FileStream.h (modified) (1 diff)
• lib/common/Guards.h (modified) (1 diff)
• lib/common/Logging.h (modified) (3 diffs)
• lib/common/PartialReadStream.cpp (modified) (1 diff)
• lib/common/Utils.cpp (modified) (2 diffs)
• lib/common/Utils.h (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/RaidFileController.cpp (modified) (1 diff)
• lib/raidfile/RaidFileWrite.cpp (modified) (3 diffs)
• lib/server/Daemon.cpp (modified) (6 diffs)
• lib/server/Daemon.h (modified) (1 diff)
• lib/server/ProtocolUncertainStream.cpp (modified) (1 diff)
• lib/server/ServerControl.h (modified) (1 diff)
• lib/server/ServerStream.h (modified) (2 diffs)
• lib/server/ServerTLS.h (modified) (1 diff)
• lib/server/SocketListen.h (modified) (13 diffs)
• lib/server/SocketStream.cpp (modified) (11 diffs)
• test/backupdiff/testbackupdiff.cpp (modified) (2 diffs)
• test/basicserver/testbasicserver.cpp (modified) (2 diffs)
• test/bbackupd/testbbackupd.cpp (modified) (4 diffs)
• test/bbackupd/testfiles/bbackupd-temploc.conf (modified) (1 diff)
• test/bbackupd/testfiles/bbackupd.conf.in (modified) (1 diff)
• test/bbackupd/testfiles/bbstored.conf (modified) (1 diff)
• test/common/testcommon.cpp (modified) (3 diffs)
• test/compress/testcompress.cpp (modified) (1 diff)
• test/raidfile/testraidfile.cpp (modified) (1 diff)

box/trunk/bin/bbackupd/BackupClientContext.cpp

@@ -45 +45 @@
         TLSContext &rTLSContext, 
         const std::string &rHostname,
+        int Port,
         int32_t AccountNumber, 
         bool ExtendedLogging,
@@ -53 +54 @@
           mrTLSContext(rTLSContext),
           mHostname(rHostname),
+          mPort(Port),
           mAccountNumber(AccountNumber),
           mpSocket(0),
@@ -130 +132 @@
 
                 // Connect!
-                mpSocket->Open(mrTLSContext, Socket::TypeINET, mHostname.c_str(), BOX_PORT_BBSTORED);
+                mpSocket->Open(mrTLSContext, Socket::TypeINET,
+                        mHostname.c_str(), mPort);
                 
                 // And create a procotol object
@@ -147 +150 @@
                         if (!mpExtendedLogFileHandle)
                         {
-                                BOX_ERROR("Failed to open extended log "
-                                        "file: " << strerror(errno));
+                                BOX_LOG_SYS_ERROR("Failed to open extended "
+                                        "log file: " << mExtendedLogFile);
                         }
                         else

box/trunk/bin/bbackupd/BackupClientContext.h

@@ -42 +42 @@
                 TLSContext &rTLSContext, 
                 const std::string &rHostname,
+                int32_t Port,
                 int32_t AccountNumber, 
                 bool ExtendedLogging,
@@ -202 +203 @@
         TLSContext &mrTLSContext;
         std::string mHostname;
+        int mPort;
         int32_t mAccountNumber;
         SocketStreamTLS *mpSocket;

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/bbackupd/BackupDaemon.cpp

@@ -959 +959 @@
                                         tlsContext, 
                                         conf.GetKeyValue("StoreHostname"),
+                                        conf.GetKeyValueInt("StorePort"),
                                         conf.GetKeyValueInt("AccountNumber"), 
                                         conf.GetKeyValueBool("ExtendedLogging"),
@@ -1813 +1814 @@
 #endif // HAVE_STRUCT_STATVFS_F_MNTONNAME
                                 {
-                                        BOX_WARNING("Failed to stat location "
+                                        BOX_LOG_SYS_WARNING("Failed to stat location "
                                                 "path '" << apLoc->mPath <<
-                                                "' (" << strerror(errno) <<
-                                                "), skipping location '" <<
+                                                "', skipping location '" <<
                                                 apLoc->mName << "'");
                                         continue;
@@ -2190 +2190 @@
                 if(::rename(newmap.c_str(), target.c_str()) != 0)
                 {
-                        BOX_ERROR("failed to rename ID map: " << newmap
-                                << " to " << target << ": " 
-                                << strerror(errno));
+                        BOX_LOG_SYS_ERROR("Failed to rename ID map: " <<
+                                newmap << " to " << target);
                         THROW_EXCEPTION(CommonException, OSFileError)
                 }
@@ -3056 +3055 @@
         if(!FileExists(storeObjectInfoFile.c_str()))
         {
-                // File doesn't exist -- so can't be deleted. But something isn't quite right, so log a message
-                BOX_WARNING("Store object info file did not exist when it "
-                        "was supposed to. (" << storeObjectInfoFile << ")");
+                // File doesn't exist -- so can't be deleted. But something
+                // isn't quite right, so log a message
+                BOX_WARNING("StoreObjectInfoFile did not exist when it "
+                        "was supposed to: " << storeObjectInfoFile);
 
                 // Return true to stop things going around in a loop
@@ -3067 +3067 @@
         if(::unlink(storeObjectInfoFile.c_str()) != 0)
         {
-                BOX_ERROR("Failed to delete the old store object info file: "
-                        << storeObjectInfoFile << ": "<< strerror(errno));
+                BOX_LOG_SYS_ERROR("Failed to delete the old "
+                        "StoreObjectInfoFile: " << storeObjectInfoFile);
                 return false;
         }

box/trunk/bin/bbackupd/Win32ServiceFunctions.cpp

@@ -208 +208 @@
                 if (emu_stat(pConfigFileName, &st) != 0)
                 {
-                        BOX_ERROR("Failed to open configuration file '" <<
-                                pConfigFileName << "': " << strerror(errno));
+                        BOX_LOG_SYS_ERROR("Failed to open configuration file "
+                                "'" << pConfigFileName << "'");
                         return 1;
                 }
@@ -222 +222 @@
         }
 
-        SC_HANDLE scm = OpenSCManager(0,0,SC_MANAGER_CREATE_SERVICE);
+        SC_HANDLE scm = OpenSCManager(0, 0, SC_MANAGER_CREATE_SERVICE);
 
         if (!scm) 

box/trunk/bin/bbackupd/bbackupd-config.in

@@ -27 +27 @@
     account-num (hexdecimal) and server-hostname
                         are supplied by the server administrator
-    working-dir         is usually @localstatedir_expanded@
+    working-dir         is usually @localstatedir_expanded@/bbackupd
     backup directories  is list of directories to back up
 

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -28 +28 @@
 #include <set>
 #include <limits>
+#include <iostream>
+#include <ostream>
 
 #include "BackupQueries.h"
@@ -811 +813 @@
                 else
                 {
-                        BOX_ERROR("Error changing to directory '" <<
-                                args[0] << ": " << strerror(errno));
+                        BOX_LOG_SYS_ERROR("Failed to change to directory "
+                                "'" << args[0] << "'");
                 }
 
@@ -823 +825 @@
         if(::getcwd(wd, PATH_MAX) == 0)
         {
-                BOX_ERROR("Error getting current directory: " <<
-                        strerror(errno));
+                BOX_LOG_SYS_ERROR("Error getting current directory");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -1400 +1401 @@
                 else
                 {
-                        BOX_WARNING("Failed to access local directory '" <<
-                                localDirDisplay << ": " << strerror(errno) <<
-                                "'.");
+                        BOX_LOG_SYS_WARNING("Failed to access local directory "
+                                "'" << localDirDisplay << "'");
                         rParams.mUncheckedFiles ++;
                 }
@@ -1450 +1450 @@
         if(dirhandle == 0)
         {
-                BOX_WARNING("Failed to open local directory '" << 
-                        localDirDisplay << "': " << strerror(errno));
+                BOX_LOG_SYS_WARNING("Failed to open local directory '" << 
+                        localDirDisplay << "'");
                 rParams.mUncheckedFiles ++;
                 return;
@@ -1519 +1519 @@
                 if(::closedir(dirhandle) != 0)
                 {
-                        BOX_ERROR("Failed to close local directory '" <<
-                                localDirDisplay << "': " << strerror(errno));
+                        BOX_LOG_SYS_ERROR("Failed to close local directory "
+                                "'" << localDirDisplay << "'");
                 }
                 dirhandle = 0;
@@ -2159 +2159 @@
 void BackupQueries::CommandUsageDisplayEntry(const char *Name, int64_t Size, int64_t HardLimit, int32_t BlockSize)
 {
-        // Calculate size in Mb
-        double mb = (((double)Size) * ((double)BlockSize)) / ((double)(1024*1024));
-        int64_t percent = (Size * 100) / HardLimit;
-
-        // Bar graph
-        char bar[41];
-        unsigned int b = (int)((Size * (sizeof(bar)-1)) / HardLimit);
-        if(b > sizeof(bar)-1) {b = sizeof(bar)-1;}
-        for(unsigned int l = 0; l < b; l++)
-        {
-                bar[l] = '*';
-        }
-        bar[b] = '\0';
-
-        // Print the entryj
-        ::printf("%14s %10.1fMb %3d%% %s\n", Name, mb, (int32_t)percent, bar);
+        std::cout << FormatUsageLineStart(Name) <<
+                FormatUsageBar(Size, Size * BlockSize, HardLimit * BlockSize) <<
+                std::endl;
 }
 

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -175 +175 @@
                         if(logFile == 0)
                         {
-                                BOX_ERROR("Failed to open log file '" <<
-                                        optarg << "': " << strerror(errno));
+                                BOX_LOG_SYS_ERROR("Failed to open log file "
+                                        "'" << optarg << "'");
                         }
                         break;
@@ -261 +261 @@
         if(!quiet) BOX_INFO("Connecting to store...");
         SocketStreamTLS socket;
-        socket.Open(tlsContext, Socket::TypeINET, conf.GetKeyValue("StoreHostname").c_str(), BOX_PORT_BBSTORED);
+        socket.Open(tlsContext, Socket::TypeINET,
+                conf.GetKeyValue("StoreHostname").c_str(),
+                conf.GetKeyValueInt("StorePort"));
         
         // 3. Make a protocol, and handshake

box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp

@@ -14 +14 @@
 #include <sys/types.h>
 #include <limits.h>
+
+#include <algorithm>
+#include <iostream>
+#include <ostream>
 #include <vector>
-#include <algorithm>
 
 #include "BoxPortsAndFiles.h"
@@ -63 +66 @@
 }
 
-std::string BlockSizeToString(int64_t Blocks, int DiscSet)
-{
-        // Work out size in Mb.
-        double mb = (Blocks * BlockSizeOfDiscSet(DiscSet)) / (1024.0*1024.0);
-        
-        // Format string
-        std::ostringstream buf;
-        buf << Blocks << " blocks " << std::fixed << std::setprecision(2) <<
-                std::showpoint << "(" << mb << " MB)";
-        return buf.str();
+std::string BlockSizeToString(int64_t Blocks, int64_t MaxBlocks, int DiscSet)
+{
+        return FormatUsageBar(Blocks, Blocks * BlockSizeOfDiscSet(DiscSet),
+                MaxBlocks * BlockSizeOfDiscSet(DiscSet));
 }
 
@@ -224 +221 @@
         
         // Then print out lots of info
-        printf("                  Account ID: %08x\n", ID);
-        printf("              Last object ID: %lld\n", info->GetLastObjectIDUsed());
-        printf("                 Blocks used: %s\n", BlockSizeToString(info->GetBlocksUsed(), discSet).c_str());
-        printf("    Blocks used by old files: %s\n", BlockSizeToString(info->GetBlocksInOldFiles(), discSet).c_str());
-        printf("Blocks used by deleted files: %s\n", BlockSizeToString(info->GetBlocksInDeletedFiles(), discSet).c_str());
-        printf("  Blocks used by directories: %s\n", BlockSizeToString(info->GetBlocksInDirectories(), discSet).c_str());
-        printf("            Block soft limit: %s\n", BlockSizeToString(info->GetBlocksSoftLimit(), discSet).c_str());
-        printf("            Block hard limit: %s\n", BlockSizeToString(info->GetBlocksHardLimit(), discSet).c_str());
-        printf("         Client store marker: %lld\n", info->GetClientStoreMarker());
+        std::cout << FormatUsageLineStart("Account ID") <<
+                BOX_FORMAT_ACCOUNT(ID) << std::endl;
+        std::cout << FormatUsageLineStart("Last object ID") <<
+                BOX_FORMAT_OBJECTID(info->GetLastObjectIDUsed()) << std::endl;
+        std::cout << FormatUsageLineStart("Used") <<
+                BlockSizeToString(info->GetBlocksUsed(),
+                        info->GetBlocksHardLimit(), discSet) << std::endl;
+        std::cout << FormatUsageLineStart("Old files") <<
+                BlockSizeToString(info->GetBlocksInOldFiles(),
+                        info->GetBlocksHardLimit(), discSet) << std::endl;
+        std::cout << FormatUsageLineStart("Deleted files") <<
+                BlockSizeToString(info->GetBlocksInDeletedFiles(),
+                        info->GetBlocksHardLimit(), discSet) << std::endl;
+        std::cout << FormatUsageLineStart("Directories") <<
+                BlockSizeToString(info->GetBlocksInDirectories(),
+                        info->GetBlocksHardLimit(), discSet) << std::endl;
+        std::cout << FormatUsageLineStart("Soft limit") <<
+                BlockSizeToString(info->GetBlocksSoftLimit(),
+                        info->GetBlocksHardLimit(), discSet) << std::endl;
+        std::cout << FormatUsageLineStart("Hard limit") <<
+                BlockSizeToString(info->GetBlocksHardLimit(),
+                        info->GetBlocksHardLimit(), discSet) << std::endl;
+        std::cout << FormatUsageLineStart("Client store marker") <<
+                info->GetLastObjectIDUsed() << std::endl;
         
         return 0;

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/bin/bbstored/bbstored-config.in

@@ -197 +197 @@
 Server
 {
-        PidFile = @localstatedir_expanded@/bbstored.pid
+        PidFile = @localstatedir_expanded@/run/bbstored.pid
         User = $username
         ListenAddresses = inet:$server

box/trunk/configure.ac

@@ -6 +6 @@
 AC_CONFIG_SRCDIR([lib/common/Box.h])
 AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
-
-# override default sysconfdir, for backwards compatibility
-test "$sysconfdir" = NONE && sysconfdir=/etc
-test "$localstatedir" = NONE && localstatedir=/var/run
 
 touch install-sh
@@ -63 +59 @@
 esac
 
-AC_CHECK_HEADER([zlib.h],, [AC_MSG_ERROR([[cannot find zlib.h]])])
 AC_CHECK_LIB([z], [zlibVersion],, [AC_MSG_ERROR([[cannot find zlib]])])
 VL_LIB_READLINE([have_libreadline=yes], [have_libreadline=no])
@@ -274 +269 @@
   LIBS="-Wl,-Bstatic $LIBS -Wl,-Bdynamic"
 fi
+
+# override default sysconfdir, for backwards compatibility
+test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+test "$localstatedir" = '${prefix}/var' && localstatedir=/var
 
 ## Kludge to allow makeparcels.pl to use bindir. This is not a good long term

box/trunk/documentation/bbackupctl.xml

@@ -4 +4 @@
     <refentrytitle>bbackupctl</refentrytitle>
 
-    <manvolnum>1</manvolnum>
+    <manvolnum>8</manvolnum>
   </refmeta>
 
@@ -24 +24 @@
     <para><literal>bbackupctl</literal> lets the user control the bbackupd
     daemon on a client machine. The main use is to force a sync with the store
-    server. This is especially important if bbackupd(1) is configured to do
+    server. This is especially important if bbackupd(8) is configured to do
     snapshot backups. In that case <literal>bbackupctl</literal> is the only
     way to effect a backup.</para>
@@ -32 +32 @@
     connecting on this socket has the correct credentials to execute the
     commands, leaving a rather sizeable security hole open. To avoid this,
-    unset the CommandSocket parameter in <literal>bbackupd.conf</literal>(8).
+    unset the CommandSocket parameter in <literal>bbackupd.conf</literal>(5).
     That disables the command socket, so bbackupd is secure. This does,
     however, render bbackupctl unusable.</para>
@@ -94 +94 @@
     <title>See Also</title>
 
-    <para><literal>bbackupd.conf(8)</literal></para>
+    <para><literal>bbackupd.conf(5)</literal></para>
 
-    <para>bbackupd(1)</para>
+    <para><literal>bbackupd(8)</literal></para>
   </refsection>
 

box/trunk/documentation/bbackupquery.xml

@@ -4 +4 @@
     <refentrytitle>bbackupquery</refentrytitle>
 
-    <manvolnum>1</manvolnum>
+    <manvolnum>8</manvolnum>
   </refmeta>
 
@@ -40 +40 @@
 
     <para>Note that commands that contain spaces are enclosed in double
-    quotes. If the <literal>quit</literal> command is ommitted, after the
+    quotes. If the <literal>quit</literal> command is omitted, after the
     preceding commands are completed, <literal>bbackupquery</literal> will
     enter interactive mode.</para>
@@ -329 +329 @@
     <title>See Also</title>
 
-    <para>bbackupd.conf(8)</para>
+    <para>bbackupd.conf(5)</para>
   </refsection>
 
@@ -358 +358 @@
 
       <listitem>
-        <para>The platform you are running on (Hardware and OS), for both
+        <para>The platform you are running on (hardware and OS), for both
         client and server.</para>
       </listitem>

box/trunk/documentation/bbstoreaccounts.xml

@@ -4 +4 @@
     <refentrytitle>bbstoreaccounts</refentrytitle>
 
-    <manvolnum>1</manvolnum>
+    <manvolnum>8</manvolnum>
   </refmeta>
 
@@ -29 +29 @@
     server. </para>
 
-    <para><literal>bbstoreaccounts</literal> alwas takes at least 2
+    <para><literal>bbstoreaccounts</literal> always takes at least 2
     parameters: the command name and the account ID. Some commands require
     additional parameters, and some commands have optional parameters.</para>
@@ -161 +161 @@
             <listitem>
               <para>Blocks used by deleted files: The number of blocks used by
-              files that have been deleted on the client. Thi s data is at
+              files that have been deleted on the client. This data is at
               risk for being removed during housekeeping.</para>
             </listitem>
@@ -268 +268 @@
 
       <listitem>
-        <para>The platform you are running on (Hardware and OS), for both
+        <para>The platform you are running on (hardware and OS), for both
         client and server.</para>
       </listitem>

box/trunk/documentation/bbstored-certs.xml

@@ -4 +4 @@
     <refentrytitle>bbstored-certs</refentrytitle>
 
-    <manvolnum>1</manvolnum>
+    <manvolnum>8</manvolnum>
   </refmeta>
 
@@ -52 +52 @@
           <para><literal>sign &lt;clientcsrfile&gt;</literal>: Sign a client
           certificate. The <literal>clientcsrfile</literal> is generated
-          during client setup. See <literal>bbackupd-config(1)</literal>. Send
+          during client setup. See <literal>bbackupd-config(8)</literal>. Send
           the signed certificate back to the client, and install according to
           the instructions given by <literal>bbackupd-config</literal>.</para>
@@ -73 +73 @@
     <title>See Also</title>
 
-    <para><literal>bbstored-config(1)</literal></para>
+    <para><literal>bbstored-config(8)</literal></para>
 
     <para><literal>bbstored.conf(5)</literal></para>
 
-    <para><literal>bbstoreaccounts(1)</literal></para>
+    <para><literal>bbstoreaccounts(8)</literal></para>
   </refsection>
 
@@ -103 +103 @@
 
       <listitem>
-        <para>The platform you are running on (Hardware and OS), for both
+        <para>The platform you are running on (hardware and OS), for both
         client and server.</para>
       </listitem>

box/trunk/documentation/bbstored-config.xml

@@ -4 +4 @@
     <refentrytitle>bbstored-config</refentrytitle>
 
-    <manvolnum>1</manvolnum>
+    <manvolnum>8</manvolnum>
   </refmeta>
 
@@ -87 +87 @@
     <title>See Also</title>
 
-    <para><literal>raidfile-config(1)</literal></para>
+    <para><literal>raidfile-config(8)</literal></para>
 
     <para><literal>bbstored.conf(5)</literal></para>
@@ -118 +118 @@
 
       <listitem>
-        <para>The platform you are running on (Hardware and OS), for both
+        <para>The platform you are running on (hardware and OS), for both
         client and server.</para>
       </listitem>

box/trunk/documentation/raidfile-config.xml

@@ -4 +4 @@
     <refentrytitle>raidfile-config</refentrytitle>
 
-    <manvolnum>1</manvolnum>
+    <manvolnum>8</manvolnum>
   </refmeta>
 
@@ -46 +46 @@
         <listitem>
           <para><literal>blocksize</literal>: The block size used for file
-          storage in the system, in bytes. Using a multple of the file system
+          storage in the system, in bytes. Using a multiple of the file system
           block size is a good strategy. Depending on the size of the files
           you will be backing up, this multiple varies. Of course it also
@@ -91 +91 @@
     <title>See Also</title>
 
-    <para><literal>bbstored-config(1)</literal></para>
+    <para><literal>bbstored-config(8)</literal></para>
 
     <para><literal>bbstored.conf(5)</literal></para>
@@ -121 +121 @@
 
       <listitem>
-        <para>The platform you are running on (Hardware and OS), for both
+        <para>The platform you are running on (hardware and OS), for both
         client and server.</para>
       </listitem>

box/trunk/lib/backupclient/BackupClientRestore.cpp

@@ -268 +268 @@
                                 if(::unlink(rLocalDirectoryName.c_str()) != 0)
                                 {
-                                        BOX_ERROR("Failed to delete file " <<
-                                                rLocalDirectoryName << ": " <<
-                                                strerror(errno));
+                                        BOX_LOG_SYS_ERROR("Failed to delete "
+                                                "file '" << 
+                                                rLocalDirectoryName << "'");
                                         return Restore_UnknownError;
                                 }
                                 BOX_TRACE("In restore, directory name " 
-                                        "collision with file " <<
-                                        rLocalDirectoryName);
+                                        "collision with file '" <<
+                                        rLocalDirectoryName << "'");
                         }
                         break;
@@ -379 +379 @@
                 ::mkdir(rLocalDirectoryName.c_str(), S_IRWXU) != 0)
         {
-                BOX_ERROR("Failed to create directory '" <<
-                        rLocalDirectoryName << "': " << 
-                        strerror(errno));
+                BOX_LOG_SYS_ERROR("Failed to create directory '" <<
+                        rLocalDirectoryName << "'");
                 return Restore_UnknownError;
         }
@@ -452 +451 @@
                                 // Local name
                                 BackupStoreFilenameClear nm(en->GetName());
-                                std::string localFilename(rLocalDirectoryName + DIRECTORY_SEPARATOR_ASCHAR + nm.GetClearFilename());
+                                std::string localFilename(rLocalDirectoryName +
+                                        DIRECTORY_SEPARATOR_ASCHAR +
+                                        nm.GetClearFilename());
                                 
                                 // Unlink anything which already exists:
@@ -460 +461 @@
                                         ::unlink(localFilename.c_str()) != 0)
                                 {
-                                        BOX_ERROR("Failed to delete file '" <<
-                                                localFilename << "': " <<
-                                                strerror(errno));
+                                        BOX_LOG_SYS_ERROR("Failed to delete "
+                                                "file '" << localFilename << 
+                                                "'");
                                         return Restore_UnknownError;
                                 }
                                 
                                 // Request it from the store
-                                rConnection.QueryGetFile(DirectoryID, en->GetObjectID());
+                                rConnection.QueryGetFile(DirectoryID,
+                                        en->GetObjectID());
                 
                                 // Stream containing encoded file
-                                std::auto_ptr<IOStream> objectStream(rConnection.ReceiveStream());
-                
-                                // Decode the file -- need to do different things depending on whether 
-                                // the directory entry has additional attributes
+                                std::auto_ptr<IOStream> objectStream(
+                                        rConnection.ReceiveStream());
+                
+                                // Decode the file -- need to do different
+                                // things depending on whether the directory
+                                // entry has additional attributes
                                 try
                                 {

box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp

@@ -18 +18 @@
 static const ConfigurationVerifyKey backuplocationkeys[] = 
 {
-        {"ExcludeFile", 0, ConfigTest_MultiValueAllowed, 0},
-        {"ExcludeFilesRegex", 0, ConfigTest_MultiValueAllowed, 0},
-        {"ExcludeDir", 0, ConfigTest_MultiValueAllowed, 0},
-        {"ExcludeDirsRegex", 0, ConfigTest_MultiValueAllowed, 0},
-        {"AlwaysIncludeFile", 0, ConfigTest_MultiValueAllowed, 0},
-        {"AlwaysIncludeFilesRegex", 0, ConfigTest_MultiValueAllowed, 0},
-        {"AlwaysIncludeDir", 0, ConfigTest_MultiValueAllowed, 0},
-        {"AlwaysIncludeDirsRegex", 0, ConfigTest_MultiValueAllowed, 0},
-        {"Path", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("ExcludeFile", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("ExcludeFilesRegex", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("ExcludeDir", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("ExcludeDirsRegex", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("AlwaysIncludeFile", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("AlwaysIncludeFilesRegex", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("AlwaysIncludeDir", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("AlwaysIncludeDirsRegex", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("Path", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
@@ -65 +65 @@
 static const ConfigurationVerifyKey verifyrootkeys[] = 
 {
-        {"AccountNumber", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
+        ConfigurationVerifyKey("AccountNumber",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("UpdateStoreInterval",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("MinimumFileAge",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("MaxUploadWait",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("MaxFileTimeInFuture", ConfigTest_IsInt, 172800),
+        // file is uploaded if the file is this much in the future
+        // (2 days default)
+        ConfigurationVerifyKey("AutomaticBackup", ConfigTest_IsBool, true),
+        
+        ConfigurationVerifyKey("SyncAllowScript", 0),
+        // script that returns "now" if backup is allowed now, or a number
+        // of seconds to wait before trying again if not
 
-        {"UpdateStoreInterval", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"MinimumFileAge", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"MaxUploadWait", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"MaxFileTimeInFuture", "172800", ConfigTest_IsInt, 0},         // file is uploaded if the file is this much in the future (2 days default)
+        ConfigurationVerifyKey("MaximumDiffingTime", ConfigTest_IsInt),
+        ConfigurationVerifyKey("DeleteRedundantLocationsAfter",
+                ConfigTest_IsInt, 172800),
 
-        {"AutomaticBackup", "yes", ConfigTest_IsBool, 0},
+        ConfigurationVerifyKey("FileTrackingSizeThreshold", 
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("DiffingUploadSizeThreshold",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("StoreHostname", ConfigTest_Exists),
+        ConfigurationVerifyKey("StorePort", ConfigTest_IsInt,
+                BOX_PORT_BBSTORED),
+        ConfigurationVerifyKey("ExtendedLogging", ConfigTest_IsBool, false),
+        // extended log to syslog
+        ConfigurationVerifyKey("ExtendedLogFile", 0),
+        // extended log to a file
+        ConfigurationVerifyKey("LogAllFileAccess", ConfigTest_IsBool, false),
+        ConfigurationVerifyKey("CommandSocket", 0),
+        // not compulsory to have this
+        ConfigurationVerifyKey("KeepAliveTime", ConfigTest_IsInt),
+        ConfigurationVerifyKey("StoreObjectInfoFile", 0),
+        // optional
+
+        ConfigurationVerifyKey("NotifyScript", 0),
+        // optional script to run when backup needs attention, eg store full
         
-        {"SyncAllowScript", 0, 0, 0},                   // optional script to run to see if the sync should be started now
-                                // return "now" if it's allowed, or a number of seconds if it's not
-
-        {"MaximumDiffingTime", 0, ConfigTest_IsInt, 0},
-        {"DeleteRedundantLocationsAfter", "172800", ConfigTest_IsInt, 0},
-
-        {"FileTrackingSizeThreshold", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"DiffingUploadSizeThreshold", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"StoreHostname", 0, ConfigTest_Exists, 0},
-        {"ExtendedLogging",     "no", ConfigTest_IsBool, 0}, // extended log to syslog
-        {"ExtendedLogFile",     NULL, 0, 0}, // extended log to a file
-        {"LogAllFileAccess", "no", ConfigTest_IsBool, 0},
-
-        {"CommandSocket", 0, 0, 0},                             // not compulsory to have this
-        {"KeepAliveTime", 0, ConfigTest_IsInt, 0},                              // optional
-        {"StoreObjectInfoFile", 0, 0, 0},                               // optional
-
-        {"NotifyScript", 0, 0, 0},                              // optional script to run when backup needs attention, eg store full
-        
-        {"CertificateFile", 0, ConfigTest_Exists, 0},
-        {"PrivateKeyFile", 0, ConfigTest_Exists, 0},
-        {"TrustedCAsFile", 0, ConfigTest_Exists, 0},
-        {"KeysFile", 0, ConfigTest_Exists, 0},
-        {"DataDirectory", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("CertificateFile", ConfigTest_Exists),
+        ConfigurationVerifyKey("PrivateKeyFile", ConfigTest_Exists),
+        ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_Exists),
+        ConfigurationVerifyKey("KeysFile", ConfigTest_Exists),
+        ConfigurationVerifyKey("DataDirectory", 
+                ConfigTest_Exists | ConfigTest_LastEntry),
 };
 

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/backupstore/BackupStoreConfigVerify.cpp

@@ -17 +17 @@
 static const ConfigurationVerifyKey verifyserverkeys[] = 
 {
-        SERVERTLS_VERIFY_SERVER_KEYS(0) // no default listen addresses
+        SERVERTLS_VERIFY_SERVER_KEYS(ConfigurationVerifyKey::NoDefaultValue)
+        // no default listen addresses
 };
 
@@ -33 +34 @@
 static const ConfigurationVerifyKey verifyrootkeys[] = 
 {
-        {"AccountDatabase",     0, ConfigTest_Exists, 0},
-        {"TimeBetweenHousekeeping",     0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"ExtendedLogging",     "no", ConfigTest_IsBool, 0},                    // make value "yes" to enable in config file
+        ConfigurationVerifyKey("AccountDatabase", ConfigTest_Exists),
+        ConfigurationVerifyKey("TimeBetweenHousekeeping",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("ExtendedLogging", ConfigTest_IsBool, false),
+        // make value "yes" to enable in config file
 
         #ifdef WIN32
-                {"RaidFileConf", "", ConfigTest_LastEntry, 0}
+                ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry)
         #else
-                {"RaidFileConf", BOX_FILE_RAIDFILE_DEFAULT_CONFIG, ConfigTest_LastEntry, 0}
+                ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry,
+                        BOX_FILE_RAIDFILE_DEFAULT_CONFIG)
         #endif
-
 };
 

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/BoxTime.cpp

@@ -40 +40 @@
                 if (gettimeofday(&tv, NULL) != 0)
                 {
-                        BOX_ERROR("Failed to gettimeofday(), dropping "
-                                "precision: " << strerror(errno));
+                        BOX_LOG_SYS_ERROR("Failed to gettimeofday(), "
+                                "dropping precision");
                 }
                 else

box/trunk/lib/common/Configuration.cpp

@@ -12 +12 @@
 #include <stdlib.h>
 #include <limits.h>
+
+#include <sstream>
 
 #include "Configuration.h"
@@ -30 +32 @@
 static const bool sValueBooleanValue[] = {true, true, false, false};
 
-
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        void *testFunction
+)
+: mName(name),
+  mHasDefaultValue(false),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{ }
+
+// to allow passing NULL for default ListenAddresses
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        NoDefaultValue_t t,
+        void *testFunction
+)
+: mName(name),
+  mHasDefaultValue(false),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{ }
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        std::string defaultValue,
+        void *testFunction
+)
+: mName(name),
+  mDefaultValue(defaultValue),
+  mHasDefaultValue(true),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{ }
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        const char *defaultValue,
+        void *testFunction
+)
+: mName(name),
+  mDefaultValue(defaultValue),
+  mHasDefaultValue(true),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{ }
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        int defaultValue,
+        void *testFunction
+)
+: mName(name),
+  mHasDefaultValue(true),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{
+        ASSERT(flags & ConfigTest_IsInt);
+        std::ostringstream val;
+        val << defaultValue;
+        mDefaultValue = val.str();
+}
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        bool defaultValue,
+        void *testFunction
+)
+: mName(name),
+  mHasDefaultValue(true),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{
+        ASSERT(flags & ConfigTest_IsBool);
+        mDefaultValue = defaultValue ? "yes" : "no";
+}
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        const ConfigurationVerifyKey& rToCopy
+)
+: mName(rToCopy.mName),
+  mDefaultValue(rToCopy.mDefaultValue),
+  mHasDefaultValue(rToCopy.mHasDefaultValue),
+  mFlags(rToCopy.mFlags),
+  mTestFunction(rToCopy.mTestFunction)
+{ }
 
 // --------------------------------------------------------------------------
@@ -109 +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;
@@ -121 +221 @@
                         if(!Verify(*pconfig, *pVerify, std::string(), rErrorMsg))
                         {
-                                //TRACE1("Error message from Verify: %s", rErrorMsg.c_str());
-                                TRACE0("Error at Configuration::Verify\n");
+                                BOX_ERROR("Error verifying configuration: " <<
+                                        rErrorMsg);
                                 delete pconfig;
                                 pconfig = 0;
@@ -190 +290 @@
                         else
                         {
-                                rErrorMsg += "Unexpected start block in " + rConfig.mName + "\n";
+                                rErrorMsg += "Unexpected start block in " +
+                                        rConfig.mName + "\n";
                         }
                 }
@@ -291 +392 @@
 //
 // Function
-//              Name:    Configuration::KeyExists(const char *)
+//              Name:    Configuration::KeyExists(const std::string&)
 //              Purpose: Checks to see if a key exists
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-bool Configuration::KeyExists(const char *pKeyName) const
-{
-        if(pKeyName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
-        return mKeys.find(pKeyName) != mKeys.end();
-}
-
-
-// --------------------------------------------------------------------------
-//
-// Function
-//              Name:    Configuration::GetKeyValue(const char *)
+bool Configuration::KeyExists(const std::string& rKeyName) const
+{
+        return mKeys.find(rKeyName) != mKeys.end();
+}
+
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    Configuration::GetKeyValue(const std::string&)
 //              Purpose: Returns the value of a configuration variable
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-const std::string &Configuration::GetKeyValue(const char *pKeyName) const
-{
-        if(pKeyName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
-        std::map<std::string, std::string>::const_iterator i(mKeys.find(pKeyName));
+const std::string &Configuration::GetKeyValue(const std::string& rKeyName) const
+{
+        std::map<std::string, std::string>::const_iterator i(mKeys.find(rKeyName));
         
         if(i == mKeys.end())
         {
-                BOX_ERROR("Missing configuration key: " << pKeyName);
+                BOX_ERROR("Missing configuration key: " << rKeyName);
                 THROW_EXCEPTION(CommonException, ConfigNoKey)
         }
@@ -333 +430 @@
 //
 // Function
-//              Name:    Configuration::GetKeyValueInt(const char *)
+//              Name:    Configuration::GetKeyValueInt(const std::string& rKeyName)
 //              Purpose: Gets a key value as an integer
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-int Configuration::GetKeyValueInt(const char *pKeyName) const
-{
-        if(pKeyName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
-        std::map<std::string, std::string>::const_iterator i(mKeys.find(pKeyName));
+int Configuration::GetKeyValueInt(const std::string& rKeyName) const
+{
+        std::map<std::string, std::string>::const_iterator i(mKeys.find(rKeyName));
         
         if(i == mKeys.end())
@@ -363 +458 @@
 //
 // Function
-//              Name:    Configuration::GetKeyValueBool(const char *) const
+//              Name:    Configuration::GetKeyValueBool(const std::string&)
 //              Purpose: Gets a key value as a boolean
 //              Created: 17/2/04
 //
 // --------------------------------------------------------------------------
-bool Configuration::GetKeyValueBool(const char *pKeyName) const
-{
-        if(pKeyName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
-        std::map<std::string, std::string>::const_iterator i(mKeys.find(pKeyName));
+bool Configuration::GetKeyValueBool(const std::string& rKeyName) const
+{
+        std::map<std::string, std::string>::const_iterator i(mKeys.find(rKeyName));
         
         if(i == mKeys.end())
@@ -429 +522 @@
 //
 // Function
-//              Name:    Configuration::SubConfigurationExists(const char *)
+//              Name:    Configuration::SubConfigurationExists(const
+//                       std::string&)
 //              Purpose: Checks to see if a sub configuration exists
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-bool Configuration::SubConfigurationExists(const char *pSubName) const
-{
-        if(pSubName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
+bool Configuration::SubConfigurationExists(const std::string& rSubName) const
+{
         // Attempt to find it...
         std::list<std::pair<std::string, Configuration> >::const_iterator i(mSubConfigurations.begin());
@@ -444 +536 @@
         {
                 // This the one?
-                if(i->first == pSubName)
+                if(i->first == rSubName)
                 {
                         // Yes.
@@ -459 +551 @@
 //
 // Function
-//              Name:    Configuration::GetSubConfiguration(const char *)
+//              Name:    Configuration::GetSubConfiguration(const
+//                       std::string&)
 //              Purpose: Gets a sub configuration
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-const Configuration &Configuration::GetSubConfiguration(const char *pSubName) const
-{
-        if(pSubName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
+const Configuration &Configuration::GetSubConfiguration(const std::string&
+        rSubName) const
+{
         // Attempt to find it...
         std::list<std::pair<std::string, Configuration> >::const_iterator i(mSubConfigurations.begin());
@@ -474 +566 @@
         {
                 // This the one?
-                if(i->first == pSubName)
+                if(i->first == rSubName)
                 {
                         // Yes.
@@ -529 +621 @@
                 {
                         // Can the key be found?
-                        ASSERT(pvkey->mpName);
-                        if(rConfig.KeyExists(pvkey->mpName))
+                        if(rConfig.KeyExists(pvkey->Name()))
                         {
                                 // Get value
-                                const std::string &rval = rConfig.GetKeyValue(pvkey->mpName);
+                                const std::string &rval = rConfig.GetKeyValue(pvkey->Name());
                                 const char *val = rval.c_str();
 
                                 // Check it's a number?
-                                if((pvkey->Tests & ConfigTest_IsInt) == ConfigTest_IsInt)
+                                if((pvkey->Flags() & ConfigTest_IsInt) == ConfigTest_IsInt)
                                 {                                       
                                         // Test it...
@@ -546 +637 @@
                                                 // not a good value
                                                 ok = false;
-                                                rErrorMsg += rLevel + rConfig.mName +"." + pvkey->mpName + " (key) is not a valid integer.\n";
+                                                rErrorMsg += rLevel + rConfig.mName + "." + pvkey->Name() + " (key) is not a valid integer.\n";
                                         }
                                 }
                                 
                                 // Check it's a bool?
-                                if((pvkey->Tests & ConfigTest_IsBool) == ConfigTest_IsBool)
+                                if((pvkey->Flags() & ConfigTest_IsBool) == ConfigTest_IsBool)
                                 {                               
                                         // See if it's one of the allowed strings.
@@ -569 +660 @@
                                         {
                                                 ok = false;
-                                                rErrorMsg += rLevel + rConfig.mName +"." + pvkey->mpName + " (key) is not a valid boolean value.\n";
+                                                rErrorMsg += rLevel + rConfig.mName + "." + pvkey->Name() + " (key) is not a valid boolean value.\n";
                                         }
                                 }
                                 
                                 // Check for multi valued statments where they're not allowed
-                                if((pvkey->Tests & ConfigTest_MultiValueAllowed) == 0)
+                                if((pvkey->Flags() & ConfigTest_MultiValueAllowed) == 0)
                                 {
                                         // Check to see if this key is a multi-value -- it shouldn't be
@@ -580 +671 @@
                                         {
                                                 ok = false;
-                                                rErrorMsg += rLevel + rConfig.mName +"." + pvkey->mpName + " (key) multi value not allowed (duplicated key?).\n";
+                                                rErrorMsg += rLevel + rConfig.mName +"." + pvkey->Name() + " (key) multi value not allowed (duplicated key?).\n";
                                         }
                                 }                               
@@ -587 +678 @@
                         {
                                 // Is it required to exist?
-                                if((pvkey->Tests & ConfigTest_Exists) == ConfigTest_Exists)
+                                if((pvkey->Flags() & ConfigTest_Exists) == ConfigTest_Exists)
                                 {
                                         // Should exist, but doesn't.
                                         ok = false;
-                                        rErrorMsg += rLevel + rConfig.mName + "." + pvkey->mpName + " (key) is missing.\n";
-                                }
-                                else if(pvkey->mpDefaultValue)
-                                {
-                                        rConfig.mKeys[std::string(pvkey->mpName)] = std::string(pvkey->mpDefaultValue);
+                                        rErrorMsg += rLevel + rConfig.mName + "." + pvkey->Name() + " (key) is missing.\n";
+                                }
+                                else if(pvkey->HasDefaultValue())
+                                {
+                                        rConfig.mKeys[pvkey->Name()] =
+                                                pvkey->DefaultValue();
                                 }
                         }
                 
-                        if((pvkey->Tests & ConfigTest_LastEntry) == ConfigTest_LastEntry)
+                        if((pvkey->Flags() & ConfigTest_LastEntry) == ConfigTest_LastEntry)
                         {
                                 // No more!
@@ -619 +711 @@
                         while(scan)
                         {
-                                if(scan->mpName == i->first)
+                                if(scan->Name() == i->first)
                                 {
                                         found = true;
@@ -626 +718 @@
                                 
                                 // Next?
-                                if((scan->Tests & ConfigTest_LastEntry) == ConfigTest_LastEntry)
+                                if((scan->Flags() & ConfigTest_LastEntry) == ConfigTest_LastEntry)
                                 {
                                         break;
@@ -651 +743 @@
                 while(scan)
                 {
-                        ASSERT(scan->mpName);
-                        if(scan->mpName[0] == '*')
+                        if(scan->mName.length() > 0 && scan->mName[0] == '*')
                         {
                                 wildcardverify = scan;
@@ -660 +751 @@
                         if((scan->Tests & ConfigTest_Exists) == ConfigTest_Exists)
                         {
-                                if(scan->mpName[0] == '*')
+                                if(scan->mName.length() > 0 &&
+                                        scan->mName[0] == '*')
                                 {
                                         // Check something exists
@@ -673 +765 @@
                                 {
                                         // Check real thing exists
-                                        if(!rConfig.SubConfigurationExists(scan->mpName))
+                                        if(!rConfig.SubConfigurationExists(scan->mName))
                                         {
                                                 // Should exist, but doesn't.
                                                 ok = false;
-                                                rErrorMsg += rLevel + rConfig.mName + "." + scan->mpName + " (block) is missing.\n";
+                                                rErrorMsg += rLevel + rConfig.mName + "." + scan->mName + " (block) is missing.\n";
                                         }
                                 }
@@ -702 +794 @@
                         while(scan)
                         {
-                                if(strcmp(scan->mpName, name) == 0)
+                                if(scan->mName == name)
                                 {
                                         // found it!

box/trunk/lib/common/Configuration.h

@@ -30 +30 @@
 {
 public:
-        const char *mpName;                     // "*" for all other keys (not implemented yet)
-        const char *mpDefaultValue;     // default for when it's not present
-        int Tests;
-        void *TestFunction;                     // set to zero for now, will implement later
+        typedef enum
+        {
+                NoDefaultValue = 1
+        } NoDefaultValue_t;
+
+        ConfigurationVerifyKey(std::string name, int flags,
+                void *testFunction = NULL);
+        // to allow passing ConfigurationVerifyKey::NoDefaultValue
+        // for default ListenAddresses
+        ConfigurationVerifyKey(std::string name, int flags,
+                NoDefaultValue_t t, void *testFunction = NULL);
+        ConfigurationVerifyKey(std::string name, int flags,
+                std::string defaultValue, void *testFunction = NULL);
+        ConfigurationVerifyKey(std::string name, int flags,
+                const char* defaultValue, void *testFunction = NULL);
+        ConfigurationVerifyKey(std::string name, int flags,
+                int defaultValue, void *testFunction = NULL);
+        ConfigurationVerifyKey(std::string name, int flags,
+                bool defaultValue, void *testFunction = NULL);
+        const std::string& Name() const { return mName; }
+        const std::string& DefaultValue() const { return mDefaultValue; }
+        const bool HasDefaultValue() const { return mHasDefaultValue; }
+        const int Flags() const { return mFlags; }
+        const void* TestFunction() const { return mTestFunction; }
+        ConfigurationVerifyKey(const ConfigurationVerifyKey& rToCopy);
+
+private:
+        ConfigurationVerifyKey& operator=(const ConfigurationVerifyKey&
+                noAssign);
+
+        std::string mName;         // "*" for all other keys (not implemented yet)
+        std::string mDefaultValue; // default for when it's not present
+        bool mHasDefaultValue;
+        int mFlags;
+        void *mTestFunction; // set to zero for now, will implement later
 };
 
@@ -39 +70 @@
 {
 public:
-        const char *mpName;                     // "*" for all other sub config names
+        std::string mName; // "*" for all other sub config names
         const ConfigurationVerify *mpSubConfigurations;
         const ConfigurationVerifyKey *mpKeys;
         int Tests;      
-        void *TestFunction;                     // set to zero for now, will implement later
+        void *TestFunction; // set to zero for now, will implement later
 };
 
@@ -80 +111 @@
         { return LoadAndVerify(rFilename, 0, rErrorMsg); }
         
-        bool KeyExists(const char *pKeyName) const;
-        const std::string &GetKeyValue(const char *pKeyName) const;
-        int GetKeyValueInt(const char *pKeyName) const;
-        bool GetKeyValueBool(const char *pKeyName) const;
+        bool KeyExists(const std::string& rKeyName) const;
+        const std::string &GetKeyValue(const std::string& rKeyName) const;
+        int GetKeyValueInt(const std::string& rKeyName) const;
+        bool GetKeyValueBool(const std::string& rKeyName) const;
         std::vector<std::string> GetKeyNames() const;
         
-        bool SubConfigurationExists(const char *pSubName) const;
-        const Configuration &GetSubConfiguration(const char *pSubName) const;
+        bool SubConfigurationExists(const std::string& rSubName) const;
+        const Configuration &GetSubConfiguration(const std::string& rSubName) const;
         std::vector<std::string> GetSubConfigurationNames() const;
         

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/EventWatchFilesystemObject.cpp

@@ -27 +27 @@
 //
 // Function
-//              Name:    EventWatchFilesystemObject::EventWatchFilesystemObject(const char *)
-//              Purpose: Constructor -- opens the file object
-//              Created: 12/3/04
+//      Name:    EventWatchFilesystemObject::EventWatchFilesystemObject
+//               (const char *)
+//      Purpose: Constructor -- opens the file object
+//      Created: 12/3/04
 //
 // --------------------------------------------------------------------------
@@ -40 +41 @@
         if(mDescriptor == -1)
         {
-                BOX_ERROR("EventWatchFilesystemObject: "
-                        "Failed to open file '" << Filename << "': " <<
-                        strerror(errno));
+                BOX_LOG_SYS_ERROR("EventWatchFilesystemObject: "
+                        "Failed to open file '" << Filename << "'");
                 THROW_EXCEPTION(CommonException, OSFileOpenError)
         }
@@ -54 +54 @@
 //
 // Function
-//              Name:    EventWatchFilesystemObject::~EventWatchFilesystemObject()
-//              Purpose: Destructor
-//              Created: 12/3/04
+//      Name:    EventWatchFilesystemObject::~EventWatchFilesystemObject()
+//      Purpose: Destructor
+//      Created: 12/3/04
 //
 // --------------------------------------------------------------------------
@@ -71 +71 @@
 //
 // Function
-//              Name:    EventWatchFilesystemObject::EventWatchFilesystemObject(const EventWatchFilesystemObject &)
-//              Purpose: Copy constructor
-//              Created: 12/3/04
+//      Name:    EventWatchFilesystemObject::EventWatchFilesystemObject
+//               (const EventWatchFilesystemObject &)
+//      Purpose: Copy constructor
+//      Created: 12/3/04
 //
 // --------------------------------------------------------------------------
-EventWatchFilesystemObject::EventWatchFilesystemObject(const EventWatchFilesystemObject &rToCopy)
+EventWatchFilesystemObject::EventWatchFilesystemObject(
+        const EventWatchFilesystemObject &rToCopy)
         : mDescriptor(::dup(rToCopy.mDescriptor))
 {
@@ -90 +92 @@
 //
 // Function
-//              Name:    EventWatchFilesystemObject::FillInKEvent(struct kevent &, int)
-//              Purpose: For WaitForEvent
-//              Created: 12/3/04
+//      Name:    EventWatchFilesystemObject::FillInKEvent(struct kevent &, int)
+//      Purpose: For WaitForEvent
+//      Created: 12/3/04
 //
 // --------------------------------------------------------------------------
-void EventWatchFilesystemObject::FillInKEvent(struct kevent &rEvent, int Flags) const
+void EventWatchFilesystemObject::FillInKEvent(struct kevent &rEvent,
+        int Flags) const
 {
-        EV_SET(&rEvent, mDescriptor, EVFILT_VNODE, EV_CLEAR, NOTE_DELETE | NOTE_WRITE, 0, (void*)this);
+        EV_SET(&rEvent, mDescriptor, EVFILT_VNODE, EV_CLEAR,
+                NOTE_DELETE | NOTE_WRITE, 0, (void*)this);
 }
 #else
-void EventWatchFilesystemObject::FillInPoll(int &fd, short &events, int Flags) const
+void EventWatchFilesystemObject::FillInPoll(int &fd, short &events,
+        int Flags) const
 {
         THROW_EXCEPTION(CommonException, KQueueNotSupportedOnThisPlatform)

box/trunk/lib/common/FileStream.cpp

@@ -31 +31 @@
         : mOSFileHandle(::open(Filename, flags, mode)),
 #endif
-          mIsEOF(false)
+          mIsEOF(false),
+          mFileName(Filename)
 {
 #ifdef WIN32
@@ -50 +51 @@
                 }
         }
-#ifdef WIN32
-        this->fileName = Filename;
-#endif
 }
 
@@ -66 +64 @@
 FileStream::FileStream(tOSFileHandle FileDescriptor)
         : mOSFileHandle(FileDescriptor),
-          mIsEOF(false)
+          mIsEOF(false),
+          mFileName("HANDLE")
 {
 #ifdef WIN32
@@ -78 +77 @@
                 THROW_EXCEPTION(CommonException, OSFileOpenError)
         }
-#ifdef WIN32
-        this->fileName = "HANDLE";
-#endif
 }
 
@@ -151 +147 @@
                 );
 
-        if ( valid )
+        if(valid)
         {
                 r = numBytesRead;
         }
-        else if (GetLastError() == ERROR_BROKEN_PIPE)
+        else if(GetLastError() == ERROR_BROKEN_PIPE)
         {
                 r = 0;
@@ -161 +157 @@
         else
         {
-                BOX_ERROR("Failed to read from file: " <<
-                        GetErrorMessage(GetLastError()));
+                BOX_LOG_WIN_ERROR("Failed to read from file: " << mFileName);
                 r = -1;
         }
 #else
         int r = ::read(mOSFileHandle, pBuffer, NBytes);
-#endif
         if(r == -1)
         {
+                BOX_LOG_SYS_ERROR("Failed to read from file: " << mFileName);
+        }
+#endif
+
+        if(r == -1)
+        {
                 THROW_EXCEPTION(CommonException, OSFileReadError)
         }
+
         if(r == 0)
         {

box/trunk/lib/common/FileStream.h

@@ -58 +58 @@
         FileStream(const FileStream &rToCopy) { /* do not call */ }
 
-#ifdef WIN32
         // for debugging..
-        std::string fileName;
-#endif
+        std::string mFileName;
 };
 

box/trunk/lib/common/Guards.h

@@ -38 +38 @@
                 if(mOSFileHandle < 0)
                 {
-                        BOX_ERROR("FileHandleGuard: failed to open file '" <<
-                                rFilename << "': " << strerror(errno));
+                        BOX_LOG_SYS_ERROR("FileHandleGuard: failed to open " 
+                                "file '" << rFilename << "'");
                         THROW_EXCEPTION(CommonException, OSFileOpenError)
                 }

box/trunk/lib/common/Logging.h

@@ -28 +28 @@
 #define BOX_LOG(level, stuff) \
 { \
-        std::ostringstream line; \
-        line << stuff; \
-        Logging::Log(level, __FILE__, __LINE__, line.str()); \
+        std::ostringstream _box_log_line; \
+        _box_log_line << stuff; \
+        Logging::Log(level, __FILE__, __LINE__, _box_log_line.str()); \
 }
 
 #define BOX_SYSLOG(level, stuff) \
 { \
-        std::ostringstream line; \
-        line << stuff; \
-        Logging::LogToSyslog(level, __FILE__, __LINE__, line.str()); \
+        std::ostringstream _box_log_line; \
+        _box_log_line << stuff; \
+        Logging::LogToSyslog(level, __FILE__, __LINE__, _box_log_line.str()); \
 }
 
@@ -49 +49 @@
         { BOX_LOG(Log::TRACE, stuff) }
 
-#define BOX_FORMAT_ACCOUNT(accno) \
+#define BOX_LOG_SYS_WARNING(stuff) \
+        BOX_WARNING(stuff << ": " << strerror(errno) << " (" << errno << ")")
+#define BOX_LOG_SYS_ERROR(stuff) \
+        BOX_ERROR(stuff << ": " << strerror(errno) << " (" << errno << ")")
+#define BOX_LOG_SYS_FATAL(stuff) \
+        BOX_FATAL(stuff << ": " << strerror(errno) << " (" << errno << ")")
+
+#ifdef WIN32
+        #define BOX_LOG_WIN_ERROR(stuff) \
+                BOX_ERROR(stuff << ": " << GetErrorMessage(GetLastError()))
+        #define BOX_LOG_WIN_ERROR_NUMBER(stuff, number) \
+                BOX_ERROR(stuff << ": " << GetErrorMessage(number))
+#endif
+
+#define BOX_FORMAT_HEX32(number) \
         std::hex << \
         std::showbase << \
@@ -55 +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*/
@@ -160 +160 @@
 }
 
-
-
-
+std::string HumanReadableSize(int64_t Bytes)
+{
+        double readableValue = Bytes;
+        std::string units = " B";
+
+        if (readableValue > 1024)
+        {
+                readableValue /= 1024;
+                units = "kB";
+        }
+  
+        if (readableValue > 1024)
+        {
+                readableValue /= 1024;
+                units = "MB";
+        }
+  
+        if (readableValue > 1024)
+        {
+                readableValue /= 1024;
+                units = "GB";
+        }
+  
+        std::ostringstream result;
+        result << std::fixed << std::setprecision(2) << readableValue <<
+                " " << units;
+        return result.str();
+}
+
+std::string FormatUsageBar(int64_t Blocks, int64_t Bytes, int64_t Max)
+{
+        std::ostringstream result;
+        
+        // Bar graph
+        char bar[17];
+        unsigned int b = (int)((Bytes * (sizeof(bar)-1)) / Max);
+        if(b > sizeof(bar)-1) {b = sizeof(bar)-1;}
+        for(unsigned int l = 0; l < b; l++)
+        {
+                bar[l] = '*';
+        }
+        for(unsigned int l = b; l < sizeof(bar) - 1; l++)
+        {
+                bar[l] = ' ';
+        }
+        bar[sizeof(bar)-1] = '\0';
+        
+        result << std::fixed <<
+                std::setw(10) << Blocks << " blocks, " <<
+                std::setw(10) << HumanReadableSize(Bytes) << ", " << 
+                std::setw(3) << std::setprecision(0) <<
+                ((Bytes*100)/Max) << "% |" << bar << "|";
+        
+        return result.str();
+}
+
+std::string FormatUsageLineStart(const std::string& rName)
+{
+        std::ostringstream result;      
+        result << std::setw(20) << std::right << rName << ": ";
+        return result.str();
+}

box/trunk/lib/common/Utils.h

@@ -31 +31 @@
 };
 int ObjectExists(const std::string& rFilename);
+std::string HumanReadableSize(int64_t Bytes);
+std::string FormatUsageBar(int64_t Blocks, int64_t Bytes, int64_t Max);
+std::string FormatUsageLineStart(const std::string& rName);
 
 #include "MemLeakFindOff.h"

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 "
+                                        "without all input being consumed, "
+                                        "possible corruption?");
                         }
                         else
@@ -149 +151 @@
                 if(ret < 0)
                 {
-                        TRACE1("zlib error code = %d\n", ret);                  
+                        BOX_WARNING("zlib error code = " << ret);                       
                         THROW_EXCEPTION(CompressException, TransformFailed)
                 }

box/trunk/lib/compress/CompressStream.cpp

@@ -415 +415 @@
                 size *= 2;
         }
-        TRACE1("Allocating CompressStream buffer, size %d\n", size);
+        BOX_TRACE("Allocating CompressStream buffer, size " << size);
         mpBuffer = ::malloc(size);
         if(mpBuffer == 0)

box/trunk/lib/crypto/CipherContext.cpp

@@ -167 +167 @@
         if(mWithinTransform)
         {
-                TRACE0("CipherContext::Begin called when context flagged as within a transform\n");
+                BOX_WARNING("CipherContext::Begin called when context "
+                        "flagged as within a transform");
         }
 
@@ -424 +425 @@
         if(mWithinTransform)
         {
-                TRACE0("CipherContext::TransformBlock called when context flagged as within a transform\n");
+                BOX_WARNING("CipherContext::TransformBlock called when "
+                        "context flagged as within a transform");
         }
 
@@ -522 +524 @@
         if(mWithinTransform)
         {
-                TRACE0("CipherContext::SetIV called when context flagged as within a transform\n");
+                BOX_WARNING("CipherContext::SetIV called when context "
+                        "flagged as within a transform");
         }
 
@@ -560 +563 @@
         if(mWithinTransform)
         {
-                TRACE0("CipherContext::SetRandomIV called when context flagged as within a transform\n");
+                BOX_WARNING("CipherContext::SetRandomIV called when "
+                        "context flagged as within a transform");
         }
 

box/trunk/lib/intercept/intercept.cpp

@@ -376 +376 @@
         if (hookfn != NULL)
         {
-                TRACE2("readdir hooked to %p for %s\n", hookfn, dirname);
+                BOX_TRACE("readdir hooked to " << hookfn << " for " << dirname);
         }
         else if (intercept_filename != NULL)
         {
-                TRACE2("readdir unhooked from %p for %s\n", readdir_hook, 
-                        intercept_filename);
+                BOX_TRACE("readdir unhooked from " << readdir_hook << 
+                        " for " << intercept_filename);
         }
 
@@ -393 +393 @@
         if (hookfn != NULL)
         {
-                TRACE2("lstat hooked to %p for %s\n", hookfn, filename);
+                BOX_TRACE("lstat hooked to " << hookfn << " for " << filename);
         }
         else
         {
-                TRACE2("lstat unhooked from %p for %s\n", lstat_hook, 
+                BOX_TRACE("lstat unhooked from " << lstat_hook << " for " <<
                         lstat_file);
         }

box/trunk/lib/raidfile/RaidFileController.cpp

@@ -71 +71 @@
         static const ConfigurationVerifyKey verifykeys[] =
         {
-                {"SetNumber",   0,      ConfigTest_Exists | ConfigTest_IsInt, 0},
-                {"BlockSize",   0,      ConfigTest_Exists | ConfigTest_IsInt, 0},
-                {"Dir0",                0,      ConfigTest_Exists, 0},
-                {"Dir1",                0,      ConfigTest_Exists, 0},
-                {"Dir2",                0,      ConfigTest_Exists | ConfigTest_LastEntry, 0}
+                ConfigurationVerifyKey("SetNumber",
+                        ConfigTest_Exists | ConfigTest_IsInt),
+                ConfigurationVerifyKey("BlockSize",
+                        ConfigTest_Exists | ConfigTest_IsInt),
+                ConfigurationVerifyKey("Dir0", ConfigTest_Exists),
+                ConfigurationVerifyKey("Dir1", ConfigTest_Exists),
+                ConfigurationVerifyKey("Dir2",
+                        ConfigTest_Exists | ConfigTest_LastEntry)
         };
         

box/trunk/lib/raidfile/RaidFileWrite.cpp

@@ -97 +97 @@
                 if(existance != RaidFileUtil::NoFile)
                 {
-                        TRACE2("Trying to overwrite raidfile %d %s\n", mSetNumber, mFilename.c_str());
+                        BOX_ERROR("Attempted to overwrite raidfile " <<
+                                mSetNumber << " " << mFilename);
                         THROW_EXCEPTION(RaidFileException, CannotOverwriteExistingFile)
                 }
@@ -179 +180 @@
         if(written != Length)
         {
-                TRACE3("RaidFileWrite::Write: Write failure, Length = %d, written = %d, errno = %d\n", Length, written, errno);
+                BOX_LOG_SYS_ERROR("RaidFileWrite failed, Length = " <<
+                        Length << ", written = " << written);
                 THROW_EXCEPTION(RaidFileException, OSError)
         }
@@ -780 +782 @@
 void RaidFileWrite::Close()
 {
-        TRACE0("Warning: RaidFileWrite::Close() called, discarding file\n");
+        BOX_WARNING("RaidFileWrite::Close() called, discarding file");
         if(mOSFileHandle != -1)
         {

box/trunk/lib/server/Daemon.cpp

@@ -466 +466 @@
                         if(::setsid() == -1)
                         {
-                                BOX_ERROR("Failed to setsid(): " << 
-                                        strerror(errno));
+                                BOX_LOG_SYS_ERROR("Failed to setsid()");
                                 THROW_EXCEPTION(ServerException, DaemoniseFailed)
                         }
@@ -476 +475 @@
                         case -1:
                                 // error
+                                BOX_LOG_SYS_ERROR("Failed to fork() a child");
                                 THROW_EXCEPTION(ServerException, DaemoniseFailed)
                                 break;
@@ -498 +498 @@
                 sa.sa_handler = SignalHandler;
                 sa.sa_flags = 0;
-                sigemptyset(&sa.sa_mask);               // macro
-                if(::sigaction(SIGHUP, &sa, NULL) != 0 || ::sigaction(SIGTERM, &sa, NULL) != 0)
-                {
+                sigemptyset(&sa.sa_mask); // macro
+                if(::sigaction(SIGHUP, &sa, NULL) != 0 ||
+                        ::sigaction(SIGTERM, &sa, NULL) != 0)
+                {
+                        BOX_LOG_SYS_ERROR("Failed to set signal handlers");
                         THROW_EXCEPTION(ServerException, DaemoniseFailed)
                 }
@@ -516 +518 @@
                 if(::write(pidFile, pid, pidsize) != pidsize)
                 {
-                        BOX_FATAL("can't write pid file");
+                        BOX_LOG_SYS_FATAL("Failed to write PID file: " <<
+                                pidFileName);
                         THROW_EXCEPTION(ServerException, DaemoniseFailed)
                 }
@@ -545 +548 @@
                         if(devnull == -1)
                         {
+                                BOX_LOG_SYS_ERROR("Failed to open /dev/null");
                                 THROW_EXCEPTION(CommonException, OSFileError);
                         }
@@ -891 +895 @@
                         return 0;
                 }
+                BOX_LOG_SYS_ERROR("Failed to stat configuration file: " <<
+                        GetConfigFileName());
                 THROW_EXCEPTION(CommonException, OSFileError)
         }

box/trunk/lib/server/Daemon.h

@@ -93 +93 @@
 };
 
-#define DAEMON_VERIFY_SERVER_KEYS       {"PidFile", 0, ConfigTest_Exists, 0}, \
-                                                                        {"User", 0, ConfigTest_LastEntry, 0}
+#define DAEMON_VERIFY_SERVER_KEYS \
+        ConfigurationVerifyKey("PidFile", ConfigTest_Exists), \
+        ConfigurationVerifyKey("User", ConfigTest_LastEntry)
 
 #endif // DAEMON__H

box/trunk/lib/server/ProtocolUncertainStream.cpp

@@ -42 +42 @@
         if(!mFinished)
         {
-                TRACE0("ProtocolUncertainStream::~ProtocolUncertainStream() destroyed when stream not complete\n");
+                BOX_WARNING("ProtocolUncertainStream destroyed before "
+                        "stream finished");
         }
 }

box/trunk/lib/server/ServerControl.h

@@ -143 +143 @@
         if (!killed)
         {
-                BOX_ERROR("Failed to kill process " << pid << ": " <<
-                        strerror(errno));
+                BOX_LOG_SYS_ERROR("Failed to kill process " << pid);
         }
         TEST_THAT(killed);

box/trunk/lib/server/ServerStream.h

@@ -274 +274 @@
                                                         
                                                         // Log it
-                                                        BOX_WARNING("Message from child process " << pid << ": " << logMessage);
+                                                        BOX_NOTICE("Message from child process " << pid << ": " << logMessage);
                                                 }
                                                 else
@@ -366 +366 @@
 
 #define SERVERSTREAM_VERIFY_SERVER_KEYS(DEFAULT_ADDRESSES) \
-                                                                                        {"ListenAddresses", DEFAULT_ADDRESSES, 0, 0}, \
-                                                                                        DAEMON_VERIFY_SERVER_KEYS 
+        ConfigurationVerifyKey("ListenAddresses", 0, DEFAULT_ADDRESSES), \
+        DAEMON_VERIFY_SERVER_KEYS 
 
 #include "MemLeakFindOff.h"

box/trunk/lib/server/ServerTLS.h

@@ -71 +71 @@
 
 #define SERVERTLS_VERIFY_SERVER_KEYS(DEFAULT_ADDRESSES) \
-                                                                                        {"CertificateFile", 0, ConfigTest_Exists, 0}, \
-                                                                                        {"PrivateKeyFile", 0, ConfigTest_Exists, 0}, \
-                                                                                        {"TrustedCAsFile", 0, ConfigTest_Exists, 0}, \
-                                                                                        SERVERSTREAM_VERIFY_SERVER_KEYS(DEFAULT_ADDRESSES)
-
+        ConfigurationVerifyKey("CertificateFile", ConfigTest_Exists), \
+        ConfigurationVerifyKey("PrivateKeyFile", ConfigTest_Exists), \
+        ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_Exists), \
+        SERVERSTREAM_VERIFY_SERVER_KEYS(DEFAULT_ADDRESSES)
 
 #endif // SERVERTLS__H

box/trunk/lib/server/SocketListen.h

@@ -109 +109 @@
 #endif
                         {
-                                THROW_EXCEPTION(ServerException, SocketCloseError)
+                                BOX_LOG_SYS_ERROR("Failed to close network "
+                                        "socket");
+                                THROW_EXCEPTION(ServerException,
+                                        SocketCloseError)
                         }
                 }
@@ -115 +118 @@
         }
 
-        // --------------------------------------------------------------------------
+        // ------------------------------------------------------------------
         //
         // Function
@@ -122 +125 @@
         //              Created: 2003/07/31
         //
-        // --------------------------------------------------------------------------
+        // ------------------------------------------------------------------
         void Listen(int Type, const char *Name, int Port = 0)
         {
-                if(mSocketHandle != -1) {THROW_EXCEPTION(ServerException, SocketAlreadyOpen)}
+                if(mSocketHandle != -1)
+                {
+                        THROW_EXCEPTION(ServerException, SocketAlreadyOpen);
+                }
                 
                 // Setup parameters based on type, looking up names if required
@@ -131 +137 @@
                 SocketAllAddr addr;
                 int addrLen = 0;
-                Socket::NameLookupToSockAddr(addr, sockDomain, Type, Name, Port, addrLen);
+                Socket::NameLookupToSockAddr(addr, sockDomain, Type, Name,
+                        Port, addrLen);
         
                 // Create the socket
-                mSocketHandle = ::socket(sockDomain, SOCK_STREAM, 0 /* let OS choose protocol */);
+                mSocketHandle = ::socket(sockDomain, SOCK_STREAM,
+                        0 /* let OS choose protocol */);
                 if(mSocketHandle == -1)
                 {
+                        BOX_LOG_SYS_ERROR("Failed to create a network socket");
                         THROW_EXCEPTION(ServerException, SocketOpenError)
                 }
@@ -142 +151 @@
                 // Set an option to allow reuse (useful for -HUP situations!)
 #ifdef WIN32
-                if(::setsockopt(mSocketHandle, SOL_SOCKET, SO_REUSEADDR, "", 0) == -1)
+                if(::setsockopt(mSocketHandle, SOL_SOCKET, SO_REUSEADDR, "",
+                        0) == -1)
 #else
                 int option = true;
-                if(::setsockopt(mSocketHandle, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)) == -1)
-#endif
-                {
+                if(::setsockopt(mSocketHandle, SOL_SOCKET, SO_REUSEADDR,
+                        &option, sizeof(option)) == -1)
+#endif
+                {
+                        BOX_LOG_SYS_ERROR("Failed to set socket options");
                         THROW_EXCEPTION(ServerException, SocketOpenError)
                 }
@@ -162 +174 @@
         }
         
-        // --------------------------------------------------------------------------
+        // ------------------------------------------------------------------
         //
         // Function
         //              Name:    SocketListen::Accept(int)
-        //              Purpose: Accepts a connection, returning a pointer to a class of
-        //                               the specified type. May return a null pointer if a signal happens,
-        //                               or there's a timeout. Timeout specified in milliseconds, defaults to infinite time.
+        //              Purpose: Accepts a connection, returning a pointer to
+        //                       a class of the specified type. May return a
+        //                       null pointer if a signal happens, or there's
+        //                       a timeout. Timeout specified in
+        //                       milliseconds, defaults to infinite time.
         //              Created: 2003/07/31
         //
-        // --------------------------------------------------------------------------
-        std::auto_ptr<SocketType> Accept(int Timeout = INFTIM, std::string *pLogMsg = 0)
-        {
-                if(mSocketHandle == -1) {THROW_EXCEPTION(ServerException, BadSocketHandle)}
+        // ------------------------------------------------------------------
+        std::auto_ptr<SocketType> Accept(int Timeout = INFTIM,
+                std::string *pLogMsg = 0)
+        {
+                if(mSocketHandle == -1)
+                {
+                        THROW_EXCEPTION(ServerException, BadSocketHandle);
+                }
                 
                 // Do the accept, using the supplied locking type
@@ -186 +204 @@
                         if(!socklock.HaveLock())
                         {
-                                // Didn't get the lock for some reason. Wait a while, then
-                                // return nothing.
+                                // Didn't get the lock for some reason.
+                                // Wait a while, then return nothing.
+                                BOX_ERROR("Failed to get a lock on incoming "
+                                        "connection");
                                 ::sleep(1);
                                 return std::auto_ptr<SocketType>();
@@ -203 +223 @@
                                 if(errno == EINTR)
                                 {
+                                        BOX_ERROR("Failed to accept "
+                                                "connection: interrupted by "
+                                                "signal");
                                         // return nothing
                                         return std::auto_ptr<SocketType>();
@@ -208 +231 @@
                                 else
                                 {
-                                        THROW_EXCEPTION(ServerException, SocketPollError)
+                                        BOX_LOG_SYS_ERROR("Failed to poll "
+                                                "connection");
+                                        THROW_EXCEPTION(ServerException,
+                                                SocketPollError)
                                 }
                                 break;
@@ -221 +247 @@
                         sock = ::accept(mSocketHandle, &addr, &addrlen);
                 }
-                // Got socket (or error), unlock (implcit in destruction)
+
+                // Got socket (or error), unlock (implicit in destruction)
                 if(sock == -1)
                 {
+                        BOX_LOG_SYS_ERROR("Failed to accept connection");
                         THROW_EXCEPTION(ServerException, SocketAcceptError)
                 }
@@ -230 +258 @@
                 if(pLogMsg)
                 {
-                        *pLogMsg = Socket::IncomingConnectionLogMessage(&addr, addrlen);
+                        *pLogMsg = Socket::IncomingConnectionLogMessage(&addr,
+                                addrlen);
                 }
                 else
@@ -244 +273 @@
         // on multiple sockets.
 #ifdef HAVE_KQUEUE
-        // --------------------------------------------------------------------------
+        // ------------------------------------------------------------------
         //
         // Function
@@ -251 +280 @@
         //              Created: 9/3/04
         //
-        // --------------------------------------------------------------------------
+        // ------------------------------------------------------------------
         void FillInKEvent(struct kevent &rEvent, int Flags = 0) const
         {
-                EV_SET(&rEvent, mSocketHandle, EVFILT_READ, 0, 0, 0, (void*)this);
+                EV_SET(&rEvent, mSocketHandle, EVFILT_READ, 0, 0, 0,
+                        (void*)this);
         }
 #else
-        // --------------------------------------------------------------------------
+        // ------------------------------------------------------------------
         //
         // Function
         //              Name:    SocketListen::FillInPoll
-        //              Purpose: Fills in the data necessary for a poll operation
+        //              Purpose: Fills in the data necessary for a poll
+        //                       operation
         //              Created: 9/3/04
         //
-        // --------------------------------------------------------------------------
+        // ------------------------------------------------------------------
         void FillInPoll(int &fd, short &events, int Flags = 0) const
         {

box/trunk/lib/server/SocketStream.cpp

@@ -151 +151 @@
 
         // Create the socket
-        mSocketHandle = ::socket(sockDomain, SOCK_STREAM, 0 /* let OS choose protocol */);
+        mSocketHandle = ::socket(sockDomain, SOCK_STREAM,
+                0 /* let OS choose protocol */);
         if(mSocketHandle == INVALID_SOCKET_VALUE)
         {
+                BOX_LOG_SYS_ERROR("Failed to create a network socket");
                 THROW_EXCEPTION(ServerException, SocketOpenError)
         }
@@ -164 +166 @@
                 DWORD err = WSAGetLastError();
                 ::closesocket(mSocketHandle);
-#else
-                int err = errno;
+                BOX_LOG_WIN_ERROR_NUMBER("Failed to connect to socket " 
+                        "(type " << Type << ", name " << Name <<
+                        ", port " << Port << ")", err);
+#else // !WIN32
+                BOX_LOG_SYS_ERROR("Failed to connect to socket (type " <<
+                        Type << ", name " << Name << ", port " << Port <<
+                        ")");
                 ::close(mSocketHandle);
-#endif
-
-#ifdef WIN32
-                BOX_ERROR("Failed to connect to socket (type " << Type <<
-                        ", name " << Name << ", port " << Port << "): " <<
-                                GetErrorMessage(err)
-                        );
-#else
-                BOX_ERROR("Failed to connect to socket (type " << Type <<
-                        ", name " << Name << ", port " << Port << "): " <<
-                                strerror(err) << " (" << err << ")"
-                        );
-#endif
+#endif // WIN32
 
                 mSocketHandle = INVALID_SOCKET_VALUE;
@@ -221 +216 @@
                         {
                                 // Bad!
-                                THROW_EXCEPTION(ServerException, SocketPollError)
+                                BOX_LOG_SYS_ERROR("Failed to poll socket");
+                                THROW_EXCEPTION(ServerException,
+                                        SocketPollError)
                         }
                         break;
@@ -251 +248 @@
                 {
                         // Other error
-                        THROW_EXCEPTION(ConnectionException, Conn_SocketReadError)
+                        BOX_LOG_SYS_ERROR("Failed to read from socket");
+                        THROW_EXCEPTION(ConnectionException,
+                                Conn_SocketReadError);
                 }
         }
+
         // Closed for reading?
         if(r == 0)
@@ -298 +298 @@
                         // Error.
                         mWriteClosed = true;    // assume can't write again
-                        THROW_EXCEPTION(ConnectionException, Conn_SocketWriteError)
+                        BOX_LOG_SYS_ERROR("Failed to write to socket");
+                        THROW_EXCEPTION(ConnectionException,
+                                Conn_SocketWriteError);
                 }
                 
@@ -311 +313 @@
                 if(bytesLeft > 0)
                 {
-                        TRACE3("Waiting to send data on socket %d, (%d to send of %d)\n", mSocketHandle, bytesLeft, NBytes);
+                        BOX_TRACE("Waiting to send data on socket " << 
+                                mSocketHandle << " (" << bytesLeft <<
+                                " of " << NBytes << " bytes left)");
                         
                         // Wait for data to send.
@@ -324 +328 @@
                                 if(errno != EINTR)
                                 {
-                                        THROW_EXCEPTION(ServerException, SocketPollError)
+                                        BOX_LOG_SYS_ERROR("Failed to poll "
+                                                "socket");
+                                        THROW_EXCEPTION(ServerException,
+                                                SocketPollError)
                                 }
                         }
@@ -351 +358 @@
 #endif
         {
+                BOX_LOG_SYS_ERROR("Failed to close socket");
                 THROW_EXCEPTION(ServerException, SocketCloseError)
         }
@@ -381 +389 @@
         if(::shutdown(mSocketHandle, how) == -1)
         {
+                BOX_LOG_SYS_ERROR("Failed to shutdown socket");
                 THROW_EXCEPTION(ConnectionException, Conn_SocketShutdownError)
         }
@@ -459 +468 @@
         socklen_t credLen = sizeof(cred);
 
-        if(::getsockopt(mSocketHandle, SOL_SOCKET, SO_PEERCRED, &cred, &credLen) == 0)
+        if(::getsockopt(mSocketHandle, SOL_SOCKET, SO_PEERCRED, &cred,
+                &credLen) == 0)
         {
                 rUidOut = cred.uid;
@@ -465 +475 @@
                 return true;
         }
+
+        BOX_LOG_SYS_ERROR("Failed to get peer credentials on socket");
 #endif
 

box/trunk/test/backupdiff/testbackupdiff.cpp

@@ -111 +111 @@
         // number of blocks
         int64_t nblocks = box_ntoh64(hdr.mNumBlocks);
-        TRACE2("Reading index from '%s', has %lld blocks\n", filename, nblocks);
-        TRACE0("======== ===== ========== ======== ========\n   Index Where  EncSz/Idx     Size  WChcksm\n");
+        BOX_TRACE("Reading index from '" << filename << "', has " <<
+                nblocks << " blocks");
+        BOX_TRACE("======== ===== ========== ======== ========");
+        BOX_TRACE("   Index Where  EncSz/Idx     Size  WChcksm");
         // Read them all in
         int64_t nnew = 0, nold = 0;
@@ -120 +122 @@
                 TEST_THAT(enc.ReadFullBuffer(&en, sizeof(en), 0));
                 int64_t s = box_ntoh64(en.mEncodedSize);
-                if(s > 0)
-                {
-                        nnew++;
-                        #ifdef WIN32
-                        TRACE2("%8I64d this  s=%8I64d", b, s);
-                        #else
-                        TRACE2("%8lld this  s=%8lld", b, s);
-                        #endif
-                }
-                else
-                {
-                        nold++;
-                        #ifdef WIN32
-                        TRACE2("%8I64d other i=%8I64d", b, 0 - s);              
-                        #else
-                        TRACE2("%8lld other i=%8lld", b, 0 - s);                
-                        #endif
-                }
+
                 // Decode the rest
                 uint64_t iv = box_ntoh64(hdr.mEntryIVBase);
                 iv += b;
-                sBlowfishDecryptBlockEntry.SetIV(&iv);                  
+                sBlowfishDecryptBlockEntry.SetIV(&iv);
                 file_BlockIndexEntryEnc entryEnc;
-                sBlowfishDecryptBlockEntry.TransformBlock(&entryEnc, sizeof(entryEnc),
-                                en.mEnEnc, sizeof(en.mEnEnc));
-                TRACE2(" %8d %08x\n", ntohl(entryEnc.mSize), ntohl(entryEnc.mWeakChecksum));
-                
-        }
-        TRACE0("======== ===== ========== ======== ========\n");
+                sBlowfishDecryptBlockEntry.TransformBlock(&entryEnc,
+                        sizeof(entryEnc), en.mEnEnc, sizeof(en.mEnEnc));
+
+
+                if(s > 0)
+                {
+                        nnew++;
+                        BOX_TRACE(std::setw(8) << b << " this  s=" << 
+                                std::setw(8) << s << " " <<
+                                std::setw(8) << ntohl(entryEnc.mSize) << " " <<
+                                std::setw(8) << std::setfill('0') <<
+                                std::hex << ntohl(entryEnc.mWeakChecksum));
+                }
+                else
+                {
+                        nold++;
+                        BOX_TRACE(std::setw(8) << b << " other i=" << 
+                                std::setw(8) << (0-s) << " " <<
+                                std::setw(8) << ntohl(entryEnc.mSize) << " " <<
+                                std::setw(8) << std::setfill('0') <<
+                                std::hex << ntohl(entryEnc.mWeakChecksum));
+                }
+        }
+        BOX_TRACE("======== ===== ========== ======== ========");
         TEST_THAT(new_blocks_expected == nnew);
         TEST_THAT(old_blocks_expected == nold);

box/trunk/test/basicserver/testbasicserver.cpp

@@ -186 +186 @@
         static ConfigurationVerifyKey verifyserverkeys[] = 
         {
-                SERVERSTREAM_VERIFY_SERVER_KEYS(0)      // no default addresses
+                SERVERSTREAM_VERIFY_SERVER_KEYS(ConfigurationVerifyKey::NoDefaultValue) // no default listen addresses
         };
 
@@ -259 +259 @@
         static ConfigurationVerifyKey verifyserverkeys[] = 
         {
-                SERVERTLS_VERIFY_SERVER_KEYS(0) // no default listen addresses
+                SERVERTLS_VERIFY_SERVER_KEYS(ConfigurationVerifyKey::NoDefaultValue) // no default listen addresses
         };
 

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -515 +515 @@
                         // connect and log in
                         SocketStreamTLS conn;
-                        conn.Open(context, Socket::TypeINET, "localhost", BOX_PORT_BBSTORED);
+                        conn.Open(context, Socket::TypeINET, "localhost",
+                                22011);
                         BackupProtocolClient protocol(conn);
                         protocol.QueryVersion(BACKUP_STORE_SERVER_VERSION);
@@ -608 +609 @@
 {
         sSocket.Open(rContext, Socket::TypeINET, 
-                "localhost", BOX_PORT_BBSTORED);
+                "localhost", 22011);
         std::auto_ptr<BackupProtocolClient> connection;
         connection.reset(new BackupProtocolClient(sSocket));
@@ -2560 +2561 @@
                                 == Restore_TargetExists);
                         
-                        // Make sure you can't restore to a nonexistant path
-                        printf("Try to restore to a path that doesn't exist\n");
-                        TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/no-such-path/subdir", 
-                                true /* print progress dots */) 
-                                == Restore_TargetPathNotFound);
-                        
                         // Find ID of the deleted directory
                         deldirid = GetDirID(*client, "x1", restoredirid);
@@ -2578 +2572 @@
                                 true /* deleted files */) 
                                 == Restore_Complete);
+
+                        // Make sure you can't restore to a nonexistant path
+                        printf("\n\n==== Try to restore to a path "
+                                "that doesn't exist\n");
+                        fflush(stdout);
+                        TEST_THAT(BackupClientRestore(*client, restoredirid, 
+                                "testfiles/no-such-path/subdir", 
+                                true /* print progress dots */) 
+                                == Restore_TargetPathNotFound);
 
                         // Log out

box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf

@@ -9 +9 @@
 
 StoreHostname = localhost
+StorePort = 22011
 AccountNumber = 0x01234567
 

box/trunk/test/bbackupd/testfiles/bbackupd.conf.in

@@ -9 +9 @@
 
 StoreHostname = localhost
+StorePort = 22011
 AccountNumber = 0x01234567
 

box/trunk/test/bbackupd/testfiles/bbstored.conf

@@ -10 +10 @@
 {
         PidFile = testfiles/bbstored.pid
-        ListenAddresses = inet:localhost
+        ListenAddresses = inet:localhost:22011
         CertificateFile = testfiles/serverCerts.pem
         PrivateKeyFile = testfiles/serverPrivKey.pem

box/trunk/test/common/testcommon.cpp

@@ -58 +58 @@
 ConfigurationVerifyKey verifykeys1_1_1[] =
 {
-        {"bing", 0, ConfigTest_Exists, 0},
-        {"carrots", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"terrible", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("bing", ConfigTest_Exists),
+        ConfigurationVerifyKey("carrots", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("terrible", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
 ConfigurationVerifyKey verifykeys1_1_2[] =
 {
-        {"fish", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"string", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("fish", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("string", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
@@ -90 +90 @@
 ConfigurationVerifyKey verifykeys1_1[] =
 {
-        {"value", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"string1", 0, ConfigTest_Exists, 0},
-        {"string2", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("value", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("string1", ConfigTest_Exists),
+        ConfigurationVerifyKey("string2", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
 ConfigurationVerifyKey verifykeys1_2[] = 
 {
-        {"carrots", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"string", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("carrots", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("string", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
@@ -121 +121 @@
 ConfigurationVerifyKey verifykeys1[] =
 {
-                {"notExpected", 0, 0, 0},
-                {"HasDefaultValue", "Lovely default value", 0, 0},
-                {"MultiValue", 0, ConfigTest_MultiValueAllowed, 0},
-                {"BoolTrue1", 0, ConfigTest_IsBool, 0},
-                {"BoolTrue2", 0, ConfigTest_IsBool, 0},
-                {"BoolFalse1", 0, ConfigTest_IsBool, 0},
-                {"BoolFalse2", 0, ConfigTest_IsBool, 0},
-                {"TOPlevel", 0, ConfigTest_LastEntry | ConfigTest_Exists, 0}
+                ConfigurationVerifyKey("notExpected", 0),
+                ConfigurationVerifyKey("HasDefaultValue", 0, "Lovely default value"),
+                ConfigurationVerifyKey("MultiValue", ConfigTest_MultiValueAllowed),
+                ConfigurationVerifyKey("BoolTrue1", ConfigTest_IsBool),
+                ConfigurationVerifyKey("BoolTrue2", ConfigTest_IsBool),
+                ConfigurationVerifyKey("BoolFalse1", ConfigTest_IsBool),
+                ConfigurationVerifyKey("BoolFalse2", ConfigTest_IsBool),
+                ConfigurationVerifyKey("TOPlevel", 
+                        ConfigTest_LastEntry | ConfigTest_Exists)
 };
 

box/trunk/test/compress/testcompress.cpp

@@ -91 +91 @@
                 // Check sizes
                 TEST_THAT(poutput->GetSize() < source.GetSize());
-                TRACE2("compressed size = %d, source size = %d\n", poutput->GetSize(), source.GetSize());
+                BOX_TRACE("compressed size = " << poutput->GetSize() <<
+                        ", source size = " << source.GetSize());
                 
                 // Decompress the data

box/trunk/test/raidfile/testraidfile.cpp

@@ -623 +623 @@
                 TEST_THAT(n1 != n3);
                 TEST_THAT(n1 == n4);            // ie wraps around
-                TRACE3("Gen paths= '%s','%s',%s'\n", n1.c_str(), n2.c_str(), n3.c_str());
+                BOX_TRACE("Gen paths = '" << n1 << "', '" << n2 << 
+                        "', '" << n3);
         }