Explorar o código

configure: allow to set --enable-verbose=extra to increase debug messages verbosity

Nathalie Furmento %!s(int64=11) %!d(string=hai) anos
pai
achega
90879cd44c
Modificáronse 4 ficheiros con 14 adicións e 6 borrados
  1. 4 0
      ChangeLog
  2. 5 1
      configure.ac
  3. 1 1
      doc/doxygen/chapters/41configure_options.doxy
  4. 4 4
      src/common/utils.h

+ 4 - 0
ChangeLog

@@ -17,6 +17,10 @@
 StarPU 1.2.0 (svn revision xxxx)
 StarPU 1.2.0 (svn revision xxxx)
 ==============================================
 ==============================================
 
 
+Small features:
+  * The option --enable-verbose can be called with
+    --enable-verbose=extra to increase the verbosity
+
 StarPU 1.1.2 (svn revision xxxx)
 StarPU 1.1.2 (svn revision xxxx)
 ==============================================
 ==============================================
 The scheduling context release
 The scheduling context release

+ 5 - 1
configure.ac

@@ -1393,12 +1393,16 @@ fi
 
 
 AC_MSG_CHECKING(whether debug messages should be displayed)
 AC_MSG_CHECKING(whether debug messages should be displayed)
 AC_ARG_ENABLE(verbose, [AS_HELP_STRING([--enable-verbose],
 AC_ARG_ENABLE(verbose, [AS_HELP_STRING([--enable-verbose],
-			[display verbose debug messages])],
+			[display verbose debug messages (--enable-verbose=extra increase the verbosity)])],
 			enable_verbose=$enableval, enable_verbose=no)
 			enable_verbose=$enableval, enable_verbose=no)
 AC_MSG_RESULT($enable_verbose)
 AC_MSG_RESULT($enable_verbose)
 if test x$enable_verbose = xyes; then
 if test x$enable_verbose = xyes; then
 	AC_DEFINE(STARPU_VERBOSE, [1], [display verbose debug messages])
 	AC_DEFINE(STARPU_VERBOSE, [1], [display verbose debug messages])
 fi
 fi
+if test x$enable_verbose = xextra; then
+	AC_DEFINE(STARPU_VERBOSE, [1], [display verbose debug messages])
+	AC_DEFINE(STARPU_EXTRA_VERBOSE, [1], [display verbose debug messages])
+fi
 
 
 AC_MSG_CHECKING(whether coverage testing should be enabled)
 AC_MSG_CHECKING(whether coverage testing should be enabled)
 AC_ARG_ENABLE(coverage, [AS_HELP_STRING([--enable-coverage],
 AC_ARG_ENABLE(coverage, [AS_HELP_STRING([--enable-coverage],

+ 1 - 1
doc/doxygen/chapters/41configure_options.doxy

@@ -42,7 +42,7 @@ Disable assertion checks, which saves computation time.
 \addindex __configure__--enable-verbose
 \addindex __configure__--enable-verbose
 Increase the verbosity of the debugging messages.  This can be disabled
 Increase the verbosity of the debugging messages.  This can be disabled
 at runtime by setting the environment variable \ref STARPU_SILENT to
 at runtime by setting the environment variable \ref STARPU_SILENT to
-any value.
+any value. <c>--enable-verbose=extra</c> increase even more the verbosity.
 
 
 \verbatim
 \verbatim
 $ STARPU_SILENT=1 ./vector_scal
 $ STARPU_SILENT=1 ./vector_scal

+ 4 - 4
src/common/utils.h

@@ -82,10 +82,10 @@
 #  define _STARPU_DEBUG(fmt, ...) do { } while (0)
 #  define _STARPU_DEBUG(fmt, ...) do { } while (0)
 #endif
 #endif
 
 
-#ifdef STARPU_VERBOSE0
-#  define _STARPU_LOG_IN()             do { if (!getenv("STARPU_SILENT")) {fprintf(stderr, STARPU_DEBUG_PREFIX"[%ld][%s] -->\n", pthread_self(), __starpu_func__ ); }} while(0)
-#  define _STARPU_LOG_OUT()            do { if (!getenv("STARPU_SILENT")) {fprintf(stderr, STARPU_DEBUG_PREFIX"[%ld][%s] <--\n", pthread_self(), __starpu_func__ ); }} while(0)
-#  define _STARPU_LOG_OUT_TAG(outtag)  do { if (!getenv("STARPU_SILENT")) {fprintf(stderr, STARPU_DEBUG_PREFIX"[%ld][%s] <-- (%s)\n", pthread_self(), __starpu_func__, outtag); }} while(0)
+#ifdef STARPU_EXTRA_VERBOSE
+#  define _STARPU_LOG_IN()             do { if (!getenv("STARPU_SILENT")) {fprintf(stderr, STARPU_DEBUG_PREFIX"[%ld][%s:%s@%d] -->\n", pthread_self(), __starpu_func__,__FILE__,  __LINE__); }} while(0)
+#  define _STARPU_LOG_OUT()            do { if (!getenv("STARPU_SILENT")) {fprintf(stderr, STARPU_DEBUG_PREFIX"[%ld][%s:%s@%d] <--\n", pthread_self(), __starpu_func__, __FILE__,  __LINE__); }} while(0)
+#  define _STARPU_LOG_OUT_TAG(outtag)  do { if (!getenv("STARPU_SILENT")) {fprintf(stderr, STARPU_DEBUG_PREFIX"[%ld][%s:%s@%d] <-- (%s)\n", pthread_self(), __starpu_func__, __FILE__, __LINE__, outtag); }} while(0)
 #else
 #else
 #  define _STARPU_LOG_IN()
 #  define _STARPU_LOG_IN()
 #  define _STARPU_LOG_OUT()
 #  define _STARPU_LOG_OUT()