Changeset 120a28c3

Timestamp:

Jun 17, 2019, 11:26:14 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8b34df0

Parents:

462a7c7

Message:

Added support for address-sanitizer which requires disabling Heap Statistics and TCMalloc

Files:

• configure (modified) (6 diffs)
• configure.ac (modified) (3 diffs)
• src/Common/Stats/Heap.cc (modified) (1 diff)

configure

@@ -796 +796 @@
 with_cfa_name
 with_target_hosts
+enable_gprofiler
 enable_dependency_tracking
 enable_shared
@@ -1455 +1456 @@
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-gprofiler     whether or not to enable gprofiler tools (if available)
   --enable-dependency-tracking
                           do not reject slow dependency extractors
@@ -3283 +3285 @@
                 \'--with-target-hosts=*) ;;
 
+                # skip gprofiler for libcfa
+                \'--enable-gprofiler=*) ;;
+                \'--disable-gprofiler) ;;
+
                 # append all other arguments to the sub configure arguments
                 *) LIBCFA_GENERAL_ARGS="${LIBCFA_GENERAL_ARGS} $var";;
@@ -3384 +3390 @@
 else
   target_hosts=${default_target}
+fi
+
+
+# Check whether --enable-gprofiler was given.
+if test "${enable_gprofiler+set}" = set; then :
+  enableval=$enable_gprofiler; enable_gprofiler=$enableval
+else
+  enable_gprofiler=yes
 fi
 
@@ -16704 +16718 @@
 fi
 
- if test "$HAVE_LIBPROFILER" -eq 1; then
+ if test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBPROFILER" -eq 1; then
   WITH_LIBPROFILER_TRUE=
   WITH_LIBPROFILER_FALSE='#'
@@ -16755 +16769 @@
 fi
 
- if test "$HAVE_LIBTCMALLOC" -eq 1; then
+ if test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBTCMALLOC" -eq 1; then
   WITH_LIBTCMALLOC_TRUE=
   WITH_LIBTCMALLOC_FALSE='#'

configure.ac

@@ -94 +94 @@
                 # skip the target hosts
                 \'--with-target-hosts=*) ;;
+
+                # skip gprofiler for libcfa
+                \'--enable-gprofiler=*) ;;
+                \'--disable-gprofiler) ;;
 
                 # append all other arguments to the sub configure arguments
@@ -125 +129 @@
         target_hosts=$withval, target_hosts=${default_target})
 
+AC_ARG_ENABLE(gprofiler,
+        [  --enable-gprofiler     whether or not to enable gprofiler tools (if available)],
+        enable_gprofiler=$enableval, enable_gprofiler=yes)
+
 AC_SUBST(TARGET_HOSTS, ${target_hosts})
 
@@ -192 +200 @@
 
 AC_CHECK_LIB([profiler], [ProfilingIsEnabledForAllThreads], [HAVE_LIBPROFILER=1], [HAVE_LIBPROFILER=0])
-AM_CONDITIONAL([WITH_LIBPROFILER], [test "$HAVE_LIBPROFILER" -eq 1])
+AM_CONDITIONAL([WITH_LIBPROFILER], [test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBPROFILER" -eq 1])
 
 AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=1], [HAVE_LIBTCMALLOC=0])
-AM_CONDITIONAL([WITH_LIBTCMALLOC], [test "$HAVE_LIBTCMALLOC" -eq 1])
+AM_CONDITIONAL([WITH_LIBTCMALLOC], [test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBTCMALLOC" -eq 1])
 
 # Checks for header files.

src/Common/Stats/Heap.cc

@@ -21 +21 @@
 #include <iostream>
 
-#if defined( NO_STATISTICS ) || defined( TCMALLOC )
-        #define NO_HEAP_STATISTICS
+#if 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
 #endif