update log put functions for new log format

darshan-log-format.h

@@ -31,21 +31,30 @@
 /* max length of exe string within job record (not counting '\0') */
 #define DARSHAN_EXE_LEN (DARSHAN_JOB_RECORD_SIZE - sizeof(struct darshan_job) - 1)
 
-typedef uint64_t darshan_record_id;
-
 #define DARSHAN_MAX_MODS 16
+
+/* TODO: do we want the logutil defs here ? */
+/* X-macro for keeping module ordering consistent */
+/* NOTE: first val used to define module enum values, 
+ * second val used to define module name strings, and
+ * third val is used to provide the name of a 
+ * corresponding logutils structure for parsing module
+ * data out of the log file (only used in darshan-util,
+ * just pass NULL (no quotes) if no log parsing
+ * functions are required).
+ */
 #define DARSHAN_MODULE_IDS \
-    X(DARSHAN_NULL_MOD,     "NULL") \
-    X(DARSHAN_POSIX_MOD,    "POSIX") \
-    X(DARSHAN_MPIIO_MOD,    "MPI-IO") \
-    X(DARSHAN_HDF5_MOD,     "HDF5") \
-    X(DARSHAN_PNETCDF_MOD,  "PNETCDF")
+    X(DARSHAN_NULL_MOD, "NULL", NULL) \
+    X(DARSHAN_POSIX_MOD, "POSIX", posix_logutils) \
+    X(DARSHAN_MPIIO_MOD, "MPI-IO", mpiio_logutils) \
+    X(DARSHAN_HDF5_MOD, "HDF5", hdf5_logutils) \
+    X(DARSHAN_PNETCDF_MOD, "PNETCDF", pnetcdf_logutils)
 
 /* 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 (and consequently, order in log file)
  */
-#define X(a, b) a,
+#define X(a, b, c) a,
 typedef enum
 {
     DARSHAN_MODULE_IDS
@@ -53,7 +62,7 @@ typedef enum
 #undef X
 
 /* module name strings */
-#define X(a, b) b,
+#define X(a, b, c) b,
 static char * const darshan_module_names[] =
 {
     DARSHAN_MODULE_IDS
@@ -67,6 +76,8 @@ enum darshan_comp_type
     DARSHAN_BZIP2_COMP,
 };
 
+typedef uint64_t darshan_record_id;
+
 /* the darshan_log_map structure is used to indicate the location of
  * specific module data in a Darshan log. Note that 'off' and 'len' are
  * the respective offset and length of the data in the file, in *uncompressed*

darshan-util/darshan-logutils.h

@@ -68,7 +68,7 @@ extern struct darshan_mod_logutil_funcs *mod_logutils[DARSHAN_MAX_MODS];
 
 darshan_fd darshan_log_open(const char *name, const char* mode);
 int darshan_log_getheader(darshan_fd fd, struct darshan_header *header);
-int darshan_log_putheader(darshan_fd fd, struct darshan_header *header);
+int darshan_log_putheader(darshan_fd fd);
 int darshan_log_getjob(darshan_fd fd, struct darshan_job *job);
 int darshan_log_putjob(darshan_fd fd, struct darshan_job *job);
 int darshan_log_getexe(darshan_fd fd, char *buf);