Instrument offsets in DXT_MPIIO module

darshan-dxt-log-format.h

@@ -8,7 +8,7 @@
 
 /* current DXT log format version */
 #define DXT_POSIX_VER 1
-#define DXT_MPIIO_VER 1
+#define DXT_MPIIO_VER 2
 
 #define HOSTNAME_SIZE 64
 

darshan-runtime/configure

@@ -4675,10 +4675,10 @@ int
 main ()
 {
 
-    MPI_Comm comm;
-    char* filename;
-    int amode;
-    MPI_Info info;
+    MPI_Comm comm=0;
+    char* filename=0;
+    int amode=0;
+    MPI_Info info=0;
     MPI_File fh;
             MPI_File_open(comm, filename, amode, info, &fh);
   ;

darshan-runtime/configure.in

@@ -392,10 +392,10 @@ AS_IF([test "x$ENABLE_MPI" = "x1"], [
 # 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>], [
-    MPI_Comm comm;
-    char* filename;
-    int amode;
-    MPI_Info info;
+    MPI_Comm comm=0;
+    char* filename=0;
+    int amode=0;
+    MPI_Info info=0;
     MPI_File fh;
             MPI_File_open(comm, filename, amode, info, &fh);],
     AC_MSG_RESULT(yes),

darshan-runtime/darshan-common.h

@@ -82,7 +82,7 @@
  * added to the common access counter, rather than just incrementing it.
  */
 #define DARSHAN_COMMON_VAL_COUNTER_INC(__val_p, __cnt_p, __value, __count, __add_flag) do {\
-    int i; \
+    int i_; \
     int inc_count, total_count; \
     int64_t tmp_val[4] = {0}; \
     int64_t tmp_cnt[4] = {0}; \
@@ -92,21 +92,21 @@
         inc_count = 1; \
     else \
         inc_count = __count; \
-    for(i=0; i<4; i++) { \
-        if(*(__val_p + i) == __value) { \
-            total_count = *(__cnt_p + i) + inc_count; \
+    for(i_=0; i_<4; i_++) { \
+        if(*(__val_p + i_) == __value) { \
+            total_count = *(__cnt_p + i_) + inc_count; \
             break; \
         } \
     } \
-    if(i == 4) total_count = __count; \
+    if(i_ == 4) total_count = __count; \
     /* first, copy over any counters that should be sorted above this one \
      * (counters with higher counts or equal counts and larger values) \
      */ \
-    for(i=0;i < 4; i++) { \
-        if((*(__cnt_p + i) > total_count) || \
-           ((*(__cnt_p + i) == total_count) && (*(__val_p + i) > __value))) { \
-            tmp_val[tmp_ndx] = *(__val_p + i); \
-            tmp_cnt[tmp_ndx] = *(__cnt_p + i); \
+    for(i_=0;i_ < 4; i_++) { \
+        if((*(__cnt_p + i_) > total_count) || \
+           ((*(__cnt_p + i_) == total_count) && (*(__val_p + i_) > __value))) { \
+            tmp_val[tmp_ndx] = *(__val_p + i_); \
+            tmp_cnt[tmp_ndx] = *(__cnt_p + i_); \
             tmp_ndx++; \
         } \
         else break; \
@@ -118,12 +118,12 @@
     tmp_ndx++; \
     /* last, copy over any remaining counters to make sure we have 4 sets total */ \
     while(tmp_ndx != 4) { \
-        if(*(__val_p + i) != __value) { \
-            tmp_val[tmp_ndx] = *(__val_p + i); \
-            tmp_cnt[tmp_ndx] = *(__cnt_p + i); \
+        if(*(__val_p + i_) != __value) { \
+            tmp_val[tmp_ndx] = *(__val_p + i_); \
+            tmp_cnt[tmp_ndx] = *(__cnt_p + i_); \
             tmp_ndx++; \
         } \
-        i++; \
+        i_++; \
     } \
     memcpy(__val_p, tmp_val, 4*sizeof(int64_t)); \
     memcpy(__cnt_p, tmp_cnt, 4*sizeof(int64_t)); \

darshan-runtime/darshan-dxt.h

@@ -45,10 +45,10 @@ void dxt_posix_read(darshan_record_id rec_id, int64_t offset,
  * with 'length' size. 'start_time' and 'end_time' are starting and ending
  * timestamps for the operation, respectively.
  */
-void dxt_mpiio_write(darshan_record_id rec_id, int64_t length,
-        double start_time, double end_time);
-void dxt_mpiio_read(darshan_record_id rec_id, int64_t length,
-        double start_time, double end_time);
+void dxt_mpiio_write(darshan_record_id rec_id, int64_t offset,
+        int64_t length, double start_time, double end_time);
+void dxt_mpiio_read(darshan_record_id rec_id, int64_t offset,
+        int64_t length, double start_time, double end_time);
 
 void dxt_posix_filter_dynamic_traces(
     struct darshan_posix_file *(*rec_id_to_psx_file)(darshan_record_id));

darshan-runtime/lib/darshan-dxt.c

@@ -517,8 +517,8 @@ void dxt_posix_read(darshan_record_id rec_id, int64_t offset,
     DXT_UNLOCK();
 }
 
-void dxt_mpiio_write(darshan_record_id rec_id, int64_t length,
-        double start_time, double end_time)
+void dxt_mpiio_write(darshan_record_id rec_id, int64_t offset,
+        int64_t length, double start_time, double end_time)
 {
     struct dxt_file_record_ref* rec_ref = NULL;
     struct dxt_file_record *file_rec;
@@ -566,6 +566,7 @@ void dxt_mpiio_write(darshan_record_id rec_id, int64_t length,
     }
 
     rec_ref->write_traces[file_rec->write_count].length = length;
+    rec_ref->write_traces[file_rec->write_count].offset = offset;
     rec_ref->write_traces[file_rec->write_count].start_time = start_time;
     rec_ref->write_traces[file_rec->write_count].end_time = end_time;
     file_rec->write_count += 1;
@@ -573,8 +574,8 @@ void dxt_mpiio_write(darshan_record_id rec_id, int64_t length,
     DXT_UNLOCK();
 }
 
-void dxt_mpiio_read(darshan_record_id rec_id, int64_t length,
-        double start_time, double end_time)
+void dxt_mpiio_read(darshan_record_id rec_id, int64_t offset,
+        int64_t length, double start_time, double end_time)
 {
     struct dxt_file_record_ref* rec_ref = NULL;
     struct dxt_file_record *file_rec;
@@ -622,6 +623,7 @@ void dxt_mpiio_read(darshan_record_id rec_id, int64_t length,
     }
 
     rec_ref->read_traces[file_rec->read_count].length = length;
+    rec_ref->read_traces[file_rec->read_count].offset = offset;
     rec_ref->read_traces[file_rec->read_count].start_time = start_time;
     rec_ref->read_traces[file_rec->read_count].end_time = end_time;
     file_rec->read_count += 1;

darshan-util/darshan-dxt-logutils.c

@@ -150,6 +150,7 @@ static int dxt_log_get_mpiio_file(darshan_fd fd, void** dxt_mpiio_buf_p)
 {
     struct dxt_file_record *rec = *((struct dxt_file_record **)dxt_mpiio_buf_p);
     struct dxt_file_record tmp_rec;
+    int i;
     int ret;
     int64_t io_trace_size;
 
@@ -196,6 +197,15 @@ static int dxt_log_get_mpiio_file(darshan_fd fd, void** dxt_mpiio_buf_p)
                 /* byte swap trace data if necessary */
                 dxt_swap_segments(rec);
             }
+
+            if(fd->mod_ver[DXT_MPIIO_MOD] == 1)
+            {
+                /* make sure to indicate offsets are invalid in version 1 */
+                for(i = 0; i < (tmp_rec.write_count + tmp_rec.read_count); i++)
+                {
+                    ((segment_info *)tmp_p)[i].offset = -1;
+                }
+            }
         }
     }
     else
@@ -383,6 +393,7 @@ void dxt_log_print_mpiio_file(void *mpiio_file_rec, char *file_name,
                 (struct dxt_file_record *)mpiio_file_rec;
 
     int64_t length;
+    int64_t offset;
     double start_time;
     double end_time;
     int i;
@@ -405,23 +416,25 @@ void dxt_log_print_mpiio_file(void *mpiio_file_rec, char *file_name,
     printf("# DXT, mnt_pt: %s, fs_type: %s\n", mnt_pt, fs_type);
 
     /* Print header */
-    printf("# Module    Rank  Wt/Rd  Segment       Length    Start(s)      End(s)\n");
+    printf("# Module    Rank  Wt/Rd  Segment          Offset       Length    Start(s)      End(s)\n");
 
     /* Print IO Traces information */
     for (i = 0; i < write_count; i++) {
+        offset = io_trace[i].offset;
         length = io_trace[i].length;
         start_time = io_trace[i].start_time;
         end_time = io_trace[i].end_time;
 
-        printf("%8s%8" PRId64 "%7s%9d%16" PRId64 "%12.4f%12.4f\n", "X_MPIIO", rank, "write", i, length, start_time, end_time);
+        printf("%8s%8" PRId64 "%7s%9d%16" PRId64 "%16" PRId64 "%12.4f%12.4f\n", "X_MPIIO", rank, "write", i, offset, length, start_time, end_time);
     }
 
     for (i = write_count; i < write_count + read_count; i++) {
+        offset = io_trace[i].offset;
         length = io_trace[i].length;
         start_time = io_trace[i].start_time;
         end_time = io_trace[i].end_time;
 
-        printf("%8s%8" PRId64 "%7s%9d%16" PRId64 "%12.4f%12.4f\n", "X_MPIIO", rank, "read", (int)(i - write_count), length, start_time, end_time);
+        printf("%8s%8" PRId64 "%7s%9d%16" PRId64 "%16" PRId64 "%12.4f%12.4f\n", "X_MPIIO", rank, "read", (int)(i - write_count), offset, length, start_time, end_time);
     }
 
     return;