X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec83ae9a081ffd1d19bfecaf81cb99c32bdf6b83..1847d1441271d076b3de449c8853031ea208ce8f:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index c875ed32fd..dd8daa8d6f 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -6,27 +6,31 @@ #include #include -#include /* Signal handling */ -#include #include "src/internal_config.h" +#include /* Signal handling */ +#include +#include #include #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/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/kernel/activity/SynchroExec.hpp" -#include "src/kernel/activity/SynchroComm.hpp" -#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/smpi/include/smpi_process.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" @@ -34,13 +38,13 @@ #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"); @@ -50,11 +54,13 @@ std::unique_ptr simix_global; static xbt_heap_t simix_timers = nullptr; /** @brief Timer datatype */ -typedef struct s_smx_timer { +typedef class s_smx_timer { double date = 0.0; - simgrid::xbt::Task callback; + s_smx_timer() = default; - s_smx_timer()=default; +public: + simgrid::xbt::Task callback; + double getDate() { return date; } s_smx_timer(double date, simgrid::xbt::Task callback) : date(date), callback(std::move(callback)) {} } s_smx_timer_t; @@ -123,9 +129,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); } @@ -197,12 +203,10 @@ void SIMIX_global_init(int *argc, char **argv) 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; - simix_global->process_to_run = xbt_dynar_new(sizeof(smx_actor_t), nullptr); - simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_actor_t), nullptr); simix_global->process_to_destroy = xbt_swag_new(xbt_swag_offset(proc, destroy_hookup)); simix_global->maestro_process = nullptr; simix_global->create_process_function = &SIMIX_process_create; @@ -231,18 +235,13 @@ void SIMIX_global_init(int *argc, char **argv) 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); }); @@ -279,7 +278,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 simix_global->process_to_run.empty() && 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."); @@ -294,8 +293,8 @@ void SIMIX_clean() xbt_heap_free(simix_timers); simix_timers = nullptr; /* Free the remaining data structures */ - xbt_dynar_free(&simix_global->process_to_run); - xbt_dynar_free(&simix_global->process_that_ran); + simix_global->process_to_run.clear(); + simix_global->process_that_ran.clear(); xbt_swag_free(simix_global->process_to_destroy); simix_global->process_list.clear(); simix_global->process_to_destroy = nullptr; @@ -336,29 +335,16 @@ double SIMIX_get_clock() } } -static int process_syscall_color(void *p) -{ - switch ((*(smx_actor_t *)p)->simcall.call) { - case SIMCALL_NONE: - case SIMCALL_PROCESS_KILL: - return 2; - case SIMCALL_PROCESS_RESUME: - return 1; - default: - return 0; - } -} - /** Wake up all processes waiting for a Surf action to finish */ static void SIMIX_wake_processes() { surf_action_t action; - for(auto model : *all_existing_models) { + for (auto const& model : *all_existing_models) { 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))) { @@ -366,7 +352,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())); } } } @@ -412,7 +398,7 @@ static bool SIMIX_execute_tasks() task(); simix_global->tasksTemp.clear(); - } while (!simix_global->tasks.empty()); + } while (not simix_global->tasks.empty()); return true; } @@ -431,19 +417,16 @@ void SIMIX_run() double time = 0; do { - XBT_DEBUG("New Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run)); + XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->process_to_run.size()); SIMIX_execute_tasks(); - while (!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)); + while (not simix_global->process_to_run.empty()) { + XBT_DEBUG("New Sub-Schedule Round; size(queue)=%zu", simix_global->process_to_run.size()); /* Run all processes that are ready to run, possibly in parallel */ SIMIX_process_runall(); - /* Move all killer processes to the end of the list, because killing a process that have an ongoing simcall is a bad idea */ - xbt_dynar_three_way_partition(simix_global->process_that_ran, process_syscall_color); - /* answer sequentially and in a fixed arbitrary order all the simcalls that were issued during that sub-round */ /* WARNING, the order *must* be fixed or you'll jeopardize the simulation reproducibility (see RR-7653) */ @@ -499,9 +482,7 @@ void SIMIX_run() * That would thus be a pure waste of time. */ - unsigned int iter; - smx_actor_t process; - xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { + for (smx_actor_t const& process : simix_global->process_that_ran) { if (process->simcall.call != SIMCALL_NONE) { SIMIX_simcall_handle(&process->simcall, 0); } @@ -514,7 +495,7 @@ void SIMIX_run() /* 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) { + for (auto const& dmon : simix_global->daemons) { XBT_DEBUG("Kill %s", dmon->cname()); SIMIX_process_kill(dmon, simix_global->maestro_process); } @@ -541,8 +522,8 @@ void SIMIX_run() } while (again); /* Autorestart all process */ - for (auto host: host_that_restart) { - XBT_INFO("Restart processes on host %s", host->cname()); + for (auto const& host : host_that_restart) { + XBT_INFO("Restart processes on host %s", host->getCname()); SIMIX_host_autorestart(host); } host_that_restart.clear(); @@ -550,15 +531,13 @@ void SIMIX_run() /* Clean processes to destroy */ SIMIX_process_empty_trash(); - XBT_DEBUG("### time %f, #processes %zu, #to_run %lu", time, simix_global->process_list.size(), - xbt_dynar_length(simix_global->process_to_run)); + XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(), + simix_global->process_to_run.size()); + if (simix_global->process_to_run.empty() && not simix_global->process_list.empty()) + simgrid::simix::onDeadlock(); - if (xbt_dynar_is_empty(simix_global->process_to_run) && - !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 simix_global->process_to_run.empty()); if (simix_global->process_list.size() != 0) { @@ -582,7 +561,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; } @@ -596,12 +575,12 @@ smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task callback) /** @brief cancels a timer that was added earlier */ void SIMIX_timer_remove(smx_timer_t timer) { - xbt_heap_rm_elm(simix_timers, timer, timer->date); + xbt_heap_rm_elm(simix_timers, timer, timer->getDate()); } /** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */ double SIMIX_timer_get_date(smx_timer_t timer) { - return timer?timer->date:0; + return timer ? timer->getDate() : 0; } /** @@ -650,46 +629,34 @@ void SIMIX_display_process_status() XBT_INFO("%d processes are still running, waiting for something.", nbprocess); /* List the process and their state */ XBT_INFO("Legend of the following listing: \"Process (@): \""); - for (auto kv : simix_global->process_list) { + for (auto const& kv : simix_global->process_list) { smx_actor_t process = kv.second; if (process->waiting_synchro) { 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()); } } }