Changes in / [58e822a:8dbedfc]

File:

• src/Common/Heap.cc (modified) (9 diffs)

src/Common/Heap.cc

@@ -21 +21 @@
 #include <iostream>
 
-#define WITH_HEAP_STATISTICS
+//#define WITH_HEAP_STATISTICS
 
 namespace HeapStats {
@@ -30 +30 @@
 #else
         struct StatBlock {
-                const char * name  = nullptr;   ///< Name of this pass
-                size_t mallocs     = 0;                 ///< Allocations in this pass
-                size_t frees       = 0;                 ///< Frees in this pass
-                size_t n_allocs    = 0;                 ///< Current number of live allocations
-                size_t peak_allocs = 0;                 ///< Peak number of live allocations this pass
+                const char * name = nullptr;
+                size_t mallocs    = 0;
+                size_t frees      = 0;
         };
 
-        StatBlock    passes[100] = {{ "Pre-Parse", 0, 0, 0, 0 }};
+        StatBlock    passes[100] = {{ "Pre-Parse", 0, 0 }};
         const size_t passes_size = sizeof(passes) / sizeof(passes[0]);
         size_t       passes_cnt = 1;
@@ -45 +43 @@
                 passes[passes_cnt].mallocs = 0;
                 passes[passes_cnt].frees   = 0;
-                passes[passes_cnt].n_allocs 
-                        = passes[passes_cnt].peak_allocs 
-                        = passes[passes_cnt-1].n_allocs;
                 passes_cnt++;
 
@@ -60 +55 @@
         }
 
-        void print(const StatBlock& stat, size_t nc, size_t total_mallocs, size_t total_frees, size_t overall_peak) {
+        void print(const StatBlock& stat, size_t nc, size_t total_mallocs, size_t total_frees) {
                 std::cerr << std::setw(nc) << stat.name;
                 std::cerr << " | ";
 
-                print(stat.mallocs,     total_mallocs);
-                print(stat.frees,       total_frees  );
-                print(stat.peak_allocs, overall_peak );
+                print(stat.mallocs, total_mallocs);
+                print(stat.frees  , total_frees  );
                 std::cerr << "\n";
         }
@@ -81 +75 @@
                 size_t total_mallocs = 0;
                 size_t total_frees   = 0;
-                size_t overall_peak  = 0;
                 for(size_t i = 0; i < passes_cnt; i++) {
                         nc = std::max(nc, std::strlen(passes[i].name));
                         total_mallocs += passes[i].mallocs;
                         total_frees   += passes[i].frees;
-                        overall_peak = std::max(overall_peak, passes[i].peak_allocs);
                 }
-                size_t nct = nc + 65;
+                size_t nct = nc + 44;
 
                 const char * const title = "Heap Usage Statistic";
@@ -96 +88 @@
                 print('-', nct);
                 std::cerr << std::setw(nc) << "Pass";
-                std::cerr << " |       Malloc Count |         Free Count |        Peak Allocs |" << std::endl;
+                std::cerr << " |       Malloc Count |         Free Count |" << std::endl;
 
                 print('-', nct);
                 for(size_t i = 0; i < passes_cnt; i++) {
-                        print(passes[i], nc, total_mallocs, total_frees, overall_peak);
+                        print(passes[i], nc, total_mallocs, total_frees);
                 }
                 print('-', nct);
-                print({"Sum", total_mallocs, total_frees, 0, overall_peak}, 
-                        nc, total_mallocs, total_frees, overall_peak);
+                print({"Sum", total_mallocs, total_frees}, nc, total_mallocs, total_frees);
 
         }
@@ -167 +158 @@
                 void * malloc( size_t size ) {
                         static auto __malloc = reinterpret_cast<void * (*)(size_t)>(interpose_symbol( "malloc", nullptr ));
-                        if( passes_cnt > 0 ) {
-                                passes[passes_cnt - 1].mallocs++;
-                                passes[passes_cnt - 1].n_allocs++;
-                                passes[passes_cnt - 1].peak_allocs 
-                                        = std::max(passes[passes_cnt - 1].peak_allocs, passes[passes_cnt - 1].n_allocs);
-                        }
+                        if( passes_cnt > 0 ) passes[passes_cnt - 1].mallocs++;
                         return __malloc( size );
                 }
@@ -178 +164 @@
                 void free( void * ptr ) {
                         static auto __free = reinterpret_cast<void   (*)(void *)>(interpose_symbol( "free", nullptr ));
-                        if( passes_cnt > 0 ) {
-                                passes[passes_cnt - 1].frees++;
-                                passes[passes_cnt - 1].n_allocs--;
-                        }
+                        if( passes_cnt > 0 ) passes[passes_cnt - 1].frees++;
                         return __free( ptr );
                 }
@@ -187 +170 @@
                 void * calloc( size_t nelem, size_t size ) {
                         static auto __calloc = reinterpret_cast<void * (*)(size_t, size_t)>(interpose_symbol( "calloc", nullptr ));
-                        if( passes_cnt > 0 ) {
-                                passes[passes_cnt - 1].mallocs++;
-                                passes[passes_cnt - 1].n_allocs++;
-                                passes[passes_cnt - 1].peak_allocs 
-                                        = std::max(passes[passes_cnt - 1].peak_allocs, passes[passes_cnt - 1].n_allocs);
-                        }
+                        if( passes_cnt > 0 ) passes[passes_cnt - 1].mallocs++;
                         return __calloc( nelem, size );
                 }