Changeset 2121

Timestamp:

03/04/2008 23:32:46 (9 months ago)

Author:

chris

Message:

Make usage output (from bbstoreaccounts info and bbackupquery usage)
consistent and easier to read, with blocks, B/kB/MB/GB, % and an ASCII
bar graph.

Location:

box/trunk

Files:

• bin/bbackupquery/BackupQueries.cpp (modified) (2 diffs)
• bin/bbstoreaccounts/bbstoreaccounts.cpp (modified) (3 diffs)
• lib/common/Utils.cpp (modified) (1 diff)
• lib/common/Utils.h (modified) (1 diff)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -28 +28 @@
 #include <set>
 #include <limits>
+#include <iostream>
+#include <ostream>
 
 #include "BackupQueries.h"
@@ -2157 +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/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 @@
 }
 
-const char *BlockSizeToString(int64_t Blocks, int DiscSet)
-{
-        // Not reentrant, nor can be used in the same function call twice, etc.
-        static char string[256];
-        
-        // Work out size in Mb.
-        double mb = (Blocks * BlockSizeOfDiscSet(DiscSet)) / (1024.0*1024.0);
-        
-        // Format string
-#ifdef WIN32
-        sprintf(string, "%I64d (%.2fMb)", Blocks, mb);
-#else
-        sprintf(string, "%lld (%.2fMb)", Blocks, mb);
-#endif
-        
-        return string;
+std::string BlockSizeToString(int64_t Blocks, int64_t MaxBlocks, int DiscSet)
+{
+        return FormatUsageBar(Blocks, Blocks * BlockSizeOfDiscSet(DiscSet),
+                MaxBlocks * BlockSizeOfDiscSet(DiscSet));
 }
 
@@ -230 +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));
-        printf("    Blocks used by old files: %s\n", BlockSizeToString(info->GetBlocksInOldFiles(), discSet));
-        printf("Blocks used by deleted files: %s\n", BlockSizeToString(info->GetBlocksInDeletedFiles(), discSet));
-        printf("  Blocks used by directories: %s\n", BlockSizeToString(info->GetBlocksInDirectories(), discSet));
-        printf("            Block soft limit: %s\n", BlockSizeToString(info->GetBlocksSoftLimit(), discSet));
-        printf("            Block hard limit: %s\n", BlockSizeToString(info->GetBlocksHardLimit(), discSet));
-        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/lib/common/Utils.cpp

@@ -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"