Changeset 4117761 for src/Common/Stats

Timestamp:

Jun 29, 2024, 5:02:49 AM (3 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

115ac1ce

Parents:

5ccc733 (diff), 3c55fcd (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.cpp (modified) (1 diff)

src/Common/Stats/Heap.cpp

@@ -21 +21 @@
 #include <iostream>
 
-#if defined(__has_feature)
+// Most of the other statistics features are deactivated only by defining
+// NO_STATISTICS (or their NO_%_STATISTICS macro). However the heap has some
+// other compatability concerns and will disable itself in some cases.
+//
+// I do not claim to understand these cases. But TCMALLOC is often defined by
+// default and you can pass --disable-gprofiler to configure to remove it.
+
+#if defined(NO_STATISTICS) || defined(TCMALLOC) || defined(__SANITIZE_ADDRESS__)
+        #define NO_HEAP_STATISTICS
+#elif defined(__has_feature)
         #if __has_feature(address_sanitizer)
-                #define NO_HEAP_STATISTICS
-        # endif
-#endif
-
-#if defined( NO_STATISTICS ) || defined( TCMALLOC ) || defined(__SANITIZE_ADDRESS__)
-        #if !defined(NO_HEAP_STATISTICS)
                 #define NO_HEAP_STATISTICS
         #endif