X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cbd8dae6d524fc62b0fb5fcf7b2604e98f953615..4e73c03c087fd07184d9ed45224f7fbad24e686e:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index dcc7d0fed2..8e3316530e 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -37,7 +37,7 @@ # define HAVE_WORKING_MMAP 1 #endif -#if HAVE_SENDFILE +#if SG_HAVE_SENDFILE #include #endif @@ -184,8 +184,8 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b 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 { @@ -201,18 +201,19 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b (static_cast(buff) >= smpi_data_exe_start) && (static_cast(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(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 @@ -220,7 +221,7 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b 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); @@ -323,17 +324,15 @@ void smpi_global_init() int event_code = PAPI_NULL; char* event_name = const_cast((*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 @@ -498,7 +497,7 @@ static void smpi_copy_file(std::string src, std::string target, off_t fdin_size) XBT_DEBUG("Copy %" PRIdMAX " bytes into %s", static_cast(fdin_size), target.c_str()); bool slow_copy = true; -#if HAVE_SENDFILE +#if SG_HAVE_SENDFILE ssize_t sent_size = sendfile(fdout, fdin, NULL, fdin_size); if (sent_size == fdin_size) slow_copy = false; @@ -563,7 +562,7 @@ static void smpi_init_privatization_dlopen(const std::string& executable) 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) @@ -673,12 +672,6 @@ int smpi_main(const char* executable, int argc, char* argv[]) 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); @@ -739,6 +732,8 @@ void SMPI_init(){ 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();