-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
# define MAC_OS_X_VERSION_10_12 101200
# endif
# define HAVE_WORKING_MMAP (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12)
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# define HAVE_WORKING_MMAP 0
#else
# define HAVE_WORKING_MMAP 1
#endif
-#if HAVE_SENDFILE
+#if SG_HAVE_SENDFILE
#include <sys/sendfile.h>
#endif
}
void smpi_process_init(int *argc, char ***argv){
- simgrid::smpi::ActorExt::init(argc, argv);
+ simgrid::smpi::ActorExt::init();
}
void * smpi_process_get_user_data(){
src_private_blocks.clear();
src_private_blocks.push_back(std::make_pair(0, buff_size));
}
- if((dst_shared=smpi_is_shared((char*)comm->dst_buff, dst_private_blocks, &dst_offset))) {
- XBT_DEBUG("Receiver %p is shared. Let's ignore it.", (char*)comm->dst_buff);
+ if ((dst_shared = smpi_is_shared((char*)comm->dst_buff_, dst_private_blocks, &dst_offset))) {
+ XBT_DEBUG("Receiver %p is shared. Let's ignore it.", (char*)comm->dst_buff_);
dst_private_blocks = shift_and_frame_private_blocks(dst_private_blocks, dst_offset, buff_size);
}
else {
(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 !");
- smpi_switch_data_segment(comm->src_proc->iface());
+ smpi_switch_data_segment(comm->src_actor_->iface());
tmpbuff = static_cast<void*>(xbt_malloc(buff_size));
memcpy_private(tmpbuff, buff, private_blocks);
}
- 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)) {
+ 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());
+ smpi_switch_data_segment(comm->dst_actor_->iface());
}
- XBT_DEBUG("Copying %zu bytes from %p to %p", buff_size, tmpbuff,comm->dst_buff);
- memcpy_private(comm->dst_buff, tmpbuff, private_blocks);
+ XBT_DEBUG("Copying %zu bytes from %p to %p", buff_size, tmpbuff, comm->dst_buff_);
+ memcpy_private(comm->dst_buff_, tmpbuff, private_blocks);
if (comm->detached) {
// if this is a detached send, the source buffer was duplicated by SMPI
xbt_free(buff);
//It seems that the request is used after the call there this should be free somewhere else but where???
//xbt_free(comm->comm.src_data);// inside SMPI the request is kept inside the user data and should be free
- comm->src_buff = nullptr;
+ comm->src_buff_ = nullptr;
}
if (tmpbuff != buff)
xbt_free(tmpbuff);
int event_code = PAPI_NULL;
char* event_name = const_cast<char*>((*events_it).c_str());
- if (PAPI_event_name_to_code(event_name, &event_code) == PAPI_OK) {
- if (PAPI_add_event(event_set, event_code) != PAPI_OK) {
- XBT_ERROR("Could not add PAPI event '%s'. Skipping.", event_name);
- continue;
- } else {
- XBT_DEBUG("Successfully added PAPI event '%s' to the event set.", event_name);
- }
- } else {
+ if (PAPI_event_name_to_code(event_name, &event_code) != PAPI_OK) {
XBT_CRITICAL("Could not find PAPI event '%s'. Skipping.", event_name);
continue;
}
+ if (PAPI_add_event(event_set, event_code) != PAPI_OK) {
+ XBT_ERROR("Could not add PAPI event '%s'. Skipping.", event_name);
+ continue;
+ }
+ XBT_DEBUG("Successfully added PAPI event '%s' to the event set.", event_name);
counters2values.push_back(
// We cannot just pass *events_it, as this is of type const basic_string
typedef int (* smpi_c_entry_point_type)(int argc, char **argv);
typedef void (*smpi_fortran_entry_point_type)();
-static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vector<std::string> args)
+static int smpi_run_entry_point(smpi_entry_point_type entry_point, const std::string& executable_path,
+ std::vector<std::string> args)
{
// copy C strings, we need them writable
std::vector<char*>* args4argv = new std::vector<char*>(args.size());
std::transform(begin(args), end(args), begin(*args4argv), [](const std::string& s) { return xbt_strdup(s.c_str()); });
+ // set argv[0] to executable_path
+ xbt_free((*args4argv)[0]);
+ (*args4argv)[0] = xbt_strdup(executable_path.c_str());
+
#if !SMPI_IFORT
// take a copy of args4argv to keep reference of the allocated strings
const std::vector<char*> args2str(*args4argv);
args4argv->push_back(nullptr);
char** argv = args4argv->data();
- simgrid::smpi::ActorExt::init(&argc, &argv);
+ simgrid::smpi::ActorExt::init();
#if SMPI_IFORT
for_rtl_init_ (&argc, argv);
#elif SMPI_FLANG
xbt_assert(fdout >= 0, "Cannot write into %s", target.c_str());
XBT_DEBUG("Copy %" PRIdMAX " bytes into %s", static_cast<intmax_t>(fdin_size), target.c_str());
-#if HAVE_SENDFILE
+ bool slow_copy = true;
+#if SG_HAVE_SENDFILE
ssize_t sent_size = sendfile(fdout, fdin, NULL, fdin_size);
- xbt_assert(sent_size == fdin_size,
- "Error while copying %s: only %zd bytes copied instead of %" PRIdMAX " (errno: %d -- %s)", target.c_str(),
- sent_size, static_cast<intmax_t>(fdin_size), errno, strerror(errno));
-#else
- const int bufsize = 1024 * 1024 * 4;
- char buf[bufsize];
- while (int got = read(fdin, buf, bufsize)) {
- if (got == -1) {
- xbt_assert(errno == EINTR, "Cannot read from %s", src.c_str());
- } else {
- char* p = buf;
- int todo = got;
- while (int done = write(fdout, p, todo)) {
- if (done == -1) {
- xbt_assert(errno == EINTR, "Cannot write into %s", target.c_str());
- } else {
- p += done;
- todo -= done;
+ if (sent_size == fdin_size)
+ slow_copy = false;
+ else if (sent_size != -1 || errno != ENOSYS)
+ xbt_die("Error while copying %s: only %zd bytes copied instead of %" PRIdMAX " (errno: %d -- %s)", target.c_str(),
+ sent_size, static_cast<intmax_t>(fdin_size), errno, strerror(errno));
+#endif
+ if (slow_copy) {
+ const int bufsize = 1024 * 1024 * 4;
+ char buf[bufsize];
+ while (int got = read(fdin, buf, bufsize)) {
+ if (got == -1) {
+ xbt_assert(errno == EINTR, "Cannot read from %s", src.c_str());
+ } else {
+ char* p = buf;
+ int todo = got;
+ while (int done = write(fdout, p, todo)) {
+ if (done == -1) {
+ xbt_assert(errno == EINTR, "Cannot write into %s", target.c_str());
+ } else {
+ p += done;
+ todo -= done;
+ }
}
}
}
}
-#endif
close(fdin);
close(fdout);
}
}
#endif
-static void smpi_init_privatization_dlopen(std::string executable)
+static void smpi_init_privatization_dlopen(const std::string& executable)
{
// Prepare the copy of the binary (get its size)
struct stat fdin_stat;
void* libhandle = dlopen(libname.c_str(), RTLD_LAZY);
// get library name from path
char fullpath[512] = {'\0'};
- strcpy(fullpath, libname.c_str());
+ strncpy(fullpath, libname.c_str(), 511);
#if not defined(__APPLE__)
int ret = dl_iterate_phdr(visit_libs, fullpath);
if (ret == 0)
simix_global->default_function = [executable, fdin_size](std::vector<std::string> args) {
return std::function<void()>([executable, fdin_size, args] {
-
// Copy the dynamic library:
std::string target_executable =
executable + "_" + std::to_string(getpid()) + "_" + std::to_string(rank) + ".so";
smpi_entry_point_type entry_point = smpi_resolve_function(handle);
if (not entry_point)
xbt_die("Could not resolve entry point");
- smpi_run_entry_point(entry_point, args);
+ smpi_run_entry_point(entry_point, executable, args);
});
};
}
-static void smpi_init_privatization_no_dlopen(std::string executable)
+static void smpi_init_privatization_no_dlopen(const std::string& executable)
{
if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
smpi_prepare_global_memory_segment();
smpi_backup_global_memory_segment();
// Execute the same entry point for each simulated process:
- simix_global->default_function = [entry_point](std::vector<std::string> args) {
- return std::function<void()>([entry_point, args] { smpi_run_entry_point(entry_point, args); });
+ simix_global->default_function = [entry_point, executable](std::vector<std::string> args) {
+ return std::function<void()>(
+ [entry_point, executable, args] { smpi_run_entry_point(entry_point, executable, args); });
};
}
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::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
simgrid::s4u::Engine::get_instance()->load_platform(argv[1]);
SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback);
process_data.erase(it);
}
});
+ simgrid::s4u::Host::on_creation.connect(
+ [](simgrid::s4u::Host& host) { host.extension_set(new simgrid::smpi::Host(&host)); });
smpi_init_options();
smpi_global_init();
