[mpich-discuss] Patch for MPE2 1.3.0 on MPI 3.0 implementations
Jeremiah Willcock
jewillco at osl.iu.edu
Thu Mar 28 18:25:27 CDT 2013
Because of the addition of const to many function parameters, the logging
and tracing parts of MPE2 1.3.0 will not compile with an implementation of
MPI 3 such as the newest versions of MPICH and MVAPICH. I have attached a
patch to fix that. The main issue with it is that it would break
compatibility with MPI 2.* implementations that do not have the extra
const modifiers; a version of it to put into the MPE release would
probably need a macro for the newly-added consts that can enable them
selectively. However, the patch provided is likely to work for users who
have this issue.
-- Jeremiah Willcock
-------------- next part --------------
diff -ur mpe2-1.3.0/src/collchk/include/collchk.h mpe2-1.3.0-new/src/collchk/include/collchk.h
--- mpe2-1.3.0/src/collchk/include/collchk.h 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/include/collchk.h 2013-03-28 19:02:43.118917396 -0400
@@ -95,16 +95,16 @@
#endif
void CollChk_set_begin(char* in);
void CollChk_unset_begin(void);
-int CollChk_check_buff(MPI_Comm comm, void * buff, char* call);
-int CollChk_check_dims(MPI_Comm comm, int ndims, int *dims, char* call);
-int CollChk_check_graph(MPI_Comm comm, int nnodes, int *index, int* edges,
+int CollChk_check_buff(MPI_Comm comm, const void * buff, char* call);
+int CollChk_check_dims(MPI_Comm comm, int ndims, const int *dims, char* call);
+int CollChk_check_graph(MPI_Comm comm, int nnodes, const int *index, const int* edges,
char* call);
int CollChk_check_size(MPI_Comm comm, int size, char* call);
int CollChk_err_han(char * err_str, int err_code, char * call, MPI_Comm comm);
int CollChk_is_init(void);
int CollChk_same_amode(MPI_Comm comm, int amode, char* call);
int CollChk_same_call(MPI_Comm comm, char* call);
-int CollChk_same_datarep(MPI_Comm comm, char* datarep, char *call);
+int CollChk_same_datarep(MPI_Comm comm, const char* datarep, char *call);
int CollChk_hash_equal(const CollChk_hash_t *alpha,
const CollChk_hash_t *beta);
@@ -117,7 +117,7 @@
MPI_Datatype recvtype, int recvcnt,
int root, int are2buffs, char *call);
int CollChk_dtype_scatterv(MPI_Comm comm,
- MPI_Datatype sendtype, int *sendcnts,
+ MPI_Datatype sendtype, const int *sendcnts,
MPI_Datatype recvtype, int recvcnt,
int root, int are2buffs, char *call);
int CollChk_dtype_allgather(MPI_Comm comm,
@@ -126,15 +126,15 @@
int are2buffs, char *call);
int CollChk_dtype_allgatherv(MPI_Comm comm,
MPI_Datatype sendtype, int sendcnt,
- MPI_Datatype recvtype, int *recvcnts,
+ MPI_Datatype recvtype, const int *recvcnts,
int are2buffs, char *call);
int CollChk_dtype_alltoallv(MPI_Comm comm,
- MPI_Datatype sendtype, int *sendcnts,
- MPI_Datatype recvtype, int *recvcnts,
+ MPI_Datatype sendtype, const int *sendcnts,
+ MPI_Datatype recvtype, const int *recvcnts,
char *call);
int CollChk_dtype_alltoallw(MPI_Comm comm,
- MPI_Datatype *sendtypes, int *sendcnts,
- MPI_Datatype *recvtypes, int *recvcnts,
+ const MPI_Datatype *sendtypes, const int *sendcnts,
+ const MPI_Datatype *recvtypes, const int *recvcnts,
char *call);
int CollChk_same_high_low(MPI_Comm comm, int high_low, char* call);
diff -ur mpe2-1.3.0/src/collchk/src/allgather.c mpe2-1.3.0-new/src/collchk/src/allgather.c
--- mpe2-1.3.0/src/collchk/src/allgather.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/allgather.c 2013-03-28 18:30:22.292451966 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Allgather( void* sbuff, int scnt, MPI_Datatype stype,
+int MPI_Allgather( const void* sbuff, int scnt, MPI_Datatype stype,
void* rbuff, int rcnt, MPI_Datatype rtype,
MPI_Comm comm )
{
diff -ur mpe2-1.3.0/src/collchk/src/allgatherv.c mpe2-1.3.0-new/src/collchk/src/allgatherv.c
--- mpe2-1.3.0/src/collchk/src/allgatherv.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/allgatherv.c 2013-03-28 18:30:30.300611131 -0400
@@ -4,8 +4,8 @@
*/
#include "collchk.h"
-int MPI_Allgatherv( void* sbuff, int scnt, MPI_Datatype stype,
- void* rbuff, int *rcnts, int *displs, MPI_Datatype rtype,
+int MPI_Allgatherv( const void* sbuff, int scnt, MPI_Datatype stype,
+ void* rbuff, const int *rcnts, const int *displs, MPI_Datatype rtype,
MPI_Comm comm )
{
char call[COLLCHK_SM_STRLEN];
diff -ur mpe2-1.3.0/src/collchk/src/allreduce.c mpe2-1.3.0-new/src/collchk/src/allreduce.c
--- mpe2-1.3.0/src/collchk/src/allreduce.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/allreduce.c 2013-03-28 18:30:33.720679107 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Allreduce( void* sbuff, void* rbuff, int cnt,
+int MPI_Allreduce( const void* sbuff, void* rbuff, int cnt,
MPI_Datatype dt, MPI_Op op, MPI_Comm comm)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/alltoall.c mpe2-1.3.0-new/src/collchk/src/alltoall.c
--- mpe2-1.3.0/src/collchk/src/alltoall.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/alltoall.c 2013-03-28 18:30:40.344810763 -0400
@@ -6,7 +6,7 @@
#define BUFFS_NOT_SHARED 0
-int MPI_Alltoall( void* sbuff, int scnt, MPI_Datatype stype,
+int MPI_Alltoall( const void* sbuff, int scnt, MPI_Datatype stype,
void* rbuff, int rcnt, MPI_Datatype rtype,
MPI_Comm comm)
{
diff -ur mpe2-1.3.0/src/collchk/src/alltoallv.c mpe2-1.3.0-new/src/collchk/src/alltoallv.c
--- mpe2-1.3.0/src/collchk/src/alltoallv.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/alltoallv.c 2013-03-28 18:30:50.745017472 -0400
@@ -4,8 +4,8 @@
*/
#include "collchk.h"
-int MPI_Alltoallv(void* sbuff, int *scnts, int *sdispls, MPI_Datatype stype,
- void* rbuff, int *rcnts, int *rdispls, MPI_Datatype rtype,
+int MPI_Alltoallv(const void* sbuff, const int *scnts, const int *sdispls, MPI_Datatype stype,
+ void* rbuff, const int *rcnts, const int *rdispls, MPI_Datatype rtype,
MPI_Comm comm)
{
int g2g = 1, rank;
diff -ur mpe2-1.3.0/src/collchk/src/alltoallw.c mpe2-1.3.0-new/src/collchk/src/alltoallw.c
--- mpe2-1.3.0/src/collchk/src/alltoallw.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/alltoallw.c 2013-03-28 18:31:03.821277370 -0400
@@ -5,8 +5,8 @@
#include "collchk.h"
-int MPI_Alltoallw(void* sbuff, int *scnts, int *sdispls, MPI_Datatype *stypes,
- void* rbuff, int *rcnts, int *rdispls, MPI_Datatype *rtypes,
+int MPI_Alltoallw(const void* sbuff, const int *scnts, const int *sdispls, const MPI_Datatype *stypes,
+ void* rbuff, const int *rcnts, const int *rdispls, const MPI_Datatype *rtypes,
MPI_Comm comm)
{
int g2g = 1, r;
diff -ur mpe2-1.3.0/src/collchk/src/cart_create.c mpe2-1.3.0-new/src/collchk/src/cart_create.c
--- mpe2-1.3.0/src/collchk/src/cart_create.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/cart_create.c 2013-03-28 18:31:24.665691667 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Cart_create(MPI_Comm comm_old, int ndims, int *dims, int *periods,
+int MPI_Cart_create(MPI_Comm comm_old, int ndims, const int *dims, const int *periods,
int reorder, MPI_Comm *comm_cart)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/cart_map.c mpe2-1.3.0-new/src/collchk/src/cart_map.c
--- mpe2-1.3.0/src/collchk/src/cart_map.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/cart_map.c 2013-03-28 18:31:30.485807346 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Cart_map(MPI_Comm comm, int ndims, int *dims, int *periods,
+int MPI_Cart_map(MPI_Comm comm, int ndims, const int *dims, const int *periods,
int *newrank)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/comm_accept.c mpe2-1.3.0-new/src/collchk/src/comm_accept.c
--- mpe2-1.3.0/src/collchk/src/comm_accept.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/comm_accept.c 2013-03-28 18:31:54.462283899 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Comm_accept(char *portname, MPI_Info info, int root,
+int MPI_Comm_accept(const char *portname, MPI_Info info, int root,
MPI_Comm comm, MPI_Comm *newcomm)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/comm_connect.c mpe2-1.3.0-new/src/collchk/src/comm_connect.c
--- mpe2-1.3.0/src/collchk/src/comm_connect.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/comm_connect.c 2013-03-28 18:31:58.178357759 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Comm_connect(char *portname, MPI_Info info, int root,
+int MPI_Comm_connect(const char *portname, MPI_Info info, int root,
MPI_Comm comm, MPI_Comm *newcomm)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/comm_spawn.c mpe2-1.3.0-new/src/collchk/src/comm_spawn.c
--- mpe2-1.3.0/src/collchk/src/comm_spawn.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/comm_spawn.c 2013-03-28 18:32:14.378679759 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Comm_spawn(char *command, char **argv, int maxprocs, MPI_Info info,
+int MPI_Comm_spawn(const char *command, char **argv, int maxprocs, MPI_Info info,
int root, MPI_Comm comm, MPI_Comm *intercomm,
int *array_of_errcodes)
{
diff -ur mpe2-1.3.0/src/collchk/src/comm_spawn_multiple.c mpe2-1.3.0-new/src/collchk/src/comm_spawn_multiple.c
--- mpe2-1.3.0/src/collchk/src/comm_spawn_multiple.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/comm_spawn_multiple.c 2013-03-28 19:04:43.053290511 -0400
@@ -5,8 +5,8 @@
#include "collchk.h"
int MPI_Comm_spawn_multiple(int count, char **array_of_commands,
- char ***array_of_argv, int *array_of_maxprocs,
- MPI_Info *array_of_info, int root, MPI_Comm comm,
+ char ***array_of_argv, const int *array_of_maxprocs,
+ const MPI_Info *array_of_info, int root, MPI_Comm comm,
MPI_Comm *intercomm, int *array_of_errcodes)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/exscan.c mpe2-1.3.0-new/src/collchk/src/exscan.c
--- mpe2-1.3.0/src/collchk/src/exscan.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/exscan.c 2013-03-28 18:32:28.994970273 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Exscan(void* sbuff, void* rbuff, int cnt,
+int MPI_Exscan(const void* sbuff, void* rbuff, int cnt,
MPI_Datatype dt, MPI_Op op, MPI_Comm comm)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/file_open.c mpe2-1.3.0-new/src/collchk/src/file_open.c
--- mpe2-1.3.0/src/collchk/src/file_open.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_open.c 2013-03-28 18:32:32.763045168 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_open(MPI_Comm comm, char *filename, int amode,
+int MPI_File_open(MPI_Comm comm, const char *filename, int amode,
MPI_Info info, MPI_File *fh)
{
int g2g = 1,i;
diff -ur mpe2-1.3.0/src/collchk/src/file_set_view.c mpe2-1.3.0-new/src/collchk/src/file_set_view.c
--- mpe2-1.3.0/src/collchk/src/file_set_view.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_set_view.c 2013-03-28 19:01:55.289971130 -0400
@@ -5,7 +5,7 @@
#include "collchk.h"
int MPI_File_set_view(MPI_File fh, MPI_Offset disp, MPI_Datatype etype,
- MPI_Datatype filetype, char *datarep, MPI_Info info)
+ MPI_Datatype filetype, const char *datarep, MPI_Info info)
{
int g2g = 1;
char call[COLLCHK_SM_STRLEN];
diff -ur mpe2-1.3.0/src/collchk/src/file_write_all_begin.c mpe2-1.3.0-new/src/collchk/src/file_write_all_begin.c
--- mpe2-1.3.0/src/collchk/src/file_write_all_begin.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_write_all_begin.c 2013-03-28 19:02:13.038322263 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_write_all_begin(MPI_File fh, void *buff, int cnt,
+int MPI_File_write_all_begin(MPI_File fh, const void *buff, int cnt,
MPI_Datatype dtype)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/file_write_all.c mpe2-1.3.0-new/src/collchk/src/file_write_all.c
--- mpe2-1.3.0/src/collchk/src/file_write_all.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_write_all.c 2013-03-28 19:02:57.595203815 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_write_all(MPI_File fh, void *buff, int cnt,
+int MPI_File_write_all(MPI_File fh, const void *buff, int cnt,
MPI_Datatype dtype, MPI_Status *st)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/file_write_all_end.c mpe2-1.3.0-new/src/collchk/src/file_write_all_end.c
--- mpe2-1.3.0/src/collchk/src/file_write_all_end.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_write_all_end.c 2013-03-28 19:03:07.679403338 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_write_all_end(MPI_File fh, void *buff, MPI_Status *st)
+int MPI_File_write_all_end(MPI_File fh, const void *buff, MPI_Status *st)
{
int g2g = 1;
char call[COLLCHK_SM_STRLEN];
diff -ur mpe2-1.3.0/src/collchk/src/file_write_at_all_begin.c mpe2-1.3.0-new/src/collchk/src/file_write_at_all_begin.c
--- mpe2-1.3.0/src/collchk/src/file_write_at_all_begin.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_write_at_all_begin.c 2013-03-28 19:03:18.883625024 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_write_at_all_begin(MPI_File fh, MPI_Offset offset, void *buff,
+int MPI_File_write_at_all_begin(MPI_File fh, MPI_Offset offset, const void *buff,
int cnt, MPI_Datatype dtype)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/file_write_at_all.c mpe2-1.3.0-new/src/collchk/src/file_write_at_all.c
--- mpe2-1.3.0/src/collchk/src/file_write_at_all.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_write_at_all.c 2013-03-28 19:03:23.451715409 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, void *buff, int cnt,
+int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, const void *buff, int cnt,
MPI_Datatype dtype, MPI_Status *st)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/file_write_at_all_end.c mpe2-1.3.0-new/src/collchk/src/file_write_at_all_end.c
--- mpe2-1.3.0/src/collchk/src/file_write_at_all_end.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_write_at_all_end.c 2013-03-28 19:03:26.287771523 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_write_at_all_end(MPI_File fh, void *buff, MPI_Status *st)
+int MPI_File_write_at_all_end(MPI_File fh, const void *buff, MPI_Status *st)
{
int g2g = 1;
char call[COLLCHK_SM_STRLEN];
diff -ur mpe2-1.3.0/src/collchk/src/file_write_ordered_begin.c mpe2-1.3.0-new/src/collchk/src/file_write_ordered_begin.c
--- mpe2-1.3.0/src/collchk/src/file_write_ordered_begin.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_write_ordered_begin.c 2013-03-28 19:03:52.680293743 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_write_ordered_begin(MPI_File fh, void *buff, int cnt,
+int MPI_File_write_ordered_begin(MPI_File fh, const void *buff, int cnt,
MPI_Datatype dtype)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/file_write_ordered.c mpe2-1.3.0-new/src/collchk/src/file_write_ordered.c
--- mpe2-1.3.0/src/collchk/src/file_write_ordered.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_write_ordered.c 2013-03-28 19:03:55.428348119 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_write_ordered(MPI_File fh, void *buff, int cnt,
+int MPI_File_write_ordered(MPI_File fh, const void *buff, int cnt,
MPI_Datatype dtype, MPI_Status *st)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/file_write_ordered_end.c mpe2-1.3.0-new/src/collchk/src/file_write_ordered_end.c
--- mpe2-1.3.0/src/collchk/src/file_write_ordered_end.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/file_write_ordered_end.c 2013-03-28 19:03:58.464408194 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_File_write_ordered_end(MPI_File fh, void *buff, MPI_Status *st)
+int MPI_File_write_ordered_end(MPI_File fh, const void *buff, MPI_Status *st)
{
int g2g = 1;
char call[COLLCHK_SM_STRLEN];
diff -ur mpe2-1.3.0/src/collchk/src/gather.c mpe2-1.3.0-new/src/collchk/src/gather.c
--- mpe2-1.3.0/src/collchk/src/gather.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/gather.c 2013-03-28 18:56:55.604043549 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Gather(void* sbuff, int scnt, MPI_Datatype stype,
+int MPI_Gather(const void* sbuff, int scnt, MPI_Datatype stype,
void* rbuff, int rcnt, MPI_Datatype rtype,
int root, MPI_Comm comm)
{
diff -ur mpe2-1.3.0/src/collchk/src/gatherv.c mpe2-1.3.0-new/src/collchk/src/gatherv.c
--- mpe2-1.3.0/src/collchk/src/gatherv.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/gatherv.c 2013-03-28 18:57:23.400593232 -0400
@@ -4,8 +4,8 @@
*/
#include "collchk.h"
-int MPI_Gatherv(void *sbuff, int scnt, MPI_Datatype stype,
- void *rbuff, int *rcnts, int *displs, MPI_Datatype rtype,
+int MPI_Gatherv(const void *sbuff, int scnt, MPI_Datatype stype,
+ void *rbuff, const int *rcnts, const int *displs, MPI_Datatype rtype,
int root, MPI_Comm comm)
{
int g2g = 1, rank;
diff -ur mpe2-1.3.0/src/collchk/src/graph_create.c mpe2-1.3.0-new/src/collchk/src/graph_create.c
--- mpe2-1.3.0/src/collchk/src/graph_create.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/graph_create.c 2013-03-28 18:58:55.222409196 -0400
@@ -4,8 +4,8 @@
*/
#include "collchk.h"
-int MPI_Graph_create(MPI_Comm comm_old, int nnodes, int *index,
- int *edges, int reorder, MPI_Comm *comm_graph)
+int MPI_Graph_create(MPI_Comm comm_old, int nnodes, const int *index,
+ const int *edges, int reorder, MPI_Comm *comm_graph)
{
int g2g = 1;
char call[COLLCHK_SM_STRLEN];
diff -ur mpe2-1.3.0/src/collchk/src/graph_map.c mpe2-1.3.0-new/src/collchk/src/graph_map.c
--- mpe2-1.3.0/src/collchk/src/graph_map.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/graph_map.c 2013-03-28 18:59:44.803389868 -0400
@@ -5,7 +5,7 @@
#include "collchk.h"
int MPI_Graph_map(MPI_Comm comm, int nnodes,
- int *index, int *edges, int *newrank)
+ const int *index, const int *edges, int *newrank)
{
int g2g = 1;
char call[COLLCHK_SM_STRLEN];
diff -ur mpe2-1.3.0/src/collchk/src/reduce.c mpe2-1.3.0-new/src/collchk/src/reduce.c
--- mpe2-1.3.0/src/collchk/src/reduce.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/reduce.c 2013-03-28 18:59:55.419599857 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Reduce(void* sbuff, void* rbuff, int cnt, MPI_Datatype dt,
+int MPI_Reduce(const void* sbuff, void* rbuff, int cnt, MPI_Datatype dt,
MPI_Op op, int root, MPI_Comm comm)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/reduce_scatter.c mpe2-1.3.0-new/src/collchk/src/reduce_scatter.c
--- mpe2-1.3.0/src/collchk/src/reduce_scatter.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/reduce_scatter.c 2013-03-28 19:00:10.363895462 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Reduce_scatter(void* sbuff, void* rbuff, int* rcnts,
+int MPI_Reduce_scatter(const void* sbuff, void* rbuff, const int* rcnts,
MPI_Datatype dt, MPI_Op op, MPI_Comm comm)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/scan.c mpe2-1.3.0-new/src/collchk/src/scan.c
--- mpe2-1.3.0/src/collchk/src/scan.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/scan.c 2013-03-28 19:00:35.236387465 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Scan(void* sbuff, void* rbuff, int cnt,
+int MPI_Scan(const void* sbuff, void* rbuff, int cnt,
MPI_Datatype dt, MPI_Op op, MPI_Comm comm)
{
int g2g = 1;
diff -ur mpe2-1.3.0/src/collchk/src/scatter.c mpe2-1.3.0-new/src/collchk/src/scatter.c
--- mpe2-1.3.0/src/collchk/src/scatter.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/scatter.c 2013-03-28 19:00:54.152761662 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Scatter(void* sbuff, int scnt, MPI_Datatype stype,
+int MPI_Scatter(const void* sbuff, int scnt, MPI_Datatype stype,
void* rbuff, int rcnt, MPI_Datatype rtype,
int root, MPI_Comm comm)
{
diff -ur mpe2-1.3.0/src/collchk/src/scatterv.c mpe2-1.3.0-new/src/collchk/src/scatterv.c
--- mpe2-1.3.0/src/collchk/src/scatterv.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/collchk/src/scatterv.c 2013-03-28 19:01:01.940915729 -0400
@@ -4,7 +4,7 @@
*/
#include "collchk.h"
-int MPI_Scatterv(void *sbuff, int *scnts, int* displs, MPI_Datatype stype,
+int MPI_Scatterv(const void *sbuff, const int *scnts, const int* displs, MPI_Datatype stype,
void *rbuff, int rcnt, MPI_Datatype rtype,
int root, MPI_Comm comm)
{
diff -ur mpe2-1.3.0/src/graphics/src/visual_mess.c mpe2-1.3.0-new/src/graphics/src/visual_mess.c
--- mpe2-1.3.0/src/graphics/src/visual_mess.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/graphics/src/visual_mess.c 2013-03-28 18:56:07.475091236 -0400
@@ -322,7 +322,7 @@
}
int MPI_Bsend( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -346,7 +346,7 @@
}
int MPI_Bsend_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -442,7 +442,7 @@
}
int MPI_Send_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -478,7 +478,7 @@
}
int MPI_Ibsend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -543,7 +543,7 @@
}
int MPI_Irsend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -579,7 +579,7 @@
}
int MPI_Isend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -615,7 +615,7 @@
}
int MPI_Issend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -676,7 +676,7 @@
}
int MPI_Rsend( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -700,7 +700,7 @@
}
int MPI_Rsend_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -736,7 +736,7 @@
}
int MPI_Send( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -760,7 +760,7 @@
}
int MPI_Sendrecv( sendbuf, sendcount, sendtype, dest, sendtag, recvbuf, recvcount, recvtype, source, recvtag, comm, status )
-void * sendbuf;
+const void * sendbuf;
int sendcount;
MPI_Datatype sendtype;
int dest;
@@ -825,7 +825,7 @@
}
int MPI_Ssend( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -849,7 +849,7 @@
}
int MPI_Ssend_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
diff -ur mpe2-1.3.0/src/wrappers/src/log_mpi_core.c mpe2-1.3.0-new/src/wrappers/src/log_mpi_core.c
--- mpe2-1.3.0/src/wrappers/src/log_mpi_core.c 2010-05-02 01:29:41.000000000 -0400
+++ mpe2-1.3.0-new/src/wrappers/src/log_mpi_core.c 2013-03-28 18:47:59.989432657 -0400
@@ -1,4 +1,3 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
/*
(C) 2001 by Argonne National Laboratory.
See COPYRIGHT in top-level directory.
@@ -1547,7 +1546,7 @@
int MPI_Allgather( sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcount;
MPI_Datatype sendtype;
void * recvbuf;
@@ -1586,12 +1585,12 @@
}
int MPI_Allgatherv( sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcount;
MPI_Datatype sendtype;
void * recvbuf;
-int * recvcounts;
-int * displs;
+const int * recvcounts;
+const int * displs;
MPI_Datatype recvtype;
MPI_Comm comm;
{
@@ -1627,7 +1626,7 @@
}
int MPI_Allreduce( sendbuf, recvbuf, count, datatype, op, comm )
-void * sendbuf;
+const void * sendbuf;
void * recvbuf;
int count;
MPI_Datatype datatype;
@@ -1666,7 +1665,7 @@
}
int MPI_Alltoall( sendbuf, sendcnt, sendtype, recvbuf, recvcnt, recvtype, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcnt;
MPI_Datatype sendtype;
void * recvbuf;
@@ -1720,13 +1719,13 @@
}
int MPI_Alltoallv( sendbuf, sendcnts, sdispls, sendtype, recvbuf, recvcnts, rdispls, recvtype, comm )
-void * sendbuf;
-int * sendcnts;
-int * sdispls;
+const void * sendbuf;
+const int * sendcnts;
+const int * sdispls;
MPI_Datatype sendtype;
void * recvbuf;
-int * recvcnts;
-int * rdispls;
+const int * recvcnts;
+const int * rdispls;
MPI_Datatype recvtype;
MPI_Comm comm;
{
@@ -1852,7 +1851,7 @@
}
int MPI_Gather( sendbuf, sendcnt, sendtype, recvbuf, recvcount, recvtype, root, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcnt;
MPI_Datatype sendtype;
void * recvbuf;
@@ -1893,12 +1892,12 @@
}
int MPI_Gatherv( sendbuf, sendcnt, sendtype, recvbuf, recvcnts, displs, recvtype, root, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcnt;
MPI_Datatype sendtype;
void * recvbuf;
-int * recvcnts;
-int * displs;
+const int * recvcnts;
+const int * displs;
MPI_Datatype recvtype;
int root;
MPI_Comm comm;
@@ -2006,9 +2005,9 @@
}
int MPI_Reduce_scatter( sendbuf, recvbuf, recvcnts, datatype, op, comm )
-void * sendbuf;
+const void * sendbuf;
void * recvbuf;
-int * recvcnts;
+const int * recvcnts;
MPI_Datatype datatype;
MPI_Op op;
MPI_Comm comm;
@@ -2046,7 +2045,7 @@
}
int MPI_Reduce( sendbuf, recvbuf, count, datatype, op, root, comm )
-void * sendbuf;
+const void * sendbuf;
void * recvbuf;
int count;
MPI_Datatype datatype;
@@ -2086,7 +2085,7 @@
}
int MPI_Scan( sendbuf, recvbuf, count, datatype, op, comm )
-void * sendbuf;
+const void * sendbuf;
void * recvbuf;
int count;
MPI_Datatype datatype;
@@ -2125,7 +2124,7 @@
}
int MPI_Scatter( sendbuf, sendcnt, sendtype, recvbuf, recvcnt, recvtype, root, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcnt;
MPI_Datatype sendtype;
void * recvbuf;
@@ -2168,9 +2167,9 @@
int MPI_Scatterv( sendbuf, sendcnts, displs, sendtype,
recvbuf, recvcnt, recvtype, root, comm )
-void * sendbuf;
-int * sendcnts;
-int * displs;
+const void * sendbuf;
+const int * sendcnts;
+const int * displs;
MPI_Datatype sendtype;
void * recvbuf;
int recvcnt;
@@ -2794,7 +2793,7 @@
int MPI_Group_excl( group, n, ranks, newgroup )
MPI_Group group;
int n;
-int * ranks;
+const int * ranks;
MPI_Group * newgroup;
{
int returnVal;
@@ -2865,7 +2864,7 @@
int MPI_Group_incl( group, n, ranks, group_out )
MPI_Group group;
int n;
-int * ranks;
+const int * ranks;
MPI_Group * group_out;
{
int returnVal;
@@ -3082,7 +3081,7 @@
int MPI_Group_translate_ranks( group_a, n, ranks_a, group_b, ranks_b )
MPI_Group group_a;
int n;
-int * ranks_a;
+const int * ranks_a;
MPI_Group group_b;
int * ranks_b;
{
@@ -4005,7 +4004,7 @@
#endif
int MPI_Address( location, address )
-void * location;
+const void * location;
MPI_Aint * address;
{
int returnVal;
@@ -4040,7 +4039,7 @@
}
int MPI_Bsend( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -4083,7 +4082,7 @@
}
int MPI_Bsend_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -4314,7 +4313,7 @@
}
int MPI_Send_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -4357,7 +4356,7 @@
}
int MPI_Get_elements( status, datatype, elements )
-MPI_Status * status;
+const MPI_Status * status;
MPI_Datatype datatype;
int * elements;
{
@@ -4393,7 +4392,7 @@
}
int MPI_Get_count( status, datatype, count )
-MPI_Status * status;
+const MPI_Status * status;
MPI_Datatype datatype;
int * count;
{
@@ -4429,7 +4428,7 @@
}
int MPI_Ibsend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -4569,7 +4568,7 @@
}
int MPI_Irsend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -4611,7 +4610,7 @@
}
int MPI_Isend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -4657,7 +4656,7 @@
}
int MPI_Issend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -4703,7 +4702,7 @@
}
int MPI_Pack( inbuf, incount, type, outbuf, outcount, position, comm )
-void * inbuf;
+const void * inbuf;
int incount;
MPI_Datatype type;
void * outbuf;
@@ -4895,7 +4894,7 @@
}
int MPI_Rsend( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -4938,7 +4937,7 @@
}
int MPI_Rsend_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -4981,7 +4980,7 @@
}
int MPI_Send( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -5026,7 +5025,7 @@
int MPI_Sendrecv( sendbuf, sendcount, sendtype, dest, sendtag,
recvbuf, recvcount, recvtype, source, recvtag,
comm, status )
-void * sendbuf;
+const void * sendbuf;
int sendcount;
MPI_Datatype sendtype;
int dest;
@@ -5163,7 +5162,7 @@
}
int MPI_Ssend( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -5205,7 +5204,7 @@
}
int MPI_Ssend_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -5506,7 +5505,7 @@
}
int MPI_Test_cancelled( status, flag )
-MPI_Status * status;
+const MPI_Status * status;
int * flag;
{
int returnVal;
@@ -5763,8 +5762,8 @@
int MPI_Type_hindexed( count, blocklens, indices, old_type, newtype )
int count;
-int * blocklens;
-MPI_Aint * indices;
+const int * blocklens;
+const MPI_Aint * indices;
MPI_Datatype old_type;
MPI_Datatype * newtype;
{
@@ -5840,8 +5839,8 @@
int MPI_Type_indexed( count, blocklens, indices, old_type, newtype )
int count;
-int * blocklens;
-int * indices;
+const int * blocklens;
+const int * indices;
MPI_Datatype old_type;
MPI_Datatype * newtype;
{
@@ -5948,9 +5947,9 @@
int MPI_Type_struct( count, blocklens, indices, old_types, newtype )
int count;
-int * blocklens;
-MPI_Aint * indices;
-MPI_Datatype * old_types;
+const int * blocklens;
+const MPI_Aint * indices;
+const MPI_Datatype * old_types;
MPI_Datatype * newtype;
{
int returnVal;
@@ -6058,7 +6057,7 @@
}
int MPI_Unpack( inbuf, insize, position, outbuf, outcount, type, comm )
-void * inbuf;
+const void * inbuf;
int insize;
int * position;
void * outbuf;
@@ -6408,8 +6407,8 @@
int MPI_Cart_create( comm_old, ndims, dims, periods, reorder, comm_cart )
MPI_Comm comm_old;
int ndims;
-int * dims;
-int * periods;
+const int * dims;
+const int * periods;
int reorder;
MPI_Comm * comm_cart;
{
@@ -6489,8 +6488,8 @@
int MPI_Cart_map( comm_old, ndims, dims, periods, newrank )
MPI_Comm comm_old;
int ndims;
-int * dims;
-int * periods;
+const int * dims;
+const int * periods;
int * newrank;
{
int returnVal;
@@ -6526,7 +6525,7 @@
int MPI_Cart_rank( comm, coords, rank )
MPI_Comm comm;
-int * coords;
+const int * coords;
int * rank;
{
int returnVal;
@@ -6600,7 +6599,7 @@
int MPI_Cart_sub( comm, remain_dims, comm_new )
MPI_Comm comm;
-int * remain_dims;
+const int * remain_dims;
MPI_Comm * comm_new;
{
int returnVal;
@@ -6711,8 +6710,8 @@
int MPI_Graph_create( comm_old, nnodes, index, edges, reorder, comm_graph )
MPI_Comm comm_old;
int nnodes;
-int * index;
-int * edges;
+const int * index;
+const int * edges;
int reorder;
MPI_Comm * comm_graph;
{
@@ -6792,8 +6791,8 @@
int MPI_Graph_map( comm_old, nnodes, index, edges, newrank )
MPI_Comm comm_old;
int nnodes;
-int * index;
-int * edges;
+const int * index;
+const int * edges;
int * newrank;
{
int returnVal;
diff -ur mpe2-1.3.0/src/wrappers/src/log_mpi_io.c mpe2-1.3.0-new/src/wrappers/src/log_mpi_io.c
--- mpe2-1.3.0/src/wrappers/src/log_mpi_io.c 2008-01-30 20:37:57.000000000 -0500
+++ mpe2-1.3.0-new/src/wrappers/src/log_mpi_io.c 2013-03-28 19:07:14.656290811 -0400
@@ -333,7 +333,7 @@
}
-int MPI_File_open( MPI_Comm comm,char * filename,int amode,MPI_Info info,MPI_File * fh )
+int MPI_File_open( MPI_Comm comm,const char * filename,int amode,MPI_Info info,MPI_File * fh )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -399,7 +399,7 @@
return returnVal;
}
-int MPI_File_delete( char * filename,MPI_Info info )
+int MPI_File_delete( const char * filename,MPI_Info info )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -663,7 +663,7 @@
return returnVal;
}
-int MPI_File_set_view( MPI_File fh,MPI_Offset disp,MPI_Datatype etype,MPI_Datatype filetype,char * datarep,MPI_Info info )
+int MPI_File_set_view( MPI_File fh,MPI_Offset disp,MPI_Datatype etype,MPI_Datatype filetype,const char * datarep,MPI_Info info )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -795,7 +795,7 @@
return returnVal;
}
-int MPI_File_write_at( MPI_File fh,MPI_Offset offset,void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
+int MPI_File_write_at( MPI_File fh,MPI_Offset offset,const void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -828,7 +828,7 @@
return returnVal;
}
-int MPI_File_write_at_all( MPI_File fh,MPI_Offset offset,void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
+int MPI_File_write_at_all( MPI_File fh,MPI_Offset offset,const void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -894,7 +894,7 @@
return returnVal;
}
-int MPI_File_iwrite_at( MPI_File fh,MPI_Offset offset,void * buf,int count,MPI_Datatype datatype,MPIO_Request * request )
+int MPI_File_iwrite_at( MPI_File fh,MPI_Offset offset,const void * buf,int count,MPI_Datatype datatype,MPIO_Request * request )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -993,7 +993,7 @@
return returnVal;
}
-int MPI_File_write( MPI_File fh,void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
+int MPI_File_write( MPI_File fh,const void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1026,7 +1026,7 @@
return returnVal;
}
-int MPI_File_write_all( MPI_File fh,void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
+int MPI_File_write_all( MPI_File fh,const void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1092,7 +1092,7 @@
return returnVal;
}
-int MPI_File_iwrite( MPI_File fh,void * buf,int count,MPI_Datatype datatype,MPIO_Request * request )
+int MPI_File_iwrite( MPI_File fh,const void * buf,int count,MPI_Datatype datatype,MPIO_Request * request )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1257,7 +1257,7 @@
return returnVal;
}
-int MPI_File_write_shared( MPI_File fh,void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
+int MPI_File_write_shared( MPI_File fh,const void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1323,7 +1323,7 @@
return returnVal;
}
-int MPI_File_iwrite_shared( MPI_File fh,void * buf,int count,MPI_Datatype datatype,MPIO_Request * request )
+int MPI_File_iwrite_shared( MPI_File fh,const void * buf,int count,MPI_Datatype datatype,MPIO_Request * request )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1389,7 +1389,7 @@
return returnVal;
}
-int MPI_File_write_ordered( MPI_File fh,void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
+int MPI_File_write_ordered( MPI_File fh,const void * buf,int count,MPI_Datatype datatype,MPI_Status * status )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1554,7 +1554,7 @@
return returnVal;
}
-int MPI_File_write_at_all_begin( MPI_File fh,MPI_Offset offset,void * buf,int count,MPI_Datatype datatype )
+int MPI_File_write_at_all_begin( MPI_File fh,MPI_Offset offset,const void * buf,int count,MPI_Datatype datatype )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1587,7 +1587,7 @@
return returnVal;
}
-int MPI_File_write_at_all_end( MPI_File fh,void * buf,MPI_Status * status )
+int MPI_File_write_at_all_end( MPI_File fh,const void * buf,MPI_Status * status )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1686,7 +1686,7 @@
return returnVal;
}
-int MPI_File_write_all_begin( MPI_File fh,void * buf,int count,MPI_Datatype datatype )
+int MPI_File_write_all_begin( MPI_File fh,const void * buf,int count,MPI_Datatype datatype )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1719,7 +1719,7 @@
return returnVal;
}
-int MPI_File_write_all_end( MPI_File fh,void * buf,MPI_Status * status )
+int MPI_File_write_all_end( MPI_File fh,const void * buf,MPI_Status * status )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1818,7 +1818,7 @@
return returnVal;
}
-int MPI_File_write_ordered_begin( MPI_File fh,void * buf,int count,MPI_Datatype datatype )
+int MPI_File_write_ordered_begin( MPI_File fh,const void * buf,int count,MPI_Datatype datatype )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -1851,7 +1851,7 @@
return returnVal;
}
-int MPI_File_write_ordered_end( MPI_File fh,void * buf,MPI_Status * status )
+int MPI_File_write_ordered_end( MPI_File fh,const void * buf,MPI_Status * status )
{
int returnVal;
MPE_LOG_STATE_DECL
diff -ur mpe2-1.3.0/src/wrappers/src/log_mpi_rma.c mpe2-1.3.0-new/src/wrappers/src/log_mpi_rma.c
--- mpe2-1.3.0/src/wrappers/src/log_mpi_rma.c 2008-01-30 20:37:57.000000000 -0500
+++ mpe2-1.3.0-new/src/wrappers/src/log_mpi_rma.c 2013-03-28 19:07:44.144874477 -0400
@@ -122,7 +122,7 @@
state->color = "maroon";
}
-int MPI_Accumulate( void *origin_addr, int origin_count,
+int MPI_Accumulate( const void *origin_addr, int origin_count,
MPI_Datatype origin_datatype, int target_rank,
MPI_Aint target_disp, int target_count,
MPI_Datatype target_datatype, MPI_Op op, MPI_Win win )
@@ -266,7 +266,7 @@
return returnVal;
}
-int MPI_Put( void *origin_addr, int origin_count,
+int MPI_Put( const void *origin_addr, int origin_count,
MPI_Datatype origin_datatype, int target_rank,
MPI_Aint target_disp, int target_count,
MPI_Datatype target_datatype, MPI_Win win )
@@ -572,7 +572,7 @@
return returnVal;
}
-int MPI_Win_set_name( MPI_Win win, char *win_name )
+int MPI_Win_set_name( MPI_Win win, const char *win_name )
{
int returnVal;
MPE_LOG_STATE_DECL
diff -ur mpe2-1.3.0/src/wrappers/src/log_mpi_spawn.c mpe2-1.3.0-new/src/wrappers/src/log_mpi_spawn.c
--- mpe2-1.3.0/src/wrappers/src/log_mpi_spawn.c 2008-01-30 20:37:57.000000000 -0500
+++ mpe2-1.3.0-new/src/wrappers/src/log_mpi_spawn.c 2013-03-28 19:10:07.639714984 -0400
@@ -98,7 +98,7 @@
state->color = "purple";
}
-int MPI_Comm_spawn( char *command, char *argv[], int maxprocs,
+int MPI_Comm_spawn( const char *command, char *argv[], int maxprocs,
MPI_Info info, int root, MPI_Comm comm,
MPI_Comm *intercomm, int array_of_errcodes[] )
{
@@ -133,8 +133,8 @@
}
int MPI_Comm_spawn_multiple( int count, char *array_of_commands[],
- char* *array_of_argv[], int array_of_maxprocs[],
- MPI_Info array_of_info[], int root, MPI_Comm comm,
+ char* *array_of_argv[], const int array_of_maxprocs[],
+ const MPI_Info array_of_info[], int root, MPI_Comm comm,
MPI_Comm *intercomm, int array_of_errcodes[] )
{
int returnVal;
@@ -200,7 +200,7 @@
return returnVal;
}
-int MPI_Comm_accept( char *port_name, MPI_Info info, int root,
+int MPI_Comm_accept( const char *port_name, MPI_Info info, int root,
MPI_Comm comm, MPI_Comm *newcomm )
{
int returnVal;
@@ -232,7 +232,7 @@
return returnVal;
}
-int MPI_Comm_connect( char *port_name, MPI_Info info, int root,
+int MPI_Comm_connect( const char *port_name, MPI_Info info, int root,
MPI_Comm comm, MPI_Comm *newcomm )
{
int returnVal;
@@ -328,7 +328,7 @@
return returnVal;
}
-int MPI_Comm_set_name( MPI_Comm comm, char *comm_name )
+int MPI_Comm_set_name( MPI_Comm comm, const char *comm_name )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -412,7 +412,7 @@
return returnVal;
}
-int MPI_Close_port( char *port_name )
+int MPI_Close_port( const char *port_name )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -441,7 +441,7 @@
}
#if defined( HAVE_MPI_NAMING )
-int MPI_Lookup_name( char *service_name, MPI_Info info, char *port_name )
+int MPI_Lookup_name( const char *service_name, MPI_Info info, char *port_name )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -469,7 +469,7 @@
return returnVal;
}
-int MPI_Publish_name( char *service_name, MPI_Info info, char *port_name )
+int MPI_Publish_name( const char *service_name, MPI_Info info, const char *port_name )
{
int returnVal;
MPE_LOG_STATE_DECL
@@ -497,7 +497,7 @@
return returnVal;
}
-int MPI_Unpublish_name( char *service_name, MPI_Info info, char *port_name )
+int MPI_Unpublish_name( const char *service_name, MPI_Info info, const char *port_name )
{
int returnVal;
MPE_LOG_STATE_DECL
diff -ur mpe2-1.3.0/src/wrappers/src/mpe_prof.c mpe2-1.3.0-new/src/wrappers/src/mpe_prof.c
--- mpe2-1.3.0/src/wrappers/src/mpe_prof.c 2007-11-02 18:50:19.000000000 -0400
+++ mpe2-1.3.0-new/src/wrappers/src/mpe_prof.c 2013-03-28 19:13:25.571633940 -0400
@@ -123,7 +123,7 @@
MPI_Send - prototyping replacement for MPI_Send
*/
int MPI_Send( buf, count, datatype, dest, tag, comm )
-void *buf;
+const void *buf;
int count, dest, tag;
MPI_Datatype datatype;
MPI_Comm comm;
@@ -188,7 +188,8 @@
MPI_Reduce - prototyping replacement for MPI_Reduce
*/
int MPI_Reduce( sendbuf, recvbuf, count, datatype, op, root, comm )
-void *sendbuf, *recvbuf;
+const void *sendbuf;
+void *recvbuf;
int count, root;
MPI_Op op;
MPI_Datatype datatype;
@@ -208,7 +209,7 @@
MPI_Allreduce
*/
int MPI_Allreduce ( sendbuf, recvbuf, count, datatype, op, comm )
-void *sendbuf;
+const void *sendbuf;
void *recvbuf;
int count;
MPI_Datatype datatype;
@@ -246,7 +247,7 @@
MPI_Isend - prototyping replacement for MPI_Isend
*/
int MPI_Isend( buf, count, datatype, dest, tag, comm, request )
-void *buf;
+const void *buf;
int count, dest, tag;
MPI_Datatype datatype;
MPI_Comm comm;
@@ -345,7 +346,8 @@
int MPI_Sendrecv( sendbuf, sendcount, sendtype, dest, sendtag,
recvbuf, recvcount, recvtype, source, recvtag,
comm, status )
-void *sendbuf, *recvbuf;
+const void *sendbuf;
+void *recvbuf;
int sendcount, dest, sendtag, source, recvtag, recvcount;
MPI_Datatype sendtype, recvtype;
MPI_Comm comm;
@@ -385,7 +387,7 @@
MPI_Ssend - prototyping replacement for MPI_Ssend
*/
int MPI_Ssend( buf, count, datatype, dest, tag, comm )
-void *buf;
+const void *buf;
int count, dest, tag;
MPI_Datatype datatype;
MPI_Comm comm;
@@ -404,7 +406,7 @@
MPI_Issend - prototyping replacement for MPI_Issend
*/
int MPI_Issend( buf, count, datatype, dest, tag, comm, request )
-void *buf;
+const void *buf;
int count;
MPI_Datatype datatype;
int dest;
diff -ur mpe2-1.3.0/src/wrappers/src/trace_mpi_core.c mpe2-1.3.0-new/src/wrappers/src/trace_mpi_core.c
--- mpe2-1.3.0/src/wrappers/src/trace_mpi_core.c 2008-07-07 16:28:50.000000000 -0400
+++ mpe2-1.3.0-new/src/wrappers/src/trace_mpi_core.c 2013-03-28 19:11:29.593337507 -0400
@@ -31,7 +31,7 @@
int MPI_Allgather( sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcount;
MPI_Datatype sendtype;
void * recvbuf;
@@ -58,12 +58,12 @@
}
int MPI_Allgatherv( sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcount;
MPI_Datatype sendtype;
void * recvbuf;
-int * recvcounts;
-int * displs;
+const int * recvcounts;
+const int * displs;
MPI_Datatype recvtype;
MPI_Comm comm;
{
@@ -86,7 +86,7 @@
}
int MPI_Allreduce( sendbuf, recvbuf, count, datatype, op, comm )
-void * sendbuf;
+const void * sendbuf;
void * recvbuf;
int count;
MPI_Datatype datatype;
@@ -111,7 +111,7 @@
}
int MPI_Alltoall( sendbuf, sendcount, sendtype, recvbuf, recvcnt, recvtype, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcount;
MPI_Datatype sendtype;
void * recvbuf;
@@ -138,13 +138,13 @@
}
int MPI_Alltoallv( sendbuf, sendcnts, sdispls, sendtype, recvbuf, recvcnts, rdispls, recvtype, comm )
-void * sendbuf;
-int * sendcnts;
-int * sdispls;
+const void * sendbuf;
+const int * sendcnts;
+const int * sdispls;
MPI_Datatype sendtype;
void * recvbuf;
-int * recvcnts;
-int * rdispls;
+const int * recvcnts;
+const int * rdispls;
MPI_Datatype recvtype;
MPI_Comm comm;
{
@@ -211,7 +211,7 @@
}
int MPI_Gather( sendbuf, sendcnt, sendtype, recvbuf, recvcount, recvtype, root, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcnt;
MPI_Datatype sendtype;
void * recvbuf;
@@ -239,12 +239,12 @@
}
int MPI_Gatherv( sendbuf, sendcnt, sendtype, recvbuf, recvcnts, displs, recvtype, root, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcnt;
MPI_Datatype sendtype;
void * recvbuf;
-int * recvcnts;
-int * displs;
+const int * recvcnts;
+const int * displs;
MPI_Datatype recvtype;
int root;
MPI_Comm comm;
@@ -310,9 +310,9 @@
}
int MPI_Reduce_scatter( sendbuf, recvbuf, recvcnts, datatype, op, comm )
-void * sendbuf;
+const void * sendbuf;
void * recvbuf;
-int * recvcnts;
+const int * recvcnts;
MPI_Datatype datatype;
MPI_Op op;
MPI_Comm comm;
@@ -336,7 +336,7 @@
}
int MPI_Reduce( sendbuf, recvbuf, count, datatype, op, root, comm )
-void * sendbuf;
+const void * sendbuf;
void * recvbuf;
int count;
MPI_Datatype datatype;
@@ -362,7 +362,7 @@
}
int MPI_Scan( sendbuf, recvbuf, count, datatype, op, comm )
-void * sendbuf;
+const void * sendbuf;
void * recvbuf;
int count;
MPI_Datatype datatype;
@@ -387,7 +387,7 @@
}
int MPI_Scatter( sendbuf, sendcnt, sendtype, recvbuf, recvcnt, recvtype, root, comm )
-void * sendbuf;
+const void * sendbuf;
int sendcnt;
MPI_Datatype sendtype;
void * recvbuf;
@@ -415,9 +415,9 @@
}
int MPI_Scatterv( sendbuf, sendcnts, displs, sendtype, recvbuf, recvcnt, recvtype, root, comm )
-void * sendbuf;
-int * sendcnts;
-int * displs;
+const void * sendbuf;
+const int * sendcnts;
+const int * displs;
MPI_Datatype sendtype;
void * recvbuf;
int recvcnt;
@@ -790,7 +790,7 @@
int MPI_Group_excl( group, n, ranks, newgroup )
MPI_Group group;
int n;
-int * ranks;
+const int * ranks;
MPI_Group * newgroup;
{
int returnVal;
@@ -833,7 +833,7 @@
int MPI_Group_incl( group, n, ranks, group_out )
MPI_Group group;
int n;
-int * ranks;
+const int * ranks;
MPI_Group * group_out;
{
int returnVal;
@@ -966,7 +966,7 @@
int MPI_Group_translate_ranks( group_a, n, ranks_a, group_b, ranks_b )
MPI_Group group_a;
int n;
-int * ranks_a;
+const int * ranks_a;
MPI_Group group_b;
int * ranks_b;
{
@@ -1375,7 +1375,7 @@
#endif
int MPI_Address( location, address )
-void * location;
+const void * location;
MPI_Aint * address;
{
int returnVal;
@@ -1396,7 +1396,7 @@
}
int MPI_Bsend( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1424,7 +1424,7 @@
}
int MPI_Bsend_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1565,7 +1565,7 @@
}
int MPI_Send_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1593,7 +1593,7 @@
}
int MPI_Get_elements( status, datatype, elements )
-MPI_Status * status;
+const MPI_Status * status;
MPI_Datatype datatype;
int * elements;
{
@@ -1615,7 +1615,7 @@
}
int MPI_Get_count( status, datatype, count )
-MPI_Status * status;
+const MPI_Status * status;
MPI_Datatype datatype;
int * count;
{
@@ -1637,7 +1637,7 @@
}
int MPI_Ibsend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1718,7 +1718,7 @@
}
int MPI_Irsend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1746,7 +1746,7 @@
}
int MPI_Isend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1775,7 +1775,7 @@
}
int MPI_Issend( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1804,7 +1804,7 @@
}
int MPI_Pack( inbuf, incount, type, outbuf, outcount, position, comm )
-void * inbuf;
+const void * inbuf;
int incount;
MPI_Datatype type;
void * outbuf;
@@ -1914,7 +1914,7 @@
}
int MPI_Rsend( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1942,7 +1942,7 @@
}
int MPI_Rsend_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1971,7 +1971,7 @@
}
int MPI_Send( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -1999,7 +1999,7 @@
}
int MPI_Sendrecv( sendbuf, sendcount, sendtype, dest, sendtag, recvbuf, recvcount, recvtype, source, recvtag, comm, status )
-void * sendbuf;
+const void * sendbuf;
int sendcount;
MPI_Datatype sendtype;
int dest;
@@ -2065,7 +2065,7 @@
}
int MPI_Ssend( buf, count, datatype, dest, tag, comm )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -2093,7 +2093,7 @@
}
int MPI_Ssend_init( buf, count, datatype, dest, tag, comm, request )
-void * buf;
+const void * buf;
int count;
MPI_Datatype datatype;
int dest;
@@ -2233,7 +2233,7 @@
}
int MPI_Test_cancelled( status, flag )
-MPI_Status * status;
+const MPI_Status * status;
int * flag;
{
int returnVal;
@@ -2364,8 +2364,8 @@
int MPI_Type_hindexed( count, blocklens, indices, old_type, newtype )
int count;
-int * blocklens;
-MPI_Aint * indices;
+const int * blocklens;
+const MPI_Aint * indices;
MPI_Datatype old_type;
MPI_Datatype * newtype;
{
@@ -2413,8 +2413,8 @@
int MPI_Type_indexed( count, blocklens, indices, old_type, newtype )
int count;
-int * blocklens;
-int * indices;
+const int * blocklens;
+const int * indices;
MPI_Datatype old_type;
MPI_Datatype * newtype;
{
@@ -2480,9 +2480,9 @@
int MPI_Type_struct( count, blocklens, indices, old_types, newtype )
int count;
-int * blocklens;
-MPI_Aint * indices;
-MPI_Datatype * old_types;
+const int * blocklens;
+const MPI_Aint * indices;
+const MPI_Datatype * old_types;
MPI_Datatype * newtype;
{
int returnVal;
@@ -2549,7 +2549,7 @@
}
int MPI_Unpack( inbuf, insize, position, outbuf, outcount, type, comm )
-void * inbuf;
+const void * inbuf;
int insize;
int * position;
void * outbuf;
@@ -2692,8 +2692,8 @@
int MPI_Cart_create( comm_old, ndims, dims, periods, reorder, comm_cart )
MPI_Comm comm_old;
int ndims;
-int * dims;
-int * periods;
+const int * dims;
+const int * periods;
int reorder;
MPI_Comm * comm_cart;
{
@@ -2742,8 +2742,8 @@
int MPI_Cart_map( comm_old, ndims, dims, periods, newrank )
MPI_Comm comm_old;
int ndims;
-int * dims;
-int * periods;
+const int * dims;
+const int * periods;
int * newrank;
{
int returnVal;
@@ -2765,7 +2765,7 @@
int MPI_Cart_rank( comm, coords, rank )
MPI_Comm comm;
-int * coords;
+const int * coords;
int * rank;
{
int returnVal;
@@ -2811,7 +2811,7 @@
int MPI_Cart_sub( comm, remain_dims, comm_new )
MPI_Comm comm;
-int * remain_dims;
+const int * remain_dims;
MPI_Comm * comm_new;
{
int returnVal;
@@ -2877,8 +2877,8 @@
int MPI_Graph_create( comm_old, nnodes, index, edges, reorder, comm_graph )
MPI_Comm comm_old;
int nnodes;
-int * index;
-int * edges;
+const int * index;
+const int * edges;
int reorder;
MPI_Comm * comm_graph;
{
@@ -2927,8 +2927,8 @@
int MPI_Graph_map( comm_old, nnodes, index, edges, newrank )
MPI_Comm comm_old;
int nnodes;
-int * index;
-int * edges;
+const int * index;
+const int * edges;
int * newrank;
{
int returnVal;
More information about the discuss
mailing list