X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..68bf973c759c6eef597da8349276be4b60a6d124:/src/smpi/include/private.hpp diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index 26c3ea0d75..ae78bcbeb1 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -62,10 +62,10 @@ 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 SMPI_Process* smpi_process_remote(simgrid::s4u::ActorPtr actor); XBT_PRIVATE int smpi_process_count(); -XBT_PRIVATE void smpi_deployment_register_process(const char* instance_id, int rank, int index); +XBT_PRIVATE void smpi_deployment_register_process(const char* instance_id, int rank, simgrid::s4u::ActorPtr actor); 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(); @@ -427,14 +427,12 @@ XBT_PRIVATE smpi_privatization_region_t smpi_init_global_memory_segment_process( #if HAVE_PAPI typedef std::vector> papi_counter_t; XBT_PRIVATE papi_counter_t& smpi_process_papi_counters(); -XBT_PRIVATE int smpi_process_papi_event_set(); #endif extern std::unordered_map location2speedup; /** @brief Returns the last call location (filename, linenumber). Process-specific. */ extern "C" { -XBT_PUBLIC(smpi_trace_call_location_t*) smpi_process_get_call_location(); XBT_PUBLIC(smpi_trace_call_location_t*) smpi_trace_get_call_location(); } @@ -442,7 +440,7 @@ enum smpi_priv_strategies { SMPI_PRIVATIZE_NONE = 0, SMPI_PRIVATIZE_MMAP = 1, SMPI_PRIVATIZE_DLOPEN = 2, - SMPI_PRIVATIZE_DEFAULT = SMPI_PRIVATIZE_MMAP + SMPI_PRIVATIZE_DEFAULT = SMPI_PRIVATIZE_DLOPEN }; extern XBT_PRIVATE int smpi_privatize_global_variables;