diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a75ea23 --- /dev/null +++ b/.gitignore @@ -0,0 +1,57 @@ +*~ +configure +configure.lineno +config.log +config.status +config.cache +*conf.cache +config.system +config.h.in +autom4te.cache +autom4te-*.cache +Makefile +lib +f77tmpdir +mpe_conf.h +mpe_conf.h.in +mpe_conf.h.in~ +*ebug* +*elease* +*.user +old +bin/mpecc +bin/mpefc +bin/bt2line +bin/check_callstack +bin/clog2_join +bin/clog2_print +bin/clog2_repair +etc/mpe_f77env.conf +etc/mpe_help.conf +etc/mpe_mpilog.conf +etc/mpe_mpitrace.conf +etc/mpe_nolog.conf +etc/mpe_log.conf +etc/mpe_log_postlib.conf +etc/mpe_callstack_ldflags.conf +etc/mpe_mpicheck.conf +sbin/mpecheckbuild +sbin/mpecheckinstall +sbin/mpeinstall +sbin/mpetestexec +sbin/mpetestexeclog +sbin/mpetestlink +include/mpe_callstack.h +include/mpe_log.h +include/mpe_graphics.h +include/mpe_logf.h +include/mpe_misc.h +include/clog_commset.h +include/clog_const.h +include/clog_inttypes.h +include/clog_uuid.h +include/mpe_log_thread.h +*.o +*.po +*.no +make.log diff --git a/cross_spec/.gitignore b/cross_spec/.gitignore new file mode 100644 index 0000000..a559f4b --- /dev/null +++ b/cross_spec/.gitignore @@ -0,0 +1 @@ +cross_conf.h.in diff --git a/src/callstack/.gitignore b/src/callstack/.gitignore new file mode 100644 index 0000000..ecca3a4 --- /dev/null +++ b/src/callstack/.gitignore @@ -0,0 +1,5 @@ +mpe_callstack_conf.h.in +mpe_callstack_conf.h +bin/bt2line +etc/mpe_callstack_ldflags.conf +include/mpe_callstack.h diff --git a/src/collchk/.gitignore b/src/collchk/.gitignore new file mode 100644 index 0000000..7c31047 --- /dev/null +++ b/src/collchk/.gitignore @@ -0,0 +1,3 @@ +mpe_collchk_conf.h.in +mpe_collchk_conf.h +etc/mpe_mpicheck.conf diff --git a/src/collchk/src/same_dtype.c b/src/collchk/src/same_dtype.c index a6614f5..1462026 100644 --- a/src/collchk/src/same_dtype.c +++ b/src/collchk/src/same_dtype.c @@ -529,6 +529,10 @@ int CollChk_dtype_scatter(MPI_Comm comm, CollChk_dtype_hash(sendtype, sendcnt, &root_hash); /* broadcast root's datatype hash to all other processes */ + /* Note: root_hash is really a structure of two unsigneds, so it is + a happy coincidence that we should be able to send it as + 2 MPI_UNSIGNED. Some versions of MPICH will complain about + a compile-time type mismatch here */ PMPI_Bcast(&root_hash, 2, MPI_UNSIGNED, root, comm); /* Compare root_hash with the input/local hash */ diff --git a/src/graphics/.gitignore b/src/graphics/.gitignore new file mode 100644 index 0000000..ca1d76c --- /dev/null +++ b/src/graphics/.gitignore @@ -0,0 +1,2 @@ +mpe_graphics_conf.h.in +mpe_graphics_conf.h diff --git a/src/graphics/configure.ac b/src/graphics/configure.ac index d6a79f9..d9111b4 100644 --- a/src/graphics/configure.ac +++ b/src/graphics/configure.ac @@ -12,6 +12,14 @@ AC_PREREQ(2.52) AC_CONFIG_HEADER(mpe_graphics_conf.h) dnl echo "Configuring MPE X Graphics Library with $ac_configure_args" +AH_BOTTOM([ +/* Define MPE_CONST=const if mpi.h uses const in MPI function declaration. */ +#if defined(HAVE_CONST_IN_MPI_DECL) || MPI_VERSION >= 3 +#define MPE_CONST const +#else +#define MPE_CONST +#endif +]) dnl dnl Set top_srcdir_abs to be the ABSOLUTE path to the home directory of MPE dnl top_srcdir is in relative path. @@ -33,6 +41,13 @@ AC_ARG_ENABLE( softerror, are used. The default is enable=no.], , enable_softerror=${mpe_enable_softerror:-no} ) +AC_ARG_ENABLE( checkMPI, +[--enable-checkMPI - Turn on/off the linking test for the MPI + include files, MPI libraries and MPI_CC + compiler. The default is enable=yes.], , +enable_checkMPI=yes ) + + MAKE=${MAKE:-make} MPI_IMPL=${MPI_IMPL:-UserSupplied} MPE_BUILD_FORTRAN2C=${MPE_BUILD_FORTRAN2C:-no} @@ -234,6 +249,27 @@ if test "$MPE_BUILD_FORTRAN2C" = "yes" ; then fi fi +dnl Check if MPI implementation uses const in function declaration +if test "$enable_checkMPI" = "yes" ; then + AC_MSG_CHECKING( [for the use of const in MPI function declaration] ) + PAC_MPI_COMPILE_CC_FUNC( $MPI_CC, [$MPI_CFLAGS], [], [], + [ +int MPI_Send(const void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm) +{ + return 0; +} + ], + [ mpe_link_ok=yes ], [ mpe_link_ok=no ] ) + if test "$mpe_link_ok" = "yes" ; then + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CONST_IN_MPI_DECL, 1, [Define MPE_CONST to const]) + else + AC_MSG_RESULT(no) + fi +fi + + if test ! -d contrib ; then mkdir contrib ; fi AC_SUBST(MPI_IMPL) diff --git a/src/graphics/src/mpe_graphics.c b/src/graphics/src/mpe_graphics.c index ef1b8a4..1cb2b82 100644 --- a/src/graphics/src/mpe_graphics.c +++ b/src/graphics/src/mpe_graphics.c @@ -134,13 +134,9 @@ N*/ The trailing blanks in Fortran CHARACTER string argument will be ignored. @*/ -int MPE_Open_graphics( handle, comm, display, x, y, w, h, is_collective ) -MPE_XGraph *handle; -MPI_Comm comm; -char display[MPI_MAX_PROCESSOR_NAME+4]; -int x, y; -int w, h; -int is_collective; +int MPE_Open_graphics(MPE_XGraph *handle, MPI_Comm comm, char display[], + int x, int y, int w, int h, int is_collective) +/* char display[MPI_MAX_PROCESSOR_NAME+4]; */ { #ifndef MPE_NOMPI @@ -389,10 +385,7 @@ static void SetBackingStoreBitGrav( MPE_XGraph graph ) The trailing blanks in Fortran 'CHARACTER' string argument will be ignored. @*/ -int MPE_CaptureFile( handle, fname, freq ) -MPE_XGraph handle; -char *fname; -int freq; +int MPE_CaptureFile(MPE_XGraph handle, char *fname, int freq) { if (handle->Cookie != MPE_G_COOKIE) { fprintf( stderr, "Handle argument is incorrect or corrupted\n" ); @@ -429,10 +422,7 @@ int freq; .N XGRAPHICS_FORTRAN @*/ -int MPE_Draw_point( handle, x, y, color ) -MPE_XGraph handle; -int x, y; -MPE_Color color; +int MPE_Draw_point(MPE_XGraph handle, int x, int y, MPE_Color color) { if (handle->Cookie != MPE_G_COOKIE) { fprintf( stderr, "Handle argument is incorrect or corrupted\n" ); @@ -463,10 +453,7 @@ MPE_Color color; .N XGRAPHICS_FORTRAN @*/ -int MPE_Draw_points( handle, points, npoints ) -MPE_XGraph handle; -MPE_Point *points; -int npoints; +int MPE_Draw_points(MPE_XGraph handle, MPE_Point *points, int npoints) { XPoint *sortedPoints; int *colorRanges, ncolors, colorNum, n; @@ -538,11 +525,9 @@ int npoints; -static void SortPoints( lista, a, listb, colorList, boundaryPoints, ncolors ) -MPE_Point *lista; -XPoint **listb; -MPE_Color **colorList; -int a, **boundaryPoints, *ncolors; +static void SortPoints(MPE_Point *lista, int a, XPoint **listb, + MPE_Color **colorList, int **boundaryPoints, + int *ncolors) { int top, bottom, outoforder; MPE_Color thisColor, tempColor, *keyList; @@ -642,10 +627,8 @@ int a, **boundaryPoints, *ncolors; .N XGRAPHICS_FORTRAN @*/ -int MPE_Draw_line( handle, x1, y_1, x2, y_2, color ) -MPE_XGraph handle; -int x1, y_1, x2, y_2; -MPE_Color color; +int MPE_Draw_line(MPE_XGraph handle, int x1, int y_1, int x2, int y_2, + MPE_Color color) { if (handle->Cookie != MPE_G_COOKIE) { fprintf( stderr, "Handle argument is incorrect or corrupted\n" ); @@ -686,10 +669,8 @@ MPE_Color color; .N XGRAPHICS_FORTRAN @*/ -int MPE_Fill_rectangle( handle, x, y, w, h, color ) -MPE_XGraph handle; -int x, y, w, h; -MPE_Color color; +int MPE_Fill_rectangle(MPE_XGraph handle, int x, int y, int w, int h, + MPE_Color color) { if (handle->Cookie != MPE_G_COOKIE) { fprintf( stderr, "Handle argument is incorrect or corrupted\n" ); @@ -724,8 +705,7 @@ MPE_Color color; .N XGRAPHICS_FORTRAN @*/ -int MPE_Update( handle ) -MPE_XGraph handle; +int MPE_Update(MPE_XGraph handle) { if (handle->Cookie != MPE_G_COOKIE) { fprintf( stderr, "Handle argument is incorrect or corrupted\n" ); @@ -784,8 +764,7 @@ MPE_XGraph handle; .N XGRAPHICS_FORTRAN @*/ -int MPE_Close_graphics( handle ) -MPE_XGraph *handle; +int MPE_Close_graphics(MPE_XGraph *handle) { if (!handle || !*handle || (*handle)->Cookie != MPE_G_COOKIE) { fprintf( stderr, "Handle argument is incorrect or corrupted\n" ); @@ -816,10 +795,7 @@ MPE_XGraph *handle; .N XGRAPHICS_FORTRAN @*/ -int MPE_Make_color_array( handle, ncolors, array ) -MPE_XGraph handle; -int ncolors; -MPE_Color array[]; +int MPE_Make_color_array(MPE_XGraph handle, int ncolors, MPE_Color array[] ) { int i; PixVal white; @@ -869,9 +845,7 @@ MPE_Color array[]; .N XGRAPHICS_FORTRAN @*/ -int MPE_Num_colors( handle, nc ) -MPE_XGraph handle; -int *nc; +int MPE_Num_colors(MPE_XGraph handle, int *nc) { if (handle->Cookie != MPE_G_COOKIE) { fprintf( stderr, "Handle argument is incorrect or corrupted\n" ); @@ -893,10 +867,8 @@ int *nc; .N XGRAPHICS_FORTRAN @*/ -int MPE_Draw_circle( graph, centerx, centery, radius, color ) -MPE_XGraph graph; -int centerx, centery, radius; -MPE_Color color; +int MPE_Draw_circle(MPE_XGraph graph, int centerx, int centery, int radius, + MPE_Color color) { int returnVal; @@ -932,10 +904,8 @@ MPE_Color color; .N XGRAPHICS_FORTRAN @*/ -int MPE_Fill_circle( graph, centerx, centery, radius, color ) -MPE_XGraph graph; -int centerx, centery, radius; -MPE_Color color; +int MPE_Fill_circle(MPE_XGraph graph, int centerx, int centery, int radius, + MPE_Color color) { int returnVal; @@ -968,11 +938,8 @@ MPE_Color color; The trailing blanks in Fortran CHARACTER string argument will be ignored. @*/ -int MPE_Draw_string( graph, x, y, color, string ) -MPE_XGraph graph; -int x, y; -MPE_Color color; -char *string; +int MPE_Draw_string(MPE_XGraph graph, int x, int y, MPE_Color color, + char *string) { int returnVal; @@ -1006,9 +973,7 @@ char *string; .N XGRAPHICS_FORTRAN @*/ -int MPE_Draw_logic( graph, function ) -MPE_XGraph graph; -int function; +int MPE_Draw_logic(MPE_XGraph graph, int function) { int returnVal; if (graph->Cookie != MPE_G_COOKIE) { @@ -1033,9 +998,7 @@ int function; .N XGRAPHICS_FORTRAN @*/ -int MPE_Line_thickness( graph, thickness ) -MPE_XGraph graph; -int thickness; +int MPE_Line_thickness(MPE_XGraph graph, int thickness) { XGCValues gcChanges; @@ -1048,9 +1011,7 @@ int thickness; -int MPE_Draw_dashes( graph, dashlen ) -MPE_XGraph graph; -int dashlen; +int MPE_Draw_dashes(MPE_XGraph graph, int dashlen) { XGCValues gcChanges; @@ -1070,9 +1031,7 @@ int dashlen; } -int MPE_Dash_offset( graph, offset ) -MPE_XGraph graph; -int offset; +int MPE_Dash_offset(MPE_XGraph graph, int offset) { XGCValues gcChanges; @@ -1107,10 +1066,8 @@ int offset; .N XGRAPHICS_FORTRAN @*/ -int MPE_Add_RGB_color( graph, red, green, blue, mapping ) -MPE_XGraph graph; -int red, green, blue; -MPE_Color *mapping; +int MPE_Add_RGB_color(MPE_XGraph graph, int red, int green, int blue, + MPE_Color *mapping) { XColor colordef; @@ -1175,8 +1132,7 @@ int MPE_Xerror( int returnVal, const char *functionName ) } -static xpand_list_Int *Int_CreateList(initialLen) -int initialLen; +static xpand_list_Int *Int_CreateList(int initialLen) { xpand_list_Int *tempPtr; @@ -1198,9 +1154,7 @@ int initialLen; } -static int Int_AddItem(listPtr, newItem) -xpand_list_Int *listPtr; -int newItem; +static int Int_AddItem(xpand_list_Int *listPtr, int newItem) { int *tmp; if (listPtr->nused == listPtr->size) { diff --git a/src/graphics/src/visual_mess.c b/src/graphics/src/visual_mess.c index d24f2a2..1924c87 100644 --- a/src/graphics/src/visual_mess.c +++ b/src/graphics/src/visual_mess.c @@ -10,6 +10,7 @@ #include #include +#include "mpi.h" #include "mpe_graphics_conf.h" /* This is used to correct system header files without prototypes */ @@ -24,7 +25,6 @@ #include #endif -#include "mpi.h" #include "mpe_graphics.h" #include "point.h" @@ -79,8 +79,7 @@ point a, b; -static void DrawScreen_0( procid, np ) -int procid, np; +static void DrawScreen_0(int procid, int np) { int width, procNum, radius; double angle; @@ -129,8 +128,7 @@ int procid, np; -static void MPE_Prof_DrawArrow_0( fromProc, toProc ) -int fromProc, toProc; +static void MPE_Prof_DrawArrow_0(int fromProc, int toProc) { point start, end, a, b, c, d, e; vector unit, norm; @@ -163,17 +161,13 @@ int fromProc, toProc; MPE_Update( prof_graph_0 ); } -static int prof_send( sender, receiver, tag, size, note ) -int sender, receiver, tag, size; -char *note; +static int prof_send(int sender, int receiver, int tag, int size, char *note) { MPE_Prof_DrawArrow_0( sender, receiver ); return 0; } -static int prof_recv( receiver, sender, tag, size, note ) -int receiver, sender, tag, size; -char *note; +static int prof_recv(int receiver, int sender, int tag, int size, char *note) { MPE_Prof_DrawArrow_0( sender, receiver ); return 0; @@ -293,9 +287,7 @@ static void ProcessWaitTest_1 ( MPI_Request request, MPI_Status *status, } -int MPI_Init( argc, argv ) -int * argc; -char *** argv; +int MPI_Init(int *argc, char ***argv) { int returnVal; @@ -315,19 +307,14 @@ char *** argv; return returnVal; } -int MPI_Finalize() +int MPI_Finalize(void) { rq_end( requests_avail_1 ); return PMPI_Finalize(); } -int MPI_Bsend( buf, count, datatype, dest, tag, comm ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Bsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm) { int returnVal; int typesize; @@ -345,14 +332,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Bsend_init( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Bsend_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq; @@ -381,8 +362,7 @@ MPI_Request * request; return returnVal; } -int MPI_Cancel( request ) -MPI_Request * request; +int MPI_Cancel(MPI_Request *request) { int returnVal; request_list *rq; @@ -398,8 +378,7 @@ MPI_Request * request; return returnVal; } -int MPI_Request_free( request ) -MPI_Request * request; +int MPI_Request_free(MPI_Request *request) { int returnVal; @@ -413,14 +392,8 @@ MPI_Request * request; return returnVal; } -int MPI_Recv_init( buf, count, datatype, source, tag, comm, request ) -void * buf; -int count; -MPI_Datatype datatype; -int source; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source, + int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq1; @@ -441,14 +414,8 @@ MPI_Request * request; return returnVal; } -int MPI_Send_init( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Send_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq; @@ -477,14 +444,8 @@ MPI_Request * request; return returnVal; } -int MPI_Ibsend( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Ibsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq; @@ -513,14 +474,8 @@ MPI_Request * request; return returnVal; } -int MPI_Irecv( buf, count, datatype, source, tag, comm, request ) -void * buf; -int count; -MPI_Datatype datatype; -int source; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, + int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq1; @@ -542,14 +497,8 @@ MPI_Request * request; return returnVal; } -int MPI_Irsend( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Irsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq; @@ -578,14 +527,8 @@ MPI_Request * request; return returnVal; } -int MPI_Isend( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Isend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq; @@ -614,14 +557,8 @@ MPI_Request * request; return returnVal; } -int MPI_Issend( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Issend(MPE_CONST void *buf, int count, MPI_Comm datatype, int dest, + int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq; @@ -650,14 +587,8 @@ MPI_Request * request; return returnVal; } -int MPI_Recv( buf, count, datatype, source, tag, comm, status ) -void * buf; -int count; -MPI_Datatype datatype; -int source; -int tag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, + int tag, MPI_Comm comm, MPI_Status *status) { int returnVal; int size; @@ -675,13 +606,8 @@ MPI_Status * status; return returnVal; } -int MPI_Rsend( buf, count, datatype, dest, tag, comm ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Rsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm) { int returnVal; int typesize; @@ -699,14 +625,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Rsend_init( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Rsend_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq; @@ -735,13 +655,8 @@ MPI_Request * request; return returnVal; } -int MPI_Send( buf, count, datatype, dest, tag, comm ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Send(MPE_CONST void *buf, int count, MPI_Datatype datatype, int dest, + int tag, MPI_Comm comm) { int returnVal; int typesize; @@ -759,19 +674,10 @@ MPI_Comm comm; return returnVal; } -int MPI_Sendrecv( sendbuf, sendcount, sendtype, dest, sendtag, recvbuf, recvcount, recvtype, source, recvtag, comm, status ) -const void * sendbuf; -int sendcount; -MPI_Datatype sendtype; -int dest; -int sendtag; -void * recvbuf; -int recvcount; -MPI_Datatype recvtype; -int source; -int recvtag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Sendrecv(MPE_CONST void *sendbuf, int sendcount, MPI_Datatype sendtype, + int dest, int sendtag, void *recvbuf, int recvcount, + MPI_Datatype recvtype, int source, int recvtag, MPI_Comm comm, + MPI_Status *status) { int returnVal; int typesize1; @@ -793,16 +699,9 @@ MPI_Status * status; return returnVal; } -int MPI_Sendrecv_replace( buf, count, datatype, dest, sendtag, source, recvtag, comm, status ) -void * buf; -int count; -MPI_Datatype datatype; -int dest; -int sendtag; -int source; -int recvtag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int dest, + int sendtag, int source, int recvtag, + MPI_Comm comm, MPI_Status *status) { int returnVal; int size1; @@ -824,13 +723,8 @@ MPI_Status * status; return returnVal; } -int MPI_Ssend( buf, count, datatype, dest, tag, comm ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Ssend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm) { int returnVal; int typesize; @@ -848,14 +742,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Ssend_init( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Ssend_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; request_list *newrq; @@ -884,10 +772,7 @@ MPI_Request * request; return returnVal; } -int MPI_Test( request, flag, status ) -MPI_Request * request; -int * flag; -MPI_Status * status; +int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status) { int returnVal; MPI_Request lreq = *request; @@ -901,11 +786,8 @@ MPI_Status * status; return returnVal; } -int MPI_Testall( count, array_of_requests, flag, array_of_statuses ) -int count; -MPI_Request * array_of_requests; -int * flag; -MPI_Status * array_of_statuses; +int MPI_Testall(int count, MPI_Request *array_of_requests, int *flag, + MPI_Status *array_of_statuses) { int returnVal; int i3; @@ -925,12 +807,8 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Testany( count, array_of_requests, index, flag, status ) -int count; -MPI_Request * array_of_requests; -int * index; -int * flag; -MPI_Status * status; +int MPI_Testany(int count, MPI_Request *array_of_requests, int *index, + int *flag, MPI_Status *status) { int returnVal; @@ -945,12 +823,8 @@ MPI_Status * status; return returnVal; } -int MPI_Testsome( incount, array_of_requests, outcount, array_of_indices, array_of_statuses ) -int incount; -MPI_Request * array_of_requests; -int * outcount; -int * array_of_indices; -MPI_Status * array_of_statuses; +int MPI_Testsome(int incount, MPI_Request *array_of_requests, int *outcount, + int *array_of_indices, MPI_Status *array_of_statuses) { int returnVal; int i2; @@ -970,9 +844,7 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Wait( request, status ) -MPI_Request * request; -MPI_Status * status; +int MPI_Wait(MPI_Request *request, MPI_Status *status) { int returnVal; MPI_Request lreq = *request; @@ -984,10 +856,8 @@ MPI_Status * status; return returnVal; } -int MPI_Waitall( count, array_of_requests, array_of_statuses ) -int count; -MPI_Request * array_of_requests; -MPI_Status * array_of_statuses; +int MPI_Waitall(int count, MPI_Request *array_of_requests, + MPI_Status *array_of_statuses) { int returnVal; int i1; @@ -1007,11 +877,8 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Waitany( count, array_of_requests, index, status ) -int count; -MPI_Request * array_of_requests; -int * index; -MPI_Status * status; +int MPI_Waitany(int count, MPI_Request *array_of_requests, int *index, + MPI_Status *status) { int returnVal; @@ -1025,12 +892,8 @@ MPI_Status * status; return returnVal; } -int MPI_Waitsome( incount, array_of_requests, outcount, array_of_indices, array_of_statuses ) -int incount; -MPI_Request * array_of_requests; -int * outcount; -int * array_of_indices; -MPI_Status * array_of_statuses; +int MPI_Waitsome(int incount, MPI_Request *array_of_requests, int *outcount, + int *array_of_indices, MPI_Status *array_of_statuses) { int returnVal; int i; diff --git a/src/graphics/src/xcolor.c b/src/graphics/src/xcolor.c index bc6156d..1185183 100644 --- a/src/graphics/src/xcolor.c +++ b/src/graphics/src/xcolor.c @@ -25,10 +25,7 @@ int XBHlsHelper ( int, int, int ); /* cmap is ignored for now? */ -void XBInitColors( XBWin, cmap, nc ) -XBWindow *XBWin; -Colormap cmap; -int nc; +void XBInitColors(XBWindow *XBWin, Colormap cmap, int nc) { PixVal white_pixel, black_pixel; @@ -65,8 +62,7 @@ int nc; /* Set the initial color map */ -int XBInitCmap( XBWin ) -XBWindow *XBWin; +int XBInitCmap(XBWindow *XBWin) { XColor colordef; int i; @@ -92,10 +88,8 @@ XBWindow *XBWin; * The input to this routine is RGB, not HLS. * X colors are 16 bits, not 8, so we have to shift the input by 8. */ -int XBCmap( red, green, blue, mapsize, XBWin ) -int mapsize; -unsigned char red[], green[], blue[]; -XBWindow *XBWin; +int XBCmap(unsigned char red[], unsigned char green[], unsigned char blue[], + int mapsize, XBWindow *XBWin) { int i, err; XColor colordef; @@ -208,8 +202,7 @@ XBWindow *XBWin; GrayScale StaticGray */ -int XBSetVisualClass( XBWin ) -XBWindow *XBWin; +int XBSetVisualClass(XBWindow *XBWin) { XVisualInfo vinfo; if (XMatchVisualInfo( XBWin->disp, XBWin->screen, @@ -233,17 +226,13 @@ XBWindow *XBWin; return 0; } -int XBGetVisualClass( XBWin ) -XBWindow *XBWin; +int XBGetVisualClass( XBWindow *XBWin ) { return XBWin->vis->class; } /* Should pass this an XBWin */ -Colormap XBCreateColormap( display, screen, visual ) -Display *display; -int screen; -Visual *visual; +Colormap XBCreateColormap(Display *display, int screen, Visual *visual) { Colormap Cmap; @@ -256,17 +245,14 @@ Visual *visual; } -int XBSetColormap( XBWin ) -XBWindow *XBWin; +int XBSetColormap(XBWindow *XBWin) { XSetWindowColormap( XBWin->disp, XBWin->win, XBWin->cmap ); return 0; } -int XBAllocBW( XBWin, white, black ) -XBWindow *XBWin; -PixVal *white, *black; +int XBAllocBW(XBWindow *XBWin, PixVal *white, PixVal *black) { XColor bcolor, wcolor; XParseColor( XBWin->disp, XBWin->cmap, "black", &bcolor ); @@ -286,9 +272,7 @@ PixVal *white, *black; } -int XBGetBaseColor( XBWin, white_pix, black_pix ) -XBWindow *XBWin; -PixVal *white_pix, *black_pix; +int XBGetBaseColor(XBWindow *XBWin, PixVal *white_pix, PixVal *black_pix) { *white_pix = XBWin->cmapping[WHITE]; *black_pix = XBWin->cmapping[BLACK]; @@ -309,17 +293,15 @@ PixVal *white_pix, *black_pix; static double Gamma = 2.0; #include -int XBSetGamma( g ) -double g; +int XBSetGamma( double g ) { Gamma = g; return 0; } -int XBSetCmapHue( red, green, blue, mapsize ) -int mapsize; -unsigned char *red, *green, *blue; +int XBSetCmapHue(unsigned char *red, unsigned char *green, unsigned char *blue, + int mapsize) { int i, hue, lightness, saturation; double igamma = 1.0 / Gamma; @@ -353,8 +335,7 @@ unsigned char *red, *green, *blue; * (0:255, 0:255, 0:255) * r g b */ -int XBHlsHelper( h, n1, n2 ) -int h, n1, n2; +int XBHlsHelper(int h, int n1, int n2) { while (h > 360) h = h - 360; while (h < 0) h = h + 360; @@ -364,9 +345,8 @@ if (h < 240) return n1 + (n2-n1)*(240-h)/60; return n1; } -int XBHlsToRgb( h, l, s, r, g, b ) -int h, l, s; -unsigned char *r, *g, *b; +int XBHlsToRgb(int h, int l, int s, + unsigned char *r, unsigned char *g, unsigned char *b) { int m1, m2; /* in 0 to 100 */ if (l <= 50) m2 = l * ( 100 + s ) / 100 ; /* not sure of "/100" */ @@ -392,10 +372,7 @@ return 0; This routine returns the pixel value for the specified color Returns 0 on failure, <>0 otherwise. */ -int XBFindColor( XBWin, name, pixval ) -XBWindow *XBWin; -char *name; -PixVal *pixval; +int XBFindColor(XBWindow *XBWin, char *name, PixVal *pixval) { XColor colordef; int st; @@ -424,10 +401,8 @@ PixVal *pixval; * This is like XBCmap, except that it APPENDS to the existing * colormap. */ -int XBAddCmap( red, green, blue, mapsize, XBWin ) -int mapsize; -unsigned char red[], green[], blue[]; -XBWindow *XBWin; +int XBAddCmap(unsigned char red[], unsigned char green[], unsigned char blue[], + int mapsize, XBWindow *XBWin) { int i, err; XColor colordef; @@ -463,10 +438,7 @@ XBWindow *XBWin; In the monchrome case (or if the color is otherwise unavailable), the "background" or "foreground" colors will be chosen */ -PixVal XBGetColor( XBWin, name, is_fore ) -XBWindow *XBWin; -char *name; -int is_fore; +PixVal XBGetColor(XBWindow *XBWin, char *name, int is_fore) { PixVal pixval; if (XBWin->numcolors == 2 || !XBFindColor( XBWin, name, &pixval )) @@ -478,10 +450,7 @@ int is_fore; This routine takes a named color and returns a color that is either lighter or darker */ -PixVal XBSimColor( XBWin, pixel, intensity, is_fore ) -XBWindow *XBWin; -PixVal pixel; -int intensity, is_fore; +PixVal XBSimColor(XBWindow *XBWin, PixVal pixel, int intensity, int is_fore) { XColor colordef, colorsdef; char RGBcolor[20]; @@ -532,9 +501,7 @@ int intensity, is_fore; colormap is used. The Pixel values chosen are in the cmapping structure; this is used by routines such as the XB contour plotter. */ -void XBUniformHues( XBwin, ncolors ) -XBWindow *XBwin; -int ncolors; +void XBUniformHues(XBWindow *XBwin, int ncolors) { unsigned char *red, *green, *blue; @@ -561,9 +528,8 @@ int ncolors; Note: The initial color is (red[0],green[0],blue[0]). */ -void XBSetCmapLight( red, green, blue, mapsize ) - int mapsize; - unsigned char *red, *green, *blue; +void XBSetCmapLight(unsigned char *red, unsigned char *green, + unsigned char *blue, int mapsize) { int i ; diff --git a/src/graphics/src/xframe.c b/src/graphics/src/xframe.c index b02b7af..fb7613d 100644 --- a/src/graphics/src/xframe.c +++ b/src/graphics/src/xframe.c @@ -26,10 +26,7 @@ static PixVal HiPix=0, LoPix=0; /* Set the colors for the highlights by name */ -int XBFrameColors( XBWin, Rgn, Hi, Lo ) -XBWindow *XBWin; -XBDecoration *Rgn; -char *Hi, *Lo; +int XBFrameColors(XBWindow *XBWin, XBDecoration *Rgn, char *Hi, char *Lo) { Rgn->Hi = XBGetColor( XBWin, Hi, 1 ); Rgn->Lo = XBGetColor( XBWin, Lo, 1 ); @@ -38,9 +35,7 @@ char *Hi, *Lo; return 0; } -int XBDrawFrame( XBWin, Rgn ) -XBWindow *XBWin; -XBDecoration *Rgn; +int XBDrawFrame(XBWindow *XBWin, XBDecoration *Rgn) { int xl = Rgn->Box.x, yl = Rgn->Box.y, xh = Rgn->Box.xh, yh = Rgn->Box.yh, @@ -114,9 +109,7 @@ XBDecoration *Rgn; . x,y - upper left corner of region to clear . w,h - width and height of region to clear */ -void XBClearWindow( XBWin, x, y, w, h ) -XBWindow *XBWin; -int x, y, w, h; +void XBClearWindow(XBWindow *XBWin, int x, int y, int w, int h) { XBSetPixVal(XBWin, XBWin->background ); XFillRectangle( XBWin->disp, XBDrawable(XBWin), XBWin->gc.set, @@ -126,9 +119,7 @@ int x, y, w, h; /* Set the colors for the highlights by name */ -void XBFrameColorsByName( XBWin, Hi, Lo ) -XBWindow *XBWin; -char *Hi, *Lo; +void XBFrameColorsByName(XBWindow *XBWin, char *Hi, char *Lo) { if (XBWin->numcolors > 2) { HiPix = XBGetColor( XBWin, Hi, 1 ); diff --git a/src/graphics/src/xinit.c b/src/graphics/src/xinit.c index c56d570..0fd485f 100644 --- a/src/graphics/src/xinit.c +++ b/src/graphics/src/xinit.c @@ -200,11 +200,7 @@ int XBOpenDisplay( XBWindow *XBWin, char *display_name ) . nc - number of colors. Use the maximum of the visual if nc == 0. Use nc = 2 for black and white displays. */ -int XBSetVisual( XBWin, q_default_visual, cmap, nc ) -XBWindow *XBWin; -int q_default_visual; -Colormap cmap; -int nc; +int XBSetVisual(XBWindow *XBWin, int q_default_visual, Colormap cmap, int nc) { if (q_default_visual) { XBWin->vis = DefaultVisual( XBWin->disp, XBWin->screen ); @@ -250,9 +246,7 @@ return 0; /* XBSetGC - set the GC structure in the base window */ -int XBSetGC( XBWin, fg ) -XBWindow *XBWin; -PixVal fg; +int XBSetGC(XBWindow *XBWin, PixVal fg) { XGCValues gcvalues; /* window graphics context values */ @@ -293,11 +287,8 @@ return 0; If w and/or h are 0, use the sizes in the fields of XBWin (which may have been set by, for example, XBSetWindowSize) */ -int XBDisplayWindow( XBWin, label, x, y, w, h, backgnd_pixel ) -XBWindow *XBWin; -char *label; -int w, h, x, y; -PixVal backgnd_pixel; +int XBDisplayWindow(XBWindow *XBWin, char *label, int x, int y, int w, int h, + PixVal backgnd_pixel) { unsigned int wavail, havail; XSizeHints size_hints; @@ -427,10 +418,8 @@ return 0; $ -geometry +100+200 $ for a window located at (100,200). */ -void XBGetArgs( Argc, argv, flag, px, py, pw, ph ) -int *Argc, flag; -char **argv; -int *px, *py, *pw, *ph; +void XBGetArgs(int *Argc, char **argv, int flag, int *px, int *py, int *pw, + int *ph) { char val[128]; int vallen; @@ -465,19 +454,14 @@ int *px, *py, *pw, *ph; argument is $ -display name */ -void XBGetArgsDisplay( Argc, argv, flag, dlen, dname ) -int *Argc, flag; -char **argv, *dname; -int dlen; +void XBGetArgsDisplay(int *Argc, char **argv, int flag, int dlen, char *dname) { ArgGetString( Argc, argv, flag, "-display", dname, dlen ); } -int XBiQuickWindow( mywindow, host, name, x, y, nx, ny, nc ) -XBWindow *mywindow; -char *host, *name; -int x, y, nx, ny, nc; +int XBiQuickWindow(XBWindow *mywindow, char *host, char *name, + int x, int y, int nx, int ny, int nc) { if (XBOpenDisplay( mywindow, host )) { fprintf( stderr, "Could not open display\n" ); @@ -523,10 +507,8 @@ int x, y, nx, ny, nc; A small modification to this routine would allow Black and White windows to be used on color displays; this would be useful for testing codes. */ -int XBQuickWindow( mywindow, host, name, x, y, nx, ny ) -XBWindow *mywindow; -char *host, *name; -int x, y, nx, ny; +int XBQuickWindow(XBWindow *mywindow, char *host, char *name, + int x, int y, int nx, int ny) { /* Just to be careful, clear mywindow */ MEMSET( mywindow, 0, sizeof(XBWindow) ); @@ -536,10 +518,7 @@ int x, y, nx, ny; /* And a quick version (from an already defined window) */ -int XBQuickWindowFromWindow( mywindow, host, win ) -XBWindow *mywindow; -char *host; -Window win; +int XBQuickWindowFromWindow(XBWindow *mywindow, char *host, Window win) { Window root; int d; @@ -580,8 +559,7 @@ Window win; to the window before flushing the requests. This is the appropriate action for animation. */ -void XBFlush( XBWin ) -XBWindow *XBWin; +void XBFlush(XBWindow *XBWin) { if (XBWin->drw) { XCopyArea( XBWin->disp, XBWin->drw, XBWin->win, XBWin->gc.set, 0, 0, @@ -597,9 +575,7 @@ XBWindow *XBWin; . window - Window to set label for . label - Label to give window */ -void XBSetWindowLabel( XBwin, label ) -XBWindow *XBwin; -char *label; +void XBSetWindowLabel(XBWindow *XBwin, char *label) { XTextProperty prop; XGetWMName(XBwin->disp,XBwin->win,&prop); @@ -622,9 +598,7 @@ char *label; Be sure that you have XBFlush()'ed the output; X11 does not require that the image be current until a flush is executed. */ -void XBCaptureWindowToFile( XBWin, fname ) -XBWindow *XBWin; -char *fname; +void XBCaptureWindowToFile(XBWindow *XBWin, char *fname) { #ifdef HAVE_SYSTEM char cmdbuf[1024]; diff --git a/src/graphics/src/xkey.c b/src/graphics/src/xkey.c index 478adb3..0f18613 100644 --- a/src/graphics/src/xkey.c +++ b/src/graphics/src/xkey.c @@ -40,11 +40,8 @@ return MPE_SUCCESS; } int MPE_ClrKeyCallback( MPE_XGraph, int ); -int MPE_ClrKeyCallback( graph, key ) -MPE_XGraph graph; -int key; +int MPE_ClrKeyCallback(MPE_XGraph graph, int key) { - return MPE_SUCCESS; } diff --git a/src/graphics/src/xmousef.c b/src/graphics/src/xmousef.c index 912091c..eea21df 100644 --- a/src/graphics/src/xmousef.c +++ b/src/graphics/src/xmousef.c @@ -33,10 +33,8 @@ void mpe_get_mouse_press_( MPE_XGraph*, int*, int*, int*, int* ); -void mpe_get_mouse_press_( graph, x, y, button, __ierr ) -MPE_XGraph *graph; -int *x, *y, *button; -int *__ierr; +void mpe_get_mouse_press_( MPE_XGraph *graph, int *x, int *y, int *button, + int *__ierr ) { *__ierr = MPE_Get_mouse_press(*graph,x,y,button); } @@ -61,10 +59,8 @@ int *__ierr; #endif void mpe_iget_mouse_press_( MPE_XGraph*, int*, int*, int*, int*, int* ); -void mpe_iget_mouse_press_( graph, x, y, button, wasPressed, __ierr ) -MPE_XGraph *graph; -int *x, *y, *button, *wasPressed; -int *__ierr; +void mpe_iget_mouse_press_( MPE_XGraph *graph, int *x, int *y, int *button, + int *wasPressed, int *__ierr ) { *__ierr = MPE_Iget_mouse_press(*graph,x,y,button,wasPressed); } diff --git a/src/graphics/src/xwmap.c b/src/graphics/src/xwmap.c index 5ea10f3..d3514a3 100644 --- a/src/graphics/src/xwmap.c +++ b/src/graphics/src/xwmap.c @@ -10,9 +10,8 @@ This routine waits until the window is actually created or destroyed Returns 0 if window is mapped; 1 if window is destroyed. */ -int XB_wait_map( XBWin, ExposeRoutine ) -XBWindow *XBWin; -void (*ExposeRoutine) ( XBWindow *, int, int, int, int ); +int XB_wait_map(XBWindow *XBWin, + void (*ExposeRoutine) ( XBWindow *, int, int, int, int )) { XEvent event; int w, h; @@ -57,8 +56,7 @@ while (1) { This routine reads a pixel from a window, thus insuring that everything has actually been drawn. If the window is null, do ALL windows. */ -void XBSync( XBWin ) -XBWindow *XBWin; +void XBSync(XBWindow *XBWin) { /* XImage *xi; */ diff --git a/src/logging/.gitignore b/src/logging/.gitignore new file mode 100644 index 0000000..bdf97a7 --- /dev/null +++ b/src/logging/.gitignore @@ -0,0 +1,8 @@ +mpe_logging_conf.h.in +mpe_logging_conf.h +etc/mpe_log.conf +etc/mpe_log_postlib.conf +etc/mpe_nolog.conf +include/clog_inttypes.h +include/mpe_log_thread.h +include/mpi_null.h diff --git a/src/misc/.gitignore b/src/misc/.gitignore new file mode 100644 index 0000000..387edc2 --- /dev/null +++ b/src/misc/.gitignore @@ -0,0 +1,3 @@ +mpe_misc_conf.h.in +mpe_misc_conf.h +src/dbxerr.c diff --git a/src/misc/src/dbxerr.c.in b/src/misc/src/dbxerr.c.in index 754a07c..d02e169 100644 --- a/src/misc/src/dbxerr.c.in +++ b/src/misc/src/dbxerr.c.in @@ -105,7 +105,7 @@ int kill(pid_t pid, int sig); #endif #endif -void MPE_Start_debugger( ) +void MPE_Start_debugger(void) { int child, i; @@ -235,8 +235,7 @@ char *string, *file; Currently, there is no Fortran interface for this routine. @*/ -void MPE_Errors_call_debugger( pgm, dbg, args ) -char *pgm, *dbg, **args; +void MPE_Errors_call_debugger(char *pgm, char *dbg, char **args) { MPI_Errhandler err; int i; @@ -275,8 +274,7 @@ static char *MPER_Copy_string( char *str ) return new; } -void MPE_Errors_call_xdbx( pgm, display ) -char *pgm, *display; +void MPE_Errors_call_xdbx(char *pgm, char *display) { char **args; @@ -301,8 +299,7 @@ char *pgm, *display; } /* This routine is collective; all processes in MPI_COMM_WORLD must call */ -void MPE_Errors_call_dbx_in_xterm( pgm, display ) -char *pgm, *display; +void MPE_Errors_call_dbx_in_xterm(char *pgm, char *display) { char **args; int myid, str_len; @@ -345,8 +342,7 @@ char *pgm, *display; } /* This routine is collective; all processes in MPI_COMM_WORLD must call */ -void MPE_Errors_call_gdb_in_xterm( pgm, display ) -char *pgm, *display; +void MPE_Errors_call_gdb_in_xterm(char *pgm, char *display) { char **args; int myid, str_len; @@ -405,8 +401,7 @@ static char *SIGNAME[] = { "Unknown", "HUP", "INT", "QUIT", "ILL", #if defined(HAVE_SIGHANDLER_T) #define SIG_HANDLER_PROTOTYPE sighandler_t void MPE_DefaultHandler ( SIG_HANDLER_PROTOTYPE ); -void MPE_DefaultHandler( sig ) -int sig +void MPE_DefaultHandler(int sig) #elif defined(MPI_sun4) #define SIG_HANDLER_PROTOTYPE int, int, struct sigcontext *, char * void MPE_DefaultHandler ( SIG_HANDLER_PROTOTYPE ); @@ -455,7 +450,7 @@ MPE_Start_debugger( ); Currently, there is no Fortran interface for this routine. @*/ -void MPE_Signals_call_debugger() +void MPE_Signals_call_debugger(void) { signal( SIGQUIT, (void (*)(SIG_HANDLER_PROTOTYPE)) MPE_DefaultHandler ); @@ -477,21 +472,19 @@ signal( SIGSYS, (void (*)(SIG_HANDLER_PROTOTYPE)) #else /* Some systems don't support SIGSTOP; for them, we just issue a warning message ... */ -void MPE_Errors_call_dbx_in_xterm( pgm, display ) -char *pgm, *display; +void MPE_Errors_call_dbx_in_xterm(char *pgm, char *display) { fprintf( stderr, "This system does not support SIGSTOP, needed to implement\n\ calling of the debugger from a this program.\n" ); } -void MPE_Errors_call_gdb_in_xterm( pgm, display ) -char *pgm, *display; +void MPE_Errors_call_gdb_in_xterm(char *pgm, char *display) { fprintf( stderr, "This system does not support SIGSTOP, needed to implement\n\ calling of the debugger from a this program.\n" ); } -void MPE_Signals_call_debugger() +void MPE_Signals_call_debugger(void) { } diff --git a/src/misc/src/decomp.c b/src/misc/src/decomp.c index 7ee2d4f..bddc96a 100644 --- a/src/misc/src/decomp.c +++ b/src/misc/src/decomp.c @@ -20,8 +20,7 @@ Output Parameters: . s,e - Array indices are s:e, with the original array considered as 1:n. @*/ -int MPE_Decomp1d( n, size, rank, s, e ) -int n, size, rank, *s, *e; +int MPE_Decomp1d( int n, int size, int rank, int *s, int *e ) { int nlocal, deficit; diff --git a/src/misc/src/decompf.c b/src/misc/src/decompf.c index 4a48f8b..745ec0d 100644 --- a/src/misc/src/decompf.c +++ b/src/misc/src/decompf.c @@ -32,9 +32,7 @@ void mpe_decomp1d_ ( int*, int *, int *, int *, int *, int * ); - void mpe_decomp1d_( n, size, rank, s, e, __ierr ) -int*n,*size,*rank, *s, *e; -int *__ierr; +void mpe_decomp1d_( int *n, int *size, int *rank, int *s, int *e, int *__ierr ) { *__ierr = MPE_Decomp1d(*n,*size,*rank,s,e); } diff --git a/src/misc/src/examine.c b/src/misc/src/examine.c index 1980809..de84565 100644 --- a/src/misc/src/examine.c +++ b/src/misc/src/examine.c @@ -33,11 +33,8 @@ int MPIR_PrintDatatypeUnpack ( FILE *, int, MPI_Datatype, long, long ); This prints on the selected file the operations that the MPICH implementation will take when unpacking a buffer. @*/ -int MPE_Print_datatype_unpack_action( fp, count, type, in_offset, out_offset ) -FILE *fp; -int count; -MPI_Datatype type; -int in_offset, out_offset; +int MPE_Print_datatype_unpack_action(FILE *fp, int count, MPI_Datatype type, + int in_offset, int out_offset) { return MPIR_PrintDatatypeUnpack( fp, count, type, in_offset, out_offset ); } @@ -57,11 +54,8 @@ int in_offset, out_offset; This prints on the selected file the operations that the MPICH implementation will take when packing a buffer. @*/ -int MPE_Print_datatype_pack_action( fp, count, type, in_offset, out_offset ) -FILE *fp; -int count; -MPI_Datatype type; -int in_offset, out_offset; +int MPE_Print_datatype_pack_action(FILE *fp, int count, MPI_Datatype type, + int in_offset, int out_offset) { return MPIR_PrintDatatypePack ( fp, count, type, in_offset, out_offset ); } @@ -82,12 +76,9 @@ int in_offset, out_offset; void mpe_print_datatype_unpack_action_ ( int *, int *, MPI_Datatype *, int *, int *, int * ); -void mpe_print_datatype_unpack_action_( fp, count, type, - in_offset, out_offset, __ierr ) -int *fp; -int *count; -MPI_Datatype *type; -int *in_offset, *out_offset, *__ierr; +void mpe_print_datatype_unpack_action_(int *fp, int *count, MPI_Datatype *type, + int *in_offset, int *out_offset, + int *__ierr ) { *__ierr = MPE_Print_datatype_unpack_action( stdout, *count,*type, *in_offset, *out_offset); @@ -95,12 +86,9 @@ int *in_offset, *out_offset, *__ierr; void mpe_print_datatype_pack_action_ ( int *, int *, MPI_Datatype *, int *, int *, int * ); -void mpe_print_datatype_pack_action_( fp, count, type, - in_offset, out_offset, __ierr ) -int *fp; -int *count; -MPI_Datatype *type; -int *in_offset, *out_offset, *__ierr; +void mpe_print_datatype_pack_action_(int *fp, int *count, MPI_Datatype *type, + int *in_offset, int *out_offset, + int *__ierr ) { *__ierr = MPE_Print_datatype_pack_action( stdout, *count,*type, *in_offset, *out_offset); diff --git a/src/misc/src/getgrank.c b/src/misc/src/getgrank.c index b0cad1b..326b234 100644 --- a/src/misc/src/getgrank.c +++ b/src/misc/src/getgrank.c @@ -18,9 +18,7 @@ Output Parameters: . grank - Rank in comm world @*/ -void MPE_Comm_global_rank( comm, rank, grank ) -MPI_Comm comm; -int rank, *grank; +void MPE_Comm_global_rank(MPI_Comm comm, int rank, int *grank) { /* We could cache world_group, at least, but then we'd have no way to free it later */ diff --git a/src/misc/src/getgrankf.c b/src/misc/src/getgrankf.c index f8fe8ef..e1476bc 100644 --- a/src/misc/src/getgrankf.c +++ b/src/misc/src/getgrankf.c @@ -31,10 +31,7 @@ #endif void mpe_comm_global_rank_ ( MPI_Comm *, int *, int *, int * ); -void mpe_comm_global_rank_( comm, rank, grank, __ierr ) -MPI_Comm *comm; -int*rank, *grank; -int *__ierr; +void mpe_comm_global_rank_(MPI_Comm *comm, int *rank, int *grank,int * __ierr ) { MPE_Comm_global_rank( *comm,*rank,grank); } diff --git a/src/misc/src/privtags.c b/src/misc/src/privtags.c index 4f90823..cd7c6cc 100644 --- a/src/misc/src/privtags.c +++ b/src/misc/src/privtags.c @@ -28,10 +28,7 @@ static int MPE_Tag_keyval = MPI_KEYVAL_INVALID; /* Private routine to delete internal storage when a communicator is freed. */ -int MPE_DelTag( comm, keyval, attr_val, extra_state ) -MPI_Comm comm; -int keyval; -void *attr_val, *extra_state; +int MPE_DelTag(MPI_Comm comm, int keyval, void *attr_val, void *extra_state) { /* The attribute value is malloc'ed on creation; this prevents a storage leak */ @@ -64,9 +61,8 @@ return MPI_SUCCESS; .seealso: MPE_ReturnTags @*/ -int MPE_GetTags( comm_in, ntags, comm_out, first_tag ) -MPI_Comm comm_in, *comm_out; -int ntags, *first_tag; +int MPE_GetTags( MPI_Comm comm_in, int ntags, MPI_Comm *comm_out, + int *first_tag ) { int mpe_errno = MPI_SUCCESS; int *tagvalp, *maxval, flag; @@ -122,9 +118,7 @@ return MPI_SUCCESS; .seealso: MPE_GetTags @*/ -int MPE_ReturnTags( comm, first_tag, ntags ) -MPI_Comm comm; -int first_tag, ntags; +int MPE_ReturnTags(MPI_Comm comm, int first_tag, int ntags) { int *tagvalp, flag, mpe_errno; @@ -151,7 +145,7 @@ return MPI_SUCCESS; to be called. If it is, it should be called immediately before 'MPI_Finalize'. @*/ -int MPE_TagsEnd() +int MPE_TagsEnd(void) { MPI_Keyval_free( &MPE_Tag_keyval ); MPE_Tag_keyval = MPI_KEYVAL_INVALID; diff --git a/src/slog2sdk/.gitignore b/src/slog2sdk/.gitignore new file mode 100644 index 0000000..e3a78d4 --- /dev/null +++ b/src/slog2sdk/.gitignore @@ -0,0 +1,17 @@ +awt_color.jar +bin/clog2TOslog2 +bin/clog2print +bin/clogTOslog2 +bin/clogprint +bin/jumpshot +bin/logconvertor +bin/slog2filter +bin/slog2navigator +bin/slog2print +bin/slog2updater +sbin/install-package +share +simple.class +simple.jar +simple_swing.class +simple_swing.jar \ No newline at end of file diff --git a/src/slog2sdk/trace_rlog/.gitignore b/src/slog2sdk/trace_rlog/.gitignore new file mode 100644 index 0000000..b72feff --- /dev/null +++ b/src/slog2sdk/trace_rlog/.gitignore @@ -0,0 +1,6 @@ +confdb +config.guess +config.sub +install-sh +ltmain.sh +trace_impl.h.in diff --git a/src/slog2sdk/trace_sample/.gitignore b/src/slog2sdk/trace_sample/.gitignore new file mode 100644 index 0000000..b72feff --- /dev/null +++ b/src/slog2sdk/trace_sample/.gitignore @@ -0,0 +1,6 @@ +confdb +config.guess +config.sub +install-sh +ltmain.sh +trace_impl.h.in diff --git a/src/wrappers/.gitignore b/src/wrappers/.gitignore new file mode 100644 index 0000000..c3d1d5a --- /dev/null +++ b/src/wrappers/.gitignore @@ -0,0 +1,5 @@ +mpe_wrappers_conf.h.in +mpe_wrappers_conf.h +etc/mpe_f77env.conf +etc/mpe_mpilog.conf +etc/mpe_mpitrace.conf diff --git a/src/wrappers/Makefile.in b/src/wrappers/Makefile.in index 271b5d2..ba1ac32 100644 --- a/src/wrappers/Makefile.in +++ b/src/wrappers/Makefile.in @@ -29,7 +29,7 @@ all: build_include build_etc ####### Building from the source build_include: - @-if [ -n "$(includebuild_dir)" ] ; then \ + @if [ -n "$(includebuild_dir)" ] ; then \ if [ ! -d $(includebuild_dir) ] ; then \ $(MKDIR) -p $(includebuild_dir) ; \ fi ; \ @@ -49,7 +49,7 @@ build_lib_bin: @( cd src && $(MAKE) $(MAKEOPTS) ) build_etc: - @-for file in ./etc/*.conf ; do \ + @for file in ./etc/*.conf ; do \ $(CP) -f $$file $(etcbuild_dir) ; \ done @@ -102,3 +102,8 @@ maintainer-clean: distclean owner-clean: maintainer-clean @-$(RM) -f configure + +configure mpe_wrappers_conf.h.in: configure.ac + autoheader + autoconf + diff --git a/src/wrappers/configure.ac b/src/wrappers/configure.ac index e504488..d20a50c 100644 --- a/src/wrappers/configure.ac +++ b/src/wrappers/configure.ac @@ -5,22 +5,20 @@ dnl define([AC_CACHE_LOAD], )dnl define([AC_CACHE_SAVE], )dnl dnl +AC_INIT() +AC_PREREQ(2.52) +AC_CONFIG_HEADER(mpe_wrappers_conf.h) +dnl +echo "Configuring MPE Wrapper Libraries For MPI with $ac_configure_args" AH_BOTTOM([ /* Define MPE_CONST=const if mpi.h uses const in MPI function declaration. */ -#if defined(HAVE_CONST_IN_MPI_DECL) +#if defined(HAVE_CONST_IN_MPI_DECL) || MPI_VERSION >= 3 #define MPE_CONST const #else #define MPE_CONST #endif ]) dnl -dnl -AC_INIT() -AC_PREREQ(2.52) -AC_CONFIG_HEADER(mpe_wrappers_conf.h) -dnl -echo "Configuring MPE Wrapper Libraries For MPI with $ac_configure_args" -dnl dnl Set top_srcdir_abs to be the ABSOLUTE path to the home directory of MPE dnl top_srcdir is in relative path. if test "X$srcdir" != "X." -a -s $srcdir/src/log_mpi_core.c ; then @@ -321,6 +319,7 @@ dnl fortran link/run tests can be performed. fi dnl Check Safe PMPI invocations +dnl FIXME: What does "safe" mean here? AC_MSG_CHECKING( [for safe PMPI invocations] ) if test "$MPI_IMPL" = "MPICH" -o "$MPI_IMPL" = "MPICH2" ; then enable_safePMPI=no @@ -333,10 +332,9 @@ else fi dnl Check if MPI implementation uses const in function declaration -if test "$MPI_IMPL" != "MPICH" -a "$MPI_IMPL" != "MPICH2" ; then - if test "$enable_checkMPI" = "yes" ; then - AC_MSG_CHECKING( [for the use of const in MPI function declaration] ) - PAC_MPI_COMPILE_CC_FUNC( $MPI_CC, [$MPI_CFLAGS], [], [], +if test "$enable_checkMPI" = "yes" ; then + AC_MSG_CHECKING( [for the use of const in MPI function declaration] ) + PAC_MPI_COMPILE_CC_FUNC( $MPI_CC, [$MPI_CFLAGS], [], [], [ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) @@ -345,60 +343,44 @@ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, } ], [ mpe_link_ok=yes ], [ mpe_link_ok=no ] ) - if test "$mpe_link_ok" = "yes" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_CONST_IN_MPI_DECL, 1, [Define MPE_CONST to const]) - else - AC_MSG_RESULT(no) - fi - fi -else -dnl MPICH2 has MPI_Init_thread(). - if test "$MPI_IMPL" = "MPICH2" ; then - AC_DEFINE(HAVE_MPI_INIT_THREAD, 1, - [Define if MPI_Init_thread available]) + if test "$mpe_link_ok" = "yes" ; then + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CONST_IN_MPI_DECL, 1, [Define MPE_CONST to const]) + else + AC_MSG_RESULT(no) fi fi dnl Check if Thread-support level in MPI implementation -if test "$MPI_IMPL" != "MPICH" -a "$MPI_IMPL" != "MPICH2" ; then - if test "$enable_checkMPI" = "yes" ; then - AC_MSG_CHECKING( [for the C version of MPI_Init_thread] ) +if test "$enable_checkMPI" = "yes" ; then + AC_MSG_CHECKING( [for the C version of MPI_Init_thread] ) + PAC_MPI_LINK_CC_FUNC( $MPI_CC, [$MPI_CFLAGS], $MPI_LIBS, , + [ int itmp; int thread_level ], + [ + itmp=MPI_Init_thread( NULL, NULL, MPI_THREAD_MULTIPLE, &thread_level ) + ], + [ mpe_link_ok=yes ], [ mpe_link_ok=no ] ) + if test "$mpe_link_ok" = "yes" ; then + AC_MSG_RESULT(yes) + AC_MSG_CHECKING( [for the C version of PMPI_Init_thread] ) PAC_MPI_LINK_CC_FUNC( $MPI_CC, [$MPI_CFLAGS], $MPI_LIBS, , - [ int itmp; int thread_level ], + [ int itmp; int thread_level], [ - itmp=MPI_Init_thread( NULL, NULL, MPI_THREAD_MULTIPLE, &thread_level ) + itmp=PMPI_Init_thread( NULL, NULL, MPI_THREAD_MULTIPLE, &thread_level ) ], [ mpe_link_ok=yes ], [ mpe_link_ok=no ] ) if test "$mpe_link_ok" = "yes" ; then AC_MSG_RESULT(yes) - AC_MSG_CHECKING( [for the C version of PMPI_Init_thread] ) - PAC_MPI_LINK_CC_FUNC( $MPI_CC, [$MPI_CFLAGS], $MPI_LIBS, , - [ int itmp; int thread_level], - [ - itmp=PMPI_Init_thread( NULL, NULL, MPI_THREAD_MULTIPLE, &thread_level ) - ], - [ mpe_link_ok=yes ], [ mpe_link_ok=no ] ) - if test "$mpe_link_ok" = "yes" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MPI_INIT_THREAD, 1, - [Define if MPI_Init_thread available]) - else - AC_MSG_RESULT(no) - fi + AC_DEFINE(HAVE_MPI_INIT_THREAD, 1, + [Define if MPI_Init_thread available]) else AC_MSG_RESULT(no) fi - fi -else -dnl MPICH2 has MPI_Init_thread(). - if test "$MPI_IMPL" = "MPICH2" ; then - AC_DEFINE(HAVE_MPI_INIT_THREAD, 1, - [Define if MPI_Init_thread available]) + else + AC_MSG_RESULT(no) fi fi - dnl Check MPI-IO if test "$MPI_IMPL" != "MPICH" -a "$MPI_IMPL" != "MPICH2" ; then if test "$enable_checkMPI" = "yes" -a "$enable_checkMPIO" = "yes" ; then diff --git a/src/wrappers/src/log_mpi_core.c b/src/wrappers/src/log_mpi_core.c index 345196b..d559dca 100644 --- a/src/wrappers/src/log_mpi_core.c +++ b/src/wrappers/src/log_mpi_core.c @@ -6,8 +6,8 @@ #ifdef MPI_BUILD_PROFILING #undef MPI_BUILD_PROFILING #endif -#include "mpe_wrappers_conf.h" #include "mpi.h" +#include "mpe_wrappers_conf.h" #include "mpe_log.h" @@ -542,12 +542,9 @@ extern MPEU_DLL_SPEC CLOG_CommSet_t *CLOG_CommSet; If there are large numbers of requests, we should probably use a better search structure, such as a hash table or tree */ -void MPE_Req_add_send( request, datatype, count, - dest, tag, commIDs, is_persistent ) - MPI_Request request; - MPI_Datatype datatype; -const CLOG_CommIDs_t *commIDs; - int count, dest, tag, is_persistent; +void MPE_Req_add_send(MPI_Request request, MPI_Datatype datatype, int count, + int dest, int tag, const CLOG_CommIDs_t *commIDs, + int is_persistent ) { request_list *newrq; int typesize; @@ -567,12 +564,9 @@ const CLOG_CommIDs_t *commIDs; } } -void MPE_Req_add_recv( request, datatype, count, - source, tag, commIDs, is_persistent ) - MPI_Request request; - MPI_Datatype datatype; -const CLOG_CommIDs_t *commIDs; - int count, source, tag, is_persistent; +void MPE_Req_add_recv(MPI_Request request, MPI_Datatype datatype, int count, + int source, int tag, const CLOG_CommIDs_t *commIDs, + int is_persistent) { request_list *newrq; @@ -591,27 +585,22 @@ const CLOG_CommIDs_t *commIDs; } } -void MPE_Req_cancel( request ) -MPI_Request request; +void MPE_Req_cancel(MPI_Request request) { request_list *rq; rq_find( requests_head_0, request, rq ); if (rq) rq->status |= RQ_CANCEL; } -void MPE_Req_remove( request ) -MPI_Request request; +void MPE_Req_remove(MPI_Request request) { rq_remove( requests_head_0, requests_tail_0, requests_avail_0, request ); } /* Persistent sends and receives are handled with this routine (called by start or startall) */ -void MPE_Req_start( request, state, thdID, is_logging_on ) -MPI_Request request; -MPE_State *state; -int thdID; -int is_logging_on; +void MPE_Req_start(MPI_Request request, MPE_State *state, int thdID, + int is_logging_on ) { request_list *rq; MPE_State *istate; @@ -649,13 +638,8 @@ int is_logging_on; } } -void MPE_Req_wait_test( request, status, note, state, thdID, is_logging_on ) -MPI_Request request; -MPI_Status *status; -char *note; -MPE_State *state; -int thdID; -int is_logging_on; +void MPE_Req_wait_test(MPI_Request request, MPI_Status *status, char *note, + MPE_State *state, int thdID, int is_logging_on ) { request_list *rq, *last; int flag, size; @@ -1550,14 +1534,9 @@ void MPE_Init_internal_logging( void ) */ -int MPI_Allgather( sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm ) -MPE_CONST void * sendbuf; -int sendcount; -MPI_Datatype sendtype; -void * recvbuf; -int recvcount; -MPI_Datatype recvtype; -MPI_Comm comm; +int MPI_Allgather( MPE_CONST void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, int recvcount, + MPI_Datatype recvtype, MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -1589,15 +1568,11 @@ MPI_Comm comm; return returnVal; } -int MPI_Allgatherv( sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm ) -MPE_CONST void * sendbuf; -int sendcount; -MPI_Datatype sendtype; -void * recvbuf; -MPE_CONST int * recvcounts; -MPE_CONST int * displs; -MPI_Datatype recvtype; -MPI_Comm comm; +int MPI_Allgatherv( MPE_CONST void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + MPE_CONST int *recvcounts, MPE_CONST int *displs, + MPI_Datatype recvtype, + MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -1630,13 +1605,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Allreduce( sendbuf, recvbuf, count, datatype, op, comm ) -MPE_CONST void * sendbuf; -void * recvbuf; -int count; -MPI_Datatype datatype; -MPI_Op op; -MPI_Comm comm; +int MPI_Allreduce( MPE_CONST void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -1669,14 +1639,9 @@ MPI_Comm comm; return returnVal; } -int MPI_Alltoall( sendbuf, sendcnt, sendtype, recvbuf, recvcnt, recvtype, comm ) -MPE_CONST void * sendbuf; -int sendcnt; -MPI_Datatype sendtype; -void * recvbuf; -int recvcnt; -MPI_Datatype recvtype; -MPI_Comm comm; +int MPI_Alltoall( MPE_CONST void *sendbuf, int sendcnt, MPI_Datatype sendtype, + void *recvbuf, int recvcnt, MPI_Datatype recvtype, + MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -1723,16 +1688,11 @@ MPI_Comm comm; return returnVal; } -int MPI_Alltoallv( sendbuf, sendcnts, sdispls, sendtype, recvbuf, recvcnts, rdispls, recvtype, comm ) -MPE_CONST void * sendbuf; -MPE_CONST int * sendcnts; -MPE_CONST int * sdispls; -MPI_Datatype sendtype; -void * recvbuf; -MPE_CONST int * recvcnts; -MPE_CONST int * rdispls; -MPI_Datatype recvtype; -MPI_Comm comm; +int MPI_Alltoallv( MPE_CONST void * sendbuf, MPE_CONST int * sendcnts, + MPE_CONST int * sdispls, MPI_Datatype sendtype, + void * recvbuf, MPE_CONST int * recvcnts, + MPE_CONST int * rdispls, MPI_Datatype recvtype, + MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -1783,8 +1743,7 @@ MPI_Comm comm; return returnVal; } -int MPI_Barrier( comm ) -MPI_Comm comm; +int MPI_Barrier( MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -1817,12 +1776,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Bcast( buffer, count, datatype, root, comm ) -void * buffer; -int count; -MPI_Datatype datatype; -int root; -MPI_Comm comm; +int MPI_Bcast( void * buffer, int count, MPI_Datatype datatype, int root, + MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -1855,15 +1810,9 @@ MPI_Comm comm; return returnVal; } -int MPI_Gather( sendbuf, sendcnt, sendtype, recvbuf, recvcount, recvtype, root, comm ) -MPE_CONST void * sendbuf; -int sendcnt; -MPI_Datatype sendtype; -void * recvbuf; -int recvcount; -MPI_Datatype recvtype; -int root; -MPI_Comm comm; +int MPI_Gather( MPE_CONST void * sendbuf, int sendcnt, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -1896,16 +1845,10 @@ MPI_Comm comm; return returnVal; } -int MPI_Gatherv( sendbuf, sendcnt, sendtype, recvbuf, recvcnts, displs, recvtype, root, comm ) -MPE_CONST void * sendbuf; -int sendcnt; -MPI_Datatype sendtype; -void * recvbuf; -MPE_CONST int * recvcnts; -MPE_CONST int * displs; -MPI_Datatype recvtype; -int root; -MPI_Comm comm; +int MPI_Gatherv( MPE_CONST void * sendbuf, int sendcnt, MPI_Datatype sendtype, + void * recvbuf, MPE_CONST int * recvcnts, + MPE_CONST int * displs, MPI_Datatype recvtype, int root, + MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -1939,10 +1882,7 @@ MPI_Comm comm; return returnVal; } -int MPI_Op_create( function, commute, op ) -MPI_User_function * function; -int commute; -MPI_Op * op; +int MPI_Op_create( MPI_User_function * function, int commute, MPI_Op * op ) { int returnVal; MPE_LOG_STATE_DECL @@ -1975,8 +1915,7 @@ MPI_Op * op; return returnVal; } -int MPI_Op_free( op ) -MPI_Op * op; +int MPI_Op_free( MPI_Op * op ) { int returnVal; MPE_LOG_STATE_DECL @@ -2009,13 +1948,9 @@ MPI_Op * op; return returnVal; } -int MPI_Reduce_scatter( sendbuf, recvbuf, recvcnts, datatype, op, comm ) -MPE_CONST void * sendbuf; -void * recvbuf; -const int * recvcnts; -MPI_Datatype datatype; -MPI_Op op; -MPI_Comm comm; +int MPI_Reduce_scatter( MPE_CONST void * sendbuf, void * recvbuf, + MPE_CONST int * recvcnts, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -2049,14 +1984,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Reduce( sendbuf, recvbuf, count, datatype, op, root, comm ) -MPE_CONST void * sendbuf; -void * recvbuf; -int count; -MPI_Datatype datatype; -MPI_Op op; -int root; -MPI_Comm comm; +int MPI_Reduce( MPE_CONST void * sendbuf, void * recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -2089,13 +2018,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Scan( sendbuf, recvbuf, count, datatype, op, comm ) -MPE_CONST void * sendbuf; -void * recvbuf; -int count; -MPI_Datatype datatype; -MPI_Op op; -MPI_Comm comm; +int MPI_Scan( MPE_CONST void * sendbuf, void * recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -2128,15 +2052,9 @@ MPI_Comm comm; return returnVal; } -int MPI_Scatter( sendbuf, sendcnt, sendtype, recvbuf, recvcnt, recvtype, root, comm ) -MPE_CONST void * sendbuf; -int sendcnt; -MPI_Datatype sendtype; -void * recvbuf; -int recvcnt; -MPI_Datatype recvtype; -int root; -MPI_Comm comm; +int MPI_Scatter( MPE_CONST void * sendbuf, int sendcnt, MPI_Datatype sendtype, + void * recvbuf, int recvcnt, MPI_Datatype recvtype, + int root, MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -2170,17 +2088,10 @@ MPI_Comm comm; return returnVal; } -int MPI_Scatterv( sendbuf, sendcnts, displs, sendtype, - recvbuf, recvcnt, recvtype, root, comm ) -MPE_CONST void * sendbuf; -MPE_CONST int * sendcnts; -MPE_CONST int * displs; -MPI_Datatype sendtype; -void * recvbuf; -int recvcnt; -MPI_Datatype recvtype; -int root; -MPI_Comm comm; +int MPI_Scatterv( MPE_CONST void * sendbuf, MPE_CONST int * sendcnts, + MPE_CONST int * displs, MPI_Datatype sendtype, + void * recvbuf, int recvcnt, MPI_Datatype recvtype, + int root, MPI_Comm comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -2214,9 +2125,7 @@ MPI_Comm comm; return returnVal; } -int MPI_Attr_delete( comm, keyval ) -MPI_Comm comm; -int keyval; +int MPI_Attr_delete( MPI_Comm comm, int keyval ) { int returnVal; MPE_LOG_STATE_DECL @@ -2249,11 +2158,7 @@ int keyval; return returnVal; } -int MPI_Attr_get( comm, keyval, attr_value, flag ) -MPI_Comm comm; -int keyval; -void * attr_value; -int * flag; +int MPI_Attr_get( MPI_Comm comm, int keyval, void * attr_value, int * flag ) { int returnVal; MPE_LOG_STATE_DECL @@ -2286,10 +2191,7 @@ int * flag; return returnVal; } -int MPI_Attr_put( comm, keyval, attr_value ) -MPI_Comm comm; -int keyval; -void * attr_value; +int MPI_Attr_put( MPI_Comm comm, int keyval, void * attr_value ) { int returnVal; MPE_LOG_STATE_DECL @@ -2322,10 +2224,7 @@ void * attr_value; return returnVal; } -int MPI_Comm_compare( comm1, comm2, result ) -MPI_Comm comm1; -MPI_Comm comm2; -int * result; +int MPI_Comm_compare( MPI_Comm comm1, MPI_Comm comm2, int * result ) { int returnVal; MPE_LOG_STATE_DECL @@ -2358,10 +2257,7 @@ int * result; return returnVal; } -int MPI_Comm_create( comm, group, comm_out ) -MPI_Comm comm; -MPI_Group group; -MPI_Comm * comm_out; +int MPI_Comm_create( MPI_Comm comm, MPI_Group group, MPI_Comm * comm_out ) { int returnVal; MPE_LOG_STATE_DECL @@ -2397,9 +2293,7 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Comm_dup( comm, comm_out ) -MPI_Comm comm; -MPI_Comm * comm_out; +int MPI_Comm_dup( MPI_Comm comm, MPI_Comm * comm_out ) { int returnVal; MPE_LOG_STATE_DECL @@ -2435,8 +2329,7 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Comm_free( comm ) -MPI_Comm * comm; +int MPI_Comm_free( MPI_Comm * comm ) { int returnVal; MPE_LOG_STATE_DECL @@ -2473,9 +2366,7 @@ MPI_Comm * comm; return returnVal; } -int MPI_Comm_group( comm, group ) -MPI_Comm comm; -MPI_Group * group; +int MPI_Comm_group( MPI_Comm comm, MPI_Group * group ) { int returnVal; MPE_LOG_STATE_DECL @@ -2508,9 +2399,7 @@ MPI_Group * group; return returnVal; } -int MPI_Comm_rank( comm, rank ) -MPI_Comm comm; -int * rank; +int MPI_Comm_rank( MPI_Comm comm, int * rank ) { int returnVal; MPE_LOG_STATE_DECL @@ -2543,9 +2432,7 @@ int * rank; return returnVal; } -int MPI_Comm_remote_group( comm, group ) -MPI_Comm comm; -MPI_Group * group; +int MPI_Comm_remote_group( MPI_Comm comm, MPI_Group * group ) { int returnVal; MPE_LOG_STATE_DECL @@ -2578,9 +2465,7 @@ MPI_Group * group; return returnVal; } -int MPI_Comm_remote_size( comm, size ) -MPI_Comm comm; -int * size; +int MPI_Comm_remote_size( MPI_Comm comm, int * size ) { int returnVal; MPE_LOG_STATE_DECL @@ -2613,9 +2498,7 @@ int * size; return returnVal; } -int MPI_Comm_size( comm, size ) -MPI_Comm comm; -int * size; +int MPI_Comm_size( MPI_Comm comm, int * size ) { int returnVal; MPE_LOG_STATE_DECL @@ -2648,11 +2531,7 @@ int * size; return returnVal; } -int MPI_Comm_split( comm, color, key, comm_out ) -MPI_Comm comm; -int color; -int key; -MPI_Comm * comm_out; +int MPI_Comm_split( MPI_Comm comm, int color, int key, MPI_Comm * comm_out ) { int returnVal; MPE_LOG_STATE_DECL @@ -2688,9 +2567,7 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Comm_test_inter( comm, flag ) -MPI_Comm comm; -int * flag; +int MPI_Comm_test_inter( MPI_Comm comm, int * flag ) { int returnVal; MPE_LOG_STATE_DECL @@ -2723,10 +2600,7 @@ int * flag; return returnVal; } -int MPI_Group_compare( group1, group2, result ) -MPI_Group group1; -MPI_Group group2; -int * result; +int MPI_Group_compare( MPI_Group group1, MPI_Group group2, int * result ) { int returnVal; MPE_LOG_STATE_DECL @@ -2759,10 +2633,8 @@ int * result; return returnVal; } -int MPI_Group_difference( group1, group2, group_out ) -MPI_Group group1; -MPI_Group group2; -MPI_Group * group_out; +int MPI_Group_difference( MPI_Group group1, MPI_Group group2, + MPI_Group * group_out ) { int returnVal; MPE_LOG_STATE_DECL @@ -2795,11 +2667,8 @@ MPI_Group * group_out; return returnVal; } -int MPI_Group_excl( group, n, ranks, newgroup ) -MPI_Group group; -int n; -MPE_CONST int * ranks; -MPI_Group * newgroup; +int MPI_Group_excl( MPI_Group group, int n, MPE_CONST int * ranks, + MPI_Group * newgroup ) { int returnVal; MPE_LOG_STATE_DECL @@ -2832,8 +2701,7 @@ MPI_Group * newgroup; return returnVal; } -int MPI_Group_free( group ) -MPI_Group * group; +int MPI_Group_free( MPI_Group * group ) { int returnVal; MPE_LOG_STATE_DECL @@ -2866,11 +2734,8 @@ MPI_Group * group; return returnVal; } -int MPI_Group_incl( group, n, ranks, group_out ) -MPI_Group group; -int n; -MPE_CONST int * ranks; -MPI_Group * group_out; +int MPI_Group_incl( MPI_Group group, int n, MPE_CONST int * ranks, + MPI_Group * group_out ) { int returnVal; MPE_LOG_STATE_DECL @@ -2903,10 +2768,8 @@ MPI_Group * group_out; return returnVal; } -int MPI_Group_intersection( group1, group2, group_out ) -MPI_Group group1; -MPI_Group group2; -MPI_Group * group_out; +int MPI_Group_intersection( MPI_Group group1, MPI_Group group2, + MPI_Group * group_out ) { int returnVal; MPE_LOG_STATE_DECL @@ -2939,9 +2802,7 @@ MPI_Group * group_out; return returnVal; } -int MPI_Group_rank( group, rank ) -MPI_Group group; -int * rank; +int MPI_Group_rank( MPI_Group group, int * rank ) { int returnVal; MPE_LOG_STATE_DECL @@ -2974,11 +2835,8 @@ int * rank; return returnVal; } -int MPI_Group_range_excl( group, n, ranges, newgroup ) -MPI_Group group; -int n; -int ranges[][3]; -MPI_Group * newgroup; +int MPI_Group_range_excl( MPI_Group group, int n, int ranges[][3], + MPI_Group * newgroup ) { int returnVal; MPE_LOG_STATE_DECL @@ -3011,11 +2869,8 @@ MPI_Group * newgroup; return returnVal; } -int MPI_Group_range_incl( group, n, ranges, newgroup ) -MPI_Group group; -int n; -int ranges[][3]; -MPI_Group * newgroup; +int MPI_Group_range_incl( MPI_Group group, int n, int ranges[][3], + MPI_Group * newgroup ) { int returnVal; MPE_LOG_STATE_DECL @@ -3048,9 +2903,7 @@ MPI_Group * newgroup; return returnVal; } -int MPI_Group_size( group, size ) -MPI_Group group; -int * size; +int MPI_Group_size( MPI_Group group, int * size ) { int returnVal; MPE_LOG_STATE_DECL @@ -3083,12 +2936,9 @@ int * size; return returnVal; } -int MPI_Group_translate_ranks( group_a, n, ranks_a, group_b, ranks_b ) -MPI_Group group_a; -int n; -MPE_CONST int * ranks_a; -MPI_Group group_b; -int * ranks_b; +int MPI_Group_translate_ranks( MPI_Group group_a, int n, + MPE_CONST int * ranks_a, MPI_Group group_b, + int * ranks_b ) { int returnVal; MPE_LOG_STATE_DECL @@ -3122,10 +2972,8 @@ int * ranks_b; return returnVal; } -int MPI_Group_union( group1, group2, group_out ) -MPI_Group group1; -MPI_Group group2; -MPI_Group * group_out; +int MPI_Group_union( MPI_Group group1, MPI_Group group2, + MPI_Group * group_out ) { int returnVal; MPE_LOG_STATE_DECL @@ -3158,13 +3006,9 @@ MPI_Group * group_out; return returnVal; } -int MPI_Intercomm_create( local_comm, local_leader, peer_comm, remote_leader, tag, comm_out ) -MPI_Comm local_comm; -int local_leader; -MPI_Comm peer_comm; -int remote_leader; -int tag; -MPI_Comm * comm_out; +int MPI_Intercomm_create( MPI_Comm local_comm, int local_leader, + MPI_Comm peer_comm, int remote_leader, int tag, + MPI_Comm * comm_out ) { int returnVal; MPE_LOG_STATE_DECL @@ -3203,10 +3047,7 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Intercomm_merge( comm, high, comm_out ) -MPI_Comm comm; -int high; -MPI_Comm * comm_out; +int MPI_Intercomm_merge( MPI_Comm comm, int high, MPI_Comm * comm_out ) { int returnVal; MPE_LOG_STATE_DECL @@ -3242,11 +3083,9 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Keyval_create( copy_fn, delete_fn, keyval, extra_state ) -MPI_Copy_function * copy_fn; -MPI_Delete_function * delete_fn; -int * keyval; -void * extra_state; +int MPI_Keyval_create( MPI_Copy_function * copy_fn, + MPI_Delete_function * delete_fn, int * keyval, + void * extra_state ) { int returnVal; MPE_LOG_STATE_DECL @@ -3279,8 +3118,7 @@ void * extra_state; return returnVal; } -int MPI_Keyval_free( keyval ) -int * keyval; +int MPI_Keyval_free( int * keyval ) { int returnVal; MPE_LOG_STATE_DECL @@ -3313,9 +3151,7 @@ int * keyval; return returnVal; } -int MPI_Abort( comm, errorcode ) -MPI_Comm comm; -int errorcode; +int MPI_Abort( MPI_Comm comm, int errorcode ) { int returnVal; MPE_LOG_STATE_DECL @@ -3349,9 +3185,7 @@ int errorcode; return returnVal; } -int MPI_Error_class( errorcode, errorclass ) -int errorcode; -int * errorclass; +int MPI_Error_class( int errorcode, int * errorclass ) { int returnVal; MPE_LOG_STATE_DECL @@ -3384,9 +3218,8 @@ int * errorclass; return returnVal; } -int MPI_Errhandler_create( function, errhandler ) -MPI_Handler_function * function; -MPI_Errhandler * errhandler; +int MPI_Errhandler_create( MPI_Handler_function * function, + MPI_Errhandler * errhandler ) { int returnVal; MPE_LOG_STATE_DECL @@ -3419,8 +3252,7 @@ MPI_Errhandler * errhandler; return returnVal; } -int MPI_Errhandler_free( errhandler ) -MPI_Errhandler * errhandler; +int MPI_Errhandler_free( MPI_Errhandler * errhandler ) { int returnVal; MPE_LOG_STATE_DECL @@ -3453,9 +3285,7 @@ MPI_Errhandler * errhandler; return returnVal; } -int MPI_Errhandler_get( comm, errhandler ) -MPI_Comm comm; -MPI_Errhandler * errhandler; +int MPI_Errhandler_get( MPI_Comm comm, MPI_Errhandler * errhandler ) { int returnVal; MPE_LOG_STATE_DECL @@ -3488,10 +3318,7 @@ MPI_Errhandler * errhandler; return returnVal; } -int MPI_Error_string( errorcode, string, resultlen ) -int errorcode; -char * string; -int * resultlen; +int MPI_Error_string( int errorcode, char * string, int * resultlen ) { int returnVal; MPE_LOG_STATE_DECL @@ -3524,9 +3351,7 @@ int * resultlen; return returnVal; } -int MPI_Errhandler_set( comm, errhandler ) -MPI_Comm comm; -MPI_Errhandler errhandler; +int MPI_Errhandler_set( MPI_Comm comm, MPI_Errhandler errhandler ) { int returnVal; MPE_LOG_STATE_DECL @@ -3564,7 +3389,7 @@ MPI_Errhandler errhandler; /* Copy of CLOG_Util_getenvbool() in log_mpi_util.c */ int MPE_Util_getenvbool( char *env_var, int default_value ); -int MPI_Finalize( ) +int MPI_Finalize(void) { MPE_State *state; MPE_Event *event; @@ -3732,9 +3557,7 @@ int MPI_Finalize( ) return returnVal; } -int MPI_Get_processor_name( name, resultlen ) -char * name; -int * resultlen; +int MPI_Get_processor_name( char * name, int * resultlen ) { int returnVal; MPE_LOG_STATE_DECL @@ -3787,9 +3610,7 @@ int MPE_Init_mpi( int *argc, char ***argv ) * Replacement for MPI_Init. Initializes logging and sets up basic * state definitions, including default color/pattern values */ -int MPI_Init( argc, argv ) -int *argc; -char ***argv; +int MPI_Init( int *argc, char ***argv ) { int returnVal; @@ -3844,11 +3665,7 @@ char ***argv; } #if defined( HAVE_MPI_INIT_THREAD ) -int MPI_Init_thread( argc, argv, required, provided ) -int *argc; -char ***argv; -int required; -int *provided; +int MPI_Init_thread( int *argc, char ***argv, int required, int *provided ) { int returnVal; @@ -3906,8 +3723,7 @@ int *provided; Log the beginning and ending of the time spent in MPI_Initialized calls. */ /* -int MPI_Initialized( flag ) -int * flag; +int MPI_Initialized( int * flag ) { int returnVal; MPE_LOG_STATE_DECL @@ -3941,7 +3757,7 @@ int * flag; Use the regular routines for these. Note that the state logging needs MPI_Wtime; make sure that it uses PMPI_Wtime if you use these */ -double MPI_Wtick( ) +double MPI_Wtick( void ) { double returnVal; MPE_LOG_STATE_DECL @@ -3974,7 +3790,7 @@ double MPI_Wtick( ) return returnVal; } -double MPI_Wtime( ) +double MPI_Wtime( void ) { double returnVal; MPE_LOG_STATE_DECL @@ -4008,9 +3824,7 @@ double MPI_Wtime( ) } #endif -int MPI_Address( location, address ) -MPE_CONST void * location; -MPI_Aint * address; +int MPI_Address( MPE_CONST void * location, MPI_Aint * address ) { int returnVal; MPE_LOG_STATE_DECL @@ -4043,13 +3857,8 @@ MPI_Aint * address; return returnVal; } -int MPI_Bsend( buf, count, datatype, dest, tag, comm ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Bsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, int dest, + int tag, MPI_Comm comm) { int returnVal; int size; @@ -4086,14 +3895,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Bsend_init( buf, count, datatype, dest, tag, comm, request ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Bsend_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -4129,9 +3932,7 @@ MPI_Request * request; return returnVal; } -int MPI_Buffer_attach( buffer, size ) -void * buffer; -int size; +int MPI_Buffer_attach(void *buffer, int size) { int returnVal; MPE_LOG_STATE_DECL @@ -4164,9 +3965,7 @@ int size; return returnVal; } -int MPI_Buffer_detach( buffer, size ) -void * buffer; -int * size; +int MPI_Buffer_detach(void *buffer, int *size) { int returnVal; MPE_LOG_STATE_DECL @@ -4199,8 +3998,7 @@ int * size; return returnVal; } -int MPI_Cancel( request ) -MPI_Request * request; +int MPI_Cancel(MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -4235,8 +4033,7 @@ MPI_Request * request; return returnVal; } -int MPI_Request_free( request ) -MPI_Request * request; +int MPI_Request_free(MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -4271,14 +4068,8 @@ MPI_Request * request; return returnVal; } -int MPI_Recv_init( buf, count, datatype, source, tag, comm, request ) -void * buf; -int count; -MPI_Datatype datatype; -int source; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source, + int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -4317,14 +4108,8 @@ MPI_Request * request; return returnVal; } -int MPI_Send_init( buf, count, datatype, dest, tag, comm, request ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Send_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -4360,9 +4145,9 @@ MPI_Request * request; return returnVal; } -int MPI_Get_elements( MPE_CONST MPI_Status *status, - MPI_Datatype datatype, - int *elements ) +int MPI_Get_elements(MPE_CONST MPI_Status *status, + MPI_Datatype datatype, + int *elements ) { int returnVal; MPE_LOG_STATE_DECL @@ -4429,14 +4214,8 @@ int MPI_Get_count( MPE_CONST MPI_Status *status, MPI_Datatype datatype, return returnVal; } -int MPI_Ibsend( buf, count, datatype, dest, tag, comm, request ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Ibsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -4471,12 +4250,8 @@ MPI_Request * request; return returnVal; } -int MPI_Iprobe( source, tag, comm, flag, status ) -int source; -int tag; -MPI_Comm comm; -int * flag; -MPI_Status * status; +int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, + MPI_Status *status) { int returnVal; MPE_LOG_STATE_DECL @@ -4525,14 +4300,8 @@ MPI_Status * status; return returnVal; } -int MPI_Irecv( buf, count, datatype, source, tag, comm, request ) -void * buf; -int count; -MPI_Datatype datatype; -int source; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, + int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -4569,14 +4338,8 @@ MPI_Request * request; return returnVal; } -int MPI_Irsend( buf, count, datatype, dest, tag, comm, request ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Irsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int size; @@ -4615,14 +4378,8 @@ MPI_Request * request; return returnVal; } -int MPI_Isend( buf, count, datatype, dest, tag, comm, request ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Isend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int size; @@ -4661,14 +4418,8 @@ MPI_Request * request; return returnVal; } -int MPI_Issend( buf, count, datatype, dest, tag, comm, request ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Issend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int size; @@ -4707,14 +4458,8 @@ MPI_Request * request; return returnVal; } -int MPI_Pack( inbuf, incount, type, outbuf, outcount, position, comm ) -MPE_CONST void * inbuf; -int incount; -MPI_Datatype type; -void * outbuf; -int outcount; -int * position; -MPI_Comm comm; +int MPI_Pack(MPE_CONST void *inbuf, int incount, MPI_Datatype type, + void *outbuf, int outcount, int *position, MPI_Comm comm) { int returnVal; MPE_LOG_STATE_DECL @@ -4748,11 +4493,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Pack_size( incount, datatype, comm, size ) -int incount; -MPI_Datatype datatype; -MPI_Comm comm; -int * size; +int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, + int *size ) { int returnVal; MPE_LOG_STATE_DECL @@ -4785,11 +4527,7 @@ int * size; return returnVal; } -int MPI_Probe( source, tag, comm, status ) -int source; -int tag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) { int returnVal; MPE_LOG_STATE_DECL @@ -4838,14 +4576,8 @@ MPI_Status * status; return returnVal; } -int MPI_Recv( buf, count, datatype, source, tag, comm, status ) -void * buf; -int count; -MPI_Datatype datatype; -int source; -int tag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, + int tag, MPI_Comm comm, MPI_Status *status) { int returnVal, acount; MPE_LOG_STATE_DECL @@ -4899,13 +4631,8 @@ MPI_Status * status; return returnVal; } -int MPI_Rsend( buf, count, datatype, dest, tag, comm ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Rsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm) { int returnVal; int size; @@ -4942,14 +4669,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Rsend_init( buf, count, datatype, dest, tag, comm, request ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Rsend_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -4985,13 +4706,8 @@ MPI_Request * request; return returnVal; } -int MPI_Send( buf, count, datatype, dest, tag, comm ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Send(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm) { int returnVal; int size; @@ -5028,21 +4744,10 @@ MPI_Comm comm; return returnVal; } -int MPI_Sendrecv( sendbuf, sendcount, sendtype, dest, sendtag, - recvbuf, recvcount, recvtype, source, recvtag, - comm, status ) -const void * sendbuf; -int sendcount; -MPI_Datatype sendtype; -int dest; -int sendtag; -void * recvbuf; -int recvcount; -MPI_Datatype recvtype; -int source; -int recvtag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Sendrecv(MPE_CONST void *sendbuf, int sendcount, + MPI_Datatype sendtype, int dest, int sendtag, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int source, + int recvtag, MPI_Comm comm, MPI_Status *status) { int returnVal; int acount, sendsize; @@ -5100,17 +4805,9 @@ MPI_Status * status; return returnVal; } -int MPI_Sendrecv_replace( buf, count, datatype, dest, sendtag, source, - recvtag, comm, status ) -void * buf; -int count; -MPI_Datatype datatype; -int dest; -int sendtag; -int source; -int recvtag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, + int dest, int sendtag, int source, int recvtag, + MPI_Comm comm, MPI_Status *status) { int returnVal; int acount, sendsize; @@ -5167,13 +4864,8 @@ MPI_Status * status; return returnVal; } -int MPI_Ssend( buf, count, datatype, dest, tag, comm ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Ssend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm) { int returnVal, size; MPE_LOG_STATE_DECL @@ -5209,14 +4901,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Ssend_init( buf, count, datatype, dest, tag, comm, request ) -MPE_CONST void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Ssend_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -5251,8 +4937,7 @@ MPI_Request * request; return returnVal; } -int MPI_Start( request ) -MPI_Request * request; +int MPI_Start(MPI_Request *request) { int returnVal; MPE_LOG_STATE_DECL @@ -5287,9 +4972,7 @@ MPI_Request * request; return returnVal; } -int MPI_Startall( count, array_of_requests ) -int count; -MPI_Request * array_of_requests; +int MPI_Startall(int count, MPI_Request *array_of_requests ) { int returnVal; int i; @@ -5326,10 +5009,7 @@ MPI_Request * array_of_requests; return returnVal; } -int MPI_Test( request, flag, status ) -MPI_Request * request; -int * flag; -MPI_Status * status; +int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status) { int returnVal; MPI_Request lreq = *request; @@ -5372,11 +5052,8 @@ MPI_Status * status; return returnVal; } -int MPI_Testall( count, array_of_requests, flag, array_of_statuses ) -int count; -MPI_Request * array_of_requests; -int * flag; -MPI_Status * array_of_statuses; +int MPI_Testall(int count, MPI_Request *array_of_requests, int *flag, + MPI_Status *array_of_statuses) { int returnVal; int i; @@ -5449,12 +5126,8 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Testany( count, array_of_requests, index, flag, status ) -int count; -MPI_Request * array_of_requests; -int * index; -int * flag; -MPI_Status * status; +int MPI_Testany(int count, MPI_Request *array_of_requests, int *index, + int *flag, MPI_Status *status) { int returnVal; int i; @@ -5521,9 +5194,7 @@ MPI_Status * status; return returnVal; } -int MPI_Test_cancelled( status, flag ) -MPE_CONST MPI_Status * status; -int * flag; +int MPI_Test_cancelled(MPE_CONST MPI_Status *status, int *flag) { int returnVal; MPE_LOG_STATE_DECL @@ -5556,13 +5227,8 @@ int * flag; return returnVal; } -int MPI_Testsome( incount, array_of_requests, outcount, - array_of_indices, array_of_statuses ) -int incount; -MPI_Request * array_of_requests; -int * outcount; -int * array_of_indices; -MPI_Status * array_of_statuses; +int MPI_Testsome(int incount, MPI_Request *array_of_requests, int *outcount, + int *array_of_indices, MPI_Status *array_of_statuses) { int returnVal; int i; @@ -5638,8 +5304,7 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Type_commit( datatype ) -MPI_Datatype * datatype; +int MPI_Type_commit(MPI_Datatype *datatype) { int returnVal; MPE_LOG_STATE_DECL @@ -5672,10 +5337,8 @@ MPI_Datatype * datatype; return returnVal; } -int MPI_Type_contiguous( count, old_type, newtype ) -int count; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_contiguous(int count, MPI_Datatype old_type, + MPI_Datatype *newtype) { int returnVal; MPE_LOG_STATE_DECL @@ -5708,9 +5371,7 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Type_extent( datatype, extent ) -MPI_Datatype datatype; -MPI_Aint * extent; +int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint *extent) { int returnVal; MPE_LOG_STATE_DECL @@ -5743,8 +5404,7 @@ MPI_Aint * extent; return returnVal; } -int MPI_Type_free( datatype ) -MPI_Datatype * datatype; +int MPI_Type_free(MPI_Datatype *datatype) { int returnVal; MPE_LOG_STATE_DECL @@ -5777,12 +5437,9 @@ MPI_Datatype * datatype; return returnVal; } -int MPI_Type_hindexed( count, blocklens, indices, old_type, newtype ) -int count; -MPE_CONST int * blocklens; -MPE_CONST MPI_Aint * indices; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_hindexed(int count, MPE_CONST int *blocklens, + MPE_CONST MPI_Aint *indices, + MPI_Datatype old_type, MPI_Datatype *newtype) { int returnVal; MPE_LOG_STATE_DECL @@ -5816,12 +5473,8 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Type_hvector( count, blocklen, stride, old_type, newtype ) -int count; -int blocklen; -MPI_Aint stride; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_hvector(int count, int blocklen, MPI_Aint stride, + MPI_Datatype old_type, MPI_Datatype *newtype) { int returnVal; MPE_LOG_STATE_DECL @@ -5854,12 +5507,9 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Type_indexed( count, blocklens, indices, old_type, newtype ) -int count; -MPE_CONST int * blocklens; -MPE_CONST int * indices; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_indexed(int count, MPE_CONST int *blocklens, + MPE_CONST int *indices, MPI_Datatype old_type, + MPI_Datatype *newtype) { int returnVal; MPE_LOG_STATE_DECL @@ -5892,9 +5542,7 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Type_lb( datatype, displacement ) -MPI_Datatype datatype; -MPI_Aint * displacement; +int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint *displacement) { int returnVal; MPE_LOG_STATE_DECL @@ -5927,9 +5575,7 @@ MPI_Aint * displacement; return returnVal; } -int MPI_Type_size( datatype, size ) -MPI_Datatype datatype; -int * size; +int MPI_Type_size(MPI_Datatype datatype, int *size) { int returnVal; MPE_LOG_STATE_DECL @@ -5962,12 +5608,9 @@ int * size; return returnVal; } -int MPI_Type_struct( count, blocklens, indices, old_types, newtype ) -int count; -MPE_CONST int * blocklens; -MPE_CONST MPI_Aint * indices; -MPE_CONST MPI_Datatype * old_types; -MPI_Datatype * newtype; +int MPI_Type_struct(int count, MPE_CONST int *blocklens, + MPE_CONST MPI_Aint *indices, + MPE_CONST MPI_Datatype *old_types, MPI_Datatype *newtype ) { int returnVal; MPE_LOG_STATE_DECL @@ -6000,9 +5643,7 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Type_ub( datatype, displacement ) -MPI_Datatype datatype; -MPI_Aint * displacement; +int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint *displacement) { int returnVal; MPE_LOG_STATE_DECL @@ -6035,12 +5676,8 @@ MPI_Aint * displacement; return returnVal; } -int MPI_Type_vector( count, blocklen, stride, old_type, newtype ) -int count; -int blocklen; -int stride; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, + MPI_Datatype *newtype) { int returnVal; MPE_LOG_STATE_DECL @@ -6073,14 +5710,8 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Unpack( inbuf, insize, position, outbuf, outcount, type, comm ) -MPE_CONST void * inbuf; -int insize; -int * position; -void * outbuf; -int outcount; -MPI_Datatype type; -MPI_Comm comm; +int MPI_Unpack(MPE_CONST void *inbuf, int insize, int *position, + void *outbuf, int outcount, MPI_Datatype type, MPI_Comm comm) { int returnVal; MPE_LOG_STATE_DECL @@ -6114,9 +5745,7 @@ MPI_Comm comm; return returnVal; } -int MPI_Wait( request, status ) -MPI_Request * request; -MPI_Status * status; +int MPI_Wait(MPI_Request *request, MPI_Status *status) { int returnVal; MPI_Request lreq = *request; @@ -6158,10 +5787,8 @@ MPI_Status * status; return returnVal; } -int MPI_Waitall( count, array_of_requests, array_of_statuses ) -int count; -MPI_Request * array_of_requests; -MPI_Status * array_of_statuses; +int MPI_Waitall(int count, MPI_Request *array_of_requests, + MPI_Status *array_of_statuses ) { int returnVal; int i; @@ -6234,11 +5861,8 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Waitany( count, array_of_requests, index, status ) -int count; -MPI_Request * array_of_requests; -int * index; -MPI_Status * status; +int MPI_Waitany(int count, MPI_Request *array_of_requests, int *index, + MPI_Status *status) { int returnVal; int i; @@ -6304,13 +5928,8 @@ MPI_Status * status; return returnVal; } -int MPI_Waitsome( incount, array_of_requests, outcount, - array_of_indices, array_of_statuses ) -int incount; -MPI_Request * array_of_requests; -int * outcount; -int * array_of_indices; -MPI_Status * array_of_statuses; +int MPI_Waitsome(int incount, MPI_Request *array_of_requests, int *outcount, + int *array_of_indices, MPI_Status *array_of_statuses) { int returnVal; int i; @@ -6386,11 +6005,7 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Cart_coords( comm, rank, maxdims, coords ) -MPI_Comm comm; -int rank; -int maxdims; -int * coords; +int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords) { int returnVal; MPE_LOG_STATE_DECL @@ -6423,13 +6038,8 @@ int * coords; return returnVal; } -int MPI_Cart_create( comm_old, ndims, dims, periods, reorder, comm_cart ) -MPI_Comm comm_old; -int ndims; -MPE_CONST int * dims; -MPE_CONST int * periods; -int reorder; -MPI_Comm * comm_cart; +int MPI_Cart_create(MPI_Comm comm_old, int ndims, MPE_CONST int *dims, + MPE_CONST int *periods, int reorder, MPI_Comm *comm_cart) { int returnVal; MPE_LOG_STATE_DECL @@ -6466,12 +6076,8 @@ MPI_Comm * comm_cart; return returnVal; } -int MPI_Cart_get( comm, maxdims, dims, periods, coords ) -MPI_Comm comm; -int maxdims; -int * dims; -int * periods; -int * coords; +int MPI_Cart_get(MPI_Comm comm, int maxdims, int *dims, int *periods, + int *coords) { int returnVal; MPE_LOG_STATE_DECL @@ -6504,12 +6110,8 @@ int * coords; return returnVal; } -int MPI_Cart_map( comm_old, ndims, dims, periods, newrank ) -MPI_Comm comm_old; -int ndims; -MPE_CONST int * dims; -MPE_CONST int * periods; -int * newrank; +int MPI_Cart_map(MPI_Comm comm_old, int ndims, MPE_CONST int *dims, + MPE_CONST int *periods, int *newrank) { int returnVal; MPE_LOG_STATE_DECL @@ -6542,10 +6144,7 @@ int * newrank; return returnVal; } -int MPI_Cart_rank( comm, coords, rank ) -MPI_Comm comm; -MPE_CONST int * coords; -int * rank; +int MPI_Cart_rank(MPI_Comm comm, MPE_CONST int *coords, int *rank) { int returnVal; MPE_LOG_STATE_DECL @@ -6578,12 +6177,8 @@ int * rank; return returnVal; } -int MPI_Cart_shift( comm, direction, displ, source, dest ) -MPI_Comm comm; -int direction; -int displ; -int * source; -int * dest; +int MPI_Cart_shift(MPI_Comm comm, int direction, int displ, + int *source, int *dest) { int returnVal; MPE_LOG_STATE_DECL @@ -6616,10 +6211,8 @@ int * dest; return returnVal; } -int MPI_Cart_sub( comm, remain_dims, comm_new ) -MPI_Comm comm; -MPE_CONST int * remain_dims; -MPI_Comm * comm_new; +int MPI_Cart_sub(MPI_Comm comm, MPE_CONST int *remain_dims, + MPI_Comm *comm_new) { int returnVal; MPE_LOG_STATE_DECL @@ -6655,9 +6248,7 @@ MPI_Comm * comm_new; return returnVal; } -int MPI_Cartdim_get( comm, ndims ) -MPI_Comm comm; -int * ndims; +int MPI_Cartdim_get(MPI_Comm comm, int *ndims) { int returnVal; MPE_LOG_STATE_DECL @@ -6690,10 +6281,7 @@ int * ndims; return returnVal; } -int MPI_Dims_create( nnodes, ndims, dims ) -int nnodes; -int ndims; -int * dims; +int MPI_Dims_create(int nnodes, int ndims, int *dims) { int returnVal; MPE_LOG_STATE_DECL @@ -6726,13 +6314,8 @@ int * dims; return returnVal; } -int MPI_Graph_create( comm_old, nnodes, index, edges, reorder, comm_graph ) -MPI_Comm comm_old; -int nnodes; -MPE_CONST int * index; -MPE_CONST int * edges; -int reorder; -MPI_Comm * comm_graph; +int MPI_Graph_create(MPI_Comm comm_old, int nnodes, MPE_CONST int *index, + MPE_CONST int *edges, int reorder, MPI_Comm *comm_graph) { int returnVal; MPE_LOG_STATE_DECL @@ -6769,12 +6352,8 @@ MPI_Comm * comm_graph; return returnVal; } -int MPI_Graph_get( comm, maxindex, maxedges, index, edges ) -MPI_Comm comm; -int maxindex; -int maxedges; -int * index; -int * edges; +int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, + int *index, int *edges) { int returnVal; MPE_LOG_STATE_DECL @@ -6807,12 +6386,8 @@ int * edges; return returnVal; } -int MPI_Graph_map( comm_old, nnodes, index, edges, newrank ) -MPI_Comm comm_old; -int nnodes; -MPE_CONST int * index; -MPE_CONST int * edges; -int * newrank; +int MPI_Graph_map(MPI_Comm comm_old, int nnodes, MPE_CONST int *index, + MPE_CONST int *edges, int *newrank) { int returnVal; MPE_LOG_STATE_DECL @@ -6845,11 +6420,8 @@ int * newrank; return returnVal; } -int MPI_Graph_neighbors( comm, rank, maxneighbors, neighbors ) -MPI_Comm comm; -int rank; -int maxneighbors; -int * neighbors; +int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, + int *neighbors) { int returnVal; MPE_LOG_STATE_DECL @@ -6882,10 +6454,7 @@ int * neighbors; return returnVal; } -int MPI_Graph_neighbors_count( comm, rank, nneighbors ) -MPI_Comm comm; -int rank; -int * nneighbors; +int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors) { int returnVal; MPE_LOG_STATE_DECL @@ -6918,10 +6487,7 @@ int * nneighbors; return returnVal; } -int MPI_Graphdims_get( comm, nnodes, nedges ) -MPI_Comm comm; -int * nnodes; -int * nedges; +int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges) { int returnVal; MPE_LOG_STATE_DECL @@ -6954,9 +6520,7 @@ int * nedges; return returnVal; } -int MPI_Topo_test( comm, top_type ) -MPI_Comm comm; -int * top_type; +int MPI_Topo_test(MPI_Comm comm, int *top_type) { int returnVal; MPE_LOG_STATE_DECL diff --git a/src/wrappers/src/mpe_prof.c b/src/wrappers/src/mpe_prof.c index 0ca2093..df38ca1 100644 --- a/src/wrappers/src/mpe_prof.c +++ b/src/wrappers/src/mpe_prof.c @@ -6,8 +6,8 @@ #undef MPI_BUILD_PROFILING #endif #include -#include "mpe_wrappers_conf.h" #include "mpi.h" +#include "mpe_wrappers_conf.h" #include "mpe_log.h" #define S_SEND_EVENT 256 @@ -69,9 +69,7 @@ static char logFileName[256]; /* MPI_Init - replacement for MPI_Init */ -int MPI_Init( argc, argv ) -int *argc; -char ***argv; +int MPI_Init(int *argc, char ***argv) { int returnVal; @@ -122,11 +120,8 @@ char ***argv; /* MPI_Send - prototyping replacement for MPI_Send */ -int MPI_Send( buf, count, datatype, dest, tag, comm ) -const void *buf; -int count, dest, tag; -MPI_Datatype datatype; -MPI_Comm comm; +int MPI_Send( MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm ) { char mesgStr[100]; int result; @@ -144,12 +139,8 @@ MPI_Comm comm; /* MPI_Recv - prototyping replacement for MPI_Recv */ -int MPI_Recv( buf, count, datatype, source, tag, comm, status ) -void *buf; -int count, source, tag; -MPI_Datatype datatype; -MPI_Comm comm; -MPI_Status *status; +int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, + MPI_Comm comm, MPI_Status *status) { char mesgStr[100]; int result; @@ -167,11 +158,8 @@ MPI_Status *status; /* MPI_Bcast - prototyping replacement for MPI_Bcast */ -int MPI_Bcast( buf, count, datatype, source, comm ) -void *buf; -int count, source; -MPI_Datatype datatype; -MPI_Comm comm; +int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int source, + MPI_Comm comm) { int result; @@ -187,13 +175,8 @@ MPI_Comm comm; /* MPI_Reduce - prototyping replacement for MPI_Reduce */ -int MPI_Reduce( sendbuf, recvbuf, count, datatype, op, root, comm ) -const void *sendbuf; -void *recvbuf; -int count, root; -MPI_Op op; -MPI_Datatype datatype; -MPI_Comm comm; +int MPI_Reduce(MPE_CONST void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) { int result; @@ -208,13 +191,8 @@ MPI_Comm comm; /* MPI_Allreduce */ -int MPI_Allreduce ( sendbuf, recvbuf, count, datatype, op, comm ) -const void *sendbuf; -void *recvbuf; -int count; -MPI_Datatype datatype; -MPI_Op op; -MPI_Comm comm; +int MPI_Allreduce (MPE_CONST void *sendbuf, void *recvbuf, int count, + MPI_Comm datatype, MPI_Op op, MPI_Comm comm) { int result; @@ -229,8 +207,7 @@ MPI_Comm comm; /* MPI_Barrier - prototyping replacement for MPI_Barrier */ -int MPI_Barrier( comm ) -MPI_Comm comm; +int MPI_Barrier(MPI_Comm comm) { int result; @@ -246,12 +223,8 @@ MPI_Comm comm; /* MPI_Isend - prototyping replacement for MPI_Isend */ -int MPI_Isend( buf, count, datatype, dest, tag, comm, request ) -const void *buf; -int count, dest, tag; -MPI_Datatype datatype; -MPI_Comm comm; -MPI_Request *request; +int MPI_Isend(MPE_CONST void *buf, int count, MPI_Datatype datatype, int dest, + int tag, MPI_Comm comm, MPI_Request *request) { int result; @@ -267,12 +240,8 @@ MPI_Request *request; /* MPI_Irecv - prototyping replacement for MPI_Irecv */ -int MPI_Irecv( buf, count, datatype, source, tag, comm, request ) -void *buf; -int count, source, tag; -MPI_Datatype datatype; -MPI_Comm comm; -MPI_Request *request; +int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, + int tag, MPI_Comm comm, MPI_Request *request) { int result; @@ -287,9 +256,7 @@ MPI_Request *request; /* MPI_Wait - prototyping replacement for MPI_Wait */ -int MPI_Wait( request, status) -MPI_Request *request; -MPI_Status *status; +int MPI_Wait(MPI_Request *request, MPI_Status *status) { int result; @@ -304,10 +271,7 @@ MPI_Status *status; /* MPI_Test - prototyping replacement for MPI_Test */ -int MPI_Test( request, flag, status ) -MPI_Request *request; -int *flag; -MPI_Status *status; +int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status) { int result; @@ -324,10 +288,7 @@ MPI_Status *status; /* MPI_Waitall - prototyping replacement for MPI_Waitall */ -int MPI_Waitall( count, requests, statuses ) -int count; -MPI_Request *requests; -MPI_Status *statuses; +int MPI_Waitall(int count, MPI_Request *requests, MPI_Status *statuses) { int result; @@ -343,15 +304,10 @@ MPI_Status *statuses; /* MPI_Sendrecv - prototyping replacement for MPI_Sendrecv */ -int MPI_Sendrecv( sendbuf, sendcount, sendtype, dest, sendtag, - recvbuf, recvcount, recvtype, source, recvtag, - comm, status ) -const void *sendbuf; -void *recvbuf; -int sendcount, dest, sendtag, source, recvtag, recvcount; -MPI_Datatype sendtype, recvtype; -MPI_Comm comm; -MPI_Status *status; +int MPI_Sendrecv(MPE_CONST void *sendbuf, int sendcount, MPI_Datatype sendtype, + int dest, int sendtag, void *recvbuf, int recvcount, + MPI_Datatype recvtype, int source, int recvtag, + MPI_Comm comm, MPI_Status *status) { int result; @@ -368,10 +324,7 @@ MPI_Status *status; /* MPI_Waitany - prototyping replacement for MPI_Waitany */ -int MPI_Waitany( count, array, index, status ) -int count, *index; -MPI_Request *array; -MPI_Status *status; +int MPI_Waitany(int count, MPI_Request *array, int *index, MPI_Status *status) { int result; @@ -386,11 +339,8 @@ MPI_Status *status; /* MPI_Ssend - prototyping replacement for MPI_Ssend */ -int MPI_Ssend( buf, count, datatype, dest, tag, comm ) -const void *buf; -int count, dest, tag; -MPI_Datatype datatype; -MPI_Comm comm; +int MPI_Ssend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm) { int result; @@ -405,14 +355,8 @@ MPI_Comm comm; /* MPI_Issend - prototyping replacement for MPI_Issend */ -int MPI_Issend( buf, count, datatype, dest, tag, comm, request ) -const void *buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request *request; +int MPI_Issend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int result; @@ -427,11 +371,7 @@ MPI_Request *request; /* MPI_ Probe- prototyping replacement for MPI_Probe */ -int MPI_Probe( source, tag, comm, status ) -int source; -int tag; -MPI_Comm comm; -MPI_Status *status; +int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) { int result; @@ -446,12 +386,7 @@ MPI_Status *status; /* MPI_Iprobe - prototyping replacement for MPI_Iprobe */ -int MPI_Iprobe( source, tag, comm, flag, status ) -int source; -int tag; -MPI_Comm comm; -int *flag; -MPI_Status *status; +int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, MPI_Status *status) { int result; @@ -466,7 +401,7 @@ MPI_Status *status; /* MPI_Finalize - prototyping replacement for MPI_Finalize */ -int MPI_Finalize() +int MPI_Finalize(void) { MPE_Finish_log( logFileName ); #ifdef DEBUG diff --git a/src/wrappers/src/mpe_proff.c b/src/wrappers/src/mpe_proff.c index d057836..22dd7e4 100644 --- a/src/wrappers/src/mpe_proff.c +++ b/src/wrappers/src/mpe_proff.c @@ -2458,8 +2458,7 @@ void mpi_scatterv_ ( void *sendbuf, MPI_Fint *sendcnts, } void mpi_finalize_ ( int * ); -void mpi_finalize_( ierr ) -int *ierr; +void mpi_finalize_( int *ierr ) { *ierr = MPI_Finalize(); } diff --git a/src/wrappers/src/trace_mpi_core.c b/src/wrappers/src/trace_mpi_core.c index 50f8887..23078ce 100644 --- a/src/wrappers/src/trace_mpi_core.c +++ b/src/wrappers/src/trace_mpi_core.c @@ -6,8 +6,8 @@ #undef MPI_BUILD_PROFILING #endif #include -#include "mpe_wrappers_conf.h" #include "mpi.h" +#include "mpe_wrappers_conf.h" #if defined(NEEDS_STDLIB_PROTOTYPES) #include "protofix.h" @@ -30,14 +30,9 @@ if ( (MPE_Trace_hasBeenInit) && (!MPE_Trace_hasBeenFinished) ) {\ -int MPI_Allgather( sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm ) -const void * sendbuf; -int sendcount; -MPI_Datatype sendtype; -void * recvbuf; -int recvcount; -MPI_Datatype recvtype; -MPI_Comm comm; +int MPI_Allgather(MPE_CONST void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, int recvcount, + int recvtype, MPI_Comm comm) { int returnVal; int llrank; @@ -57,15 +52,10 @@ MPI_Comm comm; return returnVal; } -int MPI_Allgatherv( sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm ) -const void * sendbuf; -int sendcount; -MPI_Datatype sendtype; -void * recvbuf; -const int * recvcounts; -const int * displs; -MPI_Datatype recvtype; -MPI_Comm comm; +int MPI_Allgatherv(MPE_CONST void *sendbuf, int sendcount, int sendtype, + void *recvbuf, MPE_CONST int *recvcounts, + MPE_CONST int *displs, MPI_Datatype recvtype, + MPI_Comm comm) { int returnVal; int llrank; @@ -85,13 +75,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Allreduce( sendbuf, recvbuf, count, datatype, op, comm ) -const void * sendbuf; -void * recvbuf; -int count; -MPI_Datatype datatype; -MPI_Op op; -MPI_Comm comm; +int MPI_Allreduce(MPE_CONST void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int returnVal; int llrank; @@ -110,14 +95,9 @@ MPI_Comm comm; return returnVal; } -int MPI_Alltoall( sendbuf, sendcount, sendtype, recvbuf, recvcnt, recvtype, comm ) -const void * sendbuf; -int sendcount; -MPI_Datatype sendtype; -void * recvbuf; -int recvcnt; -MPI_Datatype recvtype; -MPI_Comm comm; +int MPI_Alltoall(MPE_CONST void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, int recvcnt, + MPI_Datatype recvtype, MPI_Comm comm) { int returnVal; int llrank; @@ -137,16 +117,11 @@ MPI_Comm comm; return returnVal; } -int MPI_Alltoallv( sendbuf, sendcnts, sdispls, sendtype, recvbuf, recvcnts, rdispls, recvtype, comm ) -const void * sendbuf; -const int * sendcnts; -const int * sdispls; -MPI_Datatype sendtype; -void * recvbuf; -const int * recvcnts; -const int * rdispls; -MPI_Datatype recvtype; -MPI_Comm comm; +int MPI_Alltoallv(MPE_CONST void *sendbuf, MPE_CONST int *sendcnts, + MPE_CONST int *sdispls, MPI_Datatype sendtype, + void *recvbuf, MPE_CONST int *recvcnts, + MPE_CONST int *rdispls, MPI_Datatype recvtype, + MPI_Comm comm) { int returnVal; int llrank; @@ -166,8 +141,7 @@ MPI_Comm comm; return returnVal; } -int MPI_Barrier( comm ) -MPI_Comm comm; +int MPI_Barrier(MPI_Comm comm) { int returnVal; int llrank; @@ -186,12 +160,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Bcast( buffer, count, datatype, root, comm ) -void * buffer; -int count; -MPI_Datatype datatype; -int root; -MPI_Comm comm; +int MPI_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, + MPI_Comm comm) { int returnVal; int llrank; @@ -210,15 +180,9 @@ MPI_Comm comm; return returnVal; } -int MPI_Gather( sendbuf, sendcnt, sendtype, recvbuf, recvcount, recvtype, root, comm ) -const void * sendbuf; -int sendcnt; -MPI_Datatype sendtype; -void * recvbuf; -int recvcount; -MPI_Datatype recvtype; -int root; -MPI_Comm comm; +int MPI_Gather(MPE_CONST void *sendbuf, int sendcnt, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPI_Comm comm) { int returnVal; int llrank; @@ -238,16 +202,9 @@ MPI_Comm comm; return returnVal; } -int MPI_Gatherv( sendbuf, sendcnt, sendtype, recvbuf, recvcnts, displs, recvtype, root, comm ) -const void * sendbuf; -int sendcnt; -MPI_Datatype sendtype; -void * recvbuf; -const int * recvcnts; -const int * displs; -MPI_Datatype recvtype; -int root; -MPI_Comm comm; +int MPI_Gatherv(MPE_CONST void *sendbuf, int sendcnt, MPI_Datatype sendtype, + void *recvbuf, MPE_CONST int *recvcnts, MPE_CONST int *displs, + MPI_Datatype recvtype, int root, MPI_Comm comm) { int returnVal; int llrank; @@ -267,10 +224,7 @@ MPI_Comm comm; return returnVal; } -int MPI_Op_create( function, commute, op ) -MPI_User_function * function; -int commute; -MPI_Op * op; +int MPI_Op_create(MPI_User_function *function, int commute, MPI_Op *op) { int returnVal; int llrank; @@ -289,8 +243,7 @@ MPI_Op * op; return returnVal; } -int MPI_Op_free( op ) -MPI_Op * op; +int MPI_Op_free(MPI_Op *op) { int returnVal; int llrank; @@ -309,13 +262,9 @@ MPI_Op * op; return returnVal; } -int MPI_Reduce_scatter( sendbuf, recvbuf, recvcnts, datatype, op, comm ) -const void * sendbuf; -void * recvbuf; -const int * recvcnts; -MPI_Datatype datatype; -MPI_Op op; -MPI_Comm comm; +int MPI_Reduce_scatter(MPE_CONST void *sendbuf, void *recvbuf, + MPE_CONST int *recvcnts, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm) { int returnVal; int llrank; @@ -335,14 +284,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Reduce( sendbuf, recvbuf, count, datatype, op, root, comm ) -const void * sendbuf; -void * recvbuf; -int count; -MPI_Datatype datatype; -MPI_Op op; -int root; -MPI_Comm comm; +int MPI_Reduce(MPE_CONST void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) { int returnVal; int llrank; @@ -361,13 +304,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Scan( sendbuf, recvbuf, count, datatype, op, comm ) -const void * sendbuf; -void * recvbuf; -int count; -MPI_Datatype datatype; -MPI_Op op; -MPI_Comm comm; +int MPI_Scan(MPE_CONST void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int returnVal; int llrank; @@ -386,15 +324,9 @@ MPI_Comm comm; return returnVal; } -int MPI_Scatter( sendbuf, sendcnt, sendtype, recvbuf, recvcnt, recvtype, root, comm ) -const void * sendbuf; -int sendcnt; -MPI_Datatype sendtype; -void * recvbuf; -int recvcnt; -MPI_Datatype recvtype; -int root; -MPI_Comm comm; +int MPI_Scatter(MPE_CONST void *sendbuf, int sendcnt, MPI_Datatype sendtype, + void *recvbuf, int recvcnt, MPI_Datatype recvtype, + int root, MPI_Comm comm) { int returnVal; int llrank; @@ -414,16 +346,9 @@ MPI_Comm comm; return returnVal; } -int MPI_Scatterv( sendbuf, sendcnts, displs, sendtype, recvbuf, recvcnt, recvtype, root, comm ) -const void * sendbuf; -const int * sendcnts; -const int * displs; -MPI_Datatype sendtype; -void * recvbuf; -int recvcnt; -MPI_Datatype recvtype; -int root; -MPI_Comm comm; +int MPI_Scatterv(MPE_CONST void *sendbuf, MPE_CONST int *sendcnts, + MPE_CONST int *displs, MPI_Datatype sendtype, void *recvbuf, + int recvcnt, MPI_Datatype recvtype, int root, MPI_Comm comm) { int returnVal; int llrank; @@ -443,9 +368,7 @@ MPI_Comm comm; return returnVal; } -int MPI_Attr_delete( comm, keyval ) -MPI_Comm comm; -int keyval; +int MPI_Attr_delete(MPI_Comm comm, int keyval) { int returnVal; int llrank; @@ -464,11 +387,7 @@ int keyval; return returnVal; } -int MPI_Attr_get( comm, keyval, attr_value, flag ) -MPI_Comm comm; -int keyval; -void * attr_value; -int * flag; +int MPI_Attr_get(MPI_Comm comm, int keyval, void *attr_value, int *flag) { int returnVal; int llrank; @@ -487,10 +406,7 @@ int * flag; return returnVal; } -int MPI_Attr_put( comm, keyval, attr_value ) -MPI_Comm comm; -int keyval; -void * attr_value; +int MPI_Attr_put(MPI_Comm comm, int keyval, void *attr_value) { int returnVal; int llrank; @@ -509,10 +425,7 @@ void * attr_value; return returnVal; } -int MPI_Comm_compare( comm1, comm2, result ) -MPI_Comm comm1; -MPI_Comm comm2; -int * result; +int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) { int returnVal; int llrank; @@ -531,10 +444,7 @@ int * result; return returnVal; } -int MPI_Comm_create( comm, group, comm_out ) -MPI_Comm comm; -MPI_Group group; -MPI_Comm * comm_out; +int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *comm_out) { int returnVal; int llrank; @@ -553,9 +463,7 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Comm_dup( comm, comm_out ) -MPI_Comm comm; -MPI_Comm * comm_out; +int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *comm_out) { int returnVal; int llrank; @@ -574,8 +482,7 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Comm_free( comm ) -MPI_Comm * comm; +int MPI_Comm_free(MPI_Comm *comm) { int returnVal; int llrank; @@ -594,9 +501,7 @@ MPI_Comm * comm; return returnVal; } -int MPI_Comm_group( comm, group ) -MPI_Comm comm; -MPI_Group * group; +int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) { int returnVal; int llrank; @@ -615,9 +520,7 @@ MPI_Group * group; return returnVal; } -int MPI_Comm_rank( comm, rank ) -MPI_Comm comm; -int * rank; +int MPI_Comm_rank(MPI_Comm comm, int *rank) { int returnVal; int llrank; @@ -636,9 +539,7 @@ int * rank; return returnVal; } -int MPI_Comm_remote_group( comm, group ) -MPI_Comm comm; -MPI_Group * group; +int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) { int returnVal; int llrank; @@ -657,9 +558,7 @@ MPI_Group * group; return returnVal; } -int MPI_Comm_remote_size( comm, size ) -MPI_Comm comm; -int * size; +int MPI_Comm_remote_size(MPI_Comm comm, int *size) { int returnVal; int llrank; @@ -678,9 +577,7 @@ int * size; return returnVal; } -int MPI_Comm_size( comm, size ) -MPI_Comm comm; -int * size; +int MPI_Comm_size(MPI_Comm comm, int *size) { int returnVal; int llrank; @@ -699,11 +596,7 @@ int * size; return returnVal; } -int MPI_Comm_split( comm, color, key, comm_out ) -MPI_Comm comm; -int color; -int key; -MPI_Comm * comm_out; +int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out) { int returnVal; int llrank; @@ -722,9 +615,7 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Comm_test_inter( comm, flag ) -MPI_Comm comm; -int * flag; +int MPI_Comm_test_inter(MPI_Comm comm, int *flag) { int returnVal; int llrank; @@ -743,10 +634,7 @@ int * flag; return returnVal; } -int MPI_Group_compare( group1, group2, result ) -MPI_Group group1; -MPI_Group group2; -int * result; +int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) { int returnVal; int llrank; @@ -765,10 +653,8 @@ int * result; return returnVal; } -int MPI_Group_difference( group1, group2, group_out ) -MPI_Group group1; -MPI_Group group2; -MPI_Group * group_out; +int MPI_Group_difference(MPI_Group group1, MPI_Group group2, + MPI_Group *group_out) { int returnVal; int llrank; @@ -787,11 +673,8 @@ MPI_Group * group_out; return returnVal; } -int MPI_Group_excl( group, n, ranks, newgroup ) -MPI_Group group; -int n; -const int * ranks; -MPI_Group * newgroup; +int MPI_Group_excl(MPI_Group group, int n, MPE_CONST int *ranks, + MPI_Group *newgroup ) { int returnVal; int llrank; @@ -810,8 +693,7 @@ MPI_Group * newgroup; return returnVal; } -int MPI_Group_free( group ) -MPI_Group * group; +int MPI_Group_free(MPI_Group *group) { int returnVal; int llrank; @@ -830,11 +712,8 @@ MPI_Group * group; return returnVal; } -int MPI_Group_incl( group, n, ranks, group_out ) -MPI_Group group; -int n; -const int * ranks; -MPI_Group * group_out; +int MPI_Group_incl(MPI_Group group, int n, MPE_CONST int *ranks, + MPI_Group *group_out) { int returnVal; int llrank; @@ -853,10 +732,8 @@ MPI_Group * group_out; return returnVal; } -int MPI_Group_intersection( group1, group2, group_out ) -MPI_Group group1; -MPI_Group group2; -MPI_Group * group_out; +int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, + MPI_Group *group_out) { int returnVal; int llrank; @@ -875,9 +752,7 @@ MPI_Group * group_out; return returnVal; } -int MPI_Group_rank( group, rank ) -MPI_Group group; -int * rank; +int MPI_Group_rank(MPI_Group group, int *rank) { int returnVal; int llrank; @@ -896,11 +771,8 @@ int * rank; return returnVal; } -int MPI_Group_range_excl( group, n, ranges, newgroup ) -MPI_Group group; -int n; -int ranges[][3]; -MPI_Group * newgroup; +int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], + MPI_Group *newgroup) { int returnVal; int llrank; @@ -919,11 +791,8 @@ MPI_Group * newgroup; return returnVal; } -int MPI_Group_range_incl( group, n, ranges, newgroup ) -MPI_Group group; -int n; -int ranges[][3]; -MPI_Group * newgroup; +int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], + MPI_Group *newgroup) { int returnVal; int llrank; @@ -942,9 +811,7 @@ MPI_Group * newgroup; return returnVal; } -int MPI_Group_size( group, size ) -MPI_Group group; -int * size; +int MPI_Group_size(MPI_Group group, int *size) { int returnVal; int llrank; @@ -963,12 +830,9 @@ int * size; return returnVal; } -int MPI_Group_translate_ranks( group_a, n, ranks_a, group_b, ranks_b ) -MPI_Group group_a; -int n; -const int * ranks_a; -MPI_Group group_b; -int * ranks_b; +int MPI_Group_translate_ranks(MPI_Group group_a, int n, + MPE_CONST int *ranks_a, + MPI_Group group_b, int *ranks_b) { int returnVal; int llrank; @@ -988,10 +852,7 @@ int * ranks_b; return returnVal; } -int MPI_Group_union( group1, group2, group_out ) -MPI_Group group1; -MPI_Group group2; -MPI_Group * group_out; +int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *group_out) { int returnVal; int llrank; @@ -1010,13 +871,9 @@ MPI_Group * group_out; return returnVal; } -int MPI_Intercomm_create( local_comm, local_leader, peer_comm, remote_leader, tag, comm_out ) -MPI_Comm local_comm; -int local_leader; -MPI_Comm peer_comm; -int remote_leader; -int tag; -MPI_Comm * comm_out; +int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, + MPI_Comm peer_comm, int remote_leader, int tag, + MPI_Comm *comm_out) { int returnVal; int llrank; @@ -1036,10 +893,7 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Intercomm_merge( comm, high, comm_out ) -MPI_Comm comm; -int high; -MPI_Comm * comm_out; +int MPI_Intercomm_merge(MPI_Comm comm, int high, MPI_Comm *comm_out) { int returnVal; int llrank; @@ -1058,11 +912,9 @@ MPI_Comm * comm_out; return returnVal; } -int MPI_Keyval_create( copy_fn, delete_fn, keyval, extra_state ) -MPI_Copy_function * copy_fn; -MPI_Delete_function * delete_fn; -int * keyval; -void * extra_state; +int MPI_Keyval_create(MPI_Copy_function *copy_fn, + MPI_Delete_function *delete_fn, int *keyval, + void *extra_state) { int returnVal; int llrank; @@ -1081,8 +933,7 @@ void * extra_state; return returnVal; } -int MPI_Keyval_free( keyval ) -int * keyval; +int MPI_Keyval_free(int *keyval) { int returnVal; int llrank; @@ -1101,9 +952,7 @@ int * keyval; return returnVal; } -int MPI_Abort( comm, errorcode ) -MPI_Comm comm; -int errorcode; +int MPI_Abort(MPI_Comm comm, int errorcode) { int returnVal; int llrank; @@ -1122,9 +971,7 @@ int errorcode; return returnVal; } -int MPI_Error_class( errorcode, errorclass ) -int errorcode; -int * errorclass; +int MPI_Error_class(int errorcode, int *errorclass) { int returnVal; int llrank; @@ -1143,9 +990,8 @@ int * errorclass; return returnVal; } -int MPI_Errhandler_create( function, errhandler ) -MPI_Handler_function * function; -MPI_Errhandler * errhandler; +int MPI_Errhandler_create(MPI_Handler_function *function, + MPI_Errhandler *errhandler) { int returnVal; int llrank; @@ -1164,8 +1010,7 @@ MPI_Errhandler * errhandler; return returnVal; } -int MPI_Errhandler_free( errhandler ) -MPI_Errhandler * errhandler; +int MPI_Errhandler_free(MPI_Errhandler *errhandler) { int returnVal; int llrank; @@ -1184,9 +1029,7 @@ MPI_Errhandler * errhandler; return returnVal; } -int MPI_Errhandler_get( comm, errhandler ) -MPI_Comm comm; -MPI_Errhandler * errhandler; +int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler) { int returnVal; int llrank; @@ -1205,10 +1048,7 @@ MPI_Errhandler * errhandler; return returnVal; } -int MPI_Error_string( errorcode, string, resultlen ) -int errorcode; -char * string; -int * resultlen; +int MPI_Error_string(int errorcode, char *string, int *resultlen) { int returnVal; int llrank; @@ -1227,9 +1067,7 @@ int * resultlen; return returnVal; } -int MPI_Errhandler_set( comm, errhandler ) -MPI_Comm comm; -MPI_Errhandler errhandler; +int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) { int returnVal; int llrank; @@ -1248,7 +1086,7 @@ MPI_Errhandler errhandler; return returnVal; } -int MPI_Finalize( ) +int MPI_Finalize(void) { int returnVal; int llrank; @@ -1269,9 +1107,7 @@ int MPI_Finalize( ) return returnVal; } -int MPI_Get_processor_name( name, resultlen ) -char * name; -int * resultlen; +int MPI_Get_processor_name(char *name, int *resultlen) { int returnVal; int llrank; @@ -1290,9 +1126,7 @@ int * resultlen; return returnVal; } -int MPI_Init( argc, argv ) -int * argc; -char *** argv; +int MPI_Init(int *argc, char ***argv) { int returnVal; int llrank; @@ -1313,8 +1147,7 @@ char *** argv; return returnVal; } -int MPI_Initialized( flag ) -int * flag; +int MPI_Initialized(int *flag) { int returnVal; int llrank; @@ -1335,7 +1168,7 @@ int * flag; #ifdef FOO /* Don't trace the timer calls */ -double MPI_Wtick( ) +double MPI_Wtick(void) { double returnVal; int llrank; @@ -1354,7 +1187,7 @@ double MPI_Wtick( ) return returnVal; } -double MPI_Wtime( ) +double MPI_Wtime(void) { double returnVal; int llrank; @@ -1374,9 +1207,7 @@ double MPI_Wtime( ) } #endif -int MPI_Address( location, address ) -const void * location; -MPI_Aint * address; +int MPI_Address(MPE_CONST void *location, MPI_Aint *address) { int returnVal; int llrank; @@ -1395,13 +1226,8 @@ MPI_Aint * address; return returnVal; } -int MPI_Bsend( buf, count, datatype, dest, tag, comm ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Bsend(MPE_CONST void * buf, int count, MPI_Datatype datatype, int dest, + int tag, MPI_Comm comm) { int returnVal; int llrank; @@ -1423,14 +1249,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Bsend_init( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Bsend_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -1453,9 +1273,7 @@ MPI_Request * request; return returnVal; } -int MPI_Buffer_attach( buffer, size ) -void * buffer; -int size; +int MPI_Buffer_attach(void *buffer, int size) { int returnVal; int llrank; @@ -1474,9 +1292,7 @@ int size; return returnVal; } -int MPI_Buffer_detach( buffer, size ) -void * buffer; -int * size; +int MPI_Buffer_detach(void *buffer, int *size) { int returnVal; int llrank; @@ -1495,8 +1311,7 @@ int * size; return returnVal; } -int MPI_Cancel( request ) -MPI_Request * request; +int MPI_Cancel(MPI_Request *request) { int returnVal; int llrank; @@ -1515,8 +1330,7 @@ MPI_Request * request; return returnVal; } -int MPI_Request_free( request ) -MPI_Request * request; +int MPI_Request_free(MPI_Request *request) { int returnVal; int llrank; @@ -1535,14 +1349,8 @@ MPI_Request * request; return returnVal; } -int MPI_Recv_init( buf, count, datatype, source, tag, comm, request ) -void * buf; -int count; -MPI_Datatype datatype; -int source; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source, + int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -1564,14 +1372,8 @@ MPI_Request * request; return returnVal; } -int MPI_Send_init( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Send_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -1592,7 +1394,7 @@ MPI_Request * request; return returnVal; } -int MPI_Get_elements( const MPI_Status *status, MPI_Datatype datatype, +int MPI_Get_elements(MPE_CONST MPI_Status *status, MPI_Datatype datatype, int *elements ) { int returnVal; @@ -1612,7 +1414,7 @@ int MPI_Get_elements( const MPI_Status *status, MPI_Datatype datatype, return returnVal; } -int MPI_Get_count( const MPI_Status *status, MPI_Datatype datatype, +int MPI_Get_count( MPE_CONST MPI_Status *status, MPI_Datatype datatype, int *count ) { int returnVal; @@ -1632,14 +1434,8 @@ int MPI_Get_count( const MPI_Status *status, MPI_Datatype datatype, return returnVal; } -int MPI_Ibsend( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Ibsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -1661,12 +1457,8 @@ MPI_Request * request; return returnVal; } -int MPI_Iprobe( source, tag, comm, flag, status ) -int source; -int tag; -MPI_Comm comm; -int * flag; -MPI_Status * status; +int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, + MPI_Status *status) { int returnVal; int llrank; @@ -1685,14 +1477,8 @@ MPI_Status * status; return returnVal; } -int MPI_Irecv( buf, count, datatype, source, tag, comm, request ) -void * buf; -int count; -MPI_Datatype datatype; -int source; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, + int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -1713,14 +1499,8 @@ MPI_Request * request; return returnVal; } -int MPI_Irsend( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Irsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -1741,14 +1521,8 @@ MPI_Request * request; return returnVal; } -int MPI_Isend( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Isend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -1770,14 +1544,8 @@ MPI_Request * request; return returnVal; } -int MPI_Issend( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Issend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -1799,14 +1567,8 @@ MPI_Request * request; return returnVal; } -int MPI_Pack( inbuf, incount, type, outbuf, outcount, position, comm ) -const void * inbuf; -int incount; -MPI_Datatype type; -void * outbuf; -int outcount; -int * position; -MPI_Comm comm; +int MPI_Pack(MPE_CONST void *inbuf, int incount, MPI_Datatype type, + void *outbuf, int outcount, int *position, MPI_Comm comm) { int returnVal; int llrank; @@ -1826,11 +1588,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Pack_size( incount, datatype, comm, size ) -int incount; -MPI_Datatype datatype; -MPI_Comm comm; -int * size; +int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, + int *size) { int returnVal; int llrank; @@ -1849,11 +1608,7 @@ int * size; return returnVal; } -int MPI_Probe( source, tag, comm, status ) -int source; -int tag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) { int returnVal; int llrank; @@ -1872,14 +1627,8 @@ MPI_Status * status; return returnVal; } -int MPI_Recv( buf, count, datatype, source, tag, comm, status ) -void * buf; -int count; -MPI_Datatype datatype; -int source; -int tag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, + MPI_Comm comm, MPI_Status *status) { int returnVal; int llrank; @@ -1909,13 +1658,8 @@ MPI_Status * status; return returnVal; } -int MPI_Rsend( buf, count, datatype, dest, tag, comm ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Rsend(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm) { int returnVal; int llrank; @@ -1937,14 +1681,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Rsend_init( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Rsend_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -1966,13 +1704,8 @@ MPI_Request * request; return returnVal; } -int MPI_Send( buf, count, datatype, dest, tag, comm ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Send(MPE_CONST void *buf, int count, MPI_Datatype datatype, int dest, + int tag, MPI_Comm comm) { int returnVal; int llrank; @@ -1994,19 +1727,10 @@ MPI_Comm comm; return returnVal; } -int MPI_Sendrecv( sendbuf, sendcount, sendtype, dest, sendtag, recvbuf, recvcount, recvtype, source, recvtag, comm, status ) -const void * sendbuf; -int sendcount; -MPI_Datatype sendtype; -int dest; -int sendtag; -void * recvbuf; -int recvcount; -MPI_Datatype recvtype; -int source; -int recvtag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Sendrecv(MPE_CONST void *sendbuf, int sendcount, MPI_Datatype sendtype, + int dest, int sendtag, void *recvbuf, int recvcount, + MPI_Datatype recvtype, int source, int recvtag, MPI_Comm comm, + MPI_Status *status) { int returnVal; int llrank; @@ -2029,16 +1753,9 @@ MPI_Status * status; return returnVal; } -int MPI_Sendrecv_replace( buf, count, datatype, dest, sendtag, source, recvtag, comm, status ) -void * buf; -int count; -MPI_Datatype datatype; -int dest; -int sendtag; -int source; -int recvtag; -MPI_Comm comm; -MPI_Status * status; +int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int dest, + int sendtag, int source, int recvtag, + MPI_Comm comm, MPI_Status *status) { int returnVal; int llrank; @@ -2060,13 +1777,8 @@ MPI_Status * status; return returnVal; } -int MPI_Ssend( buf, count, datatype, dest, tag, comm ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; +int MPI_Ssend(MPE_CONST void *buf, int count, MPI_Datatype datatype, int dest, + int tag, MPI_Comm comm) { int returnVal; int llrank; @@ -2088,14 +1800,8 @@ MPI_Comm comm; return returnVal; } -int MPI_Ssend_init( buf, count, datatype, dest, tag, comm, request ) -const void * buf; -int count; -MPI_Datatype datatype; -int dest; -int tag; -MPI_Comm comm; -MPI_Request * request; +int MPI_Ssend_init(MPE_CONST void *buf, int count, MPI_Datatype datatype, + int dest, int tag, MPI_Comm comm, MPI_Request *request) { int returnVal; int llrank; @@ -2117,8 +1823,7 @@ MPI_Request * request; return returnVal; } -int MPI_Start( request ) -MPI_Request * request; +int MPI_Start(MPI_Request *request) { int returnVal; int llrank; @@ -2137,9 +1842,7 @@ MPI_Request * request; return returnVal; } -int MPI_Startall( count, array_of_requests ) -int count; -MPI_Request * array_of_requests; +int MPI_Startall(int count, MPI_Request *array_of_requests) { int returnVal; int llrank; @@ -2158,10 +1861,7 @@ MPI_Request * array_of_requests; return returnVal; } -int MPI_Test( request, flag, status ) -MPI_Request * request; -int * flag; -MPI_Status * status; +int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status) { int returnVal; int llrank; @@ -2180,11 +1880,8 @@ MPI_Status * status; return returnVal; } -int MPI_Testall( count, array_of_requests, flag, array_of_statuses ) -int count; -MPI_Request * array_of_requests; -int * flag; -MPI_Status * array_of_statuses; +int MPI_Testall(int count, MPI_Request *array_of_requests, int *flag, + MPI_Status *array_of_statuses) { int returnVal; int llrank; @@ -2204,12 +1901,8 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Testany( count, array_of_requests, index, flag, status ) -int count; -MPI_Request * array_of_requests; -int * index; -int * flag; -MPI_Status * status; +int MPI_Testany(int count, MPI_Request *array_of_requests, int *index, + int *flag, MPI_Status *status) { int returnVal; int llrank; @@ -2228,9 +1921,7 @@ MPI_Status * status; return returnVal; } -int MPI_Test_cancelled( status, flag ) -const MPI_Status * status; -int * flag; +int MPI_Test_cancelled(MPE_CONST MPI_Status *status, int *flag) { int returnVal; int llrank; @@ -2249,12 +1940,8 @@ int * flag; return returnVal; } -int MPI_Testsome( incount, array_of_requests, outcount, array_of_indices, array_of_statuses ) -int incount; -MPI_Request * array_of_requests; -int * outcount; -int * array_of_indices; -MPI_Status * array_of_statuses; +int MPI_Testsome(int incount, MPI_Request *array_of_requests, int *outcount, + int *array_of_indices, MPI_Status *array_of_statuses) { int returnVal; int llrank; @@ -2274,8 +1961,7 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Type_commit( datatype ) -MPI_Datatype * datatype; +int MPI_Type_commit(MPI_Datatype *datatype) { int returnVal; int llrank; @@ -2294,10 +1980,8 @@ MPI_Datatype * datatype; return returnVal; } -int MPI_Type_contiguous( count, old_type, newtype ) -int count; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_contiguous(int count, MPI_Datatype old_type, + MPI_Datatype *newtype) { int returnVal; int llrank; @@ -2317,9 +2001,7 @@ MPI_Datatype * newtype; } -int MPI_Type_extent( datatype, extent ) -MPI_Datatype datatype; -MPI_Aint * extent; +int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint *extent) { int returnVal; int llrank; @@ -2338,8 +2020,7 @@ MPI_Aint * extent; return returnVal; } -int MPI_Type_free( datatype ) -MPI_Datatype * datatype; +int MPI_Type_free(MPI_Datatype *datatype) { int returnVal; int llrank; @@ -2358,12 +2039,9 @@ MPI_Datatype * datatype; return returnVal; } -int MPI_Type_hindexed( count, blocklens, indices, old_type, newtype ) -int count; -const int * blocklens; -const MPI_Aint * indices; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_hindexed(int count, MPE_CONST int *blocklens, + MPE_CONST MPI_Aint *indices, MPI_Datatype old_type, + MPI_Datatype *newtype) { int returnVal; int llrank; @@ -2383,12 +2061,8 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Type_hvector( count, blocklen, stride, old_type, newtype ) -int count; -int blocklen; -MPI_Aint stride; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_hvector(int count, int blocklen, MPI_Aint stride, + MPI_Datatype old_type, MPI_Datatype *newtype) { int returnVal; int llrank; @@ -2407,12 +2081,9 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Type_indexed( count, blocklens, indices, old_type, newtype ) -int count; -const int * blocklens; -const int * indices; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_indexed(int count, MPE_CONST int *blocklens, + MPE_CONST int *indices, MPI_Datatype old_type, + MPI_Datatype *newtype) { int returnVal; int llrank; @@ -2432,9 +2103,7 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Type_lb( datatype, displacement ) -MPI_Datatype datatype; -MPI_Aint * displacement; +int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint *displacement) { int returnVal; int llrank; @@ -2453,9 +2122,7 @@ MPI_Aint * displacement; return returnVal; } -int MPI_Type_size( datatype, size ) -MPI_Datatype datatype; -int * size; +int MPI_Type_size(MPI_Datatype datatype, int *size) { int returnVal; int llrank; @@ -2474,12 +2141,9 @@ int * size; return returnVal; } -int MPI_Type_struct( count, blocklens, indices, old_types, newtype ) -int count; -const int * blocklens; -const MPI_Aint * indices; -const MPI_Datatype * old_types; -MPI_Datatype * newtype; +int MPI_Type_struct(int count, MPE_CONST int *blocklens, + MPE_CONST MPI_Aint *indices, + MPE_CONST MPI_Datatype *old_types, MPI_Datatype *newtype) { int returnVal; int llrank; @@ -2499,9 +2163,7 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Type_ub( datatype, displacement ) -MPI_Datatype datatype; -MPI_Aint * displacement; +int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint *displacement) { int returnVal; int llrank; @@ -2520,12 +2182,8 @@ MPI_Aint * displacement; return returnVal; } -int MPI_Type_vector( count, blocklen, stride, old_type, newtype ) -int count; -int blocklen; -int stride; -MPI_Datatype old_type; -MPI_Datatype * newtype; +int MPI_Type_vector(int count, int blocklen, int stride, + MPI_Datatype old_type, MPI_Datatype *newtype) { int returnVal; int llrank; @@ -2544,14 +2202,8 @@ MPI_Datatype * newtype; return returnVal; } -int MPI_Unpack( inbuf, insize, position, outbuf, outcount, type, comm ) -const void * inbuf; -int insize; -int * position; -void * outbuf; -int outcount; -MPI_Datatype type; -MPI_Comm comm; +int MPI_Unpack(MPE_CONST void *inbuf, int insize, int *position, void *outbuf, + int outcount, MPI_Datatype type, MPI_Comm comm) { int returnVal; int llrank; @@ -2571,9 +2223,7 @@ MPI_Comm comm; return returnVal; } -int MPI_Wait( request, status ) -MPI_Request * request; -MPI_Status * status; +int MPI_Wait(MPI_Request *request, MPI_Status *status) { int returnVal; int llrank; @@ -2592,10 +2242,8 @@ MPI_Status * status; return returnVal; } -int MPI_Waitall( count, array_of_requests, array_of_statuses ) -int count; -MPI_Request * array_of_requests; -MPI_Status * array_of_statuses; +int MPI_Waitall(int count, MPI_Request *array_of_requests, + MPI_Status *array_of_statuses) { int returnVal; int llrank; @@ -2614,11 +2262,8 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Waitany( count, array_of_requests, index, status ) -int count; -MPI_Request * array_of_requests; -int * index; -MPI_Status * status; +int MPI_Waitany(int count, MPI_Request *array_of_requests, int *index, + MPI_Status *status) { int returnVal; int llrank; @@ -2637,12 +2282,8 @@ MPI_Status * status; return returnVal; } -int MPI_Waitsome( incount, array_of_requests, outcount, array_of_indices, array_of_statuses ) -int incount; -MPI_Request * array_of_requests; -int * outcount; -int * array_of_indices; -MPI_Status * array_of_statuses; +int MPI_Waitsome(int incount, MPI_Request *array_of_requests, int *outcount, + int *array_of_indices, MPI_Status *array_of_statuses) { int returnVal; int llrank; @@ -2662,11 +2303,7 @@ MPI_Status * array_of_statuses; return returnVal; } -int MPI_Cart_coords( comm, rank, maxdims, coords ) -MPI_Comm comm; -int rank; -int maxdims; -int * coords; +int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords) { int returnVal; int llrank; @@ -2685,13 +2322,8 @@ int * coords; return returnVal; } -int MPI_Cart_create( comm_old, ndims, dims, periods, reorder, comm_cart ) -MPI_Comm comm_old; -int ndims; -const int * dims; -const int * periods; -int reorder; -MPI_Comm * comm_cart; +int MPI_Cart_create(MPI_Comm comm_old, int ndims, MPE_CONST int *dims, + MPE_CONST int *periods, int reorder, MPI_Comm *comm_cart) { int returnVal; int llrank; @@ -2711,12 +2343,8 @@ MPI_Comm * comm_cart; return returnVal; } -int MPI_Cart_get( comm, maxdims, dims, periods, coords ) -MPI_Comm comm; -int maxdims; -int * dims; -int * periods; -int * coords; +int MPI_Cart_get(MPI_Comm comm, int maxdims, int *dims, int *periods, + int *coords) { int returnVal; int llrank; @@ -2735,12 +2363,8 @@ int * coords; return returnVal; } -int MPI_Cart_map( comm_old, ndims, dims, periods, newrank ) -MPI_Comm comm_old; -int ndims; -const int * dims; -const int * periods; -int * newrank; +int MPI_Cart_map(MPI_Comm comm_old, int ndims, MPE_CONST int *dims, + MPE_CONST int *periods, int *newrank) { int returnVal; int llrank; @@ -2759,10 +2383,7 @@ int * newrank; return returnVal; } -int MPI_Cart_rank( comm, coords, rank ) -MPI_Comm comm; -const int * coords; -int * rank; +int MPI_Cart_rank(MPI_Comm comm, MPE_CONST int *coords, int *rank) { int returnVal; int llrank; @@ -2781,12 +2402,8 @@ int * rank; return returnVal; } -int MPI_Cart_shift( comm, direction, displ, source, dest ) -MPI_Comm comm; -int direction; -int displ; -int * source; -int * dest; +int MPI_Cart_shift(MPI_Comm comm, int direction, int displ, + int *source, int *dest) { int returnVal; int llrank; @@ -2805,10 +2422,8 @@ int * dest; return returnVal; } -int MPI_Cart_sub( comm, remain_dims, comm_new ) -MPI_Comm comm; -const int * remain_dims; -MPI_Comm * comm_new; +int MPI_Cart_sub(MPI_Comm comm, MPE_CONST int *remain_dims, + MPI_Comm *comm_new) { int returnVal; int llrank; @@ -2827,9 +2442,7 @@ MPI_Comm * comm_new; return returnVal; } -int MPI_Cartdim_get( comm, ndims ) -MPI_Comm comm; -int * ndims; +int MPI_Cartdim_get(MPI_Comm comm, int *ndims) { int returnVal; int llrank; @@ -2848,10 +2461,7 @@ int * ndims; return returnVal; } -int MPI_Dims_create( nnodes, ndims, dims ) -int nnodes; -int ndims; -int * dims; +int MPI_Dims_create(int nnodes, int ndims, int *dims) { int returnVal; int llrank; @@ -2870,13 +2480,9 @@ int * dims; return returnVal; } -int MPI_Graph_create( comm_old, nnodes, index, edges, reorder, comm_graph ) -MPI_Comm comm_old; -int nnodes; -const int * index; -const int * edges; -int reorder; -MPI_Comm * comm_graph; +int MPI_Graph_create(MPI_Comm comm_old, int nnodes, + MPE_CONST int *index, MPE_CONST int *edges, int reorder, + MPI_Comm *comm_graph) { int returnVal; int llrank; @@ -2896,12 +2502,8 @@ MPI_Comm * comm_graph; return returnVal; } -int MPI_Graph_get( comm, maxindex, maxedges, index, edges ) -MPI_Comm comm; -int maxindex; -int maxedges; -int * index; -int * edges; +int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, int *index, + int *edges) { int returnVal; int llrank; @@ -2920,12 +2522,8 @@ int * edges; return returnVal; } -int MPI_Graph_map( comm_old, nnodes, index, edges, newrank ) -MPI_Comm comm_old; -int nnodes; -const int * index; -const int * edges; -int * newrank; +int MPI_Graph_map(MPI_Comm comm_old, int nnodes, MPE_CONST int *index, + MPE_CONST int *edges, int *newrank) { int returnVal; int llrank; @@ -2944,11 +2542,8 @@ int * newrank; return returnVal; } -int MPI_Graph_neighbors( comm, rank, maxneighbors, neighbors ) -MPI_Comm comm; -int rank; -int maxneighbors; -int * neighbors; +int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, + int *neighbors) { int returnVal; int llrank; @@ -2967,10 +2562,7 @@ int * neighbors; return returnVal; } -int MPI_Graph_neighbors_count( comm, rank, nneighbors ) -MPI_Comm comm; -int rank; -int * nneighbors; +int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors) { int returnVal; int llrank; @@ -2989,10 +2581,7 @@ int * nneighbors; return returnVal; } -int MPI_Graphdims_get( comm, nnodes, nedges ) -MPI_Comm comm; -int * nnodes; -int * nedges; +int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges) { int returnVal; int llrank; @@ -3011,9 +2600,7 @@ int * nedges; return returnVal; } -int MPI_Topo_test( comm, top_type ) -MPI_Comm comm; -int * top_type; +int MPI_Topo_test(MPI_Comm comm, int *top_type) { int returnVal; int llrank;