possible bug fix to io start timestamps

- read and write start timestamps should record start timestamp of first read/write to *begin*, not start timestamp of first read/write to complete - mirrors earlier fix to open timestamps

possible bug fix to io start timestamps
- read and write start timestamps should record start timestamp of first read/write to *begin*, not start timestamp of first read/write to complete - mirrors earlier fix to open timestamps
2faf2460 · Philip Carns · f88ebef6 · 2faf2460 · 2faf2460
Commit 2faf2460 authored May 01, 2016 by Philip Carns
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

darshan-runtime/lib/darshan-mpiio.c darshan-runtime/lib/darshan-mpiio.c +4 -2

darshan-runtime/lib/darshan-posix.c darshan-runtime/lib/darshan-posix.c +4 -2

No files found.
--- a/darshan-runtime/lib/darshan-mpiio.c
+++ b/darshan-runtime/lib/darshan-mpiio.c
@@ -173,7 +173,8 @@ static void mpiio_shutdown(void);
    if(file->last_io_type == DARSHAN_IO_WRITE) \
        file->file_record->counters[MPIIO_RW_SWITCHES] += 1; \
    file->last_io_type = DARSHAN_IO_READ; \
-    if(file->file_record->fcounters[MPIIO_F_READ_START_TIMESTAMP] == 0) \
+    if(file->file_record->fcounters[MPIIO_F_READ_START_TIMESTAMP] == 0 || \
+     file->file_record->fcounters[MPIIO_F_READ_START_TIMESTAMP] > __tm1) \
        file->file_record->fcounters[MPIIO_F_READ_START_TIMESTAMP] = __tm1; \
    file->file_record->fcounters[MPIIO_F_READ_END_TIMESTAMP] = __tm2; \
    if(file->file_record->fcounters[MPIIO_F_MAX_READ_TIME] < __elapsed) { \
@@ -198,7 +199,8 @@ static void mpiio_shutdown(void);
    if(file->last_io_type == DARSHAN_IO_READ) \
        file->file_record->counters[MPIIO_RW_SWITCHES] += 1; \
    file->last_io_type = DARSHAN_IO_WRITE; \
-    if(file->file_record->fcounters[MPIIO_F_WRITE_START_TIMESTAMP] == 0) \
+    if(file->file_record->fcounters[MPIIO_F_READ_START_TIMESTAMP] == 0 || \
+     file->file_record->fcounters[MPIIO_F_READ_START_TIMESTAMP] > __tm1) \
        file->file_record->fcounters[MPIIO_F_WRITE_START_TIMESTAMP] = __tm1; \
    file->file_record->fcounters[MPIIO_F_WRITE_END_TIMESTAMP] = __tm2; \
    if(file->file_record->fcounters[MPIIO_F_MAX_WRITE_TIME] < __elapsed) { \

--- a/darshan-runtime/lib/darshan-posix.c
+++ b/darshan-runtime/lib/darshan-posix.c
@@ -274,7 +274,8 @@ static void posix_shutdown(void);
    if(file->last_io_type == DARSHAN_IO_WRITE) \
        file->file_record->counters[POSIX_RW_SWITCHES] += 1; \
    file->last_io_type = DARSHAN_IO_READ; \
-    if(file->file_record->fcounters[POSIX_F_READ_START_TIMESTAMP] == 0) \
+    if(file->file_record->fcounters[POSIX_F_READ_START_TIMESTAMP] == 0 || \
+     file->file_record->fcounters[POSIX_F_READ_START_TIMESTAMP] > __tm1) \
        file->file_record->fcounters[POSIX_F_READ_START_TIMESTAMP] = __tm1; \
    file->file_record->fcounters[POSIX_F_READ_END_TIMESTAMP] = __tm2; \
    if(file->file_record->fcounters[POSIX_F_MAX_READ_TIME] < __elapsed) { \
@@ -325,7 +326,8 @@ static void posix_shutdown(void);
    if(file->last_io_type == DARSHAN_IO_READ) \
        file->file_record->counters[POSIX_RW_SWITCHES] += 1; \
    file->last_io_type = DARSHAN_IO_WRITE; \
-    if(file->file_record->fcounters[POSIX_F_WRITE_START_TIMESTAMP] == 0) \
+    if(file->file_record->fcounters[POSIX_F_WRITE_START_TIMESTAMP] == 0 || \
+     file->file_record->fcounters[POSIX_F_WRITE_START_TIMESTAMP] > __tm1) \
        file->file_record->fcounters[POSIX_F_WRITE_START_TIMESTAMP] = __tm1; \
    file->file_record->fcounters[POSIX_F_WRITE_END_TIMESTAMP] = __tm2; \
    if(file->file_record->fcounters[POSIX_F_MAX_WRITE_TIME] < __elapsed) { \