Changeset b38433b for src/Common/Stats/Heap.cc

Timestamp:

Mar 5, 2019, 6:17:55 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

b830e046, c101756

Parents:

34737de (diff), 972540e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Common/Stats/Heap.cc (modified) (7 diffs)

src/Common/Stats/Heap.cc

@@ -21 +21 @@
 #include <iostream>
 
+#if defined( NO_STATISTICS )
+        #define NO_HEAP_STATISTICS
+#endif
+
 namespace Stats {
         namespace Heap {
@@ -28 +32 @@
                 void print() {}
 #else
+                extern bool enabled;
+
                 struct StatBlock {
                         const char * name  = nullptr;   ///< Name of this pass
@@ -77 +83 @@
 
                 void print() {
+                        if(!enabled) return;
+
                         size_t nc = 0;
                         size_t total_mallocs = 0;
@@ -166 +174 @@
                         void * malloc( size_t size ) {
                                 static auto __malloc = reinterpret_cast<void * (*)(size_t)>(interpose_symbol( "malloc", nullptr ));
-                                if( passes_cnt > 0 ) {
+                                if( enabled && passes_cnt > 0 ) {
                                         passes[passes_cnt - 1].mallocs++;
                                         passes[passes_cnt - 1].n_allocs++;
@@ -177 +185 @@
                         void free( void * ptr ) {
                                 static auto __free = reinterpret_cast<void   (*)(void *)>(interpose_symbol( "free", nullptr ));
-                                if( passes_cnt > 0 ) {
+                                if( enabled && passes_cnt > 0 ) {
                                         passes[passes_cnt - 1].frees++;
                                         passes[passes_cnt - 1].n_allocs--;
@@ -186 +194 @@
                         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 ) {
+                                if( enabled && passes_cnt > 0 ) {
                                         passes[passes_cnt - 1].mallocs++;
                                         passes[passes_cnt - 1].n_allocs++;
@@ -198 +206 @@
                                 static auto __realloc = reinterpret_cast<void * (*)(void *, size_t)>(interpose_symbol( "realloc", nullptr ));
                                 void * s = __realloc( ptr, size );
-                                if ( s != ptr && passes_cnt > 0 ) {                     // did realloc get new storage ?
+                                if ( enabled && s != ptr && passes_cnt > 0 ) {                  // did realloc get new storage ?
                                         passes[passes_cnt - 1].mallocs++;
                                         passes[passes_cnt - 1].frees++;