Changes in / [6edd210:01690b7]

Location:

src

Files:

• CodeGen/FixNames.cc (modified) (2 diffs)
• Common/Heap.cc (modified) (1 diff)
• Common/Heap.h (modified) (1 diff)
• main.cc (modified) (1 diff)

src/CodeGen/FixNames.cc

@@ -56 +56 @@
                 auto && name = SymTab::Mangler::mangle( mainDecl.get() );
                 // std::cerr << name << std::endl;
-                return name;
+                return std::move(name);
         }
         std::string mangle_main_args() {
@@ -79 +79 @@
                 auto&& name = SymTab::Mangler::mangle( mainDecl.get() );
                 // std::cerr << name << std::endl;
-                return name;
+                return std::move(name);
         }
 

src/Common/Heap.cc

@@ -14 +14 @@
 //
 
-namespace HeapStats{
-  void newPass( const char * const name ) {}
-  void printStats() {}
+#include <cstddef>
+#include <cassert>
+#include <iomanip>
+#include <iostream>
+
+namespace HeapStats {
+        #if !defined( WITH_HEAP_STATISTICS )
+                void newPass( const char * const ) {}
+
+                void printStats() {}
+        #else
+                struct StatBlock {
+                        const char * name = nullptr;
+                        size_t mallocs    = 0;
+                        size_t frees      = 0;
+                };
+
+                StatBlock    passes[100];
+                const size_t passes_size = sizeof(passes) / sizeof(passes[0]);
+                size_t       passes_cnt = 0;
+
+                void newPass( const char * const name ) {
+                        passes[passes_cnt].name    = name;
+                        passes[passes_cnt].mallocs = 0;
+                        passes[passes_cnt].frees   = 0;
+                        passes_cnt++;
+
+                        assertf(passes_cnt < passes_size, "Too many passes for HeapStats, increase the size of the array in Heap.h");
+                }
+
+                void printStats() {
+                        std::cerr << "Heap usage statistic:" << std::endl;
+                        std::cerr << "Pass                 | Malloc Count |   Free Count" << std::endl;
+                        for(size_t i = 0; i < passes_cnt; i++) {
+                                std::cerr << std::setw(20) << passes[i].name    << " | ";
+                                std::cerr << std::setw(12) << passes[i].mallocs << " | ";
+                                std::cerr << std::setw(12) << passes[i].frees   << "\n";
+                        }
+                }
+        #endif
 }
 

src/Common/Heap.h

@@ -17 +17 @@
 
 namespace HeapStats {
-  void newPass( const char * const name );
-  void printStats();
+        void newPass( const char * const name );
+        void printStats();
 }

src/main.cc

@@ -374 +374 @@
 
         deleteAll( translationUnit );
-        HeapStats::printStats();
+        if(!libcfap && !treep) HeapStats::printStats();
         return 0;
 } // main