Merge branch 'prep-release-v3.2.1' into 'master'

preprare 3.2.1 release

See merge request !56

ChangeLog

@@ -2,6 +2,12 @@
 Darshan Release Change Log
 --------------------------
 
+Darshan-3.2.1
+=============
+* fixed bug causing corruption of Darshan common access
+  counters (POSIX, MPI-IO, and HDF5 modules) and potentially
+  other preceding counters (reported by Gerd Heber)
+
 Darshan-3.2.0
 =============
 * added detailed instrumentation of HDF5 library file and dataset

darshan-log-format.h

@@ -24,7 +24,7 @@
  * log format version, NOT when a new version of a module record is
  * introduced -- we have module-specific versions to handle that
  */
-#define DARSHAN_LOG_VERSION "3.20"
+#define DARSHAN_LOG_VERSION "3.21"
 
 /* magic number for validating output files and checking byte order */
 #define DARSHAN_MAGIC_NR 6567223

darshan-runtime/configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for darshan-runtime 3.2.0.
+# Generated by GNU Autoconf 2.69 for darshan-runtime 3.2.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='darshan-runtime'
 PACKAGE_TARNAME='darshan-runtime'
-PACKAGE_VERSION='3.2.0'
-PACKAGE_STRING='darshan-runtime 3.2.0'
+PACKAGE_VERSION='3.2.1'
+PACKAGE_STRING='darshan-runtime 3.2.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1290,7 +1290,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures darshan-runtime 3.2.0 to adapt to many kinds of systems.
+\`configure' configures darshan-runtime 3.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1352,7 +1352,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of darshan-runtime 3.2.0:";;
+     short | recursive ) echo "Configuration of darshan-runtime 3.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1476,7 +1476,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-darshan-runtime configure 3.2.0
+darshan-runtime configure 3.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1828,7 +1828,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by darshan-runtime $as_me 3.2.0, which was
+It was created by darshan-runtime $as_me 3.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4881,7 +4881,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-DARSHAN_VERSION="3.2.0"
+DARSHAN_VERSION="3.2.1"
 
 
 
@@ -5420,7 +5420,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by darshan-runtime $as_me 3.2.0, which was
+This file was extended by darshan-runtime $as_me 3.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5482,7 +5482,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-darshan-runtime config.status 3.2.0
+darshan-runtime config.status 3.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

darshan-runtime/configure.in

@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl You may need to use autoheader as well if changing any DEFINEs
 
 dnl sanity checks, output header, location of scripts used here
-AC_INIT([darshan-runtime], [3.2.0])
+AC_INIT([darshan-runtime], [3.2.1])
 AC_CONFIG_SRCDIR([darshan.h])
 AC_CONFIG_AUX_DIR(../maint/config)
 AC_CONFIG_MACRO_DIR(../maint/config)

darshan-util/configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for darshan-util 3.2.0.
+# Generated by GNU Autoconf 2.69 for darshan-util 3.2.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='darshan-util'
 PACKAGE_TARNAME='darshan-util'
-PACKAGE_VERSION='3.2.0'
-PACKAGE_STRING='darshan-util 3.2.0'
+PACKAGE_VERSION='3.2.1'
+PACKAGE_STRING='darshan-util 3.2.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures darshan-util 3.2.0 to adapt to many kinds of systems.
+\`configure' configures darshan-util 3.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1309,7 +1309,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of darshan-util 3.2.0:";;
+     short | recursive ) echo "Configuration of darshan-util 3.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1405,7 +1405,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-darshan-util configure 3.2.0
+darshan-util configure 3.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1770,7 +1770,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by darshan-util $as_me 3.2.0, which was
+It was created by darshan-util $as_me 3.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4117,7 +4117,7 @@ fi
 done
 
 
-DARSHAN_UTIL_VERSION="3.2.0"
+DARSHAN_UTIL_VERSION="3.2.1"
 
 
 
@@ -4633,7 +4633,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by darshan-util $as_me 3.2.0, which was
+This file was extended by darshan-util $as_me 3.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4695,7 +4695,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-darshan-util config.status 3.2.0
+darshan-util config.status 3.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

darshan-util/configure.in

@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl You may need to use autoheader as well if changing any DEFINEs
 
 dnl sanity checks, output header, location of scripts used here
-AC_INIT([darshan-util], [3.2.0])
+AC_INIT([darshan-util], [3.2.1])
 AC_CONFIG_SRCDIR([darshan-logutils.h])
 AC_CONFIG_AUX_DIR(../maint/config)
 AC_CONFIG_HEADER(darshan-util-config.h)

darshan-util/darshan-logutils.c

@@ -781,6 +781,13 @@ void darshan_log_close(darshan_fd fd)
 
 void darshan_log_print_version_warnings(const char *version_string)
 {
+    if(strcmp(version_string, "3.20") == 0)
+    {
+        printf("# WARNING: Darshan logs generated by runtime version 3.2.0 likely exhibit some corruption in counter values.\n");
+        printf("#          This bug clearly results in bogus values for some COMMON_ACCESS counters (POSIX, MPIIO, H5 modules),\n");
+        printf("#          but preceding data may also be corrupted.\n");
+    }
+
     return;
 }
 
@@ -897,7 +904,8 @@ static int darshan_log_get_header(darshan_fd fd)
         fd->state->get_namerecs = darshan_log_get_namerecs_3_00;
     }
     else if((strcmp(fd->version, "3.10") == 0) ||
-            (strcmp(fd->version, "3.20") == 0))
+            (strcmp(fd->version, "3.20") == 0) ||
+            (strcmp(fd->version, "3.21") == 0))
     {
         fd->state->get_namerecs = darshan_log_get_namerecs;
     }