[Darshan-commits] [Git][darshan/darshan][master] 2 commits: fix parameter order

[Shane Snyder]

Shane Snyder pushed to branch master at darshan / darshan


Commits:
a77f9a31 by Rob Latham at 2020-04-30T16:57:13-04:00
fix parameter order

In shutdown_bench_setup I called MPIIO_RECORD_WRITE with the 'type' and
'offset' parameters swapped.

- - - - -
92f6d7d3 by Shane Snyder at 2020-05-03T21:09:16-05:00
Merge branch 'bugfix-wrong-order' into 'master'

fix parameter order

See merge request darshan/darshan!53
- - - - -


1 changed file:

- darshan-runtime/lib/darshan-mpiio.c


Changes:

=====================================
darshan-runtime/lib/darshan-mpiio.c
=====================================
@@ -1544,8 +1544,8 @@ void darshan_mpiio_shutdown_bench_setup(int test_case)
 
             MPIIO_RECORD_OPEN(MPI_SUCCESS, filepath, fh_array[0], MPI_COMM_SELF,
                 2, MPI_INFO_NULL, 0, 1);
-            MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[0], size_array[0], offset_array[0],
-                MPI_BYTE, MPIIO_INDEP_WRITES, 1, 2);
+            MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[0], size_array[0], MPI_BYTE,
+                offset_array[0], MPIIO_INDEP_WRITES, 1, 2);
 
             break;
         case 2: /* single shared file */
@@ -1553,8 +1553,8 @@ void darshan_mpiio_shutdown_bench_setup(int test_case)
 
             MPIIO_RECORD_OPEN(MPI_SUCCESS, filepath, fh_array[0], MPI_COMM_WORLD,
                 2, MPI_INFO_NULL, 0, 1);
-            MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[0], size_array[0], offset_array[0],
-                MPI_BYTE, MPIIO_COLL_WRITES, 1, 2);
+            MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[0], size_array[0], MPI_BYTE,
+                offset_array[0], MPIIO_COLL_WRITES, 1, 2);
 
             break;
         case 3: /* 1024 unique files per proc */
@@ -1566,8 +1566,9 @@ void darshan_mpiio_shutdown_bench_setup(int test_case)
                     2, MPI_INFO_NULL, 0, 1);
                 MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[i],
                     size_array[i % DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT],
+                    MPI_BYTE,
                     offset_array[i % DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT],
-                    MPI_BYTE, MPIIO_INDEP_WRITES, 1, 2);
+                    MPIIO_INDEP_WRITES, 1, 2);
             }
 
             break;
@@ -1580,8 +1581,9 @@ void darshan_mpiio_shutdown_bench_setup(int test_case)
                     2, MPI_INFO_NULL, 0, 1);
                 MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[i],
                     size_array[i % DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT],
+                    MPI_BYTE,
                     offset_array[i % DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT],
-                    MPI_BYTE, MPIIO_COLL_WRITES, 1, 2);
+                    MPIIO_COLL_WRITES, 1, 2);
             }
             break;
         default:



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/49eb46cc77b8de07a8e81ec21a8c2b9d0f473192...92f6d7d306a1326fdb95fc5dc67bb23c2d4b7d2a

-- 
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/49eb46cc77b8de07a8e81ec21a8c2b9d0f473192...92f6d7d306a1326fdb95fc5dc67bb23c2d4b7d2a
You're receiving this email because of your account on xgitlab.cels.anl.gov.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20200503/11236d88/attachment-0001.html>