#include <fstream>
#include <sys/stat.h>
-#if not defined(__APPLE__)
+#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__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) || defined(__HAIKU__)
constexpr bool HAVE_WORKING_MMAP = false;
#else
constexpr bool HAVE_WORKING_MMAP = true;
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_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 (comm->detached()) {
// if this is a detached send, the source buffer was duplicated by SMPI
// sender to make the original buffer available to the application ASAP
xbt_free(buff);
if (simgrid::config::is_default("smpi/host-speed")) {
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."
- "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information.");
+ "Use the option \"--cfg=smpi/host-speed:<flops>\" to set its value. "
+ "Check "
+ "https://simgrid.org/doc/latest/Configuring_SimGrid.html#automatic-benchmarking-of-smpi-code for more "
+ "information.");
}
xbt_assert(simgrid::config::get_value<double>("smpi/cpu-threshold") >= 0,
#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__)
+#if not defined(__APPLE__) && not defined(__HAIKU__)
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);