[Darshan-commits] [Darshan] branch, dev-modular, updated. darshan-2.3.1-173-g57cb762

[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  57cb76241543beb5fbbdd28b220940f068465a75 (commit)
      from  328f68bd9a8faa7128423f6589bb047d1ce4f6f8 (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 57cb76241543beb5fbbdd28b220940f068465a75
Author: Shane Snyder <snyder at cetuslac1.fst.alcf.anl.gov>
Date:   Thu Sep 10 03:57:36 2015 +0000

    fix compiler warnings

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

Summary of changes:
 darshan-runtime/darshan-dynamic.h |    1 +
 darshan-runtime/lib/darshan-bgq.c |   28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)


Diff of changes:
diff --git a/darshan-runtime/darshan-dynamic.h b/darshan-runtime/darshan-dynamic.h
index a73d75f..c86e93f 100644
--- a/darshan-runtime/darshan-dynamic.h
+++ b/darshan-runtime/darshan-dynamic.h
@@ -117,6 +117,7 @@ DARSHAN_EXTERN_DECL(PMPI_Op_free, int, (MPI_Op *op));
 DARSHAN_EXTERN_DECL(PMPI_Reduce, int, (void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm));
 DARSHAN_EXTERN_DECL(PMPI_Send, int, (void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm));
 DARSHAN_EXTERN_DECL(PMPI_Recv, int, (void *buf, int count, MPI_Datatype datatype, int source, int tag, MPI_Comm comm, MPI_Status *status));
+DARSHAN_EXTERN_DECL(PMPI_Gather, int, (const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm));
 
 #endif
 
diff --git a/darshan-runtime/lib/darshan-bgq.c b/darshan-runtime/lib/darshan-bgq.c
index b6ee623..306ab4d 100644
--- a/darshan-runtime/lib/darshan-bgq.c
+++ b/darshan-runtime/lib/darshan-bgq.c
@@ -17,7 +17,9 @@
 #include "uthash.h"
 #include "darshan.h"
 #include "darshan-bgq-log-format.h"
+#include "darshan-dynamic.h"
 
+#include <mpix.h>
 #include <spi/include/kernel/location.h>
 #include <spi/include/kernel/process.h>
 #include <firmware/include/personality.h>
@@ -56,8 +58,6 @@ void bgq_runtime_initialize(void);
 static void bgq_begin_shutdown(void);
 static void bgq_get_output_data(MPI_Comm mod_comm, darshan_record_id *shared_recs, int shared_rec_count, void **buffer, int *size);
 static void bgq_shutdown(void);
-static void bgq_setup_reduction(darshan_record_id *shared_recs,int *shared_rec_count,void **send_buf,void **recv_buf,int *rec_size);
-static void bgq_record_reduction_op(void* infile_v,void* inoutfile_v,int *len,MPI_Datatype *datatype);
 
 /* macros for obtaining/releasing the "NULL" module lock */
 #define BGQ_LOCK() pthread_mutex_lock(&bgq_runtime_mutex)
@@ -161,8 +161,6 @@ void bgq_runtime_initialize()
         &bgq_runtime->record.f_id,
         &bgq_runtime->record.alignment);
 
-    DARSHAN_MPI_CALL(PMPI_Comm_rank)(MPI_COMM_WORLD, &my_rank);
-
     capture(&bgq_runtime->record);
 
     BGQ_UNLOCK();
@@ -213,25 +211,25 @@ static void bgq_get_output_data(
 
     if (my_rank == 0)
     {
-        DARSHAN_MPI_CALL(MPI_Comm_size)(mod_comm, &nprocs);
+        DARSHAN_MPI_CALL(PMPI_Comm_size)(mod_comm, &nprocs);
         ion_ids = malloc(sizeof(*ion_ids)*nprocs);
         result = (ion_ids != NULL); 
     }
-    DARSHAN_MPI_CALL(MPI_Bcast)(&result, 1, MPI_INT, 0, mod_comm);
+    DARSHAN_MPI_CALL(PMPI_Bcast)(&result, 1, MPI_INT, 0, mod_comm);
 
     if (bgq_runtime && result)
     {
         int i, found;
         uint64_t val;
 
-        DARSHAN_MPI_CALL(MPI_Gather)(&bgq_runtime->record.counters[BGQ_INODES],
-                                     1,
-                                     MPI_LONG_LONG_INT,
-                                     ion_ids,
-                                     1,
-                                     MPI_LONG_LONG_INT,
-                                     0,
-                                     mod_comm);
+        DARSHAN_MPI_CALL(PMPI_Gather)(&bgq_runtime->record.counters[BGQ_INODES],
+                                      1,
+                                      MPI_LONG_LONG_INT,
+                                      ion_ids,
+                                      1,
+                                      MPI_LONG_LONG_INT,
+                                      0,
+                                      mod_comm);
         if (my_rank == 0)
         {
             qsort(ion_ids, nprocs, sizeof(*ion_ids), cmpr);
@@ -273,6 +271,7 @@ static void bgq_shutdown()
     return;
 }
 
+#if 0
 static void bgq_record_reduction_op(
     void* infile_v,
     void* inoutfile_v,
@@ -305,6 +304,7 @@ static void bgq_record_reduction_op(
 
     return;
 }
+#endif
 
 /*
  * Local variables:


hooks/post-receive
--