From: Francesco Chemolli Date: Fri, 9 Apr 2010 13:30:44 +0000 (+0200) Subject: refactrored --enable-cpu-profiling X-Git-Tag: SQUID_3_2_0_1~271^2~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f705e3b7a37634854c850b3efa05a74f07501cf;p=thirdparty%2Fsquid.git refactrored --enable-cpu-profiling --- diff --git a/configure.in b/configure.in index c9f7a4afd4..f2afc2c95c 100644 --- a/configure.in +++ b/configure.in @@ -1597,7 +1597,7 @@ for helper in $squid_opt_basic_auth_helpers ; do BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS $helper" # special case if test "$helper" = "SASL" ; then - require_sasl=yes + squid_require_sasl=yes fi elif test -d $srcdir/helpers/basic_auth/$helper ; then AC_MSG_NOTICE([Basic auth helper $helper ... found but cannot be built]) @@ -1972,7 +1972,8 @@ AC_SUBST(URL_REWRITE_HELPERS) AC_ARG_WITH(valgrind-debug, - AS_HELP_STRING([--with-valgrind-debug],[Include debug instrumentation for use with valgrind]), + AS_HELP_STRING([--with-valgrind-debug], + [Include debug instrumentation for use with valgrind]), [ case $withval in yes) valgrind=1 @@ -1999,10 +2000,11 @@ squid_opt_enable_mempools=yes #default AC_ARG_ENABLE(mempools, AS_HELP_STRING([--disable-mempools], [Disable memPools. Note that this option now simply sets the - default behaviour. Specific classes can override this at runtime, and - only lib/MemPool.c needs to be altered to change the squid-wide - default for all classes.]), [ -SQUID_YESNO([$squid_opt_enable_mempools],[--disable-mempools option takes no arguments]) + default behaviour. Specific classes can override this + at runtime, and only lib/MemPool.c needs to be altered + to change the squid-wide default for all classes.]), [ +SQUID_YESNO([$squid_opt_enable_mempools], + [--disable-mempools option takes no arguments]) squid_opt_enable_mempools=$enableval ]) # transform positive to negative value. @@ -2018,16 +2020,18 @@ SQUID_DEFINE_UNQUOTED(DISABLE_POOLS,$squid_opt_enable_mempools, dnl Enable WIN32 Service compile mode AC_ARG_ENABLE(win32-service, AS_HELP_STRING([--enable-win32-service], - [Compile Squid as a WIN32 Service. Works only on MS-Windows platforms]), + [Compile Squid as a WIN32 Service. + Works only on MS-Windows platforms]), [ if test "$enableval" = "yes" ; then AC_MSG_NOTICE([Enabling WIN32 run service mode]) - AC_DEFINE(USE_WIN32_SERVICE,1,[Define Windows NT & Windows 2000 run service mode]) + AC_DEFINE(USE_WIN32_SERVICE,1, + [Define Windows NT & Windows 2000 run service mode]) fi ]) -dnl Check for Cyrus SASL -if test "$require_sasl" = "yes"; then +# Check for Cyrus SASL +if test "$squid_require_sasl" = "yes"; then AC_CHECK_HEADERS(sasl/sasl.h sasl.h) if test "$ac_cv_header_sasl_sasl_h" = "yes"; then AC_MSG_NOTICE([using SASL2]) @@ -2047,40 +2051,51 @@ fi squid_opt_enable_unlinkd=yes AC_ARG_ENABLE(unlinkd, AS_HELP_STRING([--disable-unlinkd],[Do not use unlinkd]), [ -SQUID_YESNO([$enableval],[unrecognized argument to --disable-unlinkd: $enableval]) +SQUID_YESNO([$enableval], + [unrecognized argument to --disable-unlinkd: $enableval]) squid_opt_enable_unlinkd=$enableval ]) AC_MSG_NOTICE([unlinkd enabled: $squid_opt_enable_unlinkd]) -SQUID_DEFINE_UNQUOTED([USE_UNLINKD],$squid_opt_enable_unlinkd,[Enable useage of unlinkd]) -AM_CONDITIONAL(ENABLE_UNLINKD,test $squid_opt_enable_unlinkd = "yes") +SQUID_DEFINE_UNQUOTED([USE_UNLINKD],$squid_opt_enable_unlinkd, + [Enable useage of unlinkd]) +AM_CONDITIONAL(ENABLE_UNLINKD,test "$squid_opt_enable_unlinkd" = "yes") -dnl Enable backtraces on fatal errors +# Enable backtraces on fatal errors squid_opt_enable_stacktraces=no AC_ARG_ENABLE(stacktraces, - AS_HELP_STRING([--enable-stacktraces],[Enable automatic call backtrace on fatal errors]), [ -SQUID_YESNO([$enableval],[unrecognized argument to --enable-stacktraces: $enableval]) + AS_HELP_STRING([--enable-stacktraces], + [Enable automatic call backtrace on fatal errors]), [ +SQUID_YESNO([$enableval], + [unrecognized argument to --enable-stacktraces: $enableval]) squid_opt_enable_stacktraces=$enableval ]) AC_MSG_NOTICE([Automatically print stack trace on fatal errors: $squid_opt_enable_stacktraces]) -SQUID_DEFINE_UNQUOTED([PRINT_STACK_TRACE],$squid_opt_enable_stacktraces,[Print stack traces on fatal errors]) +SQUID_DEFINE_UNQUOTED([PRINT_STACK_TRACE],$squid_opt_enable_stacktraces, + [Print stack traces on fatal errors]) -AM_CONDITIONAL(ENABLE_XPROF_STATS, false) -dnl Enable USE_XPROF_STATS +# Enable USE_XPROF_STATS +squid_opt_enable_cpu_profiling=no AC_ARG_ENABLE(cpu-profiling, - AS_HELP_STRING([--enable-cpu-profiling],[Enable instrumentation to try and understand how CPU power - is spent by squid, by enabling specific probes in selected - functions. New probes can only be added by modifying the source code. - It is meant to help developers in optimizing performance - of Squid internal functions. - If you are not developer you shouldn't enable this, - as it slows squid down somewhat. See lib/Profiler.c for more details.]), -[ if test "$enableval" = "yes" ; then - AC_MSG_NOTICE([Enabling cpu-profiling]) - AC_DEFINE(USE_XPROF_STATS, 1,[Define to enable CPU profiling within Squid]) - AM_CONDITIONAL(ENABLE_XPROF_STATS, true) - fi -]) + AS_HELP_STRING([--enable-cpu-profiling], + [Enable instrumentation to try and understand how CPU power + is spent by squid, by enabling specific probes in selected + functions. + New probes can only be added by modifying the source code. + It is meant to help developers in optimizing performance + of Squid internal functions. + If you are not developer you shouldn't enable this, + as it slows squid down somewhat. + See lib/Profiler.c for more details.]), [ +SQUID_YESNO([$enableval], + [unrecognized argument to --enable-cpu-profiling: $enableval]) +squid_opt_enable_cpu_profiling=$enableval +]) +AC_MSG_NOTICE([CPU profiling enabled: $squid_opt_enable_cpu_profiling]) +SQUID_DEFINE_UNQUOTED([USE_XPROF_STATS],$squid_opt_enable_cpu_profiling, + [Define to enable CPU profiling within Squid]) +AM_CONDITIONAL(ENABLE_XPROF_STATS, + test $squid_opt_enable_cpu_profiling = "yes") dnl Enable X-Accelerator-Vary for Vary support within an accelerator setup AC_ARG_ENABLE(x-accelerator-vary,