X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1acdb6e20d63bf8987e6fbcf65e40949831a206d..a2ff7cc7c5bf86435c85fcc21ca6edc6c20cde3b:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 184472573a..d00955b753 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -6,42 +6,44 @@ #include #include -#include /* Signal handling */ -#include #include "src/internal_config.h" +#include /* Signal handling */ +#include #include -#include "simgrid/s4u/engine.hpp" -#include "simgrid/s4u/host.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" #include "src/surf/surf_interface.hpp" -#include "src/surf/storage_interface.hpp" #include "src/surf/xml/platf.hpp" #include "smx_private.h" -#include "xbt/str.h" #include "xbt/ex.h" /* ex_backtrace_display */ + #include "mc/mc.h" -#include "src/mc/mc_replay.h" #include "simgrid/sg_config.h" +#include "src/mc/mc_replay.h" +#include "src/surf/StorageImpl.hpp" + +#include "src/smpi/include/smpi_process.hpp" -#include "src/kernel/activity/SynchroExec.hpp" -#include "src/kernel/activity/SynchroComm.hpp" -#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/activity/ExecImpl.hpp" +#include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" -#if HAVE_MC +#if SIMGRID_HAVE_MC #include "src/mc/mc_private.h" #include "src/mc/remote/Client.hpp" #include "src/mc/remote/mc_protocol.h" -#include -#endif +#endif #include "src/mc/mc_record.h" #if HAVE_SMPI -#include "src/smpi/private.h" +#include "src/smpi/include/private.h" +#include "src/smpi/include/private.hpp" #endif XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); @@ -94,11 +96,11 @@ static void segvhandler(int signum, siginfo_t *siginfo, void *context) } else if (siginfo->si_signo == SIGSEGV) { fprintf(stderr, "Segmentation fault.\n"); #if HAVE_SMPI - if (smpi_enabled() && !smpi_privatize_global_variables) { + if (smpi_enabled() && smpi_privatize_global_variables == SMPI_PRIVATIZE_NONE) { #if HAVE_PRIVATIZATION - fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatize-global-variables:yes.\n"); + fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n"); #else - fprintf(stderr, "Sadly, your system does not support --cfg=smpi/privatize-global-variables:yes (yet).\n"); + fprintf(stderr, "Sadly, your system does not support --cfg=smpi/privatization:yes (yet).\n"); #endif /* HAVE_PRIVATIZATION */ } #endif /* HAVE_SMPI */ @@ -124,9 +126,9 @@ static void install_segvhandler() XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno)); return; } - if (!(old_stack.ss_flags & SS_DISABLE)) { - XBT_DEBUG("An alternate stack was already installed (sp=%p, size=%zd, flags=%x). Restore it.", - old_stack.ss_sp, old_stack.ss_size, old_stack.ss_flags); + if (not(old_stack.ss_flags & SS_DISABLE)) { + XBT_DEBUG("An alternate stack was already installed (sp=%p, size=%zu, flags=%x). Restore it.", old_stack.ss_sp, + old_stack.ss_size, (unsigned)old_stack.ss_flags); sigaltstack(&old_stack, nullptr); } @@ -192,13 +194,13 @@ void SIMIX_set_maestro(void (*code)(void*), void* data) */ void SIMIX_global_init(int *argc, char **argv) { -#if HAVE_MC +#if SIMGRID_HAVE_MC // The communication initialization is done ASAP. // We need to communicate initialization of the different layers to the model-checker. simgrid::mc::Client::initialize(); #endif - if (!simix_global) { + if (not simix_global) { simix_global = std::unique_ptr(new simgrid::simix::Global()); simgrid::simix::ActorImpl proc; @@ -228,21 +230,17 @@ void SIMIX_global_init(int *argc, char **argv) sg_platf_init(); simgrid::s4u::onPlatformCreated.connect(SIMIX_post_create_environment); simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) { - host.extension_set(new simgrid::simix::Host()); + if (host.extension() == nullptr) // another callback to the same signal may have created it + host.extension_set(new simgrid::simix::Host()); }); - simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::Storage* storage) { - const char* name = storage->cname(); - // TODO, create sg_storage_by_name - sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, name); - xbt_assert(s != nullptr, "Storage not found for name %s", name); - - SIMIX_storage_create(name, s, nullptr); + simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::StorageImpl* storage) { + sg_storage_t s = simgrid::s4u::Storage::byName(storage->cname()); + xbt_assert(s != nullptr, "Storage not found for name %s", storage->cname()); }); - - SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy); } - if (!simix_timers) + + if (not simix_timers) simix_timers = xbt_heap_new(8, [](void* p) { delete static_cast(p); }); @@ -268,7 +266,7 @@ void SIMIX_clean() #if HAVE_SMPI if (SIMIX_process_count()>0){ - if(smpi_process_initialized()){ + if(smpi_process()->initialized()){ xbt_die("Process exited without calling MPI_Finalize - Killing simulation"); }else{ XBT_WARN("Process called exit when leaving - Skipping cleanups"); @@ -279,7 +277,7 @@ void SIMIX_clean() smx_cleaned = 1; XBT_DEBUG("SIMIX_clean called. Simulation's over."); - if (!xbt_dynar_is_empty(simix_global->process_to_run) && SIMIX_get_clock() <= 0.0) { + if (not xbt_dynar_is_empty(simix_global->process_to_run) && SIMIX_get_clock() <= 0.0) { XBT_CRITICAL(" "); XBT_CRITICAL("The time is still 0, and you still have processes ready to run."); XBT_CRITICAL("It seems that you forgot to run the simulation that you setup."); @@ -302,6 +300,9 @@ void SIMIX_clean() xbt_os_mutex_destroy(simix_global->mutex); simix_global->mutex = nullptr; +#if SIMGRID_HAVE_MC + xbt_dynar_free(&simix_global->actors_vector); +#endif /* Let's free maestro now */ delete simix_global->maestro_process->context; @@ -339,8 +340,8 @@ static int process_syscall_color(void *p) case SIMCALL_NONE: case SIMCALL_PROCESS_KILL: return 2; - case SIMCALL_PROCESS_RESUME: - return 1; + // case SIMCALL_PROCESS_RESUME: + // return 1; default: return 0; } @@ -355,7 +356,7 @@ static void SIMIX_wake_processes() XBT_DEBUG("Handling the processes whose action failed (if any)"); while ((action = surf_model_extract_failed_action_set(model))) { XBT_DEBUG(" Handling Action %p",action); - SIMIX_simcall_exit((smx_activity_t) action->getData()); + SIMIX_simcall_exit(static_cast(action->getData())); } XBT_DEBUG("Handling the processes whose action terminated normally (if any)"); while ((action = surf_model_extract_done_action_set(model))) { @@ -363,7 +364,7 @@ static void SIMIX_wake_processes() if (action->getData() == nullptr) XBT_DEBUG("probably vcpu's action %p, skip", action); else - SIMIX_simcall_exit((smx_activity_t) action->getData()); + SIMIX_simcall_exit(static_cast(action->getData())); } } } @@ -409,7 +410,7 @@ static bool SIMIX_execute_tasks() task(); simix_global->tasksTemp.clear(); - } while (!simix_global->tasks.empty()); + } while (not simix_global->tasks.empty()); return true; } @@ -432,7 +433,7 @@ void SIMIX_run() SIMIX_execute_tasks(); - while (!xbt_dynar_is_empty(simix_global->process_to_run)) { + while (not xbt_dynar_is_empty(simix_global->process_to_run)) { XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run)); /* Run all processes that are ready to run, possibly in parallel */ @@ -509,6 +510,12 @@ void SIMIX_run() SIMIX_wake_processes(); } while (SIMIX_execute_tasks()); + /* If only daemon processes remain, cancel their actions, mark them to die and reschedule them */ + if (simix_global->process_list.size() == simix_global->daemons.size()) + for (const auto& dmon : simix_global->daemons) { + XBT_DEBUG("Kill %s", dmon->cname()); + SIMIX_process_kill(dmon, simix_global->maestro_process); + } } time = SIMIX_timer_next(); @@ -533,7 +540,7 @@ void SIMIX_run() /* Autorestart all process */ for (auto host: host_that_restart) { - XBT_INFO("Restart processes on host %s", host->cname()); + XBT_INFO("Restart processes on host %s", host->getCname()); SIMIX_host_autorestart(host); } host_that_restart.clear(); @@ -541,13 +548,13 @@ void SIMIX_run() /* Clean processes to destroy */ SIMIX_process_empty_trash(); - XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run)); + XBT_DEBUG("### time %f, #processes %zu, #to_run %lu", time, simix_global->process_list.size(), + xbt_dynar_length(simix_global->process_to_run)); - if (xbt_dynar_is_empty(simix_global->process_to_run) && - !simix_global->process_list.empty()) - simgrid::simix::onDeadlock(); + if (xbt_dynar_is_empty(simix_global->process_to_run) && not simix_global->process_list.empty()) + simgrid::simix::onDeadlock(); - } while (time > -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run)); + } while (time > -1.0 || not xbt_dynar_is_empty(simix_global->process_to_run)); if (simix_global->process_list.size() != 0) { @@ -571,7 +578,7 @@ void SIMIX_run() */ smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg) { - smx_timer_t timer = new s_smx_timer_t(date, [=](){ callback(arg); }); + smx_timer_t timer = new s_smx_timer_t(date, [callback, arg]() { callback(arg); }); xbt_heap_push(simix_timers, timer, date); return timer; } @@ -646,44 +653,33 @@ void SIMIX_display_process_status() const char* synchro_description = "unknown"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) synchro_description = "execution"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) synchro_description = "communication"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) synchro_description = "sleeping"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) synchro_description = "synchronization"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) synchro_description = "I/O"; - - /* - switch (process->waiting_synchro->type) { - case SIMIX_SYNC_PARALLEL_EXECUTE: - synchro_description = "parallel execution"; - break; - - case SIMIX_SYNC_JOIN: - synchro_description = "joining"; - break; -*/ - XBT_INFO("Process %lu (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid, - process->cname(), process->host->cname(), synchro_description, process->waiting_synchro, + process->cname(), process->host->getCname(), synchro_description, process->waiting_synchro.get(), process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state); } else { - XBT_INFO("Process %lu (%s@%s)", process->pid, process->cname(), process->host->cname()); + XBT_INFO("Process %lu (%s@%s)", process->pid, process->cname(), process->host->getCname()); } } } int SIMIX_is_maestro() { - return simix_global==nullptr /*SimDag*/|| SIMIX_process_self() == simix_global->maestro_process; + smx_actor_t self = SIMIX_process_self(); + return simix_global == nullptr /*SimDag*/ || self == nullptr || self == simix_global->maestro_process; }