#include "xbt/config.hpp"
#include <algorithm>
+#include <boost/algorithm/string.hpp> /* trim_right / trim_left */
+#include <boost/tokenizer.hpp>
#include <cfloat> /* DBL_MAX */
#include <cinttypes>
#include <cstdint> /* intmax_t */
#include <fstream>
#include <sys/stat.h>
-#if not defined(__APPLE__)
+#if SG_HAVE_SENDFILE
+#include <sys/sendfile.h>
+#endif
+
+#if HAVE_PAPI
+#include "papi.h"
+#endif
+
+#if not defined(__APPLE__) && not defined(__HAIKU__)
#include <link.h>
#endif
# define MAC_OS_X_VERSION_10_12 101200
# endif
constexpr bool HAVE_WORKING_MMAP = (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12);
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) || defined(__HAIKU__)
constexpr bool HAVE_WORKING_MMAP = false;
#else
constexpr bool HAVE_WORKING_MMAP = true;
#endif
-#if SG_HAVE_SENDFILE
-#include <sys/sendfile.h>
-#endif
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (kernel)");
-#include <boost/tokenizer.hpp>
-#include <boost/algorithm/string.hpp> /* trim_right / trim_left */
#if SMPI_IFORT
extern "C" void for_rtl_init_ (int *, char **);
#endif
#if HAVE_PAPI
-#include "papi.h"
std::string papi_default_config_name = "default";
std::map</* computation unit name */ std::string, papi_process_data> units2papi_setup;
#endif
void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size)
{
- int src_shared = 0;
- int dst_shared = 0;
size_t src_offset = 0;
size_t dst_offset = 0;
std::vector<std::pair<size_t, size_t>> src_private_blocks;
std::vector<std::pair<size_t, size_t>> dst_private_blocks;
XBT_DEBUG("Copy the data over");
- if((src_shared=smpi_is_shared(buff, src_private_blocks, &src_offset))) {
+ if(smpi_is_shared(buff, src_private_blocks, &src_offset)) {
XBT_DEBUG("Sender %p is shared. Let's ignore it.", buff);
src_private_blocks = shift_and_frame_private_blocks(src_private_blocks, src_offset, buff_size);
}
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))) {
+ if (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);
}
xbt_assert(simgrid::config::get_value<int>("smpi/async-small-thresh") <=
simgrid::config::get_value<int>("smpi/send-is-detached-thresh"));
- if (simgrid::config::is_default("smpi/host-speed")) {
+ if (simgrid::config::is_default("smpi/host-speed") && not MC_is_active()) {
XBT_INFO("You did not set the power of the host running the simulation. "
"The timings will certainly not be accurate. "
"Use the option \"--cfg=smpi/host-speed:<flops>\" to set its value. "
simgrid::smpi::Colls::set_collectives();
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.0, "You're trying to set the host_speed to a non-positive value (given: %f)", smpi_host_speed);
+ if (smpi_cpu_threshold < 0)
+ smpi_cpu_threshold = DBL_MAX;
+
+ smpi_host_speed = simgrid::config::get_value<double>("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::DLOPEN;
}
- if (smpi_cpu_threshold < 0)
- smpi_cpu_threshold = DBL_MAX;
-
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 = SharedMallocType::GLOBAL;
typedef int (* smpi_c_entry_point_type)(int argc, char **argv);
typedef void (*smpi_fortran_entry_point_type)();
-static int smpi_run_entry_point(const smpi_entry_point_type& entry_point, const std::string& executable_path,
- std::vector<std::string> args)
+template <typename F>
+static int smpi_run_entry_point(const F& 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());
#endif
// If this point is reached, sendfile() actually is not available. Copy file by hand.
const int bufsize = 1024 * 1024 * 4;
- char buf[bufsize];
+ char* buf = new char[bufsize];
while (int got = read(fdin, buf, bufsize)) {
if (got == -1) {
xbt_assert(errno == EINTR, "Cannot read from %s", src.c_str());
}
}
}
+ delete[] buf;
close(fdin);
close(fdout);
}
-#if not defined(__APPLE__)
+#if not defined(__APPLE__) && not defined(__HAIKU__)
static int visit_libs(struct dl_phdr_info* info, size_t, void* data)
{
char* libname = (char*)(data);
// get library name from path
char fullpath[512] = {'\0'};
strncpy(fullpath, libname.c_str(), 511);
-#if not defined(__APPLE__)
- int ret = dl_iterate_phdr(visit_libs, fullpath);
- if (ret == 0)
- xbt_die("Can't find a linked %s - check the setting you gave to smpi/privatize-libs", fullpath);
- else
- XBT_DEBUG("Extra lib to privatize found : %s", fullpath);
+#if not defined(__APPLE__) && not defined(__HAIKU__)
+ xbt_assert(0 != dl_iterate_phdr(visit_libs, fullpath),
+ "Can't find a linked %s - check your settings in smpi/privatize-libs", fullpath);
+ XBT_DEBUG("Extra lib to privatize '%s' found", fullpath);
#else
- xbt_die("smpi/privatize-libs is not (yet) compatible with OSX");
+ xbt_die("smpi/privatize-libs is not (yet) compatible with OSX nor with Haiku");
#endif
privatize_libs_paths.push_back(fullpath);
dlclose(libhandle);
