From 9659288e744557c51bd093d7d5099d43a97a8944 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Fri, 5 Nov 2004 07:52:30 +0000 Subject: [PATCH] I hate waiting on the airports. SO I start doing something usefull ... I remove a lot of inter-dependence, I use the struct_t type. BEWARE not all the function are ready. This commit was SVN r3524. --- src/attribute/attribute.c | 4 +- src/attribute/attribute.h | 4 +- src/communicator/comm.c | 16 +- src/communicator/comm_init.c | 6 +- src/communicator/communicator.h | 5 +- src/errhandler/errcode-internal.c | 1 - src/file/file.c | 9 +- src/file/file.h | 13 +- src/group/group.c | 3 +- src/group/group.h | 7 +- src/group/mpi_group_init.c | 4 +- src/group/mpi_set_group_rank.c | 2 +- src/include/types.h | 11 +- src/info/info.c | 1 - src/mca/allocator/base/allocator_base_open.c | 2 +- src/mca/base/mca_base_close.c | 2 +- src/mca/base/mca_base_components_close.c | 2 +- src/mca/base/mca_base_components_open.c | 2 +- src/mca/base/mca_base_msgbuf.c | 2 +- src/mca/base/mca_base_open.c | 2 +- src/mca/base/mca_base_parse_paramfile.c | 2 + src/mca/coll/base/coll_base_find_available.c | 1 + src/mca/coll/base/coll_base_open.c | 1 + src/mca/coll/coll.h | 2 +- src/mca/io/base/io_base_delete.c | 31 ++-- src/mca/io/base/io_base_file_select.c | 1 + src/mca/io/romio/src/io_romio.h | 168 +++++++++---------- src/mca/mpool/base/mpool_base_lookup.c | 1 + src/mca/mpool/base/mpool_base_open.c | 2 +- src/mca/ns/base/ns_base_open.c | 1 + src/mca/oob/base/oob_base_init.c | 1 + src/mca/oob/base/oob_base_open.c | 1 + src/mca/pcmclient/base/pcmclient_base_open.c | 1 + src/mca/pml/teg/src/pml_teg.c | 2 + src/mca/ptl/prof/ptl_prof.c | 3 +- src/mca/ptl/ptl.h | 7 +- src/mca/ptl/self/ptl_self.c | 1 + src/mca/ptl/self/ptl_self.h | 20 +-- src/mca/ptl/sm/src/ptl_sm.h | 2 +- src/mca/ptl/tcp/src/ptl_tcp.c | 1 + src/mca/ptl/tcp/src/ptl_tcp.h | 2 +- src/mca/ptl/tcp/src/ptl_tcp_component.c | 2 +- src/mca/svc/base/svc_base_open.c | 1 + src/mca/svc/exec/svc_exec.c | 4 + src/mca/svc/exec/svc_exec_component.c | 2 + src/mca/svc/sched/svc_sched_node.c | 3 + src/mca/svc/stdio/svc_stdio.c | 1 + src/mca/svc/stdio/svc_stdio_component.c | 1 + src/mca/topo/base/topo_base_comm_select.c | 2 + src/mca/topo/base/topo_base_open.c | 2 + src/mpi/c/allgather.c | 1 + src/mpi/c/allgatherv.c | 1 + src/mpi/c/alltoall.c | 1 + src/mpi/c/alltoallv.c | 1 + src/mpi/c/alltoallw.c | 1 + src/mpi/c/attr_delete.c | 1 + src/mpi/c/attr_get.c | 1 + src/mpi/c/attr_put.c | 1 + src/mpi/c/bcast.c | 1 + src/mpi/c/comm_create_keyval.c | 1 + src/mpi/c/comm_delete_attr.c | 1 + src/mpi/c/comm_free_keyval.c | 1 + src/mpi/c/comm_get_attr.c | 1 + src/mpi/c/comm_set_attr.c | 1 + src/mpi/c/gather.c | 1 + src/mpi/c/gatherv.c | 2 +- src/mpi/c/get_count.c | 2 +- src/mpi/c/get_elements.c | 2 +- src/mpi/c/grequest_complete.c | 3 +- src/mpi/c/intercomm_merge.c | 2 +- src/mpi/c/keyval_create.c | 1 + src/mpi/c/keyval_free.c | 1 + src/mpi/c/scatter.c | 2 +- src/mpi/c/scatterv.c | 2 +- src/mpi/c/type_c2f.c | 2 +- src/mpi/c/type_create_keyval.c | 1 + src/mpi/c/type_delete_attr.c | 2 + src/mpi/c/type_extent.c | 2 +- src/mpi/c/type_free_keyval.c | 1 + src/mpi/c/type_get_attr.c | 2 + src/mpi/c/type_set_attr.c | 2 + src/mpi/c/win_create_keyval.c | 1 + src/mpi/c/win_delete_attr.c | 1 + src/mpi/c/win_free_keyval.c | 23 +-- src/mpi/c/win_get_attr.c | 1 + src/mpi/c/win_set_attr.c | 3 +- src/mpi/c/win_wait.c | 1 - src/mpi/f77/abort_f.c | 1 - src/mpi/f77/accumulate_f.c | 1 - src/mpi/f77/add_error_class_f.c | 1 - src/mpi/f77/add_error_code_f.c | 1 - src/mpi/f77/add_error_string_f.c | 4 +- src/mpi/f77/address_f.c | 1 - src/mpi/f77/allgather_f.c | 1 - src/mpi/f77/allgatherv_f.c | 1 - src/mpi/f77/alloc_mem_f.c | 1 - src/mpi/f77/allreduce_f.c | 1 - src/mpi/f77/alltoall_f.c | 1 - src/mpi/f77/alltoallv_f.c | 1 - src/mpi/f77/alltoallw_f.c | 1 - src/mpi/f77/attr_delete_f.c | 1 - src/mpi/f77/attr_get_f.c | 1 - src/mpi/f77/barrier_f.c | 1 - src/mpi/f77/bcast_f.c | 1 - src/mpi/f77/bsend_f.c | 1 - src/mpi/f77/bsend_init_f.c | 1 - src/mpi/f77/buffer_attach_f.c | 1 - src/mpi/f77/buffer_detach_f.c | 1 - src/mpi/f77/cancel_f.c | 1 - src/mpi/f77/cart_coords_f.c | 1 - src/mpi/f77/cart_create_f.c | 1 - src/mpi/f77/cart_get_f.c | 1 - src/mpi/f77/cart_map_f.c | 1 - src/mpi/f77/cart_rank_f.c | 1 - src/mpi/f77/cart_shift_f.c | 1 - src/mpi/f77/cart_sub_f.c | 1 - src/mpi/f77/cartdim_get_f.c | 1 - src/mpi/f77/close_port_f.c | 1 - src/mpi/f77/comm_accept_f.c | 1 - src/mpi/f77/comm_call_errhandler_f.c | 41 +++-- src/mpi/f77/comm_compare_f.c | 1 - src/mpi/f77/comm_connect_f.c | 1 - src/mpi/f77/comm_create_errhandler_f.c | 1 - src/mpi/f77/comm_create_f.c | 1 - src/mpi/f77/comm_create_keyval_f.c | 2 +- src/mpi/f77/comm_delete_attr_f.c | 1 - src/mpi/f77/comm_disconnect_f.c | 1 - src/mpi/f77/comm_dup_f.c | 1 - src/mpi/f77/comm_free_f.c | 1 - src/mpi/f77/comm_free_keyval_f.c | 1 - src/mpi/f77/comm_get_attr_f.c | 1 - src/mpi/f77/comm_get_errhandler_f.c | 1 - src/mpi/f77/comm_get_name_f.c | 2 - src/mpi/f77/comm_get_parent_f.c | 1 - src/mpi/f77/comm_group_f.c | 1 - src/mpi/f77/comm_join_f.c | 1 - src/mpi/f77/comm_rank_f.c | 1 - src/mpi/f77/comm_remote_group_f.c | 1 - src/mpi/f77/comm_remote_size_f.c | 1 - src/mpi/f77/comm_set_errhandler_f.c | 1 - src/mpi/f77/comm_set_name_f.c | 2 - src/mpi/f77/errhandler_create_f.c | 1 - src/mpi/f77/file_call_errhandler_f.c | 1 - src/mpi/f77/file_close_f.c | 1 - src/mpi/f77/file_get_amode_f.c | 1 - src/mpi/f77/file_get_atomicity_f.c | 1 - src/mpi/f77/keyval_create_f.c | 1 + src/mpi/f77/type_create_keyval_f.c | 1 + src/mpi/f77/win_create_keyval_f.c | 1 + src/mpi/f77/win_set_name_f.c | 5 +- src/mpi/f77/win_start_f.c | 1 - src/mpi/f77/win_test_f.c | 1 - src/mpi/f77/win_unlock_f.c | 1 - src/mpi/f77/win_wait_f.c | 1 - src/mpi/f77/wtick_f.c | 1 - src/mpi/f77/wtime_f.c | 1 - src/mpi/runtime/ompi_mpi_abort.c | 3 +- src/mpi/runtime/ompi_mpi_finalize.c | 3 +- src/mpi/runtime/ompi_mpi_init.c | 3 +- src/proc/proc.h | 3 +- src/runtime/ompi_rte_init.c | 3 + 161 files changed, 277 insertions(+), 298 deletions(-) diff --git a/src/attribute/attribute.c b/src/attribute/attribute.c index a38b2752dc..70db68cc0b 100644 --- a/src/attribute/attribute.c +++ b/src/attribute/attribute.c @@ -5,9 +5,11 @@ #include "ompi_config.h" #include "attribute/attribute.h" -#include "communicator/communicator.h" #include "threads/mutex.h" #include "include/constants.h" +#include "datatype/datatype.h" +#include "communicator/communicator.h" +#include "win/win.h" /* * Macros diff --git a/src/attribute/attribute.h b/src/attribute/attribute.h index 39216b37cc..769ba235da 100644 --- a/src/attribute/attribute.h +++ b/src/attribute/attribute.h @@ -15,12 +15,10 @@ #include "mpi.h" #include "ompi_config.h" +#include "include/constants.h" #include "class/ompi_object.h" #include "class/ompi_bitmap.h" #include "class/ompi_hash_table.h" -#include "communicator/communicator.h" -#include "datatype/datatype.h" -#include "win/win.h" #define ATTR_HASH_SIZE 10 diff --git a/src/communicator/comm.c b/src/communicator/comm.c index fbc74cf384..0ab19434ac 100644 --- a/src/communicator/comm.c +++ b/src/communicator/comm.c @@ -7,26 +7,18 @@ #include #include "mpi.h" -#include "communicator/communicator.h" -#include "datatype/datatype.h" +#include "include/constants.h" #include "proc/proc.h" #include "threads/mutex.h" #include "util/bit_ops.h" -#include "include/constants.h" -#include "mca/pcm/pcm.h" -#include "mca/pml/pml.h" -#include "mca/coll/coll.h" -#include "mca/coll/base/base.h" #include "mca/topo/topo.h" #include "mca/topo/base/base.h" #include "mca/ns/base/base.h" -#include "mca/pml/pml.h" -#include "mca/ptl/ptl.h" +#include "attribute/attribute.h" +#include "communicator/communicator.h" + #include "mca/ptl/base/ptl_base_comm.h" -#include "mca/ptl/base/ptl_base_recvfrag.h" -#include "mca/ptl/base/ptl_base_header.h" -#include "mca/ptl/base/ptl_base_match.h" /* diff --git a/src/communicator/comm_init.c b/src/communicator/comm_init.c index 0aece80e8b..687e90cc4a 100644 --- a/src/communicator/comm_init.c +++ b/src/communicator/comm_init.c @@ -8,17 +8,15 @@ #include "mpi.h" -#include "communicator/communicator.h" #include "util/bit_ops.h" #include "include/constants.h" #include "mca/pml/pml.h" -#include "mca/coll/coll.h" #include "mca/coll/base/base.h" -#include "mca/topo/topo.h" #include "mca/topo/base/base.h" #include "mca/ns/base/base.h" #include "mpi/runtime/params.h" - +#include "communicator/communicator.h" +#include "attribute/attribute.h" /* ** Table for Fortran <-> C communicator handle conversion diff --git a/src/communicator/communicator.h b/src/communicator/communicator.h index 28dc0ece3a..a858b2281b 100644 --- a/src/communicator/communicator.h +++ b/src/communicator/communicator.h @@ -6,17 +6,16 @@ #define OMPI_COMMUNICATOR_H #include "class/ompi_object.h" +#include "class/ompi_hash_table.h" #include "errhandler/errhandler.h" #include "threads/mutex.h" +#include "threads/mutex.h" #include "util/output.h" #include "mpi.h" #include "group/group.h" #include "mca/coll/coll.h" #include "mca/topo/topo.h" -#include "class/ompi_hash_table.h" -#include "attribute/attribute.h" #include "request/request.h" -#include "threads/mutex.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { diff --git a/src/errhandler/errcode-internal.c b/src/errhandler/errcode-internal.c index 28d0e5925a..bb6f0c2ff3 100644 --- a/src/errhandler/errcode-internal.c +++ b/src/errhandler/errcode-internal.c @@ -8,7 +8,6 @@ #include #include "mpi.h" -#include "include/constants.h" #include "errhandler/errcode-internal.h" /* Table holding all error codes */ diff --git a/src/file/file.c b/src/file/file.c index 374d60e899..de0b09a628 100644 --- a/src/file/file.c +++ b/src/file/file.c @@ -8,7 +8,8 @@ #include "class/ompi_list.h" #include "mpi/runtime/params.h" #include "mca/io/base/base.h" - +#include "info/info.h" +#include "util/output.h" /* * Table for Fortran <-> C file handle conversion @@ -65,8 +66,8 @@ int ompi_file_init(void) /* * Back end to MPI_FILE_OPEN */ -int ompi_file_open(ompi_communicator_t *comm, char *filename, - int amode, ompi_info_t *info, ompi_file_t **fh) +int ompi_file_open(struct ompi_communicator_t *comm, char *filename, + int amode, struct ompi_info_t *info, ompi_file_t **fh) { int ret; ompi_file_t *file; @@ -178,7 +179,7 @@ int ompi_file_finalize(void) we're destroying everything, it isn't worth it */ } if (num_unnamed > 0) { - ompi_output(0, "WANRING: %d unnamed MPI_File handles still allocated at MPI_FINALIZE", num_unnamed); + ompi_output(0, "WARNING: %d unnamed MPI_File handles still allocated at MPI_FINALIZE", num_unnamed); } OBJ_DESTRUCT(&ompi_file_f_to_c_table); diff --git a/src/file/file.h b/src/file/file.h index 58db489a9f..f9d578d9cb 100644 --- a/src/file/file.h +++ b/src/file/file.h @@ -7,12 +7,9 @@ #include "mpi.h" #include "errhandler/errhandler.h" -#include "communicator/communicator.h" #include "threads/mutex.h" -#include "info/info.h" #include "mca/io/io.h" - /* * Flags */ @@ -31,7 +28,7 @@ struct ompi_file_t { ompi_object_t super; /** Communicator that this file was created with */ - ompi_communicator_t *f_comm; + struct ompi_communicator_t *f_comm; /** Filename that this file was created with */ char *f_filename; @@ -40,7 +37,7 @@ struct ompi_file_t { int f_amode; /** MPI_Info that this file was created with */ - ompi_info_t *f_info; + struct ompi_info_t *f_info; /** Bit flags */ int32_t f_flags; @@ -51,7 +48,7 @@ struct ompi_file_t { /** Error handler. This field does not have the "f_" prefix so that the OMPI_ERRHDL_* macros can find it, regardless of whether it's a comm, window, or file. */ - ompi_errhandler_t *error_handler; + struct ompi_errhandler_t *error_handler; /** Type of the error handler. This field does not have the "f_" prefix for the same reason as the field error_handler. */ @@ -115,8 +112,8 @@ OMPI_DECLSPEC extern ompi_pointer_array_t ompi_file_f_to_c_table; * mainly calls OBJ_RELEASE() but also does some other error * handling as well. */ - int ompi_file_open(ompi_communicator_t *comm, char *filename, - int amode, ompi_info_t *info, + int ompi_file_open(struct ompi_communicator_t *comm, char *filename, + int amode, struct ompi_info_t *info, ompi_file_t **fh); /** diff --git a/src/group/group.c b/src/group/group.c index 4647e22a97..36f9d4a671 100644 --- a/src/group/group.c +++ b/src/group/group.c @@ -7,14 +7,13 @@ #include "include/constants.h" #include "mpi.h" - int ompi_group_translate_ranks ( ompi_group_t *group1, int n_ranks, int *ranks1, ompi_group_t *group2, int *ranks2) { int rank, proc, proc2; - ompi_proc_t *proc1_pointer, *proc2_pointer; + struct ompi_proc_t *proc1_pointer, *proc2_pointer; /* loop over all ranks */ for (proc = 0; proc < n_ranks; proc++) { diff --git a/src/group/group.h b/src/group/group.h index 051e9cde63..8d5bf122b4 100644 --- a/src/group/group.h +++ b/src/group/group.h @@ -13,7 +13,6 @@ #include "util/output.h" #include "mpi.h" -#include "proc/proc.h" #include "class/ompi_pointer_array.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { @@ -27,7 +26,7 @@ struct ompi_group_t { int grp_my_rank; /**< rank in group */ int grp_f_to_c_index; /**< index in Fortran <-> C translation array */ uint32_t grp_flags; /**< flags, e.g. freed, cannot be freed etc.*/ - ompi_proc_t **grp_proc_pointers; + struct ompi_proc_t **grp_proc_pointers; /**< list of pointers to ompi_proc_t structures for each process in the group */ }; @@ -44,7 +43,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(ompi_group_t); /** * Table for Fortran <-> C group handle conversion */ -OMPI_DECLSPEC extern ompi_pointer_array_t *ompi_group_f_to_c_table; +OMPI_DECLSPEC extern struct ompi_pointer_array_t *ompi_group_f_to_c_table; OMPI_DECLSPEC extern ompi_group_t ompi_mpi_group_null; @@ -123,7 +122,7 @@ static inline int ompi_group_rank(ompi_group_t *group) * * @return Error code */ -void ompi_set_group_rank(ompi_group_t *group, ompi_proc_t *proc_pointer); +void ompi_set_group_rank(ompi_group_t *group, struct ompi_proc_t *proc_pointer); /** * Abstracting MPI_Group_translate_ranks to an ompi function for internal use diff --git a/src/group/mpi_group_init.c b/src/group/mpi_group_init.c index 840ec30c91..c1cfd7331c 100644 --- a/src/group/mpi_group_init.c +++ b/src/group/mpi_group_init.c @@ -46,8 +46,8 @@ ompi_group_t *ompi_group_allocate(int group_size) } else { /* allocate array of (ompi_proc_t *)'s, one for each * process in the group */ - new_group->grp_proc_pointers = (ompi_proc_t **) - malloc(sizeof(ompi_proc_t *) * group_size); + new_group->grp_proc_pointers = (struct ompi_proc_t **) + malloc(sizeof(struct ompi_proc_t *) * group_size); if (0 < group_size) { /* non-empty group */ if (!new_group->grp_proc_pointers) { diff --git a/src/group/mpi_set_group_rank.c b/src/group/mpi_set_group_rank.c index feb02ee790..f6abdcf13b 100644 --- a/src/group/mpi_set_group_rank.c +++ b/src/group/mpi_set_group_rank.c @@ -9,7 +9,7 @@ /* * Set group rank in a group structure. */ -void ompi_set_group_rank(ompi_group_t *group, ompi_proc_t *proc_pointer) +void ompi_set_group_rank(ompi_group_t *group, struct ompi_proc_t *proc_pointer) { /* local variables */ int proc; diff --git a/src/include/types.h b/src/include/types.h index 128dc52156..9ffea87585 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -78,13 +78,13 @@ typedef union { /* * handle differences in iovec */ - + #if defined(__APPLE__) typedef char* ompi_iov_base_ptr_t; #else typedef void* ompi_iov_base_ptr_t; #endif - + /* * handle differences in socklen_t */ @@ -95,3 +95,10 @@ typedef socklen_t ompi_socklen_t; typedef int ompi_socklen_t; #endif #endif + +/* Predefine some internal types so we dont need all the include dependencies. */ +struct ompi_communicator_t; +struct ompi_datatype_t; +struct ompi_convertor_t; +struct ompi_bitmap_t; + diff --git a/src/info/info.c b/src/info/info.c index 0dc2b50e17..26fc0aa6b2 100644 --- a/src/info/info.c +++ b/src/info/info.c @@ -4,7 +4,6 @@ #include "ompi_config.h" #include "info/info.h" -#include "include/constants.h" #include "mpi/runtime/params.h" #include "util/output.h" diff --git a/src/mca/allocator/base/allocator_base_open.c b/src/mca/allocator/base/allocator_base_open.c index d41c944f52..ddceb2c12b 100644 --- a/src/mca/allocator/base/allocator_base_open.c +++ b/src/mca/allocator/base/allocator_base_open.c @@ -5,13 +5,13 @@ #include "ompi_config.h" #include +#include #include "mca/mca.h" #include "mca/base/base.h" #include "mca/allocator/allocator.h" #include "mca/allocator/base/base.h" - /* * The following file was created by configure. It contains extern * statements and the definition of an array of pointers to each diff --git a/src/mca/base/mca_base_close.c b/src/mca/base/mca_base_close.c index 93cef3e939..6085a1d7c5 100644 --- a/src/mca/base/mca_base_close.c +++ b/src/mca/base/mca_base_close.c @@ -7,7 +7,7 @@ #include "util/output.h" #include "mca/mca.h" #include "mca/base/base.h" - +#include "include/constants.h" /* * Main MCA shutdown. diff --git a/src/mca/base/mca_base_components_close.c b/src/mca/base/mca_base_components_close.c index 02a2464b7e..bb8c075a45 100644 --- a/src/mca/base/mca_base_components_close.c +++ b/src/mca/base/mca_base_components_close.c @@ -8,7 +8,7 @@ #include "util/output.h" #include "mca/mca.h" #include "mca/base/base.h" - +#include "include/constants.h" int mca_base_components_close(int output_id, ompi_list_t *components_available, diff --git a/src/mca/base/mca_base_components_open.c b/src/mca/base/mca_base_components_open.c index a6a4d37a84..3d071bd9a1 100644 --- a/src/mca/base/mca_base_components_open.c +++ b/src/mca/base/mca_base_components_open.c @@ -14,7 +14,7 @@ #include "util/output.h" #include "mca/mca.h" #include "mca/base/base.h" - +#include "include/constants.h" struct component_name_t { ompi_list_item_t super; diff --git a/src/mca/base/mca_base_msgbuf.c b/src/mca/base/mca_base_msgbuf.c index 774f421147..83df27d237 100644 --- a/src/mca/base/mca_base_msgbuf.c +++ b/src/mca/base/mca_base_msgbuf.c @@ -7,7 +7,7 @@ #include "util/output.h" #include "mca/mca.h" #include "mca/base/base.h" - +#include "include/constants.h" #include "mca/base/mca_base_msgbuf_internal.h" /* diff --git a/src/mca/base/mca_base_open.c b/src/mca/base/mca_base_open.c index 516fb9f2d7..fa0d0c2f44 100644 --- a/src/mca/base/mca_base_open.c +++ b/src/mca/base/mca_base_open.c @@ -10,12 +10,12 @@ #if HAVE_SYSLOG_H #include #endif +#include "include/constants.h" #include "util/output.h" #include "util/printf.h" #include "mca/mca.h" #include "mca/base/base.h" - /* * Public variables */ diff --git a/src/mca/base/mca_base_parse_paramfile.c b/src/mca/base/mca_base_parse_paramfile.c index 5b8c0c6799..a7f723d548 100644 --- a/src/mca/base/mca_base_parse_paramfile.c +++ b/src/mca/base/mca_base_parse_paramfile.c @@ -5,7 +5,9 @@ #include "ompi_config.h" #include +#include +#include "include/constants.h" #include "class/ompi_list.h" #include "util/output.h" #include "mca/mca.h" diff --git a/src/mca/coll/base/coll_base_find_available.c b/src/mca/coll/base/coll_base_find_available.c index 58856a5705..186b186f94 100644 --- a/src/mca/coll/base/coll_base_find_available.c +++ b/src/mca/coll/base/coll_base_find_available.c @@ -6,6 +6,7 @@ #include #include +#include #include "mpi.h" #include "include/constants.h" diff --git a/src/mca/coll/base/coll_base_open.c b/src/mca/coll/base/coll_base_open.c index 00d5d52015..500edfb9f0 100644 --- a/src/mca/coll/base/coll_base_open.c +++ b/src/mca/coll/base/coll_base_open.c @@ -6,6 +6,7 @@ #include "ompi_config.h" #include +#include "include/constants.h" #include "util/output.h" #include "mca/mca.h" #include "mca/base/base.h" diff --git a/src/mca/coll/coll.h b/src/mca/coll/coll.h index b3adb52cd9..e596d3734c 100644 --- a/src/mca/coll/coll.h +++ b/src/mca/coll/coll.h @@ -39,7 +39,7 @@ typedef int (*mca_coll_base_module_allgather_fn_t) void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm); typedef int (*mca_coll_base_module_allgatherv_fn_t) - (void *sbuf, int scount, ompi_datatype_t *sdtype, + (void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, int *rcounts, int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm); typedef int (*mca_coll_base_module_allreduce_fn_t) diff --git a/src/mca/io/base/io_base_delete.c b/src/mca/io/base/io_base_delete.c index 26a3fb8e03..041b261ced 100644 --- a/src/mca/io/base/io_base_delete.c +++ b/src/mca/io/base/io_base_delete.c @@ -10,15 +10,14 @@ #include "mpi.h" #include "file/file.h" -#include "util/argv.h" #include "class/ompi_list.h" -#include "class/ompi_object.h" +#include "util/argv.h" +#include "util/output.h" #include "mca/mca.h" #include "mca/base/base.h" #include "mca/io/io.h" #include "mca/io/base/base.h" - /* * Local types */ @@ -37,19 +36,19 @@ typedef struct avail_io_t avail_io_t; * Local functions */ static ompi_list_t *check_components(ompi_list_t *components, - char *filename, ompi_info_t *info, + char *filename, struct ompi_info_t *info, char **names, int num_names); static avail_io_t *check_one_component(const mca_base_component_t *component, - char *filename, ompi_info_t *info); + char *filename, struct ompi_info_t *info); static avail_io_t *query(const mca_base_component_t *component, - char *filename, ompi_info_t *info); + char *filename, struct ompi_info_t *info); static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *io_component, - char *filename, ompi_info_t *info); + char *filename, struct ompi_info_t *info); -static void unquery(avail_io_t *avail, char *filename, ompi_info_t *info); +static void unquery(avail_io_t *avail, char *filename, struct ompi_info_t *info); -static int delete_file(avail_io_t *avail, char *filename, ompi_info_t *info); +static int delete_file(avail_io_t *avail, char *filename, struct ompi_info_t *info); /* @@ -60,7 +59,7 @@ static OBJ_CLASS_INSTANCE(avail_io_t, ompi_list_item_t, NULL, NULL); /* */ -int mca_io_base_delete(char *filename, ompi_info_t *info) +int mca_io_base_delete(char *filename, struct ompi_info_t *info) { int err, num_names; char *names, **name_array; @@ -172,7 +171,7 @@ int mca_io_base_delete(char *filename, ompi_info_t *info) * priority order. */ static ompi_list_t *check_components(ompi_list_t *components, - char *filename, ompi_info_t *info, + char *filename, struct ompi_info_t *info, char **names, int num_names) { int i; @@ -265,7 +264,7 @@ static ompi_list_t *check_components(ompi_list_t *components, * Check a single component */ static avail_io_t *check_one_component(const mca_base_component_t *component, - char *filename, ompi_info_t *info) + char *filename, struct ompi_info_t *info) { avail_io_t *avail; @@ -298,7 +297,7 @@ static avail_io_t *check_one_component(const mca_base_component_t *component, * module struct */ static avail_io_t *query(const mca_base_component_t *component, - char *filename, ompi_info_t *info) + char *filename, struct ompi_info_t *info) { const mca_io_base_component_1_0_0_t *ioc_100; @@ -319,7 +318,7 @@ static avail_io_t *query(const mca_base_component_t *component, static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *component, - char *filename, ompi_info_t *info) + char *filename, struct ompi_info_t *info) { bool usable; int priority, ret; @@ -349,7 +348,7 @@ static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *component, * Unquery functions **************************************************************************/ -static void unquery(avail_io_t *avail, char *filename, ompi_info_t *info) +static void unquery(avail_io_t *avail, char *filename, struct ompi_info_t *info) { const mca_io_base_component_1_0_0_t *ioc_100; @@ -374,7 +373,7 @@ static void unquery(avail_io_t *avail, char *filename, ompi_info_t *info) /* * Invoke the component's delete function */ -static int delete_file(avail_io_t *avail, char *filename, ompi_info_t *info) +static int delete_file(avail_io_t *avail, char *filename, struct ompi_info_t *info) { const mca_io_base_component_1_0_0_t *ioc_100; diff --git a/src/mca/io/base/io_base_file_select.c b/src/mca/io/base/io_base_file_select.c index 06d880cc32..c6007ea527 100644 --- a/src/mca/io/base/io_base_file_select.c +++ b/src/mca/io/base/io_base_file_select.c @@ -11,6 +11,7 @@ #include "mpi.h" #include "file/file.h" #include "util/argv.h" +#include "util/output.h" #include "class/ompi_list.h" #include "class/ompi_object.h" #include "mca/mca.h" diff --git a/src/mca/io/romio/src/io_romio.h b/src/mca/io/romio/src/io_romio.h index ce8078e2db..73f07c835f 100644 --- a/src/mca/io/romio/src/io_romio.h +++ b/src/mca/io/romio/src/io_romio.h @@ -53,212 +53,212 @@ typedef struct mca_io_romio_data_t mca_io_romio_data_t; * ROMIO_PREFIX(MPI_File_XXX) */ /* Section 9.2 */ -int mca_io_romio_file_open (ompi_communicator_t *comm, +int mca_io_romio_file_open (struct ompi_communicator_t *comm, char *filename, int amode, - ompi_info_t *info, + struct ompi_info_t *info, ompi_file_t *fh); -int mca_io_romio_file_close (ompi_file_t *fh); +int mca_io_romio_file_close (struct ompi_file_t *fh); int mca_io_romio_file_delete (char *filename, - ompi_info_t *info); -int mca_io_romio_file_set_size (ompi_file_t *fh, + struct ompi_info_t *info); +int mca_io_romio_file_set_size (struct ompi_file_t *fh, MPI_Offset size); -int mca_io_romio_file_preallocate (ompi_file_t *fh, +int mca_io_romio_file_preallocate (struct ompi_file_t *fh, MPI_Offset size); -int mca_io_romio_file_get_size (ompi_file_t *fh, +int mca_io_romio_file_get_size (struct ompi_file_t *fh, MPI_Offset * size); -int mca_io_romio_file_get_amode (ompi_file_t *fh, +int mca_io_romio_file_get_amode (struct ompi_file_t *fh, int *amode); -int mca_io_romio_file_set_info (ompi_file_t *fh, - ompi_info_t *info); -int mca_io_romio_file_get_info (ompi_file_t *fh, - ompi_info_t ** info_used); +int mca_io_romio_file_set_info (struct ompi_file_t *fh, + struct ompi_info_t *info); +int mca_io_romio_file_get_info (struct ompi_file_t *fh, + struct ompi_info_t ** info_used); /* Section 9.3 */ -int mca_io_romio_file_set_view (ompi_file_t *fh, +int mca_io_romio_file_set_view (struct ompi_file_t *fh, MPI_Offset disp, - ompi_datatype_t *etype, - ompi_datatype_t *filetype, + struct ompi_datatype_t *etype, + struct ompi_datatype_t *filetype, char *datarep, - ompi_info_t *info); -int mca_io_romio_file_get_view (ompi_file_t *fh, + struct ompi_info_t *info); +int mca_io_romio_file_get_view (struct ompi_file_t *fh, MPI_Offset * disp, - ompi_datatype_t ** etype, - ompi_datatype_t ** filetype, + struct ompi_datatype_t ** etype, + struct ompi_datatype_t ** filetype, char *datarep); /* Section 9.4.2 */ -int mca_io_romio_file_read_at (ompi_file_t *fh, +int mca_io_romio_file_read_at (struct ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_read_at_all (ompi_file_t *fh, +int mca_io_romio_file_read_at_all (struct ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_write_at (ompi_file_t *fh, +int mca_io_romio_file_write_at (struct ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_write_at_all (ompi_file_t *fh, +int mca_io_romio_file_write_at_all (struct ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_iread_at (ompi_file_t *fh, +int mca_io_romio_file_iread_at (struct ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request); -int mca_io_romio_file_iwrite_at (ompi_file_t *fh, +int mca_io_romio_file_iwrite_at (struct ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request); /* Section 9.4.3 */ -int mca_io_romio_file_read (ompi_file_t *fh, +int mca_io_romio_file_read (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_read_all (ompi_file_t *fh, +int mca_io_romio_file_read_all (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_write (ompi_file_t *fh, +int mca_io_romio_file_write (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_write_all (ompi_file_t *fh, +int mca_io_romio_file_write_all (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_iread (ompi_file_t *fh, +int mca_io_romio_file_iread (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request); -int mca_io_romio_file_iwrite (ompi_file_t *fh, +int mca_io_romio_file_iwrite (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request); -int mca_io_romio_file_seek (ompi_file_t *fh, +int mca_io_romio_file_seek (struct ompi_file_t *fh, MPI_Offset offset, int whence); -int mca_io_romio_file_get_position (ompi_file_t *fh, +int mca_io_romio_file_get_position (struct ompi_file_t *fh, MPI_Offset * offset); -int mca_io_romio_file_get_byte_offset (ompi_file_t *fh, +int mca_io_romio_file_get_byte_offset (struct ompi_file_t *fh, MPI_Offset offset, MPI_Offset * disp); /* Section 9.4.4 */ -int mca_io_romio_file_read_shared (ompi_file_t *fh, +int mca_io_romio_file_read_shared (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_write_shared (ompi_file_t *fh, +int mca_io_romio_file_write_shared (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_iread_shared (ompi_file_t *fh, +int mca_io_romio_file_iread_shared (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request); -int mca_io_romio_file_iwrite_shared (ompi_file_t *fh, +int mca_io_romio_file_iwrite_shared (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request); -int mca_io_romio_file_read_ordered (ompi_file_t *fh, +int mca_io_romio_file_read_ordered (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_write_ordered (ompi_file_t *fh, +int mca_io_romio_file_write_ordered (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status); -int mca_io_romio_file_seek_shared (ompi_file_t *fh, +int mca_io_romio_file_seek_shared (struct ompi_file_t *fh, MPI_Offset offset, int whence); -int mca_io_romio_file_get_position_shared (ompi_file_t *fh, +int mca_io_romio_file_get_position_shared (struct ompi_file_t *fh, MPI_Offset * offset); /* Section 9.4.5 */ -int mca_io_romio_file_read_at_all_begin (ompi_file_t *fh, +int mca_io_romio_file_read_at_all_begin (struct ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype); -int mca_io_romio_file_read_at_all_end (ompi_file_t *fh, + struct ompi_datatype_t *datatype); +int mca_io_romio_file_read_at_all_end (struct ompi_file_t *fh, void *buf, ompi_status_public_t * status); -int mca_io_romio_file_write_at_all_begin (ompi_file_t *fh, +int mca_io_romio_file_write_at_all_begin (struct ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype); -int mca_io_romio_file_write_at_all_end (ompi_file_t *fh, + struct ompi_datatype_t *datatype); +int mca_io_romio_file_write_at_all_end (struct ompi_file_t *fh, void *buf, ompi_status_public_t * status); -int mca_io_romio_file_read_all_begin (ompi_file_t *fh, +int mca_io_romio_file_read_all_begin (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype); -int mca_io_romio_file_read_all_end (ompi_file_t *fh, + struct ompi_datatype_t *datatype); +int mca_io_romio_file_read_all_end (struct ompi_file_t *fh, void *buf, ompi_status_public_t * status); -int mca_io_romio_file_write_all_begin (ompi_file_t *fh, +int mca_io_romio_file_write_all_begin (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype); -int mca_io_romio_file_write_all_end (ompi_file_t *fh, + struct ompi_datatype_t *datatype); +int mca_io_romio_file_write_all_end (struct ompi_file_t *fh, void *buf, ompi_status_public_t * status); -int mca_io_romio_file_read_ordered_begin (ompi_file_t *fh, +int mca_io_romio_file_read_ordered_begin (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype); -int mca_io_romio_file_read_ordered_end (ompi_file_t *fh, + struct ompi_datatype_t *datatype); +int mca_io_romio_file_read_ordered_end (struct ompi_file_t *fh, void *buf, ompi_status_public_t * status); -int mca_io_romio_file_write_ordered_begin (ompi_file_t *fh, +int mca_io_romio_file_write_ordered_begin (struct ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype); -int mca_io_romio_file_write_ordered_end (ompi_file_t *fh, + struct ompi_datatype_t *datatype); +int mca_io_romio_file_write_ordered_end (struct ompi_file_t *fh, void *buf, - ompi_status_public_t * status); + struct ompi_status_public_t * status); /* Section 9.5.1 */ -int mca_io_romio_file_get_type_extent (ompi_file_t *fh, - ompi_datatype_t *datatype, +int mca_io_romio_file_get_type_extent (struct ompi_file_t *fh, + struct ompi_datatype_t *datatype, MPI_Aint * extent); /* Section 9.6.1 */ -int mca_io_romio_file_set_atomicity (ompi_file_t *fh, +int mca_io_romio_file_set_atomicity (struct ompi_file_t *fh, int flag); -int mca_io_romio_file_get_atomicity (ompi_file_t *fh, +int mca_io_romio_file_get_atomicity (struct ompi_file_t *fh, int *flag); -int mca_io_romio_file_sync (ompi_file_t *fh); +int mca_io_romio_file_sync (struct ompi_file_t *fh); /* End Prototypes */ diff --git a/src/mca/mpool/base/mpool_base_lookup.c b/src/mca/mpool/base/mpool_base_lookup.c index b69075e863..787ff2f5f2 100644 --- a/src/mca/mpool/base/mpool_base_lookup.c +++ b/src/mca/mpool/base/mpool_base_lookup.c @@ -5,6 +5,7 @@ #include "ompi_config.h" #include +#include #include "mca/mca.h" #include "mca/base/base.h" diff --git a/src/mca/mpool/base/mpool_base_open.c b/src/mca/mpool/base/mpool_base_open.c index 2565dad880..9bbced4757 100644 --- a/src/mca/mpool/base/mpool_base_open.c +++ b/src/mca/mpool/base/mpool_base_open.c @@ -10,7 +10,7 @@ #include "mca/base/base.h" #include "mca/mpool/mpool.h" #include "mca/mpool/base/base.h" - +#include "include/constants.h" /* * The following file was created by configure. It contains extern diff --git a/src/mca/ns/base/ns_base_open.c b/src/mca/ns/base/ns_base_open.c index be6858ddc5..4659e88693 100644 --- a/src/mca/ns/base/ns_base_open.c +++ b/src/mca/ns/base/ns_base_open.c @@ -4,6 +4,7 @@ #include "ompi_config.h" +#include "include/constants.h" #include "mca/mca.h" #include "mca/base/base.h" #include "mca/base/mca_base_param.h" diff --git a/src/mca/oob/base/oob_base_init.c b/src/mca/oob/base/oob_base_init.c index 1e8ebbbe67..cbb2fa9511 100644 --- a/src/mca/oob/base/oob_base_init.c +++ b/src/mca/oob/base/oob_base_init.c @@ -5,6 +5,7 @@ #include "ompi_config.h" #include +#include #include "runtime/runtime.h" #include "util/output.h" diff --git a/src/mca/oob/base/oob_base_open.c b/src/mca/oob/base/oob_base_open.c index 7f8ed4b69c..722081fc39 100644 --- a/src/mca/oob/base/oob_base_open.c +++ b/src/mca/oob/base/oob_base_open.c @@ -4,6 +4,7 @@ #include "ompi_config.h" +#include "include/constants.h" #include "mca/mca.h" #include "mca/base/base.h" #include "mca/base/mca_base_param.h" diff --git a/src/mca/pcmclient/base/pcmclient_base_open.c b/src/mca/pcmclient/base/pcmclient_base_open.c index 41e85ea751..70adc8566b 100644 --- a/src/mca/pcmclient/base/pcmclient_base_open.c +++ b/src/mca/pcmclient/base/pcmclient_base_open.c @@ -4,6 +4,7 @@ #include "ompi_config.h" +#include "include/constants.h" #include "mca/mca.h" #include "mca/base/base.h" #include "mca/pcmclient/pcmclient.h" diff --git a/src/mca/pml/teg/src/pml_teg.c b/src/mca/pml/teg/src/pml_teg.c index a54b962a81..27a2d797e2 100644 --- a/src/mca/pml/teg/src/pml_teg.c +++ b/src/mca/pml/teg/src/pml_teg.c @@ -6,6 +6,8 @@ #include #include + +#include "class/ompi_bitmap.h" #include "mca/pml/pml.h" #include "mca/ptl/ptl.h" #include "mca/ptl/base/base.h" diff --git a/src/mca/ptl/prof/ptl_prof.c b/src/mca/ptl/prof/ptl_prof.c index 65b92a6647..9fc24d5c7a 100644 --- a/src/mca/ptl/prof/ptl_prof.c +++ b/src/mca/ptl/prof/ptl_prof.c @@ -1,11 +1,12 @@ #include "ompi_config.h" #include "ptl_prof.h" +#include "class/ompi_bitmap.h" static int ptl_prof_add_procs_fn( struct mca_ptl_base_module_t* ptl, size_t nprocs, struct ompi_proc_t** procs, struct mca_ptl_base_peer_t** peer, - ompi_bitmap_t* reachable ) + struct ompi_bitmap_t* reachable ) { return 0; } diff --git a/src/mca/ptl/ptl.h b/src/mca/ptl/ptl.h index e109389b65..89aa7b3fc8 100644 --- a/src/mca/ptl/ptl.h +++ b/src/mca/ptl/ptl.h @@ -232,9 +232,8 @@ #include "mca/mca.h" #include "include/ompi.h" -#include "class/ompi_list.h" -#include "proc/proc.h" #include "mca/pml/pml.h" +#include "include/types.h" /* * PTL types @@ -251,7 +250,7 @@ struct mca_ptl_base_match_header_t; typedef uint64_t mca_ptl_sequence_t; typedef uint64_t mca_ptl_tstamp_t; -typedef ompi_list_t mca_ptl_queue_t; +typedef struct ompi_list_t mca_ptl_queue_t; typedef enum { MCA_PTL_ENABLE @@ -395,7 +394,7 @@ typedef int (*mca_ptl_base_module_add_procs_fn_t)( size_t nprocs, struct ompi_proc_t** procs, struct mca_ptl_base_peer_t** peer, - ompi_bitmap_t* reachable + struct ompi_bitmap_t* reachable ); /** diff --git a/src/mca/ptl/self/ptl_self.c b/src/mca/ptl/self/ptl_self.c index 12a0173ed7..02c5c70bb5 100644 --- a/src/mca/ptl/self/ptl_self.c +++ b/src/mca/ptl/self/ptl_self.c @@ -23,6 +23,7 @@ #endif #include "include/constants.h" +#include "class/ompi_bitmap.h" #include "event/event.h" #include "util/argv.h" #include "util/output.h" diff --git a/src/mca/ptl/self/ptl_self.h b/src/mca/ptl/self/ptl_self.h index e820d6fc71..7ebbfb167b 100644 --- a/src/mca/ptl/self/ptl_self.h +++ b/src/mca/ptl/self/ptl_self.h @@ -25,15 +25,15 @@ extern "C" { struct mca_ptl_self_component_t { mca_ptl_base_component_1_0_0_t super; /**< base PTL component */ struct mca_ptl_base_module_t** self_ptl_modules; /**< array of available PTL modules */ - uint32_t self_num_ptl_modules; /**< number of ptl modules actually used */ - uint32_t self_max_ptl_modules; /**< maximum number of ptl modules */ - uint32_t self_buf_size; /**< the size of the internal buffer used to pack/unpack the data */ - uint32_t self_is_non_blocking; /**< how the memcopy operations are done segmented or not */ - int32_t self_free_list_num; /**< initial size of free lists */ - int32_t self_free_list_max; /**< maximum size of free lists */ - int32_t self_free_list_inc; /**< number of elements to alloc when growing free lists */ - ompi_free_list_t self_send_requests; /**< free list of self send requests -- sendreq + sendfrag */ - ompi_proc_t* self_local; /**< the self proc instance corresponding to the local process */ + uint32_t self_num_ptl_modules; /**< number of ptl modules actually used */ + uint32_t self_max_ptl_modules; /**< maximum number of ptl modules */ + uint32_t self_buf_size; /**< the size of the internal buffer used to pack/unpack the data */ + uint32_t self_is_non_blocking; /**< how the memcopy operations are done segmented or not */ + int32_t self_free_list_num; /**< initial size of free lists */ + int32_t self_free_list_max; /**< maximum size of free lists */ + int32_t self_free_list_inc; /**< number of elements to alloc when growing free lists */ + ompi_free_list_t self_send_requests; /**< free list of self send requests -- sendreq + sendfrag */ + struct ompi_proc_t* self_local; /**< the self proc instance corresponding to the local process */ }; typedef struct mca_ptl_self_component_t mca_ptl_self_component_t; @@ -76,7 +76,7 @@ extern mca_ptl_base_module_t** mca_ptl_self_component_init( bool *have_hidden_threads ); -int mca_ptl_self_add_proc(struct mca_ptl_base_module_t* ptl, size_t nprocs, struct ompi_proc_t **ompi_proc, struct mca_ptl_base_peer_t** peer_ret, ompi_bitmap_t* reachable); +int mca_ptl_self_add_proc(struct mca_ptl_base_module_t* ptl, size_t nprocs, struct ompi_proc_t **ompi_proc, struct mca_ptl_base_peer_t** peer_ret, struct ompi_bitmap_t* reachable); int mca_ptl_self_del_proc(struct mca_ptl_base_module_t* ptl, size_t nprocs, struct ompi_proc_t **proc, struct mca_ptl_base_peer_t** ptl_peer); int mca_ptl_self_finalize(struct mca_ptl_base_module_t* ptl); int mca_ptl_self_request_init(struct mca_ptl_base_module_t* ptl, struct mca_pml_base_send_request_t* request); diff --git a/src/mca/ptl/sm/src/ptl_sm.h b/src/mca/ptl/sm/src/ptl_sm.h index 1b8e6fd649..bdc7e24397 100644 --- a/src/mca/ptl/sm/src/ptl_sm.h +++ b/src/mca/ptl/sm/src/ptl_sm.h @@ -194,7 +194,7 @@ extern int mca_ptl_sm_add_procs( size_t nprocs, struct ompi_proc_t **procs, struct mca_ptl_base_peer_t** peers, - ompi_bitmap_t* reachability + struct ompi_bitmap_t* reachability ); diff --git a/src/mca/ptl/tcp/src/ptl_tcp.c b/src/mca/ptl/tcp/src/ptl_tcp.c index 77a3a77848..aaa766cda3 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp.c +++ b/src/mca/ptl/tcp/src/ptl_tcp.c @@ -4,6 +4,7 @@ #include "ompi_config.h" #include +#include "class/ompi_bitmap.h" #include "util/output.h" #include "util/if.h" #include "mca/pml/pml.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp.h b/src/mca/ptl/tcp/src/ptl_tcp.h index dee0cf0fd4..cdc867cfe9 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp.h +++ b/src/mca/ptl/tcp/src/ptl_tcp.h @@ -155,7 +155,7 @@ extern int mca_ptl_tcp_add_procs( size_t nprocs, struct ompi_proc_t **procs, struct mca_ptl_base_peer_t** peers, - ompi_bitmap_t* reachable + struct ompi_bitmap_t* reachable ); diff --git a/src/mca/ptl/tcp/src/ptl_tcp_component.c b/src/mca/ptl/tcp/src/ptl_tcp_component.c index d3d0bc9171..7401c9ad2c 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_component.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_component.c @@ -192,7 +192,7 @@ int mca_ptl_tcp_component_open(void) mca_ptl_tcp_param_register_int("max_frag_size", -1); /* the tcp allocator will never allocate buffers with more than this size */ mca_ptl_tcp_component.tcp_frag_size = - mca_ptl_tcp_param_register_int("frag_size", 16*1024); + mca_ptl_tcp_param_register_int("frag_size", 64*1024); /* adapt the first fragment size to fit with the allowed fragment size */ if( (mca_ptl_tcp_component.tcp_frag_size != 0) && (mca_ptl_tcp_module.super.ptl_first_frag_size > mca_ptl_tcp_component.tcp_frag_size) ) { diff --git a/src/mca/svc/base/svc_base_open.c b/src/mca/svc/base/svc_base_open.c index 60244eb1c7..93a86bd1a8 100644 --- a/src/mca/svc/base/svc_base_open.c +++ b/src/mca/svc/base/svc_base_open.c @@ -6,6 +6,7 @@ #include +#include "include/constants.h" #include "mca/mca.h" #include "mca/base/base.h" #include "mca/svc/svc.h" diff --git a/src/mca/svc/exec/svc_exec.c b/src/mca/svc/exec/svc_exec.c index 4a32ab12b9..ef317c592c 100644 --- a/src/mca/svc/exec/svc_exec.c +++ b/src/mca/svc/exec/svc_exec.c @@ -1,4 +1,8 @@ #include "ompi_config.h" + +#include + +#include "include/constants.h" #include "mca/oob/oob.h" #include "mca/oob/base/base.h" #include "svc_exec.h" diff --git a/src/mca/svc/exec/svc_exec_component.c b/src/mca/svc/exec/svc_exec_component.c index 7317ae2659..7fe84b653b 100644 --- a/src/mca/svc/exec/svc_exec_component.c +++ b/src/mca/svc/exec/svc_exec_component.c @@ -1,4 +1,6 @@ #include "ompi_config.h" +#include "include/constants.h" + #include "svc_exec.h" diff --git a/src/mca/svc/sched/svc_sched_node.c b/src/mca/svc/sched/svc_sched_node.c index 298abd8518..24c51f66ad 100644 --- a/src/mca/svc/sched/svc_sched_node.c +++ b/src/mca/svc/sched/svc_sched_node.c @@ -1,4 +1,7 @@ #include "ompi_config.h" + +#include + #include "svc_sched_node.h" diff --git a/src/mca/svc/stdio/svc_stdio.c b/src/mca/svc/stdio/svc_stdio.c index 6ebf96a186..8302acb2b5 100644 --- a/src/mca/svc/stdio/svc_stdio.c +++ b/src/mca/svc/stdio/svc_stdio.c @@ -1,4 +1,5 @@ #include "ompi_config.h" +#include "include/constants.h" #include "mca/oob/oob.h" #include "mca/oob/base/base.h" #include "svc_stdio.h" diff --git a/src/mca/svc/stdio/svc_stdio_component.c b/src/mca/svc/stdio/svc_stdio_component.c index c0962e40cb..29d38e69ac 100644 --- a/src/mca/svc/stdio/svc_stdio_component.c +++ b/src/mca/svc/stdio/svc_stdio_component.c @@ -1,4 +1,5 @@ #include "ompi_config.h" +#include "include/constants.h" #include "svc_stdio.h" diff --git a/src/mca/topo/base/topo_base_comm_select.c b/src/mca/topo/base/topo_base_comm_select.c index 9ecf24ee47..6de05c7108 100644 --- a/src/mca/topo/base/topo_base_comm_select.c +++ b/src/mca/topo/base/topo_base_comm_select.c @@ -4,6 +4,8 @@ #include "ompi_config.h" +#include + #include "class/ompi_list.h" #include "util/argv.h" #include "runtime/runtime.h" diff --git a/src/mca/topo/base/topo_base_open.c b/src/mca/topo/base/topo_base_open.c index 8826128f7a..5cf38ae4e2 100644 --- a/src/mca/topo/base/topo_base_open.c +++ b/src/mca/topo/base/topo_base_open.c @@ -3,8 +3,10 @@ */ #include "ompi_config.h" + #include +#include "include/constants.h" #include "util/output.h" #include "class/ompi_list.h" #include "mca/mca.h" diff --git a/src/mpi/c/allgather.c b/src/mpi/c/allgather.c index 962d7db0aa..23a686d451 100644 --- a/src/mpi/c/allgather.c +++ b/src/mpi/c/allgather.c @@ -9,6 +9,7 @@ #include "mpi/c/bindings.h" #include "mca/coll/coll.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Allgather = PMPI_Allgather diff --git a/src/mpi/c/allgatherv.c b/src/mpi/c/allgatherv.c index 58f2e6e072..2c6f060dfd 100644 --- a/src/mpi/c/allgatherv.c +++ b/src/mpi/c/allgatherv.c @@ -9,6 +9,7 @@ #include "mpi/c/bindings.h" #include "mca/coll/coll.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Allgatherv = PMPI_Allgatherv diff --git a/src/mpi/c/alltoall.c b/src/mpi/c/alltoall.c index e21ddd507a..d954910c06 100644 --- a/src/mpi/c/alltoall.c +++ b/src/mpi/c/alltoall.c @@ -9,6 +9,7 @@ #include "mpi/c/bindings.h" #include "mca/coll/coll.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Alltoall = PMPI_Alltoall diff --git a/src/mpi/c/alltoallv.c b/src/mpi/c/alltoallv.c index 495861fde0..6ceb4c22df 100644 --- a/src/mpi/c/alltoallv.c +++ b/src/mpi/c/alltoallv.c @@ -9,6 +9,7 @@ #include "mpi/c/bindings.h" #include "mca/coll/coll.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Alltoallv = PMPI_Alltoallv diff --git a/src/mpi/c/alltoallw.c b/src/mpi/c/alltoallw.c index 6dde1f9313..e28d14e51e 100644 --- a/src/mpi/c/alltoallw.c +++ b/src/mpi/c/alltoallw.c @@ -9,6 +9,7 @@ #include "mpi/c/bindings.h" #include "mca/coll/coll.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Alltoallw = PMPI_Alltoallw diff --git a/src/mpi/c/attr_delete.c b/src/mpi/c/attr_delete.c index 3667c244a8..9e0d8fad35 100644 --- a/src/mpi/c/attr_delete.c +++ b/src/mpi/c/attr_delete.c @@ -8,6 +8,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Attr_delete = PMPI_Attr_delete diff --git a/src/mpi/c/attr_get.c b/src/mpi/c/attr_get.c index 59886e9d38..a3ea0067b4 100644 --- a/src/mpi/c/attr_get.c +++ b/src/mpi/c/attr_get.c @@ -8,6 +8,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Attr_get = PMPI_Attr_get diff --git a/src/mpi/c/attr_put.c b/src/mpi/c/attr_put.c index ec35437282..257f3389f8 100644 --- a/src/mpi/c/attr_put.c +++ b/src/mpi/c/attr_put.c @@ -8,6 +8,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Attr_put = PMPI_Attr_put diff --git a/src/mpi/c/bcast.c b/src/mpi/c/bcast.c index 2084d329e1..8af27b82da 100644 --- a/src/mpi/c/bcast.c +++ b/src/mpi/c/bcast.c @@ -8,6 +8,7 @@ #include "mpi/c/bindings.h" #include "mca/coll/coll.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Bcast = PMPI_Bcast diff --git a/src/mpi/c/comm_create_keyval.c b/src/mpi/c/comm_create_keyval.c index 986fc85094..5c1408843c 100644 --- a/src/mpi/c/comm_create_keyval.c +++ b/src/mpi/c/comm_create_keyval.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Comm_create_keyval = PMPI_Comm_create_keyval diff --git a/src/mpi/c/comm_delete_attr.c b/src/mpi/c/comm_delete_attr.c index b2a6a33bfb..20922692e2 100644 --- a/src/mpi/c/comm_delete_attr.c +++ b/src/mpi/c/comm_delete_attr.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Comm_delete_attr = PMPI_Comm_delete_attr diff --git a/src/mpi/c/comm_free_keyval.c b/src/mpi/c/comm_free_keyval.c index 822c5958a3..d99eb77372 100644 --- a/src/mpi/c/comm_free_keyval.c +++ b/src/mpi/c/comm_free_keyval.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Comm_free_keyval = PMPI_Comm_free_keyval diff --git a/src/mpi/c/comm_get_attr.c b/src/mpi/c/comm_get_attr.c index 93dcbc21cd..ee8590957f 100644 --- a/src/mpi/c/comm_get_attr.c +++ b/src/mpi/c/comm_get_attr.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Comm_get_attr = PMPI_Comm_get_attr diff --git a/src/mpi/c/comm_set_attr.c b/src/mpi/c/comm_set_attr.c index 3fc5173d7f..f7b5ff1427 100644 --- a/src/mpi/c/comm_set_attr.c +++ b/src/mpi/c/comm_set_attr.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Comm_set_attr = PMPI_Comm_set_attr diff --git a/src/mpi/c/gather.c b/src/mpi/c/gather.c index e40cf6e286..0d06fdc12f 100644 --- a/src/mpi/c/gather.c +++ b/src/mpi/c/gather.c @@ -8,6 +8,7 @@ #include "mpi/c/bindings.h" #include "mca/coll/coll.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Gather = PMPI_Gather diff --git a/src/mpi/c/gatherv.c b/src/mpi/c/gatherv.c index b8d56536c8..adf534b3f5 100644 --- a/src/mpi/c/gatherv.c +++ b/src/mpi/c/gatherv.c @@ -7,8 +7,8 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "mca/coll/coll.h" -#include "errhandler/errhandler.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Gatherv = PMPI_Gatherv diff --git a/src/mpi/c/get_count.c b/src/mpi/c/get_count.c index d76847d4d2..b80f141a56 100644 --- a/src/mpi/c/get_count.c +++ b/src/mpi/c/get_count.c @@ -7,7 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "communicator/communicator.h" -#include "errhandler/errhandler.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Get_count = PMPI_Get_count diff --git a/src/mpi/c/get_elements.c b/src/mpi/c/get_elements.c index 6056ec045f..5d9980bc96 100644 --- a/src/mpi/c/get_elements.c +++ b/src/mpi/c/get_elements.c @@ -7,7 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "communicator/communicator.h" -#include "errhandler/errhandler.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Get_elements = PMPI_Get_elements diff --git a/src/mpi/c/grequest_complete.c b/src/mpi/c/grequest_complete.c index 7b8bbf0150..aa6c4e2f78 100644 --- a/src/mpi/c/grequest_complete.c +++ b/src/mpi/c/grequest_complete.c @@ -8,7 +8,6 @@ #include "mpi/c/bindings.h" #include "communicator/communicator.h" #include "request/grequest.h" -#include "errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Grequest_complete = PMPI_Grequest_complete @@ -33,7 +32,7 @@ int MPI_Grequest_complete(MPI_Request request) } switch(request->req_type) { - OMPI_REQUEST_GEN: + case OMPI_REQUEST_GEN: rc = ompi_grequest_complete((ompi_grequest_t*)request); break; default: diff --git a/src/mpi/c/intercomm_merge.c b/src/mpi/c/intercomm_merge.c index 7bf2c75138..fe15bbf470 100644 --- a/src/mpi/c/intercomm_merge.c +++ b/src/mpi/c/intercomm_merge.c @@ -3,7 +3,7 @@ */ #include "ompi_config.h" - +#include #include "mpi.h" #include "mpi/c/bindings.h" #include "communicator/communicator.h" diff --git a/src/mpi/c/keyval_create.c b/src/mpi/c/keyval_create.c index 56056e29df..4d75fe42db 100644 --- a/src/mpi/c/keyval_create.c +++ b/src/mpi/c/keyval_create.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Keyval_create = PMPI_Keyval_create diff --git a/src/mpi/c/keyval_free.c b/src/mpi/c/keyval_free.c index 90c017f45c..c3e2a208cb 100644 --- a/src/mpi/c/keyval_free.c +++ b/src/mpi/c/keyval_free.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Keyval_free = PMPI_Keyval_free diff --git a/src/mpi/c/scatter.c b/src/mpi/c/scatter.c index a67e3958f9..2d61763e15 100644 --- a/src/mpi/c/scatter.c +++ b/src/mpi/c/scatter.c @@ -7,8 +7,8 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "mca/coll/coll.h" -#include "errhandler/errhandler.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Scatter = PMPI_Scatter diff --git a/src/mpi/c/scatterv.c b/src/mpi/c/scatterv.c index 5e08f8c2ef..a4ec660a78 100644 --- a/src/mpi/c/scatterv.c +++ b/src/mpi/c/scatterv.c @@ -7,8 +7,8 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "mca/coll/coll.h" -#include "errhandler/errhandler.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Scatterv = PMPI_Scatterv diff --git a/src/mpi/c/type_c2f.c b/src/mpi/c/type_c2f.c index fabe01888c..ecde3eb7c6 100644 --- a/src/mpi/c/type_c2f.c +++ b/src/mpi/c/type_c2f.c @@ -8,7 +8,7 @@ #include "mpi/c/bindings.h" #include "mpi/f77/fint_2_int.h" #include "datatype/datatype.h" -#include "communicator/communicator.h" +/*#include "communicator/communicator.h"*/ #include "errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/src/mpi/c/type_create_keyval.c b/src/mpi/c/type_create_keyval.c index 53828804b2..fc6584d30b 100644 --- a/src/mpi/c/type_create_keyval.c +++ b/src/mpi/c/type_create_keyval.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Type_create_keyval = PMPI_Type_create_keyval diff --git a/src/mpi/c/type_delete_attr.c b/src/mpi/c/type_delete_attr.c index f13ed57664..4bf1bc0f58 100644 --- a/src/mpi/c/type_delete_attr.c +++ b/src/mpi/c/type_delete_attr.c @@ -7,6 +7,8 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Type_delete_attr = PMPI_Type_delete_attr diff --git a/src/mpi/c/type_extent.c b/src/mpi/c/type_extent.c index aa4f10c360..8742c50b92 100644 --- a/src/mpi/c/type_extent.c +++ b/src/mpi/c/type_extent.c @@ -6,8 +6,8 @@ #include "mpi.h" #include "mpi/c/bindings.h" -#include "errhandler/errhandler.h" #include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Type_extent = PMPI_Type_extent diff --git a/src/mpi/c/type_free_keyval.c b/src/mpi/c/type_free_keyval.c index c3c7f16918..0afe61e370 100644 --- a/src/mpi/c/type_free_keyval.c +++ b/src/mpi/c/type_free_keyval.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Type_free_keyval = PMPI_Type_free_keyval diff --git a/src/mpi/c/type_get_attr.c b/src/mpi/c/type_get_attr.c index 55e100a9a6..40f9289169 100644 --- a/src/mpi/c/type_get_attr.c +++ b/src/mpi/c/type_get_attr.c @@ -7,6 +7,8 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Type_get_attr = PMPI_Type_get_attr diff --git a/src/mpi/c/type_set_attr.c b/src/mpi/c/type_set_attr.c index 524218069e..e3c3ce5d51 100644 --- a/src/mpi/c/type_set_attr.c +++ b/src/mpi/c/type_set_attr.c @@ -7,6 +7,8 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" +#include "datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Type_set_attr = PMPI_Type_set_attr diff --git a/src/mpi/c/win_create_keyval.c b/src/mpi/c/win_create_keyval.c index 74db1fcb74..449c48be65 100644 --- a/src/mpi/c/win_create_keyval.c +++ b/src/mpi/c/win_create_keyval.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Win_create_keyval = PMPI_Win_create_keyval diff --git a/src/mpi/c/win_delete_attr.c b/src/mpi/c/win_delete_attr.c index 007cff1a7e..a6543290b9 100644 --- a/src/mpi/c/win_delete_attr.c +++ b/src/mpi/c/win_delete_attr.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Win_delete_attr = PMPI_Win_delete_attr diff --git a/src/mpi/c/win_free_keyval.c b/src/mpi/c/win_free_keyval.c index 82a0041d6b..5f55f05ff4 100644 --- a/src/mpi/c/win_free_keyval.c +++ b/src/mpi/c/win_free_keyval.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Win_free_keyval = PMPI_Win_free_keyval @@ -21,18 +22,18 @@ static const char FUNC_NAME[] = "MPI_Win_free_keyval"; int MPI_Win_free_keyval(int *win_keyval) { - int ret; + int ret; - /* Check for valid key pointer */ + /* Check for valid key pointer */ - if (MPI_PARAM_CHECK) { - OMPI_ERR_INIT_FINALIZE(FUNC_NAME); - if (NULL == win_keyval) { - return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, - FUNC_NAME); - } - } + if (MPI_PARAM_CHECK) { + OMPI_ERR_INIT_FINALIZE(FUNC_NAME); + if (NULL == win_keyval) { + return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, + FUNC_NAME); + } + } - ret = ompi_attr_free_keyval(WIN_ATTR, win_keyval, 0); - OMPI_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME); + ret = ompi_attr_free_keyval(WIN_ATTR, win_keyval, 0); + OMPI_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME); } diff --git a/src/mpi/c/win_get_attr.c b/src/mpi/c/win_get_attr.c index 3ba665861a..b741e2e798 100644 --- a/src/mpi/c/win_get_attr.c +++ b/src/mpi/c/win_get_attr.c @@ -7,6 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" +#include "win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Win_get_attr = PMPI_Win_get_attr diff --git a/src/mpi/c/win_set_attr.c b/src/mpi/c/win_set_attr.c index c432cce294..71c4510691 100644 --- a/src/mpi/c/win_set_attr.c +++ b/src/mpi/c/win_set_attr.c @@ -7,8 +7,7 @@ #include "mpi.h" #include "mpi/c/bindings.h" #include "attribute/attribute.h" -#include "errhandler/errhandler.h" -#include "communicator/communicator.h" +#include "win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Win_set_attr = PMPI_Win_set_attr diff --git a/src/mpi/c/win_wait.c b/src/mpi/c/win_wait.c index 3ba9a770ec..3b2f45ef6f 100644 --- a/src/mpi/c/win_wait.c +++ b/src/mpi/c/win_wait.c @@ -6,7 +6,6 @@ #include "mpi.h" #include "mpi/c/bindings.h" -#include "errhandler/errhandler.h" #include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/src/mpi/f77/abort_f.c b/src/mpi/f77/abort_f.c index 9dcd6cd8ae..ae5a705e8a 100644 --- a/src/mpi/f77/abort_f.c +++ b/src/mpi/f77/abort_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/accumulate_f.c b/src/mpi/f77/accumulate_f.c index 0a04e0c54c..2f0244a9a4 100644 --- a/src/mpi/f77/accumulate_f.c +++ b/src/mpi/f77/accumulate_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/add_error_class_f.c b/src/mpi/f77/add_error_class_f.c index c8b4c1cd2f..900834eb15 100644 --- a/src/mpi/f77/add_error_class_f.c +++ b/src/mpi/f77/add_error_class_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/add_error_code_f.c b/src/mpi/f77/add_error_code_f.c index 9840d5edf2..bc7abf76ae 100644 --- a/src/mpi/f77/add_error_code_f.c +++ b/src/mpi/f77/add_error_code_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/add_error_string_f.c b/src/mpi/f77/add_error_string_f.c index f1b642033c..27d2450f0d 100644 --- a/src/mpi/f77/add_error_string_f.c +++ b/src/mpi/f77/add_error_string_f.c @@ -6,12 +6,10 @@ #include -#include "mpi.h" +#include "mpi/f77/strings.h" #include "mpi/f77/bindings.h" #include "mpi/f77/constants.h" -#include "errhandler/errhandler.h" #include "communicator/communicator.h" -#include "mpi/f77/strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_ADD_ERROR_STRING = mpi_add_error_string_f diff --git a/src/mpi/f77/address_f.c b/src/mpi/f77/address_f.c index f1eb750e28..7c32cb168c 100644 --- a/src/mpi/f77/address_f.c +++ b/src/mpi/f77/address_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/allgather_f.c b/src/mpi/f77/allgather_f.c index 3a433d457a..642e407c84 100644 --- a/src/mpi/f77/allgather_f.c +++ b/src/mpi/f77/allgather_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/allgatherv_f.c b/src/mpi/f77/allgatherv_f.c index eaa1019f3f..25435da0fa 100644 --- a/src/mpi/f77/allgatherv_f.c +++ b/src/mpi/f77/allgatherv_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/alloc_mem_f.c b/src/mpi/f77/alloc_mem_f.c index 9a8be8726f..26237dd09c 100644 --- a/src/mpi/f77/alloc_mem_f.c +++ b/src/mpi/f77/alloc_mem_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/allreduce_f.c b/src/mpi/f77/allreduce_f.c index 090af74ad3..8017998b2f 100644 --- a/src/mpi/f77/allreduce_f.c +++ b/src/mpi/f77/allreduce_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/alltoall_f.c b/src/mpi/f77/alltoall_f.c index eab3bc0068..8746d9205e 100644 --- a/src/mpi/f77/alltoall_f.c +++ b/src/mpi/f77/alltoall_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/alltoallv_f.c b/src/mpi/f77/alltoallv_f.c index 1815a95b4b..04009a81e8 100644 --- a/src/mpi/f77/alltoallv_f.c +++ b/src/mpi/f77/alltoallv_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/alltoallw_f.c b/src/mpi/f77/alltoallw_f.c index 61a866ea84..a6f60d9e19 100644 --- a/src/mpi/f77/alltoallw_f.c +++ b/src/mpi/f77/alltoallw_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/attr_delete_f.c b/src/mpi/f77/attr_delete_f.c index 14e6180062..5907dfb88b 100644 --- a/src/mpi/f77/attr_delete_f.c +++ b/src/mpi/f77/attr_delete_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/attr_get_f.c b/src/mpi/f77/attr_get_f.c index 9cf1e393af..7d7f03b55c 100644 --- a/src/mpi/f77/attr_get_f.c +++ b/src/mpi/f77/attr_get_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/barrier_f.c b/src/mpi/f77/barrier_f.c index faa80f1d0c..fbbc6794f8 100644 --- a/src/mpi/f77/barrier_f.c +++ b/src/mpi/f77/barrier_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/bcast_f.c b/src/mpi/f77/bcast_f.c index a561aca263..21ad6cf61a 100644 --- a/src/mpi/f77/bcast_f.c +++ b/src/mpi/f77/bcast_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/bsend_f.c b/src/mpi/f77/bsend_f.c index 847a87bfba..396d96b512 100644 --- a/src/mpi/f77/bsend_f.c +++ b/src/mpi/f77/bsend_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/bsend_init_f.c b/src/mpi/f77/bsend_init_f.c index b16c4fa7fa..10c9095afc 100644 --- a/src/mpi/f77/bsend_init_f.c +++ b/src/mpi/f77/bsend_init_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/buffer_attach_f.c b/src/mpi/f77/buffer_attach_f.c index 5bed3d4611..603ad19c2d 100644 --- a/src/mpi/f77/buffer_attach_f.c +++ b/src/mpi/f77/buffer_attach_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/buffer_detach_f.c b/src/mpi/f77/buffer_detach_f.c index a7057a049c..b40e02c1ba 100644 --- a/src/mpi/f77/buffer_detach_f.c +++ b/src/mpi/f77/buffer_detach_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/cancel_f.c b/src/mpi/f77/cancel_f.c index 6fb2946f81..70df646232 100644 --- a/src/mpi/f77/cancel_f.c +++ b/src/mpi/f77/cancel_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/cart_coords_f.c b/src/mpi/f77/cart_coords_f.c index 8c2af287ce..a83c383cd3 100644 --- a/src/mpi/f77/cart_coords_f.c +++ b/src/mpi/f77/cart_coords_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/cart_create_f.c b/src/mpi/f77/cart_create_f.c index 52956725f2..e58790224d 100644 --- a/src/mpi/f77/cart_create_f.c +++ b/src/mpi/f77/cart_create_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/cart_get_f.c b/src/mpi/f77/cart_get_f.c index 3a5df15917..9c4c8501c8 100644 --- a/src/mpi/f77/cart_get_f.c +++ b/src/mpi/f77/cart_get_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/cart_map_f.c b/src/mpi/f77/cart_map_f.c index a23b09d73e..8b810f4be8 100644 --- a/src/mpi/f77/cart_map_f.c +++ b/src/mpi/f77/cart_map_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/cart_rank_f.c b/src/mpi/f77/cart_rank_f.c index 4327576c7d..21e279f376 100644 --- a/src/mpi/f77/cart_rank_f.c +++ b/src/mpi/f77/cart_rank_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/cart_shift_f.c b/src/mpi/f77/cart_shift_f.c index 6b160d7506..2f2dcf9f88 100644 --- a/src/mpi/f77/cart_shift_f.c +++ b/src/mpi/f77/cart_shift_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/cart_sub_f.c b/src/mpi/f77/cart_sub_f.c index ef5c88dff8..ab935cf09d 100644 --- a/src/mpi/f77/cart_sub_f.c +++ b/src/mpi/f77/cart_sub_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/cartdim_get_f.c b/src/mpi/f77/cartdim_get_f.c index 6b358dfbe2..512525d155 100644 --- a/src/mpi/f77/cartdim_get_f.c +++ b/src/mpi/f77/cartdim_get_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/close_port_f.c b/src/mpi/f77/close_port_f.c index dbce8e0d00..c6a29851d2 100644 --- a/src/mpi/f77/close_port_f.c +++ b/src/mpi/f77/close_port_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_accept_f.c b/src/mpi/f77/comm_accept_f.c index ecfe83de18..a0a086cf26 100644 --- a/src/mpi/f77/comm_accept_f.c +++ b/src/mpi/f77/comm_accept_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_call_errhandler_f.c b/src/mpi/f77/comm_call_errhandler_f.c index 7c8d77b6da..0a990358ac 100644 --- a/src/mpi/f77/comm_call_errhandler_f.c +++ b/src/mpi/f77/comm_call_errhandler_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER @@ -16,12 +15,12 @@ #pragma weak pmpi_comm_call_errhandler__ = mpi_comm_call_errhandler_f #elif OMPI_PROFILE_LAYER OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_CALL_ERRHANDLER, - pmpi_comm_call_errhandler, - pmpi_comm_call_errhandler_, - pmpi_comm_call_errhandler__, - pmpi_comm_call_errhandler_f, - (MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr), - (comm, errorcode, ierr) ) + pmpi_comm_call_errhandler, + pmpi_comm_call_errhandler_, + pmpi_comm_call_errhandler__, + pmpi_comm_call_errhandler_f, + (MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr), + (comm, errorcode, ierr) ) #endif #if OMPI_HAVE_WEAK_SYMBOLS @@ -32,13 +31,13 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_CALL_ERRHANDLER, #endif #if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER -OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CALL_ERRHANDLER, - mpi_comm_call_errhandler, - mpi_comm_call_errhandler_, - mpi_comm_call_errhandler__, - mpi_comm_call_errhandler_f, - (MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr), - (comm, errorcode, ierr) ) + OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CALL_ERRHANDLER, + mpi_comm_call_errhandler, + mpi_comm_call_errhandler_, + mpi_comm_call_errhandler__, + mpi_comm_call_errhandler_f, + (MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr), + (comm, errorcode, ierr) ) #endif @@ -46,14 +45,14 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CALL_ERRHANDLER, #include "mpi/f77/profile/defines.h" #endif -void mpi_comm_call_errhandler_f(MPI_Fint *comm, MPI_Fint *errorcode, - MPI_Fint *ierr) + void mpi_comm_call_errhandler_f(MPI_Fint *comm, MPI_Fint *errorcode, + MPI_Fint *ierr) { - MPI_Comm c_comm; + MPI_Comm c_comm; - c_comm = MPI_Comm_f2c(*comm); + c_comm = MPI_Comm_f2c(*comm); - *ierr = - OMPI_INT_2_FINT(MPI_Comm_call_errhandler(c_comm, - OMPI_FINT_2_INT(*errorcode))); + *ierr = + OMPI_INT_2_FINT(MPI_Comm_call_errhandler(c_comm, + OMPI_FINT_2_INT(*errorcode))); } diff --git a/src/mpi/f77/comm_compare_f.c b/src/mpi/f77/comm_compare_f.c index ac3a64c5ce..9abffad3e6 100644 --- a/src/mpi/f77/comm_compare_f.c +++ b/src/mpi/f77/comm_compare_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_connect_f.c b/src/mpi/f77/comm_connect_f.c index e5e2751905..b621148b68 100644 --- a/src/mpi/f77/comm_connect_f.c +++ b/src/mpi/f77/comm_connect_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_create_errhandler_f.c b/src/mpi/f77/comm_create_errhandler_f.c index 58145949e9..f6ad8354e9 100644 --- a/src/mpi/f77/comm_create_errhandler_f.c +++ b/src/mpi/f77/comm_create_errhandler_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_create_f.c b/src/mpi/f77/comm_create_f.c index 8b9e806523..edabf93356 100644 --- a/src/mpi/f77/comm_create_f.c +++ b/src/mpi/f77/comm_create_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_create_keyval_f.c b/src/mpi/f77/comm_create_keyval_f.c index 09bb32c18a..a793bbf17b 100644 --- a/src/mpi/f77/comm_create_keyval_f.c +++ b/src/mpi/f77/comm_create_keyval_f.c @@ -6,9 +6,9 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_COMM_CREATE_KEYVAL = mpi_comm_create_keyval_f diff --git a/src/mpi/f77/comm_delete_attr_f.c b/src/mpi/f77/comm_delete_attr_f.c index 46a0a0f1c6..bee3e48d05 100644 --- a/src/mpi/f77/comm_delete_attr_f.c +++ b/src/mpi/f77/comm_delete_attr_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_disconnect_f.c b/src/mpi/f77/comm_disconnect_f.c index 79caf6f20a..31603ac8f1 100644 --- a/src/mpi/f77/comm_disconnect_f.c +++ b/src/mpi/f77/comm_disconnect_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_dup_f.c b/src/mpi/f77/comm_dup_f.c index b17fcac1bd..1aea80feba 100644 --- a/src/mpi/f77/comm_dup_f.c +++ b/src/mpi/f77/comm_dup_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_free_f.c b/src/mpi/f77/comm_free_f.c index e878436c3d..6c37838e43 100644 --- a/src/mpi/f77/comm_free_f.c +++ b/src/mpi/f77/comm_free_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_free_keyval_f.c b/src/mpi/f77/comm_free_keyval_f.c index a2a9dd6e53..1f0a08aaf2 100644 --- a/src/mpi/f77/comm_free_keyval_f.c +++ b/src/mpi/f77/comm_free_keyval_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_get_attr_f.c b/src/mpi/f77/comm_get_attr_f.c index 91c154d044..ae40062fa7 100644 --- a/src/mpi/f77/comm_get_attr_f.c +++ b/src/mpi/f77/comm_get_attr_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_get_errhandler_f.c b/src/mpi/f77/comm_get_errhandler_f.c index 9211a45a18..cfab766643 100644 --- a/src/mpi/f77/comm_get_errhandler_f.c +++ b/src/mpi/f77/comm_get_errhandler_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_get_name_f.c b/src/mpi/f77/comm_get_name_f.c index 8402203828..a355a7c33e 100644 --- a/src/mpi/f77/comm_get_name_f.c +++ b/src/mpi/f77/comm_get_name_f.c @@ -6,9 +6,7 @@ #include -#include "mpi.h" #include "include/constants.h" -#include "errhandler/errhandler.h" #include "communicator/communicator.h" #include "mpi/f77/bindings.h" #include "mpi/f77/strings.h" diff --git a/src/mpi/f77/comm_get_parent_f.c b/src/mpi/f77/comm_get_parent_f.c index 0a34aa5cb0..4a4eea7bac 100644 --- a/src/mpi/f77/comm_get_parent_f.c +++ b/src/mpi/f77/comm_get_parent_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_group_f.c b/src/mpi/f77/comm_group_f.c index 3e8d63f7bb..8997f66fb3 100644 --- a/src/mpi/f77/comm_group_f.c +++ b/src/mpi/f77/comm_group_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_join_f.c b/src/mpi/f77/comm_join_f.c index d9d0db43b9..f76371831a 100644 --- a/src/mpi/f77/comm_join_f.c +++ b/src/mpi/f77/comm_join_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_rank_f.c b/src/mpi/f77/comm_rank_f.c index 13af6d4fed..80243da984 100644 --- a/src/mpi/f77/comm_rank_f.c +++ b/src/mpi/f77/comm_rank_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_remote_group_f.c b/src/mpi/f77/comm_remote_group_f.c index 4514405a00..740a969ff1 100644 --- a/src/mpi/f77/comm_remote_group_f.c +++ b/src/mpi/f77/comm_remote_group_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_remote_size_f.c b/src/mpi/f77/comm_remote_size_f.c index 20a12b2cc6..4a107dd0f2 100644 --- a/src/mpi/f77/comm_remote_size_f.c +++ b/src/mpi/f77/comm_remote_size_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/comm_set_errhandler_f.c b/src/mpi/f77/comm_set_errhandler_f.c index a1cf606b40..bc56d5c4c6 100644 --- a/src/mpi/f77/comm_set_errhandler_f.c +++ b/src/mpi/f77/comm_set_errhandler_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "errhandler/errhandler.h" #include "mpi/f77/bindings.h" diff --git a/src/mpi/f77/comm_set_name_f.c b/src/mpi/f77/comm_set_name_f.c index fa70a04e89..168bf5477c 100644 --- a/src/mpi/f77/comm_set_name_f.c +++ b/src/mpi/f77/comm_set_name_f.c @@ -6,9 +6,7 @@ #include -#include "mpi.h" #include "include/constants.h" -#include "errhandler/errhandler.h" #include "communicator/communicator.h" #include "mpi/f77/bindings.h" #include "mpi/f77/strings.h" diff --git a/src/mpi/f77/errhandler_create_f.c b/src/mpi/f77/errhandler_create_f.c index bed048e14b..b45d982939 100644 --- a/src/mpi/f77/errhandler_create_f.c +++ b/src/mpi/f77/errhandler_create_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/file_call_errhandler_f.c b/src/mpi/f77/file_call_errhandler_f.c index f94f490b18..c70a306c45 100644 --- a/src/mpi/f77/file_call_errhandler_f.c +++ b/src/mpi/f77/file_call_errhandler_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/file_close_f.c b/src/mpi/f77/file_close_f.c index 3ab28671c9..28ff209c9a 100644 --- a/src/mpi/f77/file_close_f.c +++ b/src/mpi/f77/file_close_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/file_get_amode_f.c b/src/mpi/f77/file_get_amode_f.c index 55b811226d..48ea5fe577 100644 --- a/src/mpi/f77/file_get_amode_f.c +++ b/src/mpi/f77/file_get_amode_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/file_get_atomicity_f.c b/src/mpi/f77/file_get_atomicity_f.c index 3740e3431a..9064b0bee8 100644 --- a/src/mpi/f77/file_get_atomicity_f.c +++ b/src/mpi/f77/file_get_atomicity_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/keyval_create_f.c b/src/mpi/f77/keyval_create_f.c index 20570f4e86..9076c1b8bc 100644 --- a/src/mpi/f77/keyval_create_f.c +++ b/src/mpi/f77/keyval_create_f.c @@ -9,6 +9,7 @@ #include "mpi.h" #include "mpi/f77/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_KEYVAL_CREATE = mpi_keyval_create_f diff --git a/src/mpi/f77/type_create_keyval_f.c b/src/mpi/f77/type_create_keyval_f.c index a3424f43f3..0de7bbc40b 100644 --- a/src/mpi/f77/type_create_keyval_f.c +++ b/src/mpi/f77/type_create_keyval_f.c @@ -9,6 +9,7 @@ #include "mpi.h" #include "mpi/f77/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_TYPE_CREATE_KEYVAL = mpi_type_create_keyval_f diff --git a/src/mpi/f77/win_create_keyval_f.c b/src/mpi/f77/win_create_keyval_f.c index c50eb270c1..d1adb2e997 100644 --- a/src/mpi/f77/win_create_keyval_f.c +++ b/src/mpi/f77/win_create_keyval_f.c @@ -9,6 +9,7 @@ #include "mpi.h" #include "mpi/f77/bindings.h" #include "attribute/attribute.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_WIN_CREATE_KEYVAL = mpi_win_create_keyval_f diff --git a/src/mpi/f77/win_set_name_f.c b/src/mpi/f77/win_set_name_f.c index f77e63e0f6..a249120b8a 100644 --- a/src/mpi/f77/win_set_name_f.c +++ b/src/mpi/f77/win_set_name_f.c @@ -6,13 +6,10 @@ #include -#include "mpi.h" -#include "mpi/f77/bindings.h" #include "include/constants.h" -#include "errhandler/errhandler.h" -#include "communicator/communicator.h" #include "mpi/f77/bindings.h" #include "mpi/f77/strings.h" +#include "communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_WIN_SET_NAME = mpi_win_set_name_f diff --git a/src/mpi/f77/win_start_f.c b/src/mpi/f77/win_start_f.c index eab336ae46..e48063a240 100644 --- a/src/mpi/f77/win_start_f.c +++ b/src/mpi/f77/win_start_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/win_test_f.c b/src/mpi/f77/win_test_f.c index a8f821bf22..43e76ef71b 100644 --- a/src/mpi/f77/win_test_f.c +++ b/src/mpi/f77/win_test_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/win_unlock_f.c b/src/mpi/f77/win_unlock_f.c index 251e6467e7..b51aa81d47 100644 --- a/src/mpi/f77/win_unlock_f.c +++ b/src/mpi/f77/win_unlock_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/win_wait_f.c b/src/mpi/f77/win_wait_f.c index a8edad904d..242ce26392 100644 --- a/src/mpi/f77/win_wait_f.c +++ b/src/mpi/f77/win_wait_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/src/mpi/f77/wtick_f.c b/src/mpi/f77/wtick_f.c index 435ddbb334..3ba73a946e 100644 --- a/src/mpi/f77/wtick_f.c +++ b/src/mpi/f77/wtick_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" /* As the standard allow us to define this function as a macro, it cannot diff --git a/src/mpi/f77/wtime_f.c b/src/mpi/f77/wtime_f.c index 6f453599b9..aae56a78b5 100644 --- a/src/mpi/f77/wtime_f.c +++ b/src/mpi/f77/wtime_f.c @@ -6,7 +6,6 @@ #include -#include "mpi.h" #include "mpi/f77/bindings.h" /* As the standard allow us to implement this function as a macro diff --git a/src/mpi/runtime/ompi_mpi_abort.c b/src/mpi/runtime/ompi_mpi_abort.c index 626a7de0fd..d2ef85882a 100644 --- a/src/mpi/runtime/ompi_mpi_abort.c +++ b/src/mpi/runtime/ompi_mpi_abort.c @@ -4,11 +4,12 @@ #include "ompi_config.h" +#include + #include "communicator/communicator.h" #include "util/show_help.h" #include "util/proc_info.h" #include "runtime/runtime.h" -#include "communicator/communicator.h" #include "mca/ns/ns.h" #include "mca/ns/base/base.h" #include "event/event.h" diff --git a/src/mpi/runtime/ompi_mpi_finalize.c b/src/mpi/runtime/ompi_mpi_finalize.c index 8d242ffc92..00040376d9 100644 --- a/src/mpi/runtime/ompi_mpi_finalize.c +++ b/src/mpi/runtime/ompi_mpi_finalize.c @@ -9,10 +9,8 @@ #include "mpi.h" #include "event/event.h" #include "group/group.h" -#include "errhandler/errhandler.h" #include "errhandler/errcode.h" #include "errhandler/errclass.h" -#include "errhandler/errcode-internal.h" #include "communicator/communicator.h" #include "datatype/datatype.h" #include "op/op.h" @@ -22,6 +20,7 @@ #include "runtime/runtime.h" #include "runtime/ompi_progress.h" #include "runtime/ompi_rte_wait.h" +#include "attribute/attribute.h" #include "mca/base/base.h" #include "mca/base/mca_base_module_exchange.h" diff --git a/src/mpi/runtime/ompi_mpi_init.c b/src/mpi/runtime/ompi_mpi_init.c index 500cdd7e40..dbd2c3a105 100644 --- a/src/mpi/runtime/ompi_mpi_init.c +++ b/src/mpi/runtime/ompi_mpi_init.c @@ -16,13 +16,12 @@ #include "group/group.h" #include "info/info.h" #include "util/show_help.h" -#include "errhandler/errhandler.h" #include "errhandler/errcode.h" #include "errhandler/errclass.h" -#include "errhandler/errcode-internal.h" #include "request/request.h" #include "op/op.h" #include "file/file.h" +#include "attribute/attribute.h" #include "mca/base/base.h" #include "mca/base/base.h" diff --git a/src/proc/proc.h b/src/proc/proc.h index 58c05ca0d6..e81ad64e7d 100644 --- a/src/proc/proc.h +++ b/src/proc/proc.h @@ -7,7 +7,6 @@ #include "include/types.h" #include "class/ompi_list.h" -#include "datatype/datatype.h" #include "threads/mutex.h" #include "mca/ns/ns.h" #include "util/bufpack.h" @@ -22,7 +21,7 @@ struct ompi_proc_t { struct mca_pml_proc_t* proc_pml; /* PML specific proc data */ ompi_object_t* proc_modex; /* MCA module exchange data */ uint32_t proc_arch; - ompi_convertor_t* proc_convertor; + struct ompi_convertor_t* proc_convertor; ompi_mutex_t proc_lock; /* JMS: need to have the following information: diff --git a/src/runtime/ompi_rte_init.c b/src/runtime/ompi_rte_init.c index 47695dd9f7..37aca7d9b1 100644 --- a/src/runtime/ompi_rte_init.c +++ b/src/runtime/ompi_rte_init.c @@ -8,6 +8,9 @@ #include "ompi_config.h" +#include +#include + #include "include/constants.h" #include "event/event.h" #include "util/output.h"