Merge branch 'hxhim-module' into 'master'

Hxhim module

See merge request darshan/darshan!23

darshan-log-format.h

@@ -119,6 +119,7 @@ struct darshan_base_record
 #include "darshan-stdio-log-format.h"
 /* DXT */
 #include "darshan-dxt-log-format.h"
+#include "darshan-mdhim-log-format.h"
 
 /* X-macro for keeping module ordering consistent */
 /* NOTE: first val used to define module enum values, 
@@ -141,7 +142,9 @@ struct darshan_base_record
     X(DARSHAN_STDIO_MOD,    "STDIO",    DARSHAN_STDIO_VER,      &stdio_logutils) \
     /* DXT */ \
     X(DXT_POSIX_MOD,       "DXT_POSIX",  DXT_POSIX_VER,         &dxt_posix_logutils) \
-    X(DXT_MPIIO_MOD,       "DXT_MPIIO",  DXT_MPIIO_VER,         &dxt_mpiio_logutils)
+    X(DXT_MPIIO_MOD,       "DXT_MPIIO",  DXT_MPIIO_VER,         &dxt_mpiio_logutils) \
+    X(DARSHAN_MDHIM_MOD,   "MDHIM",      DARSHAN_MDHIM_VER,     &mdhim_logutils)
+
 
 /* unique identifiers to distinguish between available darshan modules */
 /* NOTES: - valid ids range from [0...DARSHAN_MAX_MODS-1]

darshan-mdhim-log-format.h

+/*
+ * Copyright (C) 2015 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
+#ifndef __DARSHAN_MDHIM_LOG_FORMAT_H
+#define __DARSHAN_MDHIM_LOG_FORMAT_H
+
+/* current log format version, to support backwards compatibility */
+#define DARSHAN_MDHIM_VER 1
+
+#define MDHIM_COUNTERS \
+    /* number of 'put' function calls */\
+    X(MDHIM_PUTS) \
+    /* larget payload for a 'put' */ \
+    X(MDHIM_GETS) \
+    /* largest get */ \
+    X(MDHIM_PUT_MAX_SIZE)\
+    /* number of 'get' function calls */\
+    X(MDHIM_GET_MAX_SIZE) \
+    /* how many servers? */ \
+    X(MDHIM_SERVERS) \
+    /* end of counters */ \
+    X(MDHIM_NUM_INDICES)
+
+#define MDHIM_F_COUNTERS \
+    /* timestamp of the first call to a 'put' function */\
+    X(MDHIM_F_PUT_TIMESTAMP) \
+    X(MDHIM_F_GET_TIMESTAMP) \
+    /* timer indicating longest (slowest) call to put/get */\
+    X(MDHIM_F_PUT_MAX_DURATION) \
+    X(MDHIM_F_GET_MAX_DURATION) \
+    /* end of counters */\
+    X(MDHIM_F_NUM_INDICES)
+
+#define X(a) a,
+/* integer counters for the "NULL" example module */
+enum darshan_mdhim_indices
+{
+    MDHIM_COUNTERS
+};
+
+/* floating point counters for the "NULL" example module */
+enum darshan_mdhim_f_indices
+{
+    MDHIM_F_COUNTERS
+};
+#undef X
+
+/* the darshan_mdhim_record structure encompasses the high-level data/counters
+ * which would actually be logged to file by Darshan for the "MDHIM"
+ * module. This implementation logs the following data for each
+ * record:
+ *      - a darshan_base_record structure, which contains the record id & rank
+ *      - integer I/O counters (operation counts, I/O sizes, etc.)
+ *      - floating point I/O counters (timestamps, cumulative timers, etc.)
+ */
+struct darshan_mdhim_record
+{
+    struct darshan_base_record base_rec;
+    int64_t counters[MDHIM_NUM_INDICES];
+    double fcounters[MDHIM_F_NUM_INDICES];
+    /* when we allocate this struct, we'll do so with enough extra memory to
+     * hold N servers.  Compare to approach taken with darshan_lustre_record */
+    /* be mindful of struct alignment here:  If one reads "sizeof(struct
+     * darshan_mdhim_record)", one might end up reading more than expected.
+     * Second read will then end up reading less than needed */
+    int64_t server_histogram[1];
+};
+
+/* '-1' because d_m_r already allocated with space for one */
+#define MDHIM_RECORD_SIZE(servers) (sizeof(struct darshan_mdhim_record) + sizeof(int64_t) * ((servers) - 1) )
+#endif /* __DARSHAN_MDHIM_LOG_FORMAT_H */

darshan-runtime/Makefile.in

@@ -36,6 +36,7 @@ CFLAGS_SHARED = -DDARSHAN_CONFIG_H=\"darshan-runtime-config.h\" -I . -I$(srcdir)
 LIBS = -lz @LIBBZ2@
 
 BUILD_HDF5_MODULE = @BUILD_HDF5_MODULE@
+BUILD_MDHIM_MODULE = @BUILD_MDHIM_MODULE@
 
 DARSHAN_STATIC_MOD_OBJS = lib/darshan-posix.o lib/darshan-mpiio.o lib/darshan-pnetcdf.o lib/darshan-stdio.o lib/darshan-dxt.o
 DARSHAN_DYNAMIC_MOD_OBJS = lib/darshan-posix.po lib/darshan-mpiio.po lib/darshan-pnetcdf.po lib/darshan-stdio.po lib/darshan-dxt.po
@@ -59,6 +60,13 @@ CFLAGS += -DDARSHAN_LUSTRE
 CFLAGS_SHARED += -DDARSHAN_LUSTRE
 endif
 
+ifdef BUILD_MDHIM_MODULE
+DARSHAN_STATIC_MOD_OBJS += lib/darshan-mdhim.o
+DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-mdhim.po
+CFLAGS += -DDARSHAN_MDHIM
+CFLAGS_SHARED += -DDARSHAN_MDHIM
+endif
+
 lib::
 	@mkdir -p $@
 
@@ -140,6 +148,13 @@ lib/darshan-dxt.o: lib/darshan-dxt.c darshan.h darshan-common.h $(DARSHAN_LOG_FO
 lib/darshan-dxt.po: lib/darshan-dxt.c darshan.h darshan-dynamic.h darshan-common.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-dxt-log-format.h | lib
 	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
+lib/darshan-mdhim.o: lib/darshan-mdhim.c darshan.h darshan-common.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-mdhim-log-format.h | lib
+	$(CC) $(CFLAGS) -c $< -o $@
+
+lib/darshan-mdhim.po: lib/darshan-mdhim.c darshan.h darshan-dynamic.h darshan-common.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-mdhim-log-format.h | lib
+	$(CC) $(CFLAGS_SHARED) -c $< -o $@
+
+
 lib/lookup3.o: lib/lookup3.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
@@ -196,6 +211,9 @@ endif
 	install -m 644 $(srcdir)/share/ld-opts/darshan-posix-ld-opts $(datarootdir)/ld-opts/darshan-posix-ld-opts
 ifdef BUILD_HDF5_MODULE
 	install -m 644 $(srcdir)/share/ld-opts/darshan-hdf5-ld-opts $(datarootdir)/ld-opts/darshan-hdf5-ld-opts
+endif
+ifdef BUILD_MDHIM_MODULE
+	install -m 644 $(srcdir)/share/ld-opts/darshan-mdhim-ld-opts $(datarootdir)/ld-opts/darshan-mdhim-ld-opts
 endif
 	install -m 644 $(srcdir)/share/ld-opts/darshan-pnetcdf-ld-opts $(datarootdir)/ld-opts/darshan-pnetcdf-ld-opts
 	install -m 644 $(srcdir)/share/ld-opts/darshan-stdio-ld-opts $(datarootdir)/ld-opts/darshan-stdio-ld-opts

darshan-runtime/configure

@@ -621,6 +621,8 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+DARSHAN_MDHIM_LD_OPTS
+BUILD_MDHIM_MODULE
 DARSHAN_HDF5_LD_OPTS
 BUILD_HDF5_MODULE
 DARSHAN_USE_LUSTRE
@@ -702,6 +704,7 @@ with_jobid_env
 with_mod_mem
 enable_HDF5_post_1_10
 enable_HDF5_pre_1_10
+enable_mdhim
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1332,6 +1335,7 @@ Optional Features:
                           Enable HDF5 module for HDF5 version 1.10 or later
   --enable-HDF5-pre-1.10
                           Enable HDF5 module for HDF5 versions earlier than 1.10
+  --enable-mdhim          Enable mdhim module
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3761,6 +3765,7 @@ fi
 
 fi
 
+
 if test x$GOT_ALIGNMENT != x1; then
     as_fn_error $? "must provide --with-mem-align=<num> argument to configure." "$LINENO" 5
 fi
@@ -4223,6 +4228,33 @@ fi
 fi
 
 
+BUILD_MDHIM_MODULE=
+DARSHAN_MDHIM_LD_OPTS=
+# Check whether --enable-mdhim was given.
+if test "${enable_mdhim+set}" = set; then :
+  enableval=$enable_mdhim;
+fi
+
+if test "x$enable_mdhim" = "xyes"; then :
+  BUILD_MDHIM_MODULE=1
+      DARSHAN_MDHIM_LD_OPTS="@${darshan_share_path}/ld-opts/darshan-mdhim-ld-opts"
+      for ac_header in mdhim.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "mdhim.h" "ac_cv_header_mdhim_h" "$ac_includes_default"
+if test "x$ac_cv_header_mdhim_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MDHIM_H 1
+_ACEOF
+
+else
+  as_fn_error $? "mdhim requested but headers cannot be found" "$LINENO" 5
+fi
+
+done
+
+fi
+
+
 # determine if the MPI library includes MPI-IO functions or not
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI-IO support in MPI" >&5
 $as_echo_n "checking for MPI-IO support in MPI... " >&6; }
@@ -4401,6 +4433,8 @@ DARSHAN_VERSION="3.1.6"
 
 
 
+
+
 ac_config_files="$ac_config_files Makefile darshan-mk-log-dirs.pl darshan-gen-cc.pl darshan-gen-cxx.pl darshan-gen-fortran.pl darshan-config share/craype-1.x/darshan-module share/craype-2.x/darshan-module lib/pkgconfig/darshan-runtime.pc share/mpi-profile/darshan-cc.conf share/mpi-profile/darshan-cxx.conf share/mpi-profile/darshan-f.conf share/mpi-profile/darshan-bg-cc.conf share/mpi-profile/darshan-bg-cxx.conf share/mpi-profile/darshan-bg-f.conf share/ld-opts/darshan-base-ld-opts"
 
 cat >confcache <<\_ACEOF

darshan-runtime/configure.in

@@ -162,6 +162,7 @@ if test x$enable_lustre_mod != xno; then
             []))
 fi
 
+
 if test x$GOT_ALIGNMENT != x1; then
     AC_MSG_ERROR(must provide --with-mem-align=<num> argument to configure.)
 fi
@@ -283,6 +284,22 @@ AC_ARG_ENABLE(HDF5-pre-1.10,
 fi]
 ,)
 
+BUILD_MDHIM_MODULE=
+DARSHAN_MDHIM_LD_OPTS=
+AC_ARG_ENABLE([mdhim],
+	      AS_HELP_STRING([--enable-mdhim], [Enable mdhim module]),
+	      [],[] )
+AS_IF([test "x$enable_mdhim" = "xyes"],
+      BUILD_MDHIM_MODULE=1
+      DARSHAN_MDHIM_LD_OPTS="@${darshan_share_path}/ld-opts/darshan-mdhim-ld-opts"
+      AC_CHECK_HEADERS([mdhim.h],
+		       [],
+		       AC_MSG_ERROR([mdhim requested but headers cannot be found]) ),
+      []
+
+      )
+
+
 # determine if the MPI library includes MPI-IO functions or not
 AC_MSG_CHECKING(for MPI-IO support in MPI)
 AC_TRY_LINK([#include <mpi.h>], [
@@ -382,6 +399,8 @@ AC_SUBST(DARSHAN_USE_BGQ)
 AC_SUBST(DARSHAN_USE_LUSTRE)
 AC_SUBST(BUILD_HDF5_MODULE)
 AC_SUBST(DARSHAN_HDF5_LD_OPTS)
+AC_SUBST(BUILD_MDHIM_MODULE)
+AC_SUBST(DARSHAN_MDHIM_LD_OPTS)
 AC_OUTPUT(Makefile
 darshan-mk-log-dirs.pl
 darshan-gen-cc.pl

darshan-runtime/darshan-runtime-config.h.in

@@ -12,6 +12,9 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 
+/* Define to 1 if you have the <mdhim.h> header file. */
+#undef HAVE_MDHIM_H
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 

darshan-runtime/share/ld-opts/darshan-base-ld-opts.in

@@ -12,3 +12,4 @@
 @@darshan_share_path@/ld-opts/darshan-stdio-ld-opts
 @@darshan_share_path@/ld-opts/darshan-mpiio-ld-opts
 @DARSHAN_HDF5_LD_OPTS@
+@DARSHAN_MDHIM_LD_OPTS@

darshan-runtime/share/ld-opts/darshan-mdhim-ld-opts

+--wrap=mdhimPut
+--wrap=mdhimGet

darshan-util/Makefile.in

@@ -13,10 +13,45 @@ libdir = $(DESTDIR)@libdir@
 pkgconfigdir = $(DESTDIR)$(libdir)/pkgconfig
 
 DARSHAN_LOG_FORMAT = $(srcdir)/../darshan-log-format.h
-DARSHAN_MOD_LOG_FORMATS = $(srcdir)/../darshan-posix-log-format.h $(srcdir)/../darshan-mpiio-log-format.h $(srcdir)/../darshan-hdf5-log-format.h $(srcdir)/../darshan-pnetcdf-log-format.h $(srcdir)/../darshan-bgq-log-format.h $(srcdir)/../darshan-lustre-log-format.h $(srcdir)/../darshan-stdio-log-format.h $(srcdir)/../darshan-dxt-log-format.h
-DARSHAN_MOD_LOGUTIL_HEADERS = darshan-posix-logutils.h darshan-mpiio-logutils.h darshan-hdf5-logutils.h darshan-pnetcdf-logutils.h darshan-bgq-logutils.h darshan-lustre-logutils.h darshan-stdio-logutils.h darshan-dxt-logutils.h
-DARSHAN_STATIC_MOD_OBJS = darshan-posix-logutils.o darshan-mpiio-logutils.o darshan-hdf5-logutils.o darshan-pnetcdf-logutils.o darshan-bgq-logutils.o darshan-lustre-logutils.o darshan-stdio-logutils.o darshan-dxt-logutils.o
-DARSHAN_DYNAMIC_MOD_OBJS = darshan-posix-logutils.po darshan-mpiio-logutils.po darshan-hdf5-logutils.po darshan-pnetcdf-logutils.po darshan-bgq-logutils.po darshan-lustre-logutils.po darshan-stdio-logutils.po darshan-dxt-logutils.po
+DARSHAN_MOD_LOG_FORMATS = $(srcdir)/../darshan-posix-log-format.h \
+			  $(srcdir)/../darshan-mpiio-log-format.h \
+			  $(srcdir)/../darshan-hdf5-log-format.h \
+			  $(srcdir)/../darshan-pnetcdf-log-format.h \
+			  $(srcdir)/../darshan-bgq-log-format.h \
+			  $(srcdir)/../darshan-lustre-log-format.h \
+			  $(srcdir)/../darshan-stdio-log-format.h \
+			  $(srcdir)/../darshan-dxt-log-format.h \
+			  $(srcdir)/../darshan-mdhim-log-format.h
+
+DARSHAN_MOD_LOGUTIL_HEADERS = darshan-posix-logutils.h \
+			      darshan-mpiio-logutils.h \
+			      darshan-hdf5-logutils.h \
+			      darshan-pnetcdf-logutils.h \
+			      darshan-bgq-logutils.h \
+			      darshan-lustre-logutils.h \
+			      darshan-stdio-logutils.h \
+			      darshan-dxt-logutils.h \
+			      darshan-mdhim-logutils.h
+
+DARSHAN_STATIC_MOD_OBJS = darshan-posix-logutils.o \
+			  darshan-mpiio-logutils.o \
+			  darshan-hdf5-logutils.o \
+			  darshan-pnetcdf-logutils.o \
+			  darshan-bgq-logutils.o \
+			  darshan-lustre-logutils.o \
+			  darshan-stdio-logutils.o \
+			  darshan-dxt-logutils.o \
+			  darshan-mdhim-logutils.o
+
+DARSHAN_DYNAMIC_MOD_OBJS = darshan-posix-logutils.po \
+			   darshan-mpiio-logutils.po \
+			   darshan-hdf5-logutils.po \
+			   darshan-pnetcdf-logutils.po \
+			   darshan-bgq-logutils.po \
+			   darshan-lustre-logutils.po \
+			   darshan-stdio-logutils.po \
+			   darshan-dxt-logutils.po \
+			   darshan-mdhim-logutils.po
 
 DARSHAN_ENABLE_SHARED=@DARSHAN_ENABLE_SHARED@
 
@@ -96,6 +131,12 @@ darshan-dxt-logutils.o: darshan-dxt-logutils.c darshan-logutils.h darshan-dxt-lo
 darshan-dxt-logutils.po: darshan-dxt-logutils.c darshan-logutils.h darshan-dxt-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-dxt-log-format.h | uthash-1.9.2
 	$(CC) $(CFLAGS_SHARED) -c  $< -o $@
 
+darshan-mdhim-logutils.o: darshan-mdhim-logutils.c darshan-logutils.h darshan-mdhim-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-mdhim-log-format.h | uthash-1.9.2
+	$(CC) $(CFLAGS) -c  $< -o $@
+darshan-mdhim-logutils.po: darshan-mdhim-logutils.c darshan-logutils.h darshan-mdhim-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-mdhim-log-format.h | uthash-1.9.2
+	$(CC) $(CFLAGS_SHARED) -c  $< -o $@
+
+
 libdarshan-util.a: darshan-logutils.o $(DARSHAN_STATIC_MOD_OBJS)
 	ar rcs libdarshan-util.a $^
 
@@ -159,6 +200,7 @@ endif
 	install -m 644 $(srcdir)/darshan-lustre-logutils.h $(includedir)
 	install -m 644 $(srcdir)/darshan-stdio-logutils.h $(includedir)
 	install -m 644 $(srcdir)/darshan-dxt-logutils.h $(includedir)
+	install -m 644 $(srcdir)/darshan-mdhim-logutils.h $(includedir)
 	install -m 644 $(srcdir)/../darshan-null-log-format.h $(includedir)
 	install -m 644 $(srcdir)/../darshan-posix-log-format.h $(includedir)
 	install -m 644 $(srcdir)/../darshan-mpiio-log-format.h $(includedir)
@@ -168,6 +210,7 @@ endif
 	install -m 644 $(srcdir)/../darshan-lustre-log-format.h $(includedir)
 	install -m 644 $(srcdir)/../darshan-stdio-log-format.h $(includedir)
 	install -m 644 $(srcdir)/../darshan-dxt-log-format.h $(includedir)
+	install -m 644 $(srcdir)/../darshan-mdhim-log-format.h $(includedir)
 	install -d $(includedir)/uthash-1.9.2
 	install -d $(includedir)/uthash-1.9.2/src
 	install -m 644 uthash-1.9.2/src/uthash.h $(includedir)/uthash-1.9.2/src/

darshan-util/darshan-logutils.h

@@ -137,6 +137,7 @@ extern struct darshan_mod_logutil_funcs *mod_logutils[];
 
 /* DXT */
 #include "darshan-dxt-logutils.h"
+#include "darshan-mdhim-logutils.h"
 
 darshan_fd darshan_log_open(const char *name);
 darshan_fd darshan_log_create(const char *name, enum darshan_comp_type comp_type,

darshan-util/darshan-mdhim-logutils.h

+/*
+ * Copyright (C) 2015 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
+#ifndef __DARSHAN_MDHIM_LOG_UTILS_H
+#define __DARSHAN_MDHIM_LOG_UTILS_H
+
+/* declare MDHIM module counter name strings and logutil definition as
+ * extern variables so they can be used in other utilities
+ */
+extern char *mdhim_counter_names[];
+extern char *mdhim_f_counter_names[];
+
+extern struct darshan_mod_logutil_funcs mdhim_logutils;
+
+#endif