First commit for modularing darshan runtime

New darshan-core source files which intercept MPI init/finalize,
initialize darshan job information, and first attempt at a POSIX
module.

darshan-runtime/Makefile.in

-all: lib/libdarshan-posix.a lib/libdarshan-mpi-io.a lib/libdarshan-stubs.a
+all: lib/libdarshan-core.a
+#all: lib/libdarshan-posix.a lib/libdarshan-mpi-io.a lib/libdarshan-stubs.a
 
 DESTDIR =
 srcdir = @srcdir@
@@ -18,14 +19,14 @@ DISABLE_LDPRELOAD = @DISABLE_LDPRELOAD@
 DARSHAN_LOG_FORMAT = $(srcdir)/../darshan-log-format.h
 DARSHAN_VERSION = @DARSHAN_VERSION@
 
-ifndef DISABLE_LDPRELOAD
-all: lib/libdarshan.so 
-endif
+#ifndef DISABLE_LDPRELOAD
+#all: lib/libdarshan.so 
+#endif
 
 VPATH = $(srcdir)
 
 CFLAGS = -DDARSHAN_CONFIG_H=\"darshan-runtime-config.h\" -I . -I ../ -I $(srcdir) -I$(srcdir)/../ @CFLAGS@ @CPPFLAGS@ -D_LARGEFILE64_SOURCE 
-
+#
 CFLAGS_SHARED = -DDARSHAN_CONFIG_H=\"darshan-runtime-config.h\" -I . -I$(srcdir) -I$(srcdir)/../ @CFLAGS@ @CPPFLAGS@ -D_LARGEFILE64_SOURCE -shared -fpic -DPIC -DDARSHAN_PRELOAD
 
 LIBS = -lz @LIBBZ2@
@@ -33,89 +34,96 @@ LIBS = -lz @LIBBZ2@
 lib::
 	@mkdir -p $@
 
-lib/darshan-mpi-io.o: lib/darshan-mpi-io.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
+lib/darshan-core.o: lib/darshan-core.c darshan-core.h $(DARSHAN_LOG_FORMAT) | lib
 	$(CC) $(CFLAGS) -c $< -o $@
 
-lib/darshan-mpi-io.po: lib/darshan-mpi-io.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
-	$(CC) $(CFLAGS_SHARED) -c $< -o $@
+#lib/darshan-mpi-io.o: lib/darshan-mpi-io.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
+#	$(CC) $(CFLAGS) -c $< -o $@
 
-lib/darshan-mpi-init-finalize.o: lib/darshan-mpi-init-finalize.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
-	$(CC) $(CFLAGS) -c $< -o $@
+#lib/darshan-mpi-io.po: lib/darshan-mpi-io.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
+#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
-lib/darshan-mpi-init-finalize.po: lib/darshan-mpi-init-finalize.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
-	$(CC) $(CFLAGS_SHARED) -c $< -o $@
+#lib/darshan-mpi-init-finalize.o: lib/darshan-mpi-init-finalize.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
+#	$(CC) $(CFLAGS) -c $< -o $@
 
-lib/darshan-pnetcdf-stubs.o: lib/darshan-pnetcdf-stubs.c darshan.h $(DARSHAN_LOG_FORMAT) | lib 
-	$(CC) $(CFLAGS) -c $< -o $@
+#lib/darshan-mpi-init-finalize.po: lib/darshan-mpi-init-finalize.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
+#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
-lib/darshan-pnetcdf.o: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib 
-	$(CC) $(CFLAGS) -c $< -o $@
+#lib/darshan-pnetcdf-stubs.o: lib/darshan-pnetcdf-stubs.c darshan.h $(DARSHAN_LOG_FORMAT) | lib 
+#	$(CC) $(CFLAGS) -c $< -o $@
 
-lib/darshan-pnetcdf.po: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib 
-	$(CC) $(CFLAGS_SHARED) -c $< -o $@
+#lib/darshan-pnetcdf.o: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib 
+#	$(CC) $(CFLAGS) -c $< -o $@
 
-lib/darshan-hdf5.o: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
-	$(CC) $(CFLAGS) -c $< -o $@
+#lib/darshan-pnetcdf.po: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib 
+#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
-lib/darshan-hdf5-stubs.o: lib/darshan-hdf5-stubs.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
-	$(CC) $(CFLAGS) -c $< -o $@
+#lib/darshan-hdf5.o: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
+#	$(CC) $(CFLAGS) -c $< -o $@
+
+#lib/darshan-hdf5-stubs.o: lib/darshan-hdf5-stubs.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
+#	$(CC) $(CFLAGS) -c $< -o $@
 
-lib/darshan-hdf5.po: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
-	$(CC) $(CFLAGS_SHARED) -c $< -o $@
+#lib/darshan-hdf5.po: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
+#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
 lib/darshan-posix.o: lib/darshan-posix.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
 	$(CC) $(CFLAGS) -c $< -o $@
 
-lib/darshan-posix.po: lib/darshan-posix.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
-	$(CC) $(CFLAGS_SHARED) -c $< -o $@
+#lib/darshan-posix.po: lib/darshan-posix.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
+#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
 lib/lookup3.o: lib/lookup3.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-lib/lookup3.po: lib/lookup3.c
-	$(CC) $(CFLAGS_SHARED) -c $< -o $@
+#lib/lookup3.po: lib/lookup3.c
+#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
 lib/lookup8.o: lib/lookup8.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-lib/lookup8.po: lib/lookup8.c
-	$(CC) $(CFLAGS_SHARED) -c $< -o $@
+#lib/lookup8.po: lib/lookup8.c
+#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
-%.i: %.c
-	$(CC) -E $(CFLAGS) -c $< -o $@
+#%.i: %.c
+#	$(CC) -E $(CFLAGS) -c $< -o $@
 
-lib/libdarshan-mpi-io.a: lib/darshan-mpi-io.o lib/darshan-mpi-init-finalize.o lib/darshan-pnetcdf.o lib/darshan-hdf5.o
+lib/libdarshan-core.a: lib/darshan-core.o lib/lookup3.o lib/lookup8.o lib/darshan-posix.o
 	ar rcs $@ $^
 
-lib/libdarshan-stubs.a: lib/darshan-pnetcdf-stubs.o lib/darshan-hdf5-stubs.o
-	ar rcs $@ $^
+#lib/libdarshan-mpi-io.a: lib/darshan-mpi-io.o lib/darshan-mpi-init-finalize.o lib/darshan-pnetcdf.o lib/darshan-hdf5.o
+#	ar rcs $@ $^
 
-lib/libdarshan-posix.a: lib/darshan-posix.o lib/lookup3.o lib/lookup8.o 
-	ar rcs $@ $^
+#lib/libdarshan-stubs.a: lib/darshan-pnetcdf-stubs.o lib/darshan-hdf5-stubs.o
+#	ar rcs $@ $^
+
+#lib/libdarshan-posix.a: lib/darshan-posix.o lib/lookup3.o lib/lookup8.o 
+#	ar rcs $@ $^
 
-lib/libdarshan.so: lib/darshan-mpi-io.po lib/darshan-mpi-init-finalize.po lib/darshan-pnetcdf.po lib/darshan-hdf5.po lib/darshan-posix.po lib/lookup3.po lib/lookup8.po
-	$(CC) $(CFLAGS_SHARED) $(LDFLAGS) -o $@ $^ -lpthread -lrt -lz -ldl
+#lib/libdarshan.so: lib/darshan-mpi-io.po lib/darshan-mpi-init-finalize.po lib/darshan-pnetcdf.po lib/darshan-hdf5.po lib/darshan-posix.po lib/lookup3.po lib/lookup8.po
+#	$(CC) $(CFLAGS_SHARED) $(LDFLAGS) -o $@ $^ -lpthread -lrt -lz -ldl
 
 install:: all
 	install -d $(libdir)
-	install -m 755 lib/libdarshan-posix.a $(libdir)
-	install -m 755 lib/libdarshan-mpi-io.a $(libdir)
-	install -m 755 lib/libdarshan-stubs.a $(libdir)
-ifndef DISABLE_LDPRELOAD
-	install -m 755 lib/libdarshan.so $(libdir)
-endif
+	install -m 755 lib/libdarshan-core.a $(libdir)
+#	install -m 755 lib/libdarshan-posix.a $(libdir)
+#	install -m 755 lib/libdarshan-mpi-io.a $(libdir)
+#	install -m 755 lib/libdarshan-stubs.a $(libdir)
+#ifndef DISABLE_LDPRELOAD
+#	install -m 755 lib/libdarshan.so $(libdir)
+#endif
 	install -d $(bindir)
-	install -m 755 darshan-mk-log-dirs.pl $(bindir)
+#	install -m 755 darshan-mk-log-dirs.pl $(bindir)
 	install -m 755 darshan-gen-cc.pl $(bindir)
-	install -m 755 darshan-gen-cxx.pl $(bindir)
-	install -m 755 darshan-gen-fortran.pl $(bindir)
-	install -m 755 darshan-config $(bindir)
-	install -d $(datarootdir)/craype-1.x/modulefiles/darshan
-	install -m 755 share/craype-1.x/darshan-module $(datarootdir)/craype-1.x/modulefiles/darshan/$(DARSHAN_VERSION)
-	install -d $(datarootdir)/craype-2.x/modulefiles/darshan
-	install -m 755 share/craype-2.x/darshan-module $(datarootdir)/craype-2.x/modulefiles/darshan/$(DARSHAN_VERSION)
-	install -d $(libdir)/pkgconfig
-	install -m 644 lib/pkgconfig/darshan-runtime.pc $(libdir)/pkgconfig/darshan-runtime.pc
+#	install -m 755 darshan-gen-cxx.pl $(bindir)
+#	install -m 755 darshan-gen-fortran.pl $(bindir)
+#	install -m 755 darshan-config $(bindir)
+#	install -d $(datarootdir)/craype-1.x/modulefiles/darshan
+#	install -m 755 share/craype-1.x/darshan-module $(datarootdir)/craype-1.x/modulefiles/darshan/$(DARSHAN_VERSION)
+#	install -d $(datarootdir)/craype-2.x/modulefiles/darshan
+#	install -m 755 share/craype-2.x/darshan-module $(datarootdir)/craype-2.x/modulefiles/darshan/$(DARSHAN_VERSION)
+#	install -d $(libdir)/pkgconfig
+#	install -m 644 lib/pkgconfig/darshan-runtime.pc $(libdir)/pkgconfig/darshan-runtime.pc
 
 clean::
 	rm -f *.o *.a lib/*.o lib/*.po lib/*.a lib/*.so 

darshan-runtime/darshan-config.in

@@ -10,9 +10,10 @@ DARSHAN_LD_FLAGS="@LDFLAGS@"
 #   final one is necessary to give the linker a change to resolve indirect
 #   dependencies on PnetCDF and HDF5 symbols (if the app used a library which 
 #   in turn used one of those HLLs).
-PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan-mpi-io -lz $CP_WRAPPERS"
-POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan-posix -ldarshan-mpi-io -lz -lrt -lpthread"
-
+PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan-core -lz $CP_WRAPPERS"
+POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan-core -lz -lrt -lpthread"
+#PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan-mpi-io -lz $CP_WRAPPERS"
+#POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan-posix -ldarshan-mpi-io -lz -lrt -lpthread"
 
 usage="\
 Usage: darshan-config [--pre-ld-flags] [--post-ld-flags]"

darshan-runtime/darshan-core.h

+/*
+ *  (C) 2014 by Argonne National Laboratory.
+ *      See COPYRIGHT in top-level directory.
+ */
+
+#ifndef __DARSHAN_CORE_H
+#define __DARSHAN_CORE_H
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <stdint.h>
+
+#define DARSHAN_MPI_CALL(func) func
+
+typedef uint64_t darshan_file_id;
+
+struct darshan_module_funcs
+{
+    void (*prepare_for_shutdown)(void);
+    void (*get_output_data)(void **, int);
+};
+
+struct darshan_module
+{
+    char *name;
+    struct darshan_module_funcs mod_funcs;
+};
+
+void darshan_core_register_module(
+    char *name,
+    struct darshan_module_funcs *funcs,
+    int *runtime_mem_limit);
+
+void darshan_core_lookup_id(
+    void *name,
+    int len,
+    int printable_flag,
+    darshan_file_id *id);
+
+#endif /* __DARSHAN_CORE_H */

darshan-runtime/darshan.h

@@ -225,16 +225,11 @@ enum cp_counter_type
  * http://publib.boulder.ibm.com/infocenter/compbgpl/v9v111/index.jsp?topic=/com.ibm.bg9111.doc/bgusing/data_alignment.htm
  */
 
-extern struct darshan_job_runtime* darshan_global_job;
-
-void darshan_initialize(int argc, char** argv, int nprocs, int rank);
 void darshan_finalize(struct darshan_job_runtime* job);
 void darshan_condense(void);
-void darshan_shutdown(int timing_flag);
 void darshan_walk_file_accesses(struct darshan_job_runtime* final_job);
 double darshan_wtime(void);
 void darshan_mnt_id_from_path(const char* path, int64_t* device_id, int64_t* block_size);
-char* darshan_get_exe_and_mounts(struct darshan_job_runtime* final_job);
 void darshan_mpi_initialize(int *argc, char ***argv);
 
 uint32_t darshan_hashlittle(const void *key, size_t length, uint32_t initval);