/* 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 "SmpiHost.hpp"
+#include "smpi_host.hpp"
#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "smpi_coll.hpp"
auto private_blocks = merge_private_blocks(src_private_blocks, dst_private_blocks);
check_blocks(private_blocks, buff_size);
void* tmpbuff=buff;
- if ((smpi_privatize_global_variables == SmpiPrivStrategies::Mmap) &&
+ if ((smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) &&
(static_cast<char*>(buff) >= smpi_data_exe_start) &&
(static_cast<char*>(buff) < smpi_data_exe_start + smpi_data_exe_size)) {
XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !");
memcpy_private(tmpbuff, buff, private_blocks);
}
- if ((smpi_privatize_global_variables == SmpiPrivStrategies::Mmap) && ((char*)comm->dst_buff >= smpi_data_exe_start) &&
+ if ((smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) && ((char*)comm->dst_buff >= smpi_data_exe_start) &&
((char*)comm->dst_buff < smpi_data_exe_start + smpi_data_exe_size)) {
XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment");
smpi_switch_data_segment(comm->dst_proc->iface());
xbt_os_timer_free(global_timer);
}
- if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap)
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
smpi_destroy_global_memory_segments();
smpi_free_static();
}
xbt_assert(smpi_host_speed >= 0, "You're trying to set the host_speed to a negative value (%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;
+ smpi_privatize_global_variables = SmpiPrivStrategies::NONE;
else if (smpi_privatize_option == "yes" || smpi_privatize_option == "1")
- smpi_privatize_global_variables = SmpiPrivStrategies::Default;
+ smpi_privatize_global_variables = SmpiPrivStrategies::DEFAULT;
else if (smpi_privatize_option == "mmap")
- smpi_privatize_global_variables = SmpiPrivStrategies::Mmap;
+ smpi_privatize_global_variables = SmpiPrivStrategies::MMAP;
else if (smpi_privatize_option == "dlopen")
- smpi_privatize_global_variables = SmpiPrivStrategies::Dlopen;
+ smpi_privatize_global_variables = SmpiPrivStrategies::DLOPEN;
else
xbt_die("Invalid value for smpi/privatization: '%s'", smpi_privatize_option.c_str());
if (not SMPI_switch_data_segment) {
XBT_DEBUG("Running without smpi_main(); disable smpi/privatization.");
- smpi_privatize_global_variables = SmpiPrivStrategies::None;
+ smpi_privatize_global_variables = SmpiPrivStrategies::NONE;
}
#if defined(__FreeBSD__)
- if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap) {
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
XBT_INFO("mmap privatization is broken on FreeBSD, switching to dlopen privatization instead.");
- smpi_privatize_global_variables = SmpiPrivStrategies::Dlopen;
+ smpi_privatize_global_variables = SmpiPrivStrategies::DLOPEN;
}
#endif
std::string val = simgrid::config::get_value<std::string>("smpi/shared-malloc");
if ((val == "yes") || (val == "1") || (val == "on") || (val == "global")) {
- smpi_cfg_shared_malloc = shmalloc_global;
+ smpi_cfg_shared_malloc = SharedMallocType::GLOBAL;
} else if (val == "local") {
- smpi_cfg_shared_malloc = shmalloc_local;
+ smpi_cfg_shared_malloc = SharedMallocType::LOCAL;
} else if ((val == "no") || (val == "0") || (val == "off")) {
- smpi_cfg_shared_malloc = shmalloc_none;
+ smpi_cfg_shared_malloc = SharedMallocType::NONE;
} else {
xbt_die("Invalid value '%s' for option smpi/shared-malloc. Possible values: 'on' or 'global', 'local', 'off'",
val.c_str());
// 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?
- simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
- host.extension_set(new simgrid::smpi::SmpiHost(&host));
- });
+ 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]);
SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback);
smpi_init_options();
- if (smpi_privatize_global_variables == SmpiPrivStrategies::Dlopen) {
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::DLOPEN) {
std::string executable_copy = executable;
};
}
else {
- if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap)
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
smpi_prepare_global_memory_segment();
// Load the dynamic library and resolve the entry point:
void* handle = dlopen(executable, RTLD_LAZY | RTLD_LOCAL);
smpi_entry_point_type entry_point = smpi_resolve_function(handle);
if (not entry_point)
xbt_die("main not found in %s", executable);
- if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap)
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
smpi_backup_global_memory_segment();
// Execute the same entry point for each simulated process:
}
smpi_global_destroy();
- TRACE_end();
-
return smpi_exit_status;
}
smpi_init_options();
smpi_global_init();
smpi_check_options();
- simgrid::s4u::onSimulationEnd.connect(TRACE_smpi_release);
+ simgrid::s4u::on_simulation_end.connect(TRACE_smpi_release);
}
void SMPI_finalize(){