From 794555c12839e503e3fd6e101e3e82336036939e Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 9 Oct 2017 23:17:45 +0200 Subject: [PATCH] File smpi/include/private.h cannot be compiled in C mode either. Merge with private.hpp. --- src/mc/ObjectInformation.hpp | 4 +- src/mc/compare.cpp | 1 - src/mc/mc_checkpoint.cpp | 2 +- src/mc/mc_snapshot.cpp | 2 +- src/simix/smx_global.cpp | 1 - src/smpi/bindings/smpi_f77.cpp | 2 +- src/smpi/bindings/smpi_f77_coll.cpp | 2 +- src/smpi/bindings/smpi_f77_comm.cpp | 2 +- src/smpi/bindings/smpi_f77_request.cpp | 2 +- src/smpi/bindings/smpi_f77_type.cpp | 2 +- src/smpi/bindings/smpi_mpi.cpp | 2 +- src/smpi/bindings/smpi_pmpi.cpp | 2 +- src/smpi/bindings/smpi_pmpi_coll.cpp | 2 +- src/smpi/bindings/smpi_pmpi_comm.cpp | 2 +- src/smpi/bindings/smpi_pmpi_group.cpp | 2 +- src/smpi/bindings/smpi_pmpi_info.cpp | 2 +- src/smpi/bindings/smpi_pmpi_op.cpp | 2 +- src/smpi/bindings/smpi_pmpi_request.cpp | 2 +- src/smpi/bindings/smpi_pmpi_topo.cpp | 2 +- src/smpi/bindings/smpi_pmpi_type.cpp | 2 +- src/smpi/bindings/smpi_pmpi_win.cpp | 2 +- src/smpi/colls/colls_private.hpp | 2 +- src/smpi/colls/smpi_coll.cpp | 2 +- src/smpi/include/private.h | 419 ------------------- src/smpi/include/private.hpp | 415 +++++++++++++++++- src/smpi/internals/instr_smpi.cpp | 1 - src/smpi/internals/smpi_bench.cpp | 1 - src/smpi/internals/smpi_deployment.cpp | 2 +- src/smpi/internals/smpi_global.cpp | 1 - src/smpi/internals/smpi_memory.cpp | 1 - src/smpi/internals/smpi_process.cpp | 1 - src/smpi/internals/smpi_replay.cpp | 2 +- src/smpi/internals/smpi_shared.cpp | 1 - src/smpi/internals/smpi_static_variables.cpp | 2 +- src/smpi/mpi/smpi_comm.cpp | 1 - src/smpi/mpi/smpi_datatype.cpp | 1 - src/smpi/mpi/smpi_f2c.cpp | 2 +- src/smpi/mpi/smpi_keyvals.cpp | 2 +- src/smpi/mpi/smpi_op.cpp | 1 - src/smpi/mpi/smpi_request.cpp | 1 - src/smpi/mpi/smpi_status.cpp | 2 +- src/smpi/mpi/smpi_topo.cpp | 2 +- src/smpi/mpi/smpi_win.cpp | 2 +- tools/cmake/DefinePackages.cmake | 1 - 44 files changed, 439 insertions(+), 468 deletions(-) delete mode 100644 src/smpi/include/private.h diff --git a/src/mc/ObjectInformation.hpp b/src/mc/ObjectInformation.hpp index 019e75baf5..a7e9bf588e 100644 --- a/src/mc/ObjectInformation.hpp +++ b/src/mc/ObjectInformation.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. +/* Copyright (c) 2007-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -19,7 +19,7 @@ #include "src/mc/Type.hpp" #include "src/mc/Frame.hpp" -#include "src/smpi/include/private.h" +#include "src/smpi/include/private.hpp" namespace simgrid { namespace mc { diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index ce28dc7de2..15d99f3409 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -25,7 +25,6 @@ #include "src/xbt/mmalloc/mmprivate.h" #if HAVE_SMPI -#include "src/smpi/include/private.h" #include "src/smpi/include/private.hpp" #endif diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 055a4ee4c1..d5a334f480 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -17,7 +17,7 @@ #include "src/internal_config.h" #include "src/mc/mc_private.hpp" -#include "src/smpi/include/private.h" +#include "src/smpi/include/private.hpp" #include "xbt/mmalloc.h" #include "xbt/module.h" diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp index c3a1cb8a9b..1b3504ef67 100644 --- a/src/mc/mc_snapshot.cpp +++ b/src/mc/mc_snapshot.cpp @@ -13,7 +13,7 @@ #include "xbt/sysdep.h" #include "src/internal_config.h" -#include "src/smpi/include/private.h" +#include "src/smpi/include/private.hpp" #include "src/mc/mc_snapshot.hpp" #include "src/mc/mc_private.hpp" diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index c1ffa87e93..b2e7d3123a 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -43,7 +43,6 @@ #include "src/mc/mc_record.hpp" #if HAVE_SMPI -#include "src/smpi/include/private.h" #include "src/smpi/include/private.hpp" #endif diff --git a/src/smpi/bindings/smpi_f77.cpp b/src/smpi/bindings/smpi_f77.cpp index ac716095c0..a482ce2cc9 100644 --- a/src/smpi/bindings/smpi_f77.cpp +++ b/src/smpi/bindings/smpi_f77.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_op.hpp" diff --git a/src/smpi/bindings/smpi_f77_coll.cpp b/src/smpi/bindings/smpi_f77_coll.cpp index 1d642da9ad..1ca65b3382 100644 --- a/src/smpi/bindings/smpi_f77_coll.cpp +++ b/src/smpi/bindings/smpi_f77_coll.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_op.hpp" diff --git a/src/smpi/bindings/smpi_f77_comm.cpp b/src/smpi/bindings/smpi_f77_comm.cpp index f0f56d0d2a..ef0e4f651d 100644 --- a/src/smpi/bindings/smpi_f77_comm.cpp +++ b/src/smpi/bindings/smpi_f77_comm.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_info.hpp" diff --git a/src/smpi/bindings/smpi_f77_request.cpp b/src/smpi/bindings/smpi_f77_request.cpp index f2e77aed6f..3fb234305f 100644 --- a/src/smpi/bindings/smpi_f77_request.cpp +++ b/src/smpi/bindings/smpi_f77_request.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_request.hpp" diff --git a/src/smpi/bindings/smpi_f77_type.cpp b/src/smpi/bindings/smpi_f77_type.cpp index 1da72486c8..b40ab8060d 100644 --- a/src/smpi/bindings/smpi_f77_type.cpp +++ b/src/smpi/bindings/smpi_f77_type.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" diff --git a/src/smpi/bindings/smpi_mpi.cpp b/src/smpi/bindings/smpi_mpi.cpp index 9c9bdb6796..7d519b1377 100644 --- a/src/smpi/bindings/smpi_mpi.cpp +++ b/src/smpi/bindings/smpi_mpi.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license ,(GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "simgrid/sg_config.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi, smpi, "Logging specific to SMPI ,(mpi)"); diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 59561a4699..da15d37a16 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "smpi_comm.hpp" diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp index 29c9db411b..f58808cd63 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_coll.hpp" #include "smpi_datatype_derived.hpp" diff --git a/src/smpi/bindings/smpi_pmpi_comm.cpp b/src/smpi/bindings/smpi_pmpi_comm.cpp index f658bfe078..faa15ab219 100644 --- a/src/smpi/bindings/smpi_pmpi_comm.cpp +++ b/src/smpi/bindings/smpi_pmpi_comm.cpp @@ -5,7 +5,7 @@ #include -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_process.hpp" diff --git a/src/smpi/bindings/smpi_pmpi_group.cpp b/src/smpi/bindings/smpi_pmpi_group.cpp index 587c11bfd0..d757f7192f 100644 --- a/src/smpi/bindings/smpi_pmpi_group.cpp +++ b/src/smpi/bindings/smpi_pmpi_group.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_coll.hpp" #include "smpi_datatype_derived.hpp" diff --git a/src/smpi/bindings/smpi_pmpi_info.cpp b/src/smpi/bindings/smpi_pmpi_info.cpp index 4cbd21c8f1..ed0c2b3c56 100644 --- a/src/smpi/bindings/smpi_pmpi_info.cpp +++ b/src/smpi/bindings/smpi_pmpi_info.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_info.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); diff --git a/src/smpi/bindings/smpi_pmpi_op.cpp b/src/smpi/bindings/smpi_pmpi_op.cpp index 013b78007e..4ca50ded06 100644 --- a/src/smpi/bindings/smpi_pmpi_op.cpp +++ b/src/smpi/bindings/smpi_pmpi_op.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_op.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index a8969916e8..c1c98969fb 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_request.hpp" diff --git a/src/smpi/bindings/smpi_pmpi_topo.cpp b/src/smpi/bindings/smpi_pmpi_topo.cpp index 6864b0f82e..0be7e5fe34 100644 --- a/src/smpi/bindings/smpi_pmpi_topo.cpp +++ b/src/smpi/bindings/smpi_pmpi_topo.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); diff --git a/src/smpi/bindings/smpi_pmpi_type.cpp b/src/smpi/bindings/smpi_pmpi_type.cpp index e150b2b418..ec5cc1baa7 100644 --- a/src/smpi/bindings/smpi_pmpi_type.cpp +++ b/src/smpi/bindings/smpi_pmpi_type.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_datatype_derived.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp index 03b8438e66..806717fe4a 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_coll.hpp" #include "smpi_datatype_derived.hpp" diff --git a/src/smpi/colls/colls_private.hpp b/src/smpi/colls/colls_private.hpp index e27ec91fdc..dc897fe16a 100644 --- a/src/smpi/colls/colls_private.hpp +++ b/src/smpi/colls/colls_private.hpp @@ -8,7 +8,7 @@ #include #include "smpi/mpi.h" -#include "private.h" +#include "private.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" diff --git a/src/smpi/colls/smpi_coll.cpp b/src/smpi/colls/smpi_coll.cpp index a0760feabf..1e89798c6e 100644 --- a/src/smpi/colls/smpi_coll.cpp +++ b/src/smpi/colls/smpi_coll.cpp @@ -5,7 +5,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" diff --git a/src/smpi/include/private.h b/src/smpi/include/private.h deleted file mode 100644 index f17eccb30d..0000000000 --- a/src/smpi/include/private.h +++ /dev/null @@ -1,419 +0,0 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#ifndef SMPI_PRIVATE_H -#define SMPI_PRIVATE_H - -#include "smpi/smpi.h" -#include "simgrid/msg.h" // msg_bar_t - -SG_BEGIN_DECL() - -#define PERSISTENT 0x1 -#define NON_PERSISTENT 0x2 -#define SEND 0x4 -#define RECV 0x8 -#define RECV_DELETE 0x10 -#define ISEND 0x20 -#define SSEND 0x40 -#define PREPARED 0x80 -#define FINISHED 0x100 -#define RMA 0x200 -#define ACCUMULATE 0x400 - -enum smpi_process_state{ - SMPI_UNINITIALIZED, - SMPI_INITIALIZED, - SMPI_FINALIZED -}; - -#define COLL_TAG_REDUCE -112 -#define COLL_TAG_SCATTER -223 -#define COLL_TAG_SCATTERV -334 -#define COLL_TAG_GATHER -445 -#define COLL_TAG_ALLGATHER -556 -#define COLL_TAG_ALLGATHERV -667 -#define COLL_TAG_BARRIER -778 -#define COLL_TAG_REDUCE_SCATTER -889 -#define COLL_TAG_ALLTOALLV -1000 -#define COLL_TAG_ALLTOALL -1112 -#define COLL_TAG_GATHERV -2223 -#define COLL_TAG_BCAST -3334 -#define COLL_TAG_ALLREDUCE -4445 -//SMPI_RMA_TAG has to be the smallest one, as it will be decremented for accumulate ordering. -#define SMPI_RMA_TAG -6666 - -/* Convert between Fortran and C */ - -#define FORT_BOTTOM(addr) ((*(int*)addr) == -200 ? MPI_BOTTOM : (void*)addr) -#define FORT_IN_PLACE(addr) ((*(int*)addr) == -100 ? MPI_IN_PLACE : (void*)addr) -#define FORT_STATUS_IGNORE(addr) (static_cast((*(int*)addr) == -300 ? MPI_STATUS_IGNORE : (void*)addr)) -#define FORT_STATUSES_IGNORE(addr) (static_cast((*(int*)addr) == -400 ? MPI_STATUSES_IGNORE : (void*)addr)) - -extern XBT_PRIVATE MPI_Comm MPI_COMM_UNINITIALIZED; - -typedef SMPI_Cart_topology *MPIR_Cart_Topology; - -typedef SMPI_Graph_topology *MPIR_Graph_Topology; - -typedef SMPI_Dist_Graph_topology *MPIR_Dist_Graph_Topology; - -XBT_PRIVATE SMPI_Process* smpi_process(); -XBT_PRIVATE SMPI_Process* smpi_process_remote(int index); -XBT_PRIVATE int smpi_process_count(); - -XBT_PRIVATE void smpi_deployment_register_process(const char* instance_id, int rank, int index); -XBT_PRIVATE MPI_Comm* smpi_deployment_comm_world(const char* instance_id); -XBT_PRIVATE msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id); -XBT_PRIVATE void smpi_deployment_cleanup_instances(); - -XBT_PRIVATE void smpi_comm_copy_buffer_callback(smx_activity_t comm, void *buff, size_t buff_size); - -XBT_PRIVATE void smpi_comm_null_copy_buffer_callback(smx_activity_t comm, void *buff, size_t buff_size); - -XBT_PRIVATE int smpi_enabled(); -XBT_PRIVATE void smpi_global_init(); -XBT_PRIVATE void smpi_global_destroy(); -XBT_PRIVATE double smpi_mpi_wtime(); -XBT_PRIVATE void smpi_mpi_init(); - -// utilities -extern XBT_PRIVATE double smpi_cpu_threshold; -extern XBT_PRIVATE double smpi_host_speed; -extern XBT_PRIVATE char* smpi_data_exe_start; // start of the data+bss segment of the executable -extern XBT_PRIVATE int smpi_data_exe_size; // size of the data+bss segment of the executable - -typedef enum { shmalloc_none, shmalloc_local, shmalloc_global } shared_malloc_type; -extern XBT_PRIVATE shared_malloc_type smpi_cfg_shared_malloc; // Whether to activate shared malloc - -XBT_PRIVATE void smpi_switch_data_segment(int dest); -XBT_PRIVATE void smpi_really_switch_data_segment(int dest); -XBT_PRIVATE int smpi_is_privatization_file(char* file); - -XBT_PRIVATE void smpi_get_executable_global_size(); -XBT_PRIVATE void smpi_initialize_global_memory_segments(); -XBT_PRIVATE void smpi_destroy_global_memory_segments(); -XBT_PRIVATE void smpi_bench_destroy(); -XBT_PRIVATE void smpi_bench_begin(); -XBT_PRIVATE void smpi_bench_end(); -XBT_PRIVATE void smpi_shared_destroy(); - -XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size); -XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size); -XBT_PRIVATE void smpi_free_tmp_buffer(void* buf); - - -// f77 wrappers -void mpi_init_(int* ierr); -void mpi_finalize_(int* ierr); -void mpi_abort_(int* comm, int* errorcode, int* ierr); -void mpi_comm_rank_(int* comm, int* rank, int* ierr); -void mpi_comm_size_(int* comm, int* size, int* ierr); -double mpi_wtime_(); -double mpi_wtick_(); -void mpi_initialized_(int* flag, int* ierr); - -void mpi_comm_dup_(int* comm, int* newcomm, int* ierr); -void mpi_comm_create_(int* comm, int* group, int* newcomm, int* ierr); -void mpi_comm_free_(int* comm, int* ierr); -void mpi_comm_split_(int* comm, int* color, int* key, int* comm_out, int* ierr); -void mpi_group_incl_(int* group, int* n, int* key, int* group_out, int* ierr) ; -void mpi_comm_group_(int* comm, int* group_out, int* ierr); -void mpi_comm_create_group_ (int* comm, int* group, int, int* comm_out, int* ierr); -void mpi_send_init_(void *buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* request, int* ierr); -void mpi_isend_(void *buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* request, int* ierr); -void mpi_irsend_(void *buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* request, int* ierr); -void mpi_send_(void* buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* ierr); -void mpi_rsend_(void* buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* ierr); -void mpi_recv_init_(void *buf, int* count, int* datatype, int* src, int* tag, int* comm, int* request, int* ierr); -void mpi_irecv_(void *buf, int* count, int* datatype, int* src, int* tag, int* comm, int* request, int* ierr); -void mpi_recv_(void* buf, int* count, int* datatype, int* src, int* tag, int* comm, MPI_Status* status, int* ierr); -void mpi_start_(int* request, int* ierr); -void mpi_startall_(int* count, int* requests, int* ierr); -void mpi_wait_(int* request, MPI_Status* status, int* ierr); -void mpi_waitany_(int* count, int* requests, int* index, MPI_Status* status, int* ierr); -void mpi_waitall_(int* count, int* requests, MPI_Status* status, int* ierr); - -void mpi_barrier_(int* comm, int* ierr); -void mpi_bcast_(void* buf, int* count, int* datatype, int* root, int* comm, int* ierr); -void mpi_reduce_(void* sendbuf, void* recvbuf, int* count, int* datatype, int* op, int* root, int* comm, int* ierr); -void mpi_allreduce_(void* sendbuf, void* recvbuf, int* count, int* datatype, int* op, int* comm, int* ierr); -void mpi_reduce_scatter_(void* sendbuf, void* recvbuf, int* recvcounts, int* datatype, int* op, int* comm, int* ierr) ; -void mpi_scatter_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* recvtype, - int* root, int* comm, int* ierr); -void mpi_scatterv_(void* sendbuf, int* sendcounts, int* displs, int* sendtype, - void* recvbuf, int* recvcount, int* recvtype, int* root, int* comm, int* ierr); -void mpi_gather_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* recvtype, - int* root, int* comm, int* ierr); -void mpi_gatherv_(void* sendbuf, int* sendcount, int* sendtype, - void* recvbuf, int* recvcounts, int* displs, int* recvtype, int* root, int* comm, int* ierr); -void mpi_allgather_(void* sendbuf, int* sendcount, int* sendtype, - void* recvbuf, int* recvcount, int* recvtype, int* comm, int* ierr); -void mpi_allgatherv_(void* sendbuf, int* sendcount, int* sendtype, - void* recvbuf, int* recvcount,int* displs, int* recvtype, int* comm, int* ierr) ; -void mpi_type_size_(int* datatype, int *size, int* ierr); - -void mpi_scan_(void* sendbuf, void* recvbuf, int* count, int* datatype, int* op, int* comm, int* ierr); -void mpi_alltoall_(void* sendbuf, int* sendcount, int* sendtype, - void* recvbuf, int* recvcount, int* recvtype, int* comm, int* ierr); -void mpi_alltoallv_(void* sendbuf, int* sendcounts, int* senddisps, int* sendtype, - void* recvbuf, int* recvcounts, int* recvdisps, int* recvtype, int* comm, int* ierr); -void mpi_get_processor_name_(char *name, int *resultlen, int* ierr); -void mpi_test_ (int * request, int *flag, MPI_Status * status, int* ierr); -void mpi_testall_ (int* count, int * requests, int *flag, MPI_Status * statuses, int* ierr); -void mpi_get_count_(MPI_Status * status, int* datatype, int *count, int* ierr); -void mpi_type_extent_(int* datatype, MPI_Aint * extent, int* ierr); -void mpi_attr_get_(int* comm, int* keyval, void* attr_value, int* flag, int* ierr ); -void mpi_type_commit_(int* datatype, int* ierr); -void mpi_type_vector_(int* count, int* blocklen, int* stride, int* old_type, int* newtype, int* ierr); -void mpi_type_hvector_(int* count, int* blocklen, MPI_Aint* stride, int* old_type, int* newtype, int* ierr); -void mpi_type_create_hvector_(int* count, int* blocklen, MPI_Aint* stride, int* old_type, int* newtype, int* ierr); -void mpi_type_free_(int* datatype, int* ierr); -void mpi_type_lb_(int* datatype, MPI_Aint * extent, int* ierr); -void mpi_type_ub_(int* datatype, MPI_Aint * extent, int* ierr); -void mpi_win_fence_( int* assert, int* win, int* ierr); -void mpi_win_free_( int* win, int* ierr); -void mpi_win_create_( int *base, MPI_Aint* size, int* disp_unit, int* info, int* comm, int *win, int* ierr); -void mpi_win_set_name_ (int* win, char * name, int* ierr, int size); -void mpi_win_get_name_ (int* win, char * name, int* len, int* ierr); -void mpi_win_post_(int* group, int assert, int* win, int* ierr); -void mpi_win_start_(int* group, int assert, int* win, int* ierr); -void mpi_win_complete_(int* win, int* ierr); -void mpi_win_wait_(int* win, int* ierr); -void mpi_win_allocate_( MPI_Aint* size, int* disp_unit, int* info, int* comm, void* base, int* win, int* ierr); -void mpi_win_attach_(int* win, int* base, MPI_Aint* size, int* ierr); -void mpi_win_create_dynamic_( int* info, int* comm, int *win, int* ierr); -void mpi_win_detach_(int* win, int* base, int* ierr); -void mpi_win_set_info_(int* win, int* info, int* ierr); -void mpi_win_get_info_(int* win, int* info, int* ierr); -void mpi_win_get_group_(int* win, int* group, int* ierr); -void mpi_win_get_attr_(int* win, int* type_keyval, void* attribute_val, int* flag, int* ierr); -void mpi_win_set_attr_(int* win, int* type_keyval, void* att, int* ierr); -void mpi_win_delete_attr_(int* win, int* comm_keyval, int* ierr); -void mpi_win_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); -void mpi_win_free_keyval_(int* keyval, int* ierr); -void mpi_win_lock_(int* lock_type, int* rank, int* assert, int* win, int* ierr); -void mpi_win_lock_all_(int* assert, int* win, int* ierr); -void mpi_win_unlock_(int* rank, int* win, int* ierr); -void mpi_win_unlock_all_(int* win, int* ierr); -void mpi_win_flush_(int* rank, int* win, int* ierr); -void mpi_win_flush_local_(int* rank, int* win, int* ierr); -void mpi_win_flush_all_(int* win, int* ierr); -void mpi_win_flush_local_all_(int* win, int* ierr); -void mpi_info_create_( int *info, int* ierr); -void mpi_info_set_( int *info, char *key, char *value, int* ierr, unsigned int keylen, unsigned int valuelen); -void mpi_info_free_(int* info, int* ierr); -void mpi_get_( int *origin_addr, int* origin_count, int* origin_datatype, int* target_rank, - MPI_Aint* target_disp, int* target_count, int* target_datatype, int* win, int* ierr); -void mpi_put_( int *origin_addr, int* origin_count, int* origin_datatype, int* target_rank, - MPI_Aint* target_disp, int* target_count, int* target_datatype, int* win, int* ierr); -void mpi_rget_( int *origin_addr, int* origin_count, int* origin_datatype, int* target_rank, - MPI_Aint* target_disp, int* target_count, int* target_datatype, int* win, int* request, int* ierr); -void mpi_rput_( int *origin_addr, int* origin_count, int* origin_datatype, int* target_rank, - MPI_Aint* target_disp, int* target_count, int* target_datatype, int* win, int* request, int* ierr); -void mpi_fetch_and_op_( int *origin_addr, int* result_addr, int* datatype, int* target_rank, MPI_Aint* target_disp, int* op, int* win, int* ierr); -void mpi_compare_and_swap_( int *origin_addr, int* compare_addr, int* result_addr, - int* datatype, int* target_rank, MPI_Aint* target_disp, int* win, int* ierr); -void mpi_get_accumulate_(int *origin_addr, int* origin_count, int* origin_datatype, int* result_addr, - int* result_count, int* result_datatype, int* target_rank, MPI_Aint* target_disp, int* target_count, - int* target_datatype, int* op, int* win, int* ierr); -void mpi_rget_accumulate_(int *origin_addr, int* origin_count, int* origin_datatype, int* result_addr, - int* result_count, int* result_datatype, int* target_rank, MPI_Aint* target_disp, int* target_count, - int* target_datatype, int* op, int* win, int* request, int* ierr); -void mpi_accumulate_( int *origin_addr, int* origin_count, int* origin_datatype, int* target_rank, - MPI_Aint* target_disp, int* target_count, int* target_datatype, int* op, int* win, int* ierr); -void mpi_raccumulate_( int *origin_addr, int* origin_count, int* origin_datatype, int* target_rank, - MPI_Aint* target_disp, int* target_count, int* target_datatype, int* op, int* win, int* request, int* ierr); -void mpi_error_string_(int* errorcode, char* string, int* resultlen, int* ierr); -void mpi_sendrecv_(void* sendbuf, int* sendcount, int* sendtype, int* dst, int* sendtag, void *recvbuf, int* recvcount, - int* recvtype, int* src, int* recvtag, int* comm, MPI_Status* status, int* ierr); - -void mpi_finalized_ (int * flag, int* ierr); -void mpi_init_thread_ (int *required, int *provided, int* ierr); -void mpi_query_thread_ (int *provided, int* ierr); -void mpi_is_thread_main_ (int *flag, int* ierr); -void mpi_address_ (void *location, MPI_Aint * address, int* ierr); -void mpi_get_address_ (void *location, MPI_Aint * address, int* ierr); -void mpi_type_dup_ (int* datatype, int* newdatatype, int* ierr); -void mpi_type_set_name_ (int* datatype, char * name, int* ierr, int size); -void mpi_type_get_name_ (int* datatype, char * name, int* len, int* ierr); -void mpi_type_get_attr_ (int* type, int* type_keyval, void *attribute_val, int* flag, int* ierr); -void mpi_type_set_attr_ (int* type, int* type_keyval, void *attribute_val, int* ierr); -void mpi_type_delete_attr_ (int* type, int* type_keyval, int* ierr); -void mpi_type_create_keyval_ (void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); -void mpi_type_free_keyval_ (int* keyval, int* ierr) ; -void mpi_pcontrol_ (int* level , int* ierr); -void mpi_type_get_extent_ (int* datatype, MPI_Aint * lb, MPI_Aint * extent, int* ierr); -void mpi_type_get_true_extent_ (int* datatype, MPI_Aint * lb, MPI_Aint * extent, int* ierr); -void mpi_op_create_ (void * function, int* commute, int* op, int* ierr); -void mpi_op_free_ (int* op, int* ierr); -void mpi_op_commutative_ (int* op, int* commute, int* ierr); -void mpi_group_free_ (int* group, int* ierr); -void mpi_group_size_ (int* group, int *size, int* ierr); -void mpi_group_rank_ (int* group, int *rank, int* ierr); -void mpi_group_translate_ranks_ (int* group1, int* n, int *ranks1, int* group2, int *ranks2, int* ierr); -void mpi_group_compare_ (int* group1, int* group2, int *result, int* ierr); -void mpi_group_union_ (int* group1, int* group2, int* newgroup, int* ierr); -void mpi_group_intersection_ (int* group1, int* group2, int* newgroup, int* ierr); -void mpi_group_difference_ (int* group1, int* group2, int* newgroup, int* ierr); -void mpi_group_excl_ (int* group, int* n, int *ranks, int* newgroup, int* ierr); -void mpi_group_range_incl_ (int* group, int* n, int ranges[][3], int* newgroup, int* ierr); -void mpi_group_range_excl_ (int* group, int* n, int ranges[][3], int* newgroup, int* ierr); -void mpi_comm_get_attr_ (int* comm, int* comm_keyval, void *attribute_val, int *flag, int* ierr); -void mpi_comm_set_attr_ (int* comm, int* comm_keyval, void *attribute_val, int* ierr); -void mpi_comm_delete_attr_ (int* comm, int* comm_keyval, int* ierr); -void mpi_comm_create_keyval_ (void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); -void mpi_comm_free_keyval_ (int* keyval, int* ierr) ; -void mpi_comm_get_name_ (int* comm, char* name, int* len, int* ierr); -void mpi_comm_compare_ (int* comm1, int* comm2, int *result, int* ierr); -void mpi_comm_disconnect_ (int* comm, int* ierr); -void mpi_request_free_ (int* request, int* ierr); -void mpi_sendrecv_replace_ (void *buf, int* count, int* datatype, int* dst, int* sendtag, int* src, int* recvtag, - int* comm, MPI_Status* status, int* ierr); -void mpi_testany_ (int* count, int* requests, int *index, int *flag, MPI_Status* status, int* ierr); -void mpi_waitsome_ (int* incount, int* requests, int *outcount, int *indices, MPI_Status* status, int* ierr); -void mpi_reduce_local_ (void *inbuf, void *inoutbuf, int* count, int* datatype, int* op, int* ierr); -void mpi_reduce_scatter_block_ (void *sendbuf, void *recvbuf, int* recvcount, int* datatype, int* op, int* comm, - int* ierr); -void mpi_pack_size_ (int* incount, int* datatype, int* comm, int* size, int* ierr) ; -void mpi_cart_coords_ (int* comm, int* rank, int* maxdims, int* coords, int* ierr) ; -void mpi_cart_create_ (int* comm_old, int* ndims, int* dims, int* periods, int* reorder, int* comm_cart, int* ierr) ; -void mpi_cart_get_ (int* comm, int* maxdims, int* dims, int* periods, int* coords, int* ierr) ; -void mpi_cart_map_ (int* comm_old, int* ndims, int* dims, int* periods, int* newrank, int* ierr) ; -void mpi_cart_rank_ (int* comm, int* coords, int* rank, int* ierr) ; -void mpi_cart_shift_ (int* comm, int* direction, int* displ, int* source, int* dest, int* ierr) ; -void mpi_cart_sub_ (int* comm, int* remain_dims, int* comm_new, int* ierr) ; -void mpi_cartdim_get_ (int* comm, int* ndims, int* ierr) ; -void mpi_graph_create_ (int* comm_old, int* nnodes, int* index, int* edges, int* reorder, int* comm_graph, int* ierr) ; -void mpi_graph_get_ (int* comm, int* maxindex, int* maxedges, int* index, int* edges, int* ierr) ; -void mpi_graph_map_ (int* comm_old, int* nnodes, int* index, int* edges, int* newrank, int* ierr) ; -void mpi_graph_neighbors_ (int* comm, int* rank, int* maxneighbors, int* neighbors, int* ierr) ; -void mpi_graph_neighbors_count_ (int* comm, int* rank, int* nneighbors, int* ierr) ; -void mpi_graphdims_get_ (int* comm, int* nnodes, int* nedges, int* ierr) ; -void mpi_topo_test_ (int* comm, int* top_type, int* ierr) ; -void mpi_error_class_ (int* errorcode, int* errorclass, int* ierr) ; -void mpi_errhandler_create_ (void* function, void* errhandler, int* ierr) ; -void mpi_errhandler_free_ (void* errhandler, int* ierr) ; -void mpi_errhandler_get_ (int* comm, void* errhandler, int* ierr) ; -void mpi_errhandler_set_ (int* comm, void* errhandler, int* ierr) ; -void mpi_comm_set_errhandler_ (int* comm, void* errhandler, int* ierr) ; -void mpi_comm_get_errhandler_ (int* comm, void* errhandler, int* ierr) ; -void mpi_type_contiguous_ (int* count, int* old_type, int* newtype, int* ierr) ; -void mpi_cancel_ (int* request, int* ierr) ; -void mpi_buffer_attach_ (void* buffer, int* size, int* ierr) ; -void mpi_buffer_detach_ (void* buffer, int* size, int* ierr) ; -void mpi_testsome_ (int* incount, int* requests, int* outcount, int* indices, MPI_Status* statuses, int* ierr) ; -void mpi_comm_test_inter_ (int* comm, int* flag, int* ierr) ; -void mpi_unpack_ (void* inbuf, int* insize, int* position, void* outbuf, int* outcount, int* type, int* comm, - int* ierr) ; -void mpi_pack_external_size_ (char *datarep, int* incount, int* datatype, MPI_Aint *size, int* ierr); -void mpi_pack_external_ (char *datarep, void *inbuf, int* incount, int* datatype, void *outbuf, MPI_Aint* outcount, - MPI_Aint *position, int* ierr); -void mpi_unpack_external_ (char *datarep, void *inbuf, MPI_Aint* insize, MPI_Aint *position, void *outbuf, - int* outcount, int* datatype, int* ierr); -void mpi_type_hindexed_ (int* count, int* blocklens, MPI_Aint* indices, int* old_type, int* newtype, int* ierr) ; -void mpi_type_create_hindexed_ (int* count, int* blocklens, MPI_Aint* indices, int* old_type, int* newtype, int* ierr); -void mpi_type_create_hindexed_block_ (int* count, int* blocklength, MPI_Aint* indices, int* old_type, int* newtype, - int* ierr) ; -void mpi_type_indexed_ (int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr) ; -void mpi_type_create_indexed_ (int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr) ; -void mpi_type_create_indexed_block_ (int* count, int* blocklength, int* indices, int* old_type, int*newtype, - int* ierr); -void mpi_type_struct_ (int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr) ; -void mpi_type_create_struct_ (int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr); -void mpi_ssend_ (void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* ierr) ; -void mpi_ssend_init_ (void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr) ; -void mpi_intercomm_create_ (int* local_comm, int* local_leader, int* peer_comm, int* remote_leader, int* tag, - int* comm_out, int* ierr) ; -void mpi_intercomm_merge_ (int* comm, int* high, int* comm_out, int* ierr) ; -void mpi_bsend_ (void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* ierr) ; -void mpi_bsend_init_ (void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr) ; -void mpi_ibsend_ (void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr) ; -void mpi_comm_remote_group_ (int* comm, int* group, int* ierr) ; -void mpi_comm_remote_size_ (int* comm, int* size, int* ierr) ; -void mpi_issend_ (void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr) ; -void mpi_probe_ (int* source, int* tag, int* comm, MPI_Status* status, int* ierr) ; -void mpi_attr_delete_ (int* comm, int* keyval, int* ierr) ; -void mpi_attr_put_ (int* comm, int* keyval, void* attr_value, int* ierr) ; -void mpi_rsend_init_ (void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr) ; -void mpi_keyval_create_ (void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr) ; -void mpi_keyval_free_ (int* keyval, int* ierr) ; -void mpi_test_cancelled_ (MPI_Status* status, int* flag, int* ierr) ; -void mpi_pack_ (void* inbuf, int* incount, int* type, void* outbuf, int* outcount, int* position, int* comm, int* ierr); -void mpi_get_elements_ (MPI_Status* status, int* datatype, int* elements, int* ierr) ; -void mpi_dims_create_ (int* nnodes, int* ndims, int* dims, int* ierr) ; -void mpi_iprobe_ (int* source, int* tag, int* comm, int* flag, MPI_Status* status, int* ierr) ; -void mpi_type_get_envelope_ ( int* datatype, int *num_integers, int *num_addresses, int *num_datatypes, int *combiner, - int* ierr); -void mpi_type_get_contents_ (int* datatype, int* max_integers, int* max_addresses, int* max_datatypes, - int* array_of_integers, MPI_Aint* array_of_addresses, - int*array_of_datatypes, int* ierr); -void mpi_type_create_darray_ (int* size, int* rank, int* ndims, int* array_of_gsizes, int* array_of_distribs, - int* array_of_dargs, int* array_of_psizes, - int* order, int* oldtype, int*newtype, int* ierr) ; -void mpi_type_create_resized_ (int* oldtype,MPI_Aint* lb, MPI_Aint* extent, int*newtype, int* ierr); -void mpi_type_create_subarray_ (int* ndims,int *array_of_sizes, int *array_of_subsizes, int *array_of_starts, - int* order, int* oldtype, int*newtype, int* ierr); -void mpi_type_match_size_ (int* typeclass,int* size,int*datatype, int* ierr); -void mpi_alltoallw_ ( void *sendbuf, int *sendcnts, int *sdispls, int*sendtypes, void *recvbuf, int *recvcnts, - int *rdispls, int*recvtypes, int* comm, int* ierr); -void mpi_exscan_ (void *sendbuf, void *recvbuf, int* count, int* datatype, int* op, int* comm, int* ierr); -void mpi_comm_set_name_ (int* comm, char* name, int* ierr, int size); -void mpi_comm_dup_with_info_ (int* comm, int* info, int* newcomm, int* ierr); -void mpi_comm_split_type_ (int* comm, int* split_type, int* key, int* info, int*newcomm, int* ierr); -void mpi_comm_set_info_ (int* comm, int* info, int* ierr); -void mpi_comm_get_info_ (int* comm, int* info, int* ierr); -void mpi_info_get_ (int* info,char *key,int* valuelen, char *value, int *flag, int* ierr, unsigned int keylen); -void mpi_comm_create_errhandler_ ( void *function, void *errhandler, int* ierr); -void mpi_add_error_class_ ( int *errorclass, int* ierr); -void mpi_add_error_code_ ( int* errorclass, int *errorcode, int* ierr); -void mpi_add_error_string_ ( int* errorcode, char *string, int* ierr); -void mpi_comm_call_errhandler_ (int* comm,int* errorcode, int* ierr); -void mpi_info_dup_ (int* info, int* newinfo, int* ierr); -void mpi_info_get_valuelen_ ( int* info, char *key, int *valuelen, int *flag, int* ierr, unsigned int keylen); -void mpi_info_delete_ (int* info, char *key, int* ierr, unsigned int keylen); -void mpi_info_get_nkeys_ ( int* info, int *nkeys, int* ierr); -void mpi_info_get_nthkey_ ( int* info, int* n, char *key, int* ierr, unsigned int keylen); -void mpi_get_version_ (int *version,int *subversion, int* ierr); -void mpi_get_library_version_ (char *version,int *len, int* ierr); -void mpi_request_get_status_ ( int* request, int *flag, MPI_Status* status, int* ierr); -void mpi_grequest_start_ ( void *query_fn, void *free_fn, void *cancel_fn, void *extra_state, int*request, int* ierr); -void mpi_grequest_complete_ ( int* request, int* ierr); -void mpi_status_set_cancelled_ (MPI_Status* status,int* flag, int* ierr); -void mpi_status_set_elements_ ( MPI_Status* status, int* datatype, int* count, int* ierr); -void mpi_comm_connect_ ( char *port_name, int* info, int* root, int* comm, int* newcomm, int* ierr); -void mpi_publish_name_ ( char *service_name, int* info, char *port_name, int* ierr); -void mpi_unpublish_name_ ( char *service_name, int* info, char *port_name, int* ierr); -void mpi_lookup_name_ ( char *service_name, int* info, char *port_name, int* ierr); -void mpi_comm_join_ ( int* fd, int*intercomm, int* ierr); -void mpi_open_port_ ( int* info, char *port_name, int* ierr); -void mpi_close_port_ ( char *port_name, int* ierr); -void mpi_comm_accept_ ( char *port_name, int* info, int* root, int* comm, int* newcomm, int* ierr); -void mpi_comm_spawn_ ( char *command, char *argv, int* maxprocs, int* info, int* root, int* comm, int*intercomm, - int* array_of_errcodes, int* ierr); -void mpi_comm_spawn_multiple_ ( int* count, char *array_of_commands, char** array_of_argv, int* array_of_maxprocs, - int* array_of_info, int* root, int* comm, int*intercomm, int* array_of_errcodes, int* ierr); -void mpi_comm_get_parent_ ( int*parent, int* ierr); -void mpi_file_close_ ( int* file, int* ierr); -void mpi_file_delete_ ( char* filename, int* info, int* ierr); -void mpi_file_open_ ( int* comm, char* filename, int* amode, int* info, int* fh, int* ierr); -void mpi_file_set_view_ ( int* fh, long long int* offset, int* etype, int* filetype, char* datarep, int* info, int* ierr); -void mpi_file_read_ ( int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr); -void mpi_file_write_ ( int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr); - -// TODO, make this static and expose it more cleanly - -typedef struct s_smpi_privatization_region { - void* address; - int file_descriptor; -} s_smpi_privatization_region_t; -typedef s_smpi_privatization_region_t* smpi_privatization_region_t; - -extern XBT_PRIVATE smpi_privatization_region_t smpi_privatization_regions; -extern XBT_PRIVATE int smpi_loaded_page; -extern XBT_PRIVATE int smpi_universe_size; - -SG_END_DECL() -#endif diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index cd10106855..f85d4f2a9b 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -6,10 +6,415 @@ #ifndef SMPI_PRIVATE_HPP #define SMPI_PRIVATE_HPP +#include "simgrid/msg.h" // msg_bar_t +#include "smpi/smpi.h" #include "src/instr/instr_smpi.hpp" +#include "src/internal_config.h" #include #include -#include "src/internal_config.h" + +SG_BEGIN_DECL() + +#define PERSISTENT 0x1 +#define NON_PERSISTENT 0x2 +#define SEND 0x4 +#define RECV 0x8 +#define RECV_DELETE 0x10 +#define ISEND 0x20 +#define SSEND 0x40 +#define PREPARED 0x80 +#define FINISHED 0x100 +#define RMA 0x200 +#define ACCUMULATE 0x400 + +enum smpi_process_state { SMPI_UNINITIALIZED, SMPI_INITIALIZED, SMPI_FINALIZED }; + +#define COLL_TAG_REDUCE -112 +#define COLL_TAG_SCATTER -223 +#define COLL_TAG_SCATTERV -334 +#define COLL_TAG_GATHER -445 +#define COLL_TAG_ALLGATHER -556 +#define COLL_TAG_ALLGATHERV -667 +#define COLL_TAG_BARRIER -778 +#define COLL_TAG_REDUCE_SCATTER -889 +#define COLL_TAG_ALLTOALLV -1000 +#define COLL_TAG_ALLTOALL -1112 +#define COLL_TAG_GATHERV -2223 +#define COLL_TAG_BCAST -3334 +#define COLL_TAG_ALLREDUCE -4445 +// SMPI_RMA_TAG has to be the smallest one, as it will be decremented for accumulate ordering. +#define SMPI_RMA_TAG -6666 + +/* Convert between Fortran and C */ + +#define FORT_BOTTOM(addr) ((*(int*)addr) == -200 ? MPI_BOTTOM : (void*)addr) +#define FORT_IN_PLACE(addr) ((*(int*)addr) == -100 ? MPI_IN_PLACE : (void*)addr) +#define FORT_STATUS_IGNORE(addr) (static_cast((*(int*)addr) == -300 ? MPI_STATUS_IGNORE : (void*)addr)) +#define FORT_STATUSES_IGNORE(addr) (static_cast((*(int*)addr) == -400 ? MPI_STATUSES_IGNORE : (void*)addr)) + +extern XBT_PRIVATE MPI_Comm MPI_COMM_UNINITIALIZED; + +typedef SMPI_Cart_topology* MPIR_Cart_Topology; + +typedef SMPI_Graph_topology* MPIR_Graph_Topology; + +typedef SMPI_Dist_Graph_topology* MPIR_Dist_Graph_Topology; + +XBT_PRIVATE SMPI_Process* smpi_process(); +XBT_PRIVATE SMPI_Process* smpi_process_remote(int index); +XBT_PRIVATE int smpi_process_count(); + +XBT_PRIVATE void smpi_deployment_register_process(const char* instance_id, int rank, int index); +XBT_PRIVATE MPI_Comm* smpi_deployment_comm_world(const char* instance_id); +XBT_PRIVATE msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id); +XBT_PRIVATE void smpi_deployment_cleanup_instances(); + +XBT_PRIVATE void smpi_comm_copy_buffer_callback(smx_activity_t comm, void* buff, size_t buff_size); + +XBT_PRIVATE void smpi_comm_null_copy_buffer_callback(smx_activity_t comm, void* buff, size_t buff_size); + +XBT_PRIVATE int smpi_enabled(); +XBT_PRIVATE void smpi_global_init(); +XBT_PRIVATE void smpi_global_destroy(); +XBT_PRIVATE double smpi_mpi_wtime(); +XBT_PRIVATE void smpi_mpi_init(); + +// utilities +extern XBT_PRIVATE double smpi_cpu_threshold; +extern XBT_PRIVATE double smpi_host_speed; +extern XBT_PRIVATE char* smpi_data_exe_start; // start of the data+bss segment of the executable +extern XBT_PRIVATE int smpi_data_exe_size; // size of the data+bss segment of the executable + +typedef enum { shmalloc_none, shmalloc_local, shmalloc_global } shared_malloc_type; +extern XBT_PRIVATE shared_malloc_type smpi_cfg_shared_malloc; // Whether to activate shared malloc + +XBT_PRIVATE void smpi_switch_data_segment(int dest); +XBT_PRIVATE void smpi_really_switch_data_segment(int dest); +XBT_PRIVATE int smpi_is_privatization_file(char* file); + +XBT_PRIVATE void smpi_get_executable_global_size(); +XBT_PRIVATE void smpi_initialize_global_memory_segments(); +XBT_PRIVATE void smpi_destroy_global_memory_segments(); +XBT_PRIVATE void smpi_bench_destroy(); +XBT_PRIVATE void smpi_bench_begin(); +XBT_PRIVATE void smpi_bench_end(); +XBT_PRIVATE void smpi_shared_destroy(); + +XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size); +XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size); +XBT_PRIVATE void smpi_free_tmp_buffer(void* buf); + +// f77 wrappers +void mpi_init_(int* ierr); +void mpi_finalize_(int* ierr); +void mpi_abort_(int* comm, int* errorcode, int* ierr); +void mpi_comm_rank_(int* comm, int* rank, int* ierr); +void mpi_comm_size_(int* comm, int* size, int* ierr); +double mpi_wtime_(); +double mpi_wtick_(); +void mpi_initialized_(int* flag, int* ierr); + +void mpi_comm_dup_(int* comm, int* newcomm, int* ierr); +void mpi_comm_create_(int* comm, int* group, int* newcomm, int* ierr); +void mpi_comm_free_(int* comm, int* ierr); +void mpi_comm_split_(int* comm, int* color, int* key, int* comm_out, int* ierr); +void mpi_group_incl_(int* group, int* n, int* key, int* group_out, int* ierr); +void mpi_comm_group_(int* comm, int* group_out, int* ierr); +void mpi_comm_create_group_(int* comm, int* group, int, int* comm_out, int* ierr); +void mpi_send_init_(void* buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* request, int* ierr); +void mpi_isend_(void* buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* request, int* ierr); +void mpi_irsend_(void* buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* request, int* ierr); +void mpi_send_(void* buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* ierr); +void mpi_rsend_(void* buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* ierr); +void mpi_recv_init_(void* buf, int* count, int* datatype, int* src, int* tag, int* comm, int* request, int* ierr); +void mpi_irecv_(void* buf, int* count, int* datatype, int* src, int* tag, int* comm, int* request, int* ierr); +void mpi_recv_(void* buf, int* count, int* datatype, int* src, int* tag, int* comm, MPI_Status* status, int* ierr); +void mpi_start_(int* request, int* ierr); +void mpi_startall_(int* count, int* requests, int* ierr); +void mpi_wait_(int* request, MPI_Status* status, int* ierr); +void mpi_waitany_(int* count, int* requests, int* index, MPI_Status* status, int* ierr); +void mpi_waitall_(int* count, int* requests, MPI_Status* status, int* ierr); + +void mpi_barrier_(int* comm, int* ierr); +void mpi_bcast_(void* buf, int* count, int* datatype, int* root, int* comm, int* ierr); +void mpi_reduce_(void* sendbuf, void* recvbuf, int* count, int* datatype, int* op, int* root, int* comm, int* ierr); +void mpi_allreduce_(void* sendbuf, void* recvbuf, int* count, int* datatype, int* op, int* comm, int* ierr); +void mpi_reduce_scatter_(void* sendbuf, void* recvbuf, int* recvcounts, int* datatype, int* op, int* comm, int* ierr); +void mpi_scatter_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* recvtype, int* root, + int* comm, int* ierr); +void mpi_scatterv_(void* sendbuf, int* sendcounts, int* displs, int* sendtype, void* recvbuf, int* recvcount, + int* recvtype, int* root, int* comm, int* ierr); +void mpi_gather_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* recvtype, int* root, + int* comm, int* ierr); +void mpi_gatherv_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcounts, int* displs, + int* recvtype, int* root, int* comm, int* ierr); +void mpi_allgather_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* recvtype, + int* comm, int* ierr); +void mpi_allgatherv_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* displs, + int* recvtype, int* comm, int* ierr); +void mpi_type_size_(int* datatype, int* size, int* ierr); + +void mpi_scan_(void* sendbuf, void* recvbuf, int* count, int* datatype, int* op, int* comm, int* ierr); +void mpi_alltoall_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* recvtype, + int* comm, int* ierr); +void mpi_alltoallv_(void* sendbuf, int* sendcounts, int* senddisps, int* sendtype, void* recvbuf, int* recvcounts, + int* recvdisps, int* recvtype, int* comm, int* ierr); +void mpi_get_processor_name_(char* name, int* resultlen, int* ierr); +void mpi_test_(int* request, int* flag, MPI_Status* status, int* ierr); +void mpi_testall_(int* count, int* requests, int* flag, MPI_Status* statuses, int* ierr); +void mpi_get_count_(MPI_Status* status, int* datatype, int* count, int* ierr); +void mpi_type_extent_(int* datatype, MPI_Aint* extent, int* ierr); +void mpi_attr_get_(int* comm, int* keyval, void* attr_value, int* flag, int* ierr); +void mpi_type_commit_(int* datatype, int* ierr); +void mpi_type_vector_(int* count, int* blocklen, int* stride, int* old_type, int* newtype, int* ierr); +void mpi_type_hvector_(int* count, int* blocklen, MPI_Aint* stride, int* old_type, int* newtype, int* ierr); +void mpi_type_create_hvector_(int* count, int* blocklen, MPI_Aint* stride, int* old_type, int* newtype, int* ierr); +void mpi_type_free_(int* datatype, int* ierr); +void mpi_type_lb_(int* datatype, MPI_Aint* extent, int* ierr); +void mpi_type_ub_(int* datatype, MPI_Aint* extent, int* ierr); +void mpi_win_fence_(int* assert, int* win, int* ierr); +void mpi_win_free_(int* win, int* ierr); +void mpi_win_create_(int* base, MPI_Aint* size, int* disp_unit, int* info, int* comm, int* win, int* ierr); +void mpi_win_set_name_(int* win, char* name, int* ierr, int size); +void mpi_win_get_name_(int* win, char* name, int* len, int* ierr); +void mpi_win_post_(int* group, int assert, int* win, int* ierr); +void mpi_win_start_(int* group, int assert, int* win, int* ierr); +void mpi_win_complete_(int* win, int* ierr); +void mpi_win_wait_(int* win, int* ierr); +void mpi_win_allocate_(MPI_Aint* size, int* disp_unit, int* info, int* comm, void* base, int* win, int* ierr); +void mpi_win_attach_(int* win, int* base, MPI_Aint* size, int* ierr); +void mpi_win_create_dynamic_(int* info, int* comm, int* win, int* ierr); +void mpi_win_detach_(int* win, int* base, int* ierr); +void mpi_win_set_info_(int* win, int* info, int* ierr); +void mpi_win_get_info_(int* win, int* info, int* ierr); +void mpi_win_get_group_(int* win, int* group, int* ierr); +void mpi_win_get_attr_(int* win, int* type_keyval, void* attribute_val, int* flag, int* ierr); +void mpi_win_set_attr_(int* win, int* type_keyval, void* att, int* ierr); +void mpi_win_delete_attr_(int* win, int* comm_keyval, int* ierr); +void mpi_win_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); +void mpi_win_free_keyval_(int* keyval, int* ierr); +void mpi_win_lock_(int* lock_type, int* rank, int* assert, int* win, int* ierr); +void mpi_win_lock_all_(int* assert, int* win, int* ierr); +void mpi_win_unlock_(int* rank, int* win, int* ierr); +void mpi_win_unlock_all_(int* win, int* ierr); +void mpi_win_flush_(int* rank, int* win, int* ierr); +void mpi_win_flush_local_(int* rank, int* win, int* ierr); +void mpi_win_flush_all_(int* win, int* ierr); +void mpi_win_flush_local_all_(int* win, int* ierr); +void mpi_info_create_(int* info, int* ierr); +void mpi_info_set_(int* info, char* key, char* value, int* ierr, unsigned int keylen, unsigned int valuelen); +void mpi_info_free_(int* info, int* ierr); +void mpi_get_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* target_datatype, int* win, int* ierr); +void mpi_put_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* target_datatype, int* win, int* ierr); +void mpi_rget_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* target_datatype, int* win, int* request, int* ierr); +void mpi_rput_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* target_datatype, int* win, int* request, int* ierr); +void mpi_fetch_and_op_(int* origin_addr, int* result_addr, int* datatype, int* target_rank, MPI_Aint* target_disp, + int* op, int* win, int* ierr); +void mpi_compare_and_swap_(int* origin_addr, int* compare_addr, int* result_addr, int* datatype, int* target_rank, + MPI_Aint* target_disp, int* win, int* ierr); +void mpi_get_accumulate_(int* origin_addr, int* origin_count, int* origin_datatype, int* result_addr, int* result_count, + int* result_datatype, int* target_rank, MPI_Aint* target_disp, int* target_count, + int* target_datatype, int* op, int* win, int* ierr); +void mpi_rget_accumulate_(int* origin_addr, int* origin_count, int* origin_datatype, int* result_addr, + int* result_count, int* result_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* target_datatype, int* op, int* win, int* request, int* ierr); +void mpi_accumulate_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* target_datatype, int* op, int* win, int* ierr); +void mpi_raccumulate_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, + MPI_Aint* target_disp, int* target_count, int* target_datatype, int* op, int* win, int* request, + int* ierr); +void mpi_error_string_(int* errorcode, char* string, int* resultlen, int* ierr); +void mpi_sendrecv_(void* sendbuf, int* sendcount, int* sendtype, int* dst, int* sendtag, void* recvbuf, int* recvcount, + int* recvtype, int* src, int* recvtag, int* comm, MPI_Status* status, int* ierr); + +void mpi_finalized_(int* flag, int* ierr); +void mpi_init_thread_(int* required, int* provided, int* ierr); +void mpi_query_thread_(int* provided, int* ierr); +void mpi_is_thread_main_(int* flag, int* ierr); +void mpi_address_(void* location, MPI_Aint* address, int* ierr); +void mpi_get_address_(void* location, MPI_Aint* address, int* ierr); +void mpi_type_dup_(int* datatype, int* newdatatype, int* ierr); +void mpi_type_set_name_(int* datatype, char* name, int* ierr, int size); +void mpi_type_get_name_(int* datatype, char* name, int* len, int* ierr); +void mpi_type_get_attr_(int* type, int* type_keyval, void* attribute_val, int* flag, int* ierr); +void mpi_type_set_attr_(int* type, int* type_keyval, void* attribute_val, int* ierr); +void mpi_type_delete_attr_(int* type, int* type_keyval, int* ierr); +void mpi_type_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); +void mpi_type_free_keyval_(int* keyval, int* ierr); +void mpi_pcontrol_(int* level, int* ierr); +void mpi_type_get_extent_(int* datatype, MPI_Aint* lb, MPI_Aint* extent, int* ierr); +void mpi_type_get_true_extent_(int* datatype, MPI_Aint* lb, MPI_Aint* extent, int* ierr); +void mpi_op_create_(void* function, int* commute, int* op, int* ierr); +void mpi_op_free_(int* op, int* ierr); +void mpi_op_commutative_(int* op, int* commute, int* ierr); +void mpi_group_free_(int* group, int* ierr); +void mpi_group_size_(int* group, int* size, int* ierr); +void mpi_group_rank_(int* group, int* rank, int* ierr); +void mpi_group_translate_ranks_(int* group1, int* n, int* ranks1, int* group2, int* ranks2, int* ierr); +void mpi_group_compare_(int* group1, int* group2, int* result, int* ierr); +void mpi_group_union_(int* group1, int* group2, int* newgroup, int* ierr); +void mpi_group_intersection_(int* group1, int* group2, int* newgroup, int* ierr); +void mpi_group_difference_(int* group1, int* group2, int* newgroup, int* ierr); +void mpi_group_excl_(int* group, int* n, int* ranks, int* newgroup, int* ierr); +void mpi_group_range_incl_(int* group, int* n, int ranges[][3], int* newgroup, int* ierr); +void mpi_group_range_excl_(int* group, int* n, int ranges[][3], int* newgroup, int* ierr); +void mpi_comm_get_attr_(int* comm, int* comm_keyval, void* attribute_val, int* flag, int* ierr); +void mpi_comm_set_attr_(int* comm, int* comm_keyval, void* attribute_val, int* ierr); +void mpi_comm_delete_attr_(int* comm, int* comm_keyval, int* ierr); +void mpi_comm_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); +void mpi_comm_free_keyval_(int* keyval, int* ierr); +void mpi_comm_get_name_(int* comm, char* name, int* len, int* ierr); +void mpi_comm_compare_(int* comm1, int* comm2, int* result, int* ierr); +void mpi_comm_disconnect_(int* comm, int* ierr); +void mpi_request_free_(int* request, int* ierr); +void mpi_sendrecv_replace_(void* buf, int* count, int* datatype, int* dst, int* sendtag, int* src, int* recvtag, + int* comm, MPI_Status* status, int* ierr); +void mpi_testany_(int* count, int* requests, int* index, int* flag, MPI_Status* status, int* ierr); +void mpi_waitsome_(int* incount, int* requests, int* outcount, int* indices, MPI_Status* status, int* ierr); +void mpi_reduce_local_(void* inbuf, void* inoutbuf, int* count, int* datatype, int* op, int* ierr); +void mpi_reduce_scatter_block_(void* sendbuf, void* recvbuf, int* recvcount, int* datatype, int* op, int* comm, + int* ierr); +void mpi_pack_size_(int* incount, int* datatype, int* comm, int* size, int* ierr); +void mpi_cart_coords_(int* comm, int* rank, int* maxdims, int* coords, int* ierr); +void mpi_cart_create_(int* comm_old, int* ndims, int* dims, int* periods, int* reorder, int* comm_cart, int* ierr); +void mpi_cart_get_(int* comm, int* maxdims, int* dims, int* periods, int* coords, int* ierr); +void mpi_cart_map_(int* comm_old, int* ndims, int* dims, int* periods, int* newrank, int* ierr); +void mpi_cart_rank_(int* comm, int* coords, int* rank, int* ierr); +void mpi_cart_shift_(int* comm, int* direction, int* displ, int* source, int* dest, int* ierr); +void mpi_cart_sub_(int* comm, int* remain_dims, int* comm_new, int* ierr); +void mpi_cartdim_get_(int* comm, int* ndims, int* ierr); +void mpi_graph_create_(int* comm_old, int* nnodes, int* index, int* edges, int* reorder, int* comm_graph, int* ierr); +void mpi_graph_get_(int* comm, int* maxindex, int* maxedges, int* index, int* edges, int* ierr); +void mpi_graph_map_(int* comm_old, int* nnodes, int* index, int* edges, int* newrank, int* ierr); +void mpi_graph_neighbors_(int* comm, int* rank, int* maxneighbors, int* neighbors, int* ierr); +void mpi_graph_neighbors_count_(int* comm, int* rank, int* nneighbors, int* ierr); +void mpi_graphdims_get_(int* comm, int* nnodes, int* nedges, int* ierr); +void mpi_topo_test_(int* comm, int* top_type, int* ierr); +void mpi_error_class_(int* errorcode, int* errorclass, int* ierr); +void mpi_errhandler_create_(void* function, void* errhandler, int* ierr); +void mpi_errhandler_free_(void* errhandler, int* ierr); +void mpi_errhandler_get_(int* comm, void* errhandler, int* ierr); +void mpi_errhandler_set_(int* comm, void* errhandler, int* ierr); +void mpi_comm_set_errhandler_(int* comm, void* errhandler, int* ierr); +void mpi_comm_get_errhandler_(int* comm, void* errhandler, int* ierr); +void mpi_type_contiguous_(int* count, int* old_type, int* newtype, int* ierr); +void mpi_cancel_(int* request, int* ierr); +void mpi_buffer_attach_(void* buffer, int* size, int* ierr); +void mpi_buffer_detach_(void* buffer, int* size, int* ierr); +void mpi_testsome_(int* incount, int* requests, int* outcount, int* indices, MPI_Status* statuses, int* ierr); +void mpi_comm_test_inter_(int* comm, int* flag, int* ierr); +void mpi_unpack_(void* inbuf, int* insize, int* position, void* outbuf, int* outcount, int* type, int* comm, int* ierr); +void mpi_pack_external_size_(char* datarep, int* incount, int* datatype, MPI_Aint* size, int* ierr); +void mpi_pack_external_(char* datarep, void* inbuf, int* incount, int* datatype, void* outbuf, MPI_Aint* outcount, + MPI_Aint* position, int* ierr); +void mpi_unpack_external_(char* datarep, void* inbuf, MPI_Aint* insize, MPI_Aint* position, void* outbuf, int* outcount, + int* datatype, int* ierr); +void mpi_type_hindexed_(int* count, int* blocklens, MPI_Aint* indices, int* old_type, int* newtype, int* ierr); +void mpi_type_create_hindexed_(int* count, int* blocklens, MPI_Aint* indices, int* old_type, int* newtype, int* ierr); +void mpi_type_create_hindexed_block_(int* count, int* blocklength, MPI_Aint* indices, int* old_type, int* newtype, + int* ierr); +void mpi_type_indexed_(int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr); +void mpi_type_create_indexed_(int* count, int* blocklens, int* indices, int* old_type, int* newtype, int* ierr); +void mpi_type_create_indexed_block_(int* count, int* blocklength, int* indices, int* old_type, int* newtype, int* ierr); +void mpi_type_struct_(int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr); +void mpi_type_create_struct_(int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr); +void mpi_ssend_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* ierr); +void mpi_ssend_init_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr); +void mpi_intercomm_create_(int* local_comm, int* local_leader, int* peer_comm, int* remote_leader, int* tag, + int* comm_out, int* ierr); +void mpi_intercomm_merge_(int* comm, int* high, int* comm_out, int* ierr); +void mpi_bsend_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* ierr); +void mpi_bsend_init_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr); +void mpi_ibsend_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr); +void mpi_comm_remote_group_(int* comm, int* group, int* ierr); +void mpi_comm_remote_size_(int* comm, int* size, int* ierr); +void mpi_issend_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr); +void mpi_probe_(int* source, int* tag, int* comm, MPI_Status* status, int* ierr); +void mpi_attr_delete_(int* comm, int* keyval, int* ierr); +void mpi_attr_put_(int* comm, int* keyval, void* attr_value, int* ierr); +void mpi_rsend_init_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr); +void mpi_keyval_create_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); +void mpi_keyval_free_(int* keyval, int* ierr); +void mpi_test_cancelled_(MPI_Status* status, int* flag, int* ierr); +void mpi_pack_(void* inbuf, int* incount, int* type, void* outbuf, int* outcount, int* position, int* comm, int* ierr); +void mpi_get_elements_(MPI_Status* status, int* datatype, int* elements, int* ierr); +void mpi_dims_create_(int* nnodes, int* ndims, int* dims, int* ierr); +void mpi_iprobe_(int* source, int* tag, int* comm, int* flag, MPI_Status* status, int* ierr); +void mpi_type_get_envelope_(int* datatype, int* num_integers, int* num_addresses, int* num_datatypes, int* combiner, + int* ierr); +void mpi_type_get_contents_(int* datatype, int* max_integers, int* max_addresses, int* max_datatypes, + int* array_of_integers, MPI_Aint* array_of_addresses, int* array_of_datatypes, int* ierr); +void mpi_type_create_darray_(int* size, int* rank, int* ndims, int* array_of_gsizes, int* array_of_distribs, + int* array_of_dargs, int* array_of_psizes, int* order, int* oldtype, int* newtype, + int* ierr); +void mpi_type_create_resized_(int* oldtype, MPI_Aint* lb, MPI_Aint* extent, int* newtype, int* ierr); +void mpi_type_create_subarray_(int* ndims, int* array_of_sizes, int* array_of_subsizes, int* array_of_starts, + int* order, int* oldtype, int* newtype, int* ierr); +void mpi_type_match_size_(int* typeclass, int* size, int* datatype, int* ierr); +void mpi_alltoallw_(void* sendbuf, int* sendcnts, int* sdispls, int* sendtypes, void* recvbuf, int* recvcnts, + int* rdispls, int* recvtypes, int* comm, int* ierr); +void mpi_exscan_(void* sendbuf, void* recvbuf, int* count, int* datatype, int* op, int* comm, int* ierr); +void mpi_comm_set_name_(int* comm, char* name, int* ierr, int size); +void mpi_comm_dup_with_info_(int* comm, int* info, int* newcomm, int* ierr); +void mpi_comm_split_type_(int* comm, int* split_type, int* key, int* info, int* newcomm, int* ierr); +void mpi_comm_set_info_(int* comm, int* info, int* ierr); +void mpi_comm_get_info_(int* comm, int* info, int* ierr); +void mpi_info_get_(int* info, char* key, int* valuelen, char* value, int* flag, int* ierr, unsigned int keylen); +void mpi_comm_create_errhandler_(void* function, void* errhandler, int* ierr); +void mpi_add_error_class_(int* errorclass, int* ierr); +void mpi_add_error_code_(int* errorclass, int* errorcode, int* ierr); +void mpi_add_error_string_(int* errorcode, char* string, int* ierr); +void mpi_comm_call_errhandler_(int* comm, int* errorcode, int* ierr); +void mpi_info_dup_(int* info, int* newinfo, int* ierr); +void mpi_info_get_valuelen_(int* info, char* key, int* valuelen, int* flag, int* ierr, unsigned int keylen); +void mpi_info_delete_(int* info, char* key, int* ierr, unsigned int keylen); +void mpi_info_get_nkeys_(int* info, int* nkeys, int* ierr); +void mpi_info_get_nthkey_(int* info, int* n, char* key, int* ierr, unsigned int keylen); +void mpi_get_version_(int* version, int* subversion, int* ierr); +void mpi_get_library_version_(char* version, int* len, int* ierr); +void mpi_request_get_status_(int* request, int* flag, MPI_Status* status, int* ierr); +void mpi_grequest_start_(void* query_fn, void* free_fn, void* cancel_fn, void* extra_state, int* request, int* ierr); +void mpi_grequest_complete_(int* request, int* ierr); +void mpi_status_set_cancelled_(MPI_Status* status, int* flag, int* ierr); +void mpi_status_set_elements_(MPI_Status* status, int* datatype, int* count, int* ierr); +void mpi_comm_connect_(char* port_name, int* info, int* root, int* comm, int* newcomm, int* ierr); +void mpi_publish_name_(char* service_name, int* info, char* port_name, int* ierr); +void mpi_unpublish_name_(char* service_name, int* info, char* port_name, int* ierr); +void mpi_lookup_name_(char* service_name, int* info, char* port_name, int* ierr); +void mpi_comm_join_(int* fd, int* intercomm, int* ierr); +void mpi_open_port_(int* info, char* port_name, int* ierr); +void mpi_close_port_(char* port_name, int* ierr); +void mpi_comm_accept_(char* port_name, int* info, int* root, int* comm, int* newcomm, int* ierr); +void mpi_comm_spawn_(char* command, char* argv, int* maxprocs, int* info, int* root, int* comm, int* intercomm, + int* array_of_errcodes, int* ierr); +void mpi_comm_spawn_multiple_(int* count, char* array_of_commands, char** array_of_argv, int* array_of_maxprocs, + int* array_of_info, int* root, int* comm, int* intercomm, int* array_of_errcodes, + int* ierr); +void mpi_comm_get_parent_(int* parent, int* ierr); +void mpi_file_close_(int* file, int* ierr); +void mpi_file_delete_(char* filename, int* info, int* ierr); +void mpi_file_open_(int* comm, char* filename, int* amode, int* info, int* fh, int* ierr); +void mpi_file_set_view_(int* fh, long long int* offset, int* etype, int* filetype, char* datarep, int* info, int* ierr); +void mpi_file_read_(int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr); +void mpi_file_write_(int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr); + +// TODO, make this static and expose it more cleanly + +typedef struct s_smpi_privatization_region { + void* address; + int file_descriptor; +} s_smpi_privatization_region_t; +typedef s_smpi_privatization_region_t* smpi_privatization_region_t; + +extern XBT_PRIVATE smpi_privatization_region_t smpi_privatization_regions; +extern XBT_PRIVATE int smpi_loaded_page; +extern XBT_PRIVATE int smpi_universe_size; + +SG_END_DECL() /** * Get the address of the beginning of the memory page where addr is located. @@ -17,11 +422,10 @@ * * This is used when privatizing. */ -#define TOPAGE(addr) (void *)(((unsigned long)(addr) / xbt_pagesize) * xbt_pagesize) +#define TOPAGE(addr) (void*)(((unsigned long)(addr) / xbt_pagesize) * xbt_pagesize) #if HAVE_PAPI -typedef - std::vector> papi_counter_t; +typedef std::vector> papi_counter_t; XBT_PRIVATE papi_counter_t& smpi_process_papi_counters(); XBT_PRIVATE int smpi_process_papi_event_set(); #endif @@ -44,4 +448,3 @@ typedef enum { extern XBT_PRIVATE int smpi_privatize_global_variables; #endif - diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index 69ffcb27b3..305b232d31 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -4,7 +4,6 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" #include "private.hpp" #include #include diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index 24ba70485b..6c72dc4cd7 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -3,7 +3,6 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" #include "private.hpp" #include "simgrid/modelchecker.h" #include "smpi_comm.hpp" diff --git a/src/smpi/internals/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp index 78a95fdc53..f372239e25 100644 --- a/src/smpi/internals/smpi_deployment.cpp +++ b/src/smpi/internals/smpi_deployment.cpp @@ -6,7 +6,7 @@ #include "simgrid/msg.h" /* barrier */ #include "SmpiHost.hpp" -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 01264d33fc..fe670b8b27 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -11,7 +11,6 @@ #include "src/surf/surf_interface.hpp" #include "SmpiHost.hpp" #include "xbt/config.hpp" -#include "private.h" #include "private.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" diff --git a/src/smpi/internals/smpi_memory.cpp b/src/smpi/internals/smpi_memory.cpp index a94b870d6a..dbdb570a69 100644 --- a/src/smpi/internals/smpi_memory.cpp +++ b/src/smpi/internals/smpi_memory.cpp @@ -24,7 +24,6 @@ #include "src/internal_config.h" #include "src/xbt/memory_map.hpp" -#include "private.h" #include "private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_memory, smpi, "Memory layout support for SMPI"); diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp index 056228e5f9..42a256250e 100644 --- a/src/smpi/internals/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -7,7 +7,6 @@ #include "src/mc/mc_replay.h" #include "src/msg/msg_private.hpp" #include "src/simix/smx_private.hpp" -#include "private.h" #include "private.hpp" #include "smpi_process.hpp" #include "smpi_group.hpp" diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 90cac5bfc4..98ef1da684 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp index 728b97a2b7..5d41bd600f 100644 --- a/src/smpi/internals/smpi_shared.cpp +++ b/src/smpi/internals/smpi_shared.cpp @@ -36,7 +36,6 @@ #include #include -#include "private.h" #include "private.hpp" #include diff --git a/src/smpi/internals/smpi_static_variables.cpp b/src/smpi/internals/smpi_static_variables.cpp index 7d26e57575..63ef04626e 100644 --- a/src/smpi/internals/smpi_static_variables.cpp +++ b/src/smpi/internals/smpi_static_variables.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "private.h" +#include "private.hpp" typedef struct s_smpi_static { void *ptr; diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index c369b05b4d..2416e66ac4 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -4,7 +4,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "smpi_comm.hpp" -#include "private.h" #include "private.hpp" #include "simgrid/s4u/Host.hpp" #include "smpi_coll.hpp" diff --git a/src/smpi/mpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp index 565ec99448..e23986d976 100644 --- a/src/smpi/mpi/smpi_datatype.cpp +++ b/src/smpi/mpi/smpi_datatype.cpp @@ -5,7 +5,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/modelchecker.h" -#include "private.h" #include "private.hpp" #include "smpi_datatype_derived.hpp" #include "smpi_op.hpp" diff --git a/src/smpi/mpi/smpi_f2c.cpp b/src/smpi/mpi/smpi_f2c.cpp index 4a31be6386..9a11267d1c 100644 --- a/src/smpi/mpi/smpi_f2c.cpp +++ b/src/smpi/mpi/smpi_f2c.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_f2c.hpp" #include "smpi_process.hpp" diff --git a/src/smpi/mpi/smpi_keyvals.cpp b/src/smpi/mpi/smpi_keyvals.cpp index 559ef5c3c9..9c1b90008e 100644 --- a/src/smpi/mpi/smpi_keyvals.cpp +++ b/src/smpi/mpi/smpi_keyvals.cpp @@ -4,7 +4,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -//#include "private.h" +//#include "private.hpp" #include "smpi_keyvals.hpp" namespace simgrid{ diff --git a/src/smpi/mpi/smpi_op.cpp b/src/smpi/mpi/smpi_op.cpp index 67d6ae8a1c..0112d9b478 100644 --- a/src/smpi/mpi/smpi_op.cpp +++ b/src/smpi/mpi/smpi_op.cpp @@ -3,7 +3,6 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" #include "private.hpp" #include "smpi_datatype.hpp" #include "smpi_op.hpp" diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp index d490799d03..8834d3215c 100644 --- a/src/smpi/mpi/smpi_request.cpp +++ b/src/smpi/mpi/smpi_request.cpp @@ -9,7 +9,6 @@ #include "src/kernel/activity/CommImpl.hpp" #include "src/mc/mc_replay.h" #include "SmpiHost.hpp" -#include "private.h" #include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" diff --git a/src/smpi/mpi/smpi_status.cpp b/src/smpi/mpi/smpi_status.cpp index 6d637c521c..9a862c2740 100644 --- a/src/smpi/mpi/smpi_status.cpp +++ b/src/smpi/mpi/smpi_status.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "src/simix/smx_private.hpp" #include "smpi_datatype.hpp" #include "smpi_status.hpp" diff --git a/src/smpi/mpi/smpi_topo.cpp b/src/smpi/mpi/smpi_topo.cpp index b55b0e313f..b56bc73b05 100644 --- a/src/smpi/mpi/smpi_topo.cpp +++ b/src/smpi/mpi/smpi_topo.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "smpi/smpi.h" -#include "private.h" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_topo.hpp" #include "xbt/sysdep.h" diff --git a/src/smpi/mpi/smpi_win.cpp b/src/smpi/mpi/smpi_win.cpp index 02c7765ea1..4a3596eae4 100644 --- a/src/smpi/mpi/smpi_win.cpp +++ b/src/smpi/mpi/smpi_win.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" +#include "private.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 66fa5853f1..794398ba8e 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -34,7 +34,6 @@ set(EXTRA_DIST src/smpi/colls/coll_tuned_topo.hpp src/smpi/colls/colls_private.hpp src/smpi/colls/smpi_mvapich2_selector_stampede.hpp - src/smpi/include/private.h src/smpi/include/private.hpp src/surf/cpu_cas01.hpp src/surf/cpu_interface.hpp -- 2.20.1