[Darshan-commits] [Darshan] branch, master, updated. darshan-2.3.1-3-g341bf09

[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, master has been updated
       via  341bf09f292b2c02feb5a7b290b0f5a54fcf6ad4 (commit)
       via  1d20246489ae357833ee195d7607ca2e1af347fc (commit)
      from  7272638723031ecbdaa9d898e499647293c11b4b (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 341bf09f292b2c02feb5a7b290b0f5a54fcf6ad4
Author: Shane Snyder <ssnyder at mcs.anl.gov>
Date:   Tue Jun 30 22:36:16 2015 -0500

    bug fix for aio_return wrapper

commit 1d20246489ae357833ee195d7607ca2e1af347fc
Author: Shane Snyder <ssnyder at mcs.anl.gov>
Date:   Tue Jun 30 22:31:31 2015 -0500

    fix map_or_fail typo in lio_listio wrapper

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

Summary of changes:
 darshan-runtime/lib/darshan-posix.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)


Diff of changes:
diff --git a/darshan-runtime/lib/darshan-posix.c b/darshan-runtime/lib/darshan-posix.c
index 1556cc4..6cdc724 100644
--- a/darshan-runtime/lib/darshan-posix.c
+++ b/darshan-runtime/lib/darshan-posix.c
@@ -1172,8 +1172,16 @@ ssize_t DARSHAN_DECL(aio_return)(struct aiocb *aiocbp)
         if((unsigned long)aiocbp->aio_buf % darshan_mem_alignment == 0)
             aligned_flag = 1;
         CP_LOCK();
-        CP_RECORD_WRITE(ret, aiocbp->aio_fildes, aiocbp->aio_nbytes,
-            1, aiocbp->aio_offset, aligned_flag, 0, tmp->tm1, tm2);
+        if(aiocbp->aio_lio_opcode == LIO_WRITE)
+        {
+            CP_RECORD_WRITE(ret, aiocbp->aio_fildes, aiocbp->aio_nbytes,
+                1, aiocbp->aio_offset, aligned_flag, 0, tmp->tm1, tm2);
+        }
+        if(aiocbp->aio_lio_opcode == LIO_READ)
+        {
+            CP_RECORD_READ(ret, aiocbp->aio_fildes, aiocbp->aio_nbytes,
+                1, aiocbp->aio_offset, aligned_flag, 0, tmp->tm1, tm2);
+        }
         CP_UNLOCK();
         free(tmp);
     }
@@ -1207,7 +1215,7 @@ int DARSHAN_DECL(lio_listio64)(int mode, struct aiocb64 *const aiocb_list[],
     int ret;
     int i;
 
-    MAP_OR_FAIL(lio_listio);
+    MAP_OR_FAIL(lio_listio64);
 
     ret = __real_lio_listio64(mode, aiocb_list, nitems, sevp);
     if(ret == 0)


hooks/post-receive
--