More updates to facilitate runtime core shutdown

darshan-runtime/darshan-core.h

@@ -22,22 +22,21 @@
 #define DARSHAN_MOD_NAME_LEN 31
 
 /* flags to indicate properties of file records */
-#define CP_FLAG_CONDENSED 1<<0
 #define CP_FLAG_NOTIMING 1<<1
 
 struct darshan_core_module
 {
+    darshan_module_id id;
     char name[DARSHAN_MOD_NAME_LEN+1];
     struct darshan_module_funcs mod_funcs;
-    struct darshan_core_module *next;
 };
 
 /* in memory structure to keep up with job level data */
 struct darshan_core_job_runtime
 {
     struct darshan_job log_job;
+    struct darshan_core_module* mod_array[DARSHAN_MAX_MODS];
     char exe[CP_EXE_LEN+1];
-    struct darshan_core_module *mod_list_head;
     char comp_buf[CP_COMP_BUF_SIZE];
     int flags;
     double wtime_offset;

darshan-runtime/darshan.h

@@ -25,9 +25,25 @@
 /* Environment variable to override __CP_MEM_ALIGNMENT */
 #define CP_MEM_ALIGNMENT_OVERRIDE "DARSHAN_MEMALIGN"
 
-/* TODO these go where ? */
+/* TODO where do each of the following macros make most sense ? */
 #define DARSHAN_MPI_CALL(func) func
 
+/* max length of module name string (not counting \0) */
+#define DARSHAN_MOD_NAME_LEN 31
+
+/* unique identifiers to distinguish between available darshan modules */
+/* NOTES: - valid ids range from [0...DARSHAN_MAX_MODS-1]
+ *        - order of ids control module shutdown order (first module shuts down first)
+ */
+#define DARSHAN_MAX_MODS 16
+typedef enum
+{
+    DARSHAN_POSIX_MOD,
+    DARSHAN_MPIIO_MOD,
+    DARSHAN_HDF5_MOD,
+    DARSHAN_PNETCDF_MOD,
+} darshan_module_id;
+
 typedef uint64_t darshan_file_id;
 
 struct darshan_module_funcs
@@ -41,6 +57,7 @@ struct darshan_module_funcs
 *********************************************/
 
 void darshan_core_register_module(
+    darshan_module_id id,
     char *name,
     struct darshan_module_funcs *funcs,
     int *runtime_mem_limit);

darshan-runtime/lib/darshan-posix.c

@@ -362,6 +362,7 @@ static void posix_runtime_initialize()
 
     /* register the posix module with darshan core */
     darshan_core_register_module(
+        DARSHAN_POSIX_MOD,
         POSIX_MOD_NAME,
         &posix_mod_fns,
         &mem_limit);