Changes in / [db27767:02af79b0]


Ignore:
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • configure

    rdb27767 r02af79b0  
    637637LIBOBJS
    638638CFA_BACKEND_CC
     639WITH_LIBTCMALLOC_FALSE
     640WITH_LIBTCMALLOC_TRUE
     641WITH_LIBPROFILER_FALSE
     642WITH_LIBPROFILER_TRUE
    639643WITH_LIBFIBRE_FALSE
    640644WITH_LIBFIBRE_TRUE
     
    33983402                "debug") ;;
    33993403                "nolib") ;;
     3404                "profile") ;;
    34003405                *)
    34013406                        >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
     
    1665716662
    1665816663
     16664{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ProfilingIsEnabledForAllThreads in -lprofiler" >&5
     16665$as_echo_n "checking for ProfilingIsEnabledForAllThreads in -lprofiler... " >&6; }
     16666if ${ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads+:} false; then :
     16667  $as_echo_n "(cached) " >&6
     16668else
     16669  ac_check_lib_save_LIBS=$LIBS
     16670LIBS="-lprofiler  $LIBS"
     16671cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     16672/* end confdefs.h.  */
     16673
     16674/* Override any GCC internal prototype to avoid an error.
     16675   Use char because int might match the return type of a GCC
     16676   builtin and then its argument prototype would still apply.  */
     16677#ifdef __cplusplus
     16678extern "C"
     16679#endif
     16680char ProfilingIsEnabledForAllThreads ();
     16681int
     16682main ()
     16683{
     16684return ProfilingIsEnabledForAllThreads ();
     16685  ;
     16686  return 0;
     16687}
     16688_ACEOF
     16689if ac_fn_c_try_link "$LINENO"; then :
     16690  ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads=yes
     16691else
     16692  ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads=no
     16693fi
     16694rm -f core conftest.err conftest.$ac_objext \
     16695    conftest$ac_exeext conftest.$ac_ext
     16696LIBS=$ac_check_lib_save_LIBS
     16697fi
     16698{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads" >&5
     16699$as_echo "$ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads" >&6; }
     16700if test "x$ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads" = xyes; then :
     16701  HAVE_LIBPROFILER=1
     16702else
     16703  HAVE_LIBPROFILER=0
     16704fi
     16705
     16706 if test "$HAVE_LIBPROFILER" -eq 1; then
     16707  WITH_LIBPROFILER_TRUE=
     16708  WITH_LIBPROFILER_FALSE='#'
     16709else
     16710  WITH_LIBPROFILER_TRUE='#'
     16711  WITH_LIBPROFILER_FALSE=
     16712fi
     16713
     16714
     16715{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5
     16716$as_echo_n "checking for malloc in -ltcmalloc... " >&6; }
     16717if ${ac_cv_lib_tcmalloc_malloc+:} false; then :
     16718  $as_echo_n "(cached) " >&6
     16719else
     16720  ac_check_lib_save_LIBS=$LIBS
     16721LIBS="-ltcmalloc  $LIBS"
     16722cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     16723/* end confdefs.h.  */
     16724
     16725/* Override any GCC internal prototype to avoid an error.
     16726   Use char because int might match the return type of a GCC
     16727   builtin and then its argument prototype would still apply.  */
     16728#ifdef __cplusplus
     16729extern "C"
     16730#endif
     16731char malloc ();
     16732int
     16733main ()
     16734{
     16735return malloc ();
     16736  ;
     16737  return 0;
     16738}
     16739_ACEOF
     16740if ac_fn_c_try_link "$LINENO"; then :
     16741  ac_cv_lib_tcmalloc_malloc=yes
     16742else
     16743  ac_cv_lib_tcmalloc_malloc=no
     16744fi
     16745rm -f core conftest.err conftest.$ac_objext \
     16746    conftest$ac_exeext conftest.$ac_ext
     16747LIBS=$ac_check_lib_save_LIBS
     16748fi
     16749{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcmalloc_malloc" >&5
     16750$as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; }
     16751if test "x$ac_cv_lib_tcmalloc_malloc" = xyes; then :
     16752  HAVE_LIBTCMALLOC=1
     16753else
     16754  HAVE_LIBTCMALLOC=0
     16755fi
     16756
     16757 if test "$HAVE_LIBTCMALLOC" -eq 1; then
     16758  WITH_LIBTCMALLOC_TRUE=
     16759  WITH_LIBTCMALLOC_FALSE='#'
     16760else
     16761  WITH_LIBTCMALLOC_TRUE='#'
     16762  WITH_LIBTCMALLOC_FALSE=
     16763fi
     16764
     16765
    1665916766# Checks for header files.
    1666016767for ac_header in libintl.h malloc.h unistd.h
     
    1688916996if test -z "${WITH_LIBFIBRE_TRUE}" && test -z "${WITH_LIBFIBRE_FALSE}"; then
    1689016997  as_fn_error $? "conditional \"WITH_LIBFIBRE\" was never defined.
     16998Usually this means the macro was only invoked conditionally." "$LINENO" 5
     16999fi
     17000if test -z "${WITH_LIBPROFILER_TRUE}" && test -z "${WITH_LIBPROFILER_FALSE}"; then
     17001  as_fn_error $? "conditional \"WITH_LIBPROFILER\" was never defined.
     17002Usually this means the macro was only invoked conditionally." "$LINENO" 5
     17003fi
     17004if test -z "${WITH_LIBTCMALLOC_TRUE}" && test -z "${WITH_LIBTCMALLOC_FALSE}"; then
     17005  as_fn_error $? "conditional \"WITH_LIBTCMALLOC\" was never defined.
    1689117006Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1689217007fi
  • configure.ac

    rdb27767 r02af79b0  
    139139                "debug") ;;
    140140                "nolib") ;;
     141                "profile") ;;
    141142                *)
    142143                        >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
     
    190191AM_CONDITIONAL([WITH_LIBFIBRE], [test "$HAVE_LIBFIBRE" -eq 1])
    191192
     193AC_CHECK_LIB([profiler], [ProfilingIsEnabledForAllThreads], [HAVE_LIBPROFILER=1], [HAVE_LIBPROFILER=0])
     194AM_CONDITIONAL([WITH_LIBPROFILER], [test "$HAVE_LIBPROFILER" -eq 1])
     195
     196AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=1], [HAVE_LIBTCMALLOC=0])
     197AM_CONDITIONAL([WITH_LIBTCMALLOC], [test "$HAVE_LIBTCMALLOC" -eq 1])
     198
    192199# Checks for header files.
    193200AC_CHECK_HEADERS([libintl.h malloc.h unistd.h], [], [echo "Error: Missing required header"; exit 1])
  • libcfa/configure

    rdb27767 r02af79b0  
    29592959case $CONFIGURATION in
    29602960        "debug"   )
    2961                 CONFIG_CFLAGS="-O0 -g"
     2961                CONFIG_CFLAGS="-Og -g"
    29622962                CONFIG_CFAFLAGS="-debug"
    29632963                CONFIG_BUILDLIB="yes"
    29642964        ;;
    29652965        "nodebug" )
    2966                 CONFIG_CFLAGS="-O2 -s"
     2966                CONFIG_CFLAGS="-O3 -s"
    29672967                CONFIG_CFAFLAGS="-nodebug"
    29682968                CONFIG_BUILDLIB="yes"
    29692969        ;;
    29702970        "nolib"   )
    2971                 CONFIG_CFLAGS="-O2 -s"
     2971                CONFIG_CFLAGS="-O3 -s"
    29722972                CONFIG_CFAFLAGS="-nolib"
    29732973                CONFIG_BUILDLIB="no"
     2974        ;;
     2975        "profile" )
     2976                CONFIG_CFLAGS="-O3 -g -fno-omit-frame-pointer"
     2977                CONFIG_CFAFLAGS="-nodebug"
     2978                CONFIG_BUILDLIB="yes"
    29742979        ;;
    29752980        *)
  • libcfa/configure.ac

    rdb27767 r02af79b0  
    4545case $CONFIGURATION in
    4646        "debug"   )
    47                 CONFIG_CFLAGS="-O0 -g"
     47                CONFIG_CFLAGS="-Og -g"
    4848                CONFIG_CFAFLAGS="-debug"
    4949                CONFIG_BUILDLIB="yes"
    5050        ;;
    5151        "nodebug" )
    52                 CONFIG_CFLAGS="-O2 -s"
     52                CONFIG_CFLAGS="-O3 -s"
    5353                CONFIG_CFAFLAGS="-nodebug"
    5454                CONFIG_BUILDLIB="yes"
    5555        ;;
    5656        "nolib"   )
    57                 CONFIG_CFLAGS="-O2 -s"
     57                CONFIG_CFLAGS="-O3 -s"
    5858                CONFIG_CFAFLAGS="-nolib"
    5959                CONFIG_BUILDLIB="no"
     60        ;;
     61        "profile" )
     62                CONFIG_CFLAGS="-O3 -g -fno-omit-frame-pointer"
     63                CONFIG_CFAFLAGS="-nodebug"
     64                CONFIG_BUILDLIB="yes"
    6065        ;;
    6166        *)
  • src/Makefile.am

    rdb27767 r02af79b0  
    5656___driver_cfa_cpp_LDADD = -ldl                  # yywrap
    5757
    58 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
     58if WITH_LIBPROFILER
     59        ___driver_cfa_cpp_LDADD += -lprofiler
     60endif
     61
     62if WITH_LIBTCMALLOC
     63        ___driver_cfa_cpp_LDADD += -ltcmalloc
     64endif
     65
     66AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14
    5967AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
    6068ARFLAGS     = cr
  • src/Makefile.in

    rdb27767 r02af79b0  
    651651___driver_cfa_cpp_SOURCES = $(SRC)
    652652___driver_cfa_cpp_LDADD = -ldl                  # yywrap
    653 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
     653AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14
    654654AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
    655655ARFLAGS = cr
     
    15261526        @rm BasicTypes-gen
    15271527
     1528@WITH_LIBPROFILER_TRUE@ ___driver_cfa_cpp_LDADD += -lprofiler
     1529
     1530@WITH_LIBTCMALLOC_TRUE@ ___driver_cfa_cpp_LDADD += -ltcmalloc
     1531
    15281532# Tell versions [3.59,3.63) of GNU make to not export all variables.
    15291533# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.