[svn-r8932] Purpose:

    Code cleanup

Description:
    Clean up collective chunking code a bit.

    Also, add '--enable-instrument' configure flag to have a mechanism for
determining that optimized operations happened correctly in the library (instead
of just the "normal" way) by allowing 'flag' properties to be set outside the
library and set when the "right" thing happens.  This is mainly for debugging
and regression checks, so we make certain we don't break optimized I/O by
accident.  It's enabled by default when --enable-debug is on (which is on by
default in the development branch and off by default in the release branch),
but can also be independently controlled with its own configure flag.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    IBM p690 (copper) w/parallel

1 files changed, 45 insertions, 4 deletions

diff --git a/configure b/configure
index b26e75b..1f21af9 100755
--- a/configure
+++ b/configure
@@ -1033,6 +1033,8 @@ Optional Features:
                           debug is disabled.
   --enable-trace          Enable API tracing capability. Default=no if debug
                           is disabled.
+  --enable-instrument     Enable library instrumentation of optimization
+                          tracing. Default=no if debug is disabled.
   --enable-parallel       Search for MPI-IO and MPI support files
   --enable-fphdf5         Enable the Flexible Parallel HDF5 interface
                           [default=no]
@@ -4016,7 +4018,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4019 "configure"' > conftest.$ac_ext
+  echo '#line 4021 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4557,7 +4559,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -6364,7 +6366,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6367 "configure"
+#line 6369 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6462,7 +6464,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6465 "configure"
+#line 6467 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -31611,6 +31613,41 @@ echo "${ECHO_T}no" >&6
     ;;
 esac
 
+
+echo "$as_me:$LINENO: checking for instrumented library" >&5
+echo $ECHO_N "checking for instrumented library... $ECHO_C" >&6;
+# Check whether --enable-instrument or --disable-instrument was given.
+if test "${enable_instrument+set}" = set; then
+  enableval="$enable_instrument"
+  INSTRUMENT=$enableval
+fi;
+
+if test "X-$INSTRUMENT" = X- ; then
+  if test -z "$DEBUG_PKG" ; then
+    INSTRUMENT=no
+  else
+    INSTRUMENT=yes
+  fi
+fi
+
+case "X-$INSTRUMENT" in
+  X-yes)
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+    INSTRUMENT_LIBRARY=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INSTRUMENTED_LIBRARY 1
+_ACEOF
+
+    ;;
+  X-no|*)
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    INSTRUMENT_LIBRARY=no
+    ;;
+esac
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -34470,6 +34507,7 @@ s,@PDB2HDF@,$PDB2HDF,;t t
 s,@PTHREAD@,$PTHREAD,;t t
 s,@DEBUG_PKG@,$DEBUG_PKG,;t t
 s,@TRACE_API@,$TRACE_API,;t t
+s,@INSTRUMENT_LIBRARY@,$INSTRUMENT_LIBRARY,;t t
 s,@PARALLEL@,$PARALLEL,;t t
 s,@RUNSERIAL@,$RUNSERIAL,;t t
 s,@RUNPARALLEL@,$RUNPARALLEL,;t t
@@ -35136,6 +35174,9 @@ IF_YES_NO "$STATIC_EXEC"
 PRINT_N "                        Tracing"
 IF_YES_NO "$TRACE_API"
 
+PRINT_N "   Optimization Instrumentation"
+IF_YES_NO "$INSTRUMENT"
+
 PRINT "Languages:"
 
 PRINT_N "                            C++"