1 files changed, 94 insertions, 21 deletions

diff --git a/src/tests/nidstool.cpp b/src/tests/nidstool.cpp
index 546534e..1becba5 100644
--- a/src/tests/nidstool.cpp
+++ b/src/tests/nidstool.cpp
@@ -5,6 +5,13 @@
 
 #include <stdlib.h>
 
+typedef struct Block
+{
+        uint32_t uFirstBlock;
+        uint32_t uNextBlock;
+        uint32_t uBytesUsed;
+} Block;
+
 class Param : public Bu::ParamProc
 {
 public:
@@ -14,7 +21,9 @@ public:
                 addParam("info", 'i', mkproc(Param::procInfo),
                         "Print some info about the file.");
                 addParam("dump", 'd', mkproc(Param::procDump),
-                        "Dump a stream to a file");
+                        "Dump a stream to a file.");
+                addParam("analyze", 'a', mkproc(Param::procAnalyze),
+                        "Analyze a nids file.");
                 addParam("help", 'h', mkproc(Bu::ParamProc::help), "This help.");
                 process( argc, argv );
         }
@@ -23,6 +32,20 @@ public:
         {
         }
 
+        void printInfo( Bu::Nids &n )
+        {
+                printf("File info:\n");
+                printf("  Header overhead: %db\n", n.getBlockStart() );
+                printf("  Block size:      %db\n", n.getBlockSize() );
+                printf("  Block count:     %d\n", n.getNumBlocks() );
+                printf("  Blocks used:     %d (%d%%)\n", n.getNumUsedBlocks(),
+                        n.getNumUsedBlocks()*100/n.getNumBlocks() );
+                printf("  Block overhead:  %db\n", n.getBlockOverhead() );
+                printf("  Block storage:   %db (%d%%)\n",
+                        n.getBlockSize()-n.getBlockOverhead(),
+                        (n.getBlockSize()-n.getBlockOverhead())*100/n.getBlockSize() );
+        }
+
         int procInfo( int argc, char *argv[] )
         {
                 if( argc < 1 )
@@ -35,27 +58,10 @@ public:
                 Bu::Nids n( fIn );
                 n.initialize();
 
-                printf("Block size:     %db\n", n.getBlockSize() );
-                printf("Block count:    %d\n", n.getNumBlocks() );
-                printf("Blocks used:    %d (%d%%)\n", n.getNumUsedBlocks(),
-                        n.getNumUsedBlocks()*100/n.getNumBlocks() );
-                printf("Block start:    %db\n", n.getBlockStart() );
-                printf("Block overhead: %db\n", n.getBlockOverhead() );
-                printf("Block storage:  %db (%d%%)\n",
-                        n.getBlockSize()-n.getBlockOverhead(),
-                        (n.getBlockSize()-n.getBlockOverhead())*100/n.getBlockSize() );
+                printInfo( n );
 
                 if( argc >= 2 )
                 {
-                        typedef struct Block
-                        {
-                                uint32_t uFirstBlock;
-                                uint32_t uNextBlock;
-                                uint32_t uPrevBlock;
-                                uint32_t uBytesUsed;
-                                uint32_t uReserved;
-                        } Block;
-
                         uint32_t uStream = strtoul( argv[1], NULL, 0 );
                         uint32_t uBlock = uStream;
 
@@ -65,8 +71,8 @@ public:
                         {
                                 fIn.setPos( n.getBlockStart()+n.getBlockSize()*uBlock );
                                 fIn.read( &b, sizeof(Block) );
-                                printf("Stream %u:  block %u, next %u, prev %u, %ub used.\n",
-                                        uStream, uBlock, b.uNextBlock, b.uPrevBlock, b.uBytesUsed
+                                printf("Stream %u:  block %u, next %u, %ub used.\n",
+                                        uStream, uBlock, b.uNextBlock, b.uBytesUsed
                                         );
                                 if( b.uNextBlock == 0xFFFFFFFFUL )
                                         break;
@@ -112,6 +118,73 @@ public:
                 return 3;
         }
 
+        int procAnalyze( int argc, char *argv[] )
+        {
+                if( argc < 1 )
+                {
+                        printf("You must provide a file name.\n");
+                        exit( 1 );
+                }
+
+                Bu::File fIn( argv[0], Bu::File::Read );
+                Bu::Nids n( fIn );
+                n.initialize();
+
+                printInfo( n );
+
+                int iStreamCnt = 0;
+                int iStreamTotal = 0;
+                int iOneBlock = 0;
+                uint32_t iLargest = 0;
+                uint32_t iSmallest = 0;
+                int iWaste = 0;
+                int iUsable = n.getBlockSize()-n.getBlockOverhead();
+                Block b;
+                for( int j = 0; j < n.getNumBlocks(); j++ )
+                {
+                        fIn.setPos( n.getBlockStart()+n.getBlockSize()*j );
+                        fIn.read( &b, sizeof(Block) );
+                        if( b.uFirstBlock != (uint32_t)j )
+                                continue;
+                        
+                        iStreamCnt++;
+                        iStreamTotal += b.uBytesUsed;
+
+                        if( b.uNextBlock == 0xFFFFFFFFUL )
+                        {
+                                iOneBlock++;
+                                iWaste += iUsable - b.uBytesUsed;
+                        }
+                        else
+                        {
+                                iWaste += iUsable - (b.uBytesUsed%iUsable);
+                        }
+                        
+                        if( j == 0 )
+                        {
+                                iSmallest = iLargest = b.uBytesUsed;
+                        }
+                        else
+                        {
+                                if( iLargest < b.uBytesUsed )
+                                        iLargest = b.uBytesUsed;
+                                if( iSmallest > b.uBytesUsed )
+                                        iSmallest = b.uBytesUsed;
+                        }
+                }
+                printf("Steam analysis:\n");
+                printf("  Stream count:          %d\n", iStreamCnt );
+                printf("  Stream size:           %db/%db/%db (min/avr/max)\n",
+                        iSmallest, iStreamTotal/iStreamCnt, iLargest );
+                printf("  One-block streams:     %d (%d%%)\n",
+                        iOneBlock, iOneBlock*100/iStreamCnt );
+                printf("  Total wasted space:    %db (%d%%)\n",
+                        iWaste, iWaste*100/iStreamTotal );
+                printf("  Avr blocks-per-stream: %f%%\n",
+                        (float)n.getNumBlocks()/(float)iStreamCnt );
+
+                return 1;
+        }
 };