[Darshan-commits] [Darshan] branch, dev-modular, updated. darshan-2.3.1-88-g58ae2da

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".

The branch, dev-modular has been updated
       via  58ae2da29e36978ead086d05597df9c7dfbee614 (commit)
      from  5c5918aa36ddb95896ed547b726ed1432e5ca794 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 58ae2da29e36978ead086d05597df9c7dfbee614
Author: Phil Carns <carns at mcs.anl.gov>
Date:   Mon Apr 6 15:59:27 2015 -0400

    record open counters in mpiio module

-----------------------------------------------------------------------

Summary of changes:
 darshan-mpiio-log-format.h          |   10 ++++++++++
 darshan-runtime/lib/darshan-mpiio.c |   20 +++++++-------------
 2 files changed, 17 insertions(+), 13 deletions(-)


Diff of changes:
diff --git a/darshan-mpiio-log-format.h b/darshan-mpiio-log-format.h
index 5cf0c66..48a10f0 100644
--- a/darshan-mpiio-log-format.h
+++ b/darshan-mpiio-log-format.h
@@ -12,15 +12,25 @@ enum darshan_mpiio_indices
 {
     DARSHAN_MPIIO_INDEP_OPENS,   /* independent opens */
     DARSHAN_MPIIO_COLL_OPENS,    /* collective opens */
+    DARSHAN_MPIIO_HINTS,    /* how many times hints were used */
 
     DARSHAN_MPIIO_NUM_INDICES,
 };
 
+enum darshan_mpiio_f_indices
+{
+    DARSHAN_MPIIO_F_META_TIME,      /* cumulative metadata time */
+    DARSHAN_MPIIO_F_OPEN_TIMESTAMP, /* first open timestamp */
+
+    DARSHAN_MPIIO_F_NUM_INDICES,
+};
+
 struct darshan_mpiio_file
 {
     darshan_record_id f_id;
     int64_t rank;
     int64_t counters[DARSHAN_MPIIO_NUM_INDICES];
+    double fcounters[DARSHAN_MPIIO_F_NUM_INDICES];
 };
 
 #endif /* __DARSHAN_MPIIO_LOG_FORMAT_H */
diff --git a/darshan-runtime/lib/darshan-mpiio.c b/darshan-runtime/lib/darshan-mpiio.c
index e467697..ff67ee5 100644
--- a/darshan-runtime/lib/darshan-mpiio.c
+++ b/darshan-runtime/lib/darshan-mpiio.c
@@ -55,6 +55,7 @@
 struct mpiio_file_runtime
 {
     struct darshan_mpiio_file* file_record;
+    double last_mpi_meta_end; /* end time of last MPI meta op (so far) */
     /* TODO: any stateful (but not intended for persistent storage in the log)
      * information about MPI-IO access.  If we don't have any then this struct
      * could be eliminated.
@@ -153,33 +154,26 @@ int MPI_File_open(MPI_Comm comm, char *filename, int amode, MPI_Info info, MPI_F
         }
 
         file = mpiio_file_by_name_setfh(filename, fh);
-        //printf("Hello world: got file ref %p\n", file);
-        /* TODO: record statistics */
-
-#if 0
-        file = darshan_file_by_name_setfh(filename, (*fh));
         if(file)
         {
-            CP_SET(file, CP_MODE, amode);
-            CP_F_INC_NO_OVERLAP(file, tm1, tm2, file->last_mpi_meta_end, CP_F_MPI_META_TIME);
-            if(CP_F_VALUE(file, CP_F_OPEN_TIMESTAMP) == 0)
-                CP_F_SET(file, CP_F_OPEN_TIMESTAMP,
+            DARSHAN_COUNTER_F_INC_NO_OVERLAP(file->file_record, tm1, tm2, file->last_mpi_meta_end, DARSHAN_MPIIO_F_META_TIME);
+            if(DARSHAN_COUNTER_F_VALUE(file->file_record, DARSHAN_MPIIO_F_OPEN_TIMESTAMP) == 0)
+                DARSHAN_COUNTER_F_SET(file->file_record, DARSHAN_MPIIO_F_OPEN_TIMESTAMP,
                 tm1);
             DARSHAN_MPI_CALL(PMPI_Comm_size)(comm, &comm_size);
             if(comm_size == 1)
             {
-                CP_INC(file, CP_INDEP_OPENS, 1);
+                DARSHAN_COUNTER_INC(file->file_record, DARSHAN_MPIIO_INDEP_OPENS, 1);
             }
             else
             {
-                CP_INC(file, CP_COLL_OPENS, 1);
+                DARSHAN_COUNTER_INC(file->file_record, DARSHAN_MPIIO_COLL_OPENS, 1);
             }
             if(info != MPI_INFO_NULL)
             {
-                CP_INC(file, CP_HINTS, 1);
+                DARSHAN_COUNTER_INC(file->file_record, DARSHAN_MPIIO_HINTS, 1);
             }
         }
-#endif
 
         MPIIO_UNLOCK();
     }


hooks/post-receive
--