/* 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 "smpi_host.hpp"
#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "smpi_coll.hpp"
-#include "smpi_process.hpp"
-#include "src/msg/msg_private.hpp"
+#include "smpi_f2c.hpp"
+#include "smpi_host.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
#include "src/simix/smx_private.hpp"
+#include "src/smpi/include/smpi_actor.hpp"
#include "xbt/config.hpp"
#include <cfloat> /* DBL_MAX */
#if HAVE_PAPI
#include "papi.h"
-const char* papi_default_config_name = "default";
-
-struct papi_process_data {
- papi_counter_t counter_data;
- int event_set;
-};
+std::string papi_default_config_name = "default";
+std::map</* computation unit name */ std::string, papi_process_data> units2papi_setup;
#endif
using simgrid::s4u::Actor;
using simgrid::s4u::ActorPtr;
std::unordered_map<std::string, double> location2speedup;
-static std::map</*process_id*/ ActorPtr, simgrid::smpi::Process*> process_data;
+static std::map</*process_id*/ ActorPtr, simgrid::smpi::ActorExt*> process_data;
int process_count = 0;
static int smpi_exit_status = 0;
int smpi_universe_size = 0;
return process_count;
}
-simgrid::smpi::Process* smpi_process()
+simgrid::smpi::ActorExt* smpi_process()
{
ActorPtr me = Actor::self();
+
if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...)
return nullptr;
- simgrid::msg::ActorExt* msgExt = static_cast<simgrid::msg::ActorExt*>(me->get_impl()->getUserData());
- return static_cast<simgrid::smpi::Process*>(msgExt->data);
+
+ return process_data.at(me);
}
-simgrid::smpi::Process* smpi_process_remote(ActorPtr actor)
+simgrid::smpi::ActorExt* smpi_process_remote(ActorPtr actor)
{
return process_data.at(actor);
}
}
void smpi_process_init(int *argc, char ***argv){
- simgrid::smpi::Process::init(argc, argv);
+ simgrid::smpi::ActorExt::init(argc, argv);
}
int smpi_process_index(){
}
void * smpi_process_get_user_data(){
- return smpi_process()->get_user_data();
+ return Actor::self()->get_impl()->get_user_data();
}
void smpi_process_set_user_data(void *data){
- return smpi_process()->set_user_data(data);
+ Actor::self()->get_impl()->set_user_data(data);
}
// This map holds for each computation unit (such as "default" or "process1" etc.)
// the configuration as given by the user (counter data as a pair of (counter_name, counter_counter))
// and the (computed) event_set.
- std::map</* computation unit name */ std::string, papi_process_data> units2papi_setup;
if (not simgrid::config::get_value<std::string>("smpi/papi-events").empty()) {
if (PAPI_library_init(PAPI_VER_CURRENT) != PAPI_VER_CURRENT)
XBT_ERROR("Could not initialize PAPI library; is it correctly installed and linked?"
- " Expected version is %i",
- PAPI_VER_CURRENT);
+ " Expected version is %u", PAPI_VER_CURRENT);
typedef boost::tokenizer<boost::char_separator<char>> Tokenizer;
boost::char_separator<char> separator_units(";");
if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
smpi_destroy_global_memory_segments();
smpi_free_static();
+ if(simgrid::smpi::F2C::lookup() != nullptr)
+ simgrid::smpi::F2C::delete_lookup();
}
static void smpi_init_options(){
simgrid::smpi::Colls::smpi_coll_cleanup_callback = nullptr;
smpi_cpu_threshold = simgrid::config::get_value<double>("smpi/cpu-threshold");
smpi_host_speed = simgrid::config::get_value<double>("smpi/host-speed");
- xbt_assert(smpi_host_speed >= 0, "You're trying to set the host_speed to a negative value (%f)", smpi_host_speed);
+ xbt_assert(smpi_host_speed > 0.0, "You're trying to set the host_speed to a non-positive value (given: %f)", smpi_host_speed);
std::string smpi_privatize_option = simgrid::config::get_value<std::string>("smpi/privatization");
if (smpi_privatize_option == "no" || smpi_privatize_option == "0")
smpi_privatize_global_variables = SmpiPrivStrategies::NONE;
XBT_DEBUG("Running without smpi_main(); disable smpi/privatization.");
smpi_privatize_global_variables = SmpiPrivStrategies::NONE;
}
-#if HAVE_WORKING_MMAP
+#if !HAVE_WORKING_MMAP
if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
- XBT_INFO("mmap privatization is broken on FreeBSD, switching to dlopen privatization instead.");
+ XBT_INFO("mmap privatization is broken on this platform, switching to dlopen privatization instead.");
smpi_privatize_global_variables = SmpiPrivStrategies::DLOPEN;
}
#endif
}
TRACE_global_init();
-
SIMIX_global_init(&argc, argv);
- MSG_init(&argc, argv); // FIXME Remove this MSG call. Once it's removed, we can remove the msg header include as well
SMPI_switch_data_segment = &smpi_switch_data_segment;
// TODO This will not be executed in the case where smpi_main is not called,
// e.g., not for smpi_msg_masterslave. This should be moved to another location
- // that is always called -- maybe close to Actor::onCreation?
+ // that is always called -- maybe close to Actor::on_creation?
simgrid::s4u::Host::on_creation.connect(
[](simgrid::s4u::Host& host) { host.extension_set(new simgrid::smpi::Host(&host)); });
// parse the platform file: get the host list
- SIMIX_create_environment(argv[1]);
+ simgrid::s4u::Engine::get_instance()->load_platform(argv[1]);
SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback);
smpi_init_options();
smpi_init_privatization_no_dlopen(executable);
SMPI_init();
- SIMIX_launch_application(argv[2]);
+ simgrid::s4u::Engine::get_instance()->load_deployment(argv[2]);
SMPI_app_instance_register(smpi_default_instance_name.c_str(), nullptr,
process_data.size()); // This call has a side effect on process_count...
MPI_COMM_WORLD = *smpi_deployment_comm_world(smpi_default_instance_name);
void SMPI_init(){
simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::ActorPtr actor) {
if (not actor->is_daemon()) {
- process_data.insert({actor, new simgrid::smpi::Process(actor, nullptr)});
+ process_data.insert({actor, new simgrid::smpi::ActorExt(actor, nullptr)});
}
});
simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) {
}
void smpi_mpi_init() {
+ smpi_init_fortran_types();
if(smpi_init_sleep > 0)
simcall_process_sleep(smpi_init_sleep);
}
