X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f540320e2e4fd4fe5c9cb1bf8a4b1c0a972082e6..38906765bf812b1c32df889f3ce7e72bb58e1326:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index d63e2cb89b..90a9c486c0 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -25,11 +25,11 @@ #include "src/mc/mc_replay.h" #include "simgrid/sg_config.h" -#include "src/synchro/SynchroExec.hpp" -#include "src/synchro/SynchroComm.hpp" -#include "src/synchro/SynchroSleep.hpp" -#include "src/synchro/SynchroIo.hpp" -#include "src/synchro/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroExec.hpp" +#include "src/kernel/activity/SynchroComm.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/kernel/activity/SynchroIo.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" #if HAVE_MC #include "src/mc/mc_private.h" @@ -57,9 +57,8 @@ typedef struct s_smx_timer { double date = 0.0; simgrid::xbt::Task callback; - s_smx_timer() {} - s_smx_timer(double date, simgrid::xbt::Task callback) - : date(date), callback(std::move(callback)) {} + s_smx_timer()=default; + s_smx_timer(double date, simgrid::xbt::Task callback) : date(date), callback(std::move(callback)) {} } s_smx_timer_t; void (*SMPI_switch_data_segment)(int) = nullptr; @@ -91,8 +90,7 @@ static void segvhandler(int signum, siginfo_t *siginfo, void *context) "Try to increase stack size with --cfg=contexts/stack_size (current size is %d KiB).\n", smx_context_stack_size / 1024); if (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) { - fprintf(stderr, - "siginfo = {si_signo = %d, si_errno = %d, si_code = %d, si_addr = %p}\n", + fprintf(stderr, "siginfo = {si_signo = %d, si_errno = %d, si_code = %d, si_addr = %p}\n", siginfo->si_signo, siginfo->si_errno, siginfo->si_code, siginfo->si_addr); } } else if (siginfo->si_signo == SIGSEGV) { @@ -100,11 +98,9 @@ static void segvhandler(int signum, siginfo_t *siginfo, void *context) #if HAVE_SMPI if (smpi_enabled() && !smpi_privatize_global_variables) { #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/privatize-global-variables: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/privatize-global-variables:yes (yet).\n"); #endif /* HAVE_PRIVATIZATION */ } #endif /* HAVE_SMPI */ @@ -118,7 +114,7 @@ char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */ * Install signal handler for SIGSEGV. Check that nobody has already installed * its own handler. For example, the Java VM does this. */ -static void install_segvhandler(void) +static void install_segvhandler() { stack_t stack, old_stack; stack.ss_sp = sigsegv_stack; @@ -146,8 +142,7 @@ static void install_segvhandler(void) } if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) { XBT_DEBUG("A signal handler was already installed for SIGSEGV (%p). Restore it.", - (old_action.sa_flags & SA_SIGINFO) ? - (void*)old_action.sa_sigaction : (void*)old_action.sa_handler); + (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler); sigaction(SIGSEGV, &old_action, nullptr); } } @@ -155,7 +150,7 @@ static void install_segvhandler(void) #endif /* _WIN32 */ /********************************* SIMIX **************************************/ -double SIMIX_timer_next(void) +double SIMIX_timer_next() { return xbt_heap_size(simix_timers) > 0 ? xbt_heap_maxkey(simix_timers) : -1.0; } @@ -201,7 +196,7 @@ void SIMIX_global_init(int *argc, char **argv) if (!simix_global) { simix_global = std::unique_ptr(new simgrid::simix::Global()); - simgrid::simix::Process proc; + simgrid::simix::ActorImpl proc; simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), nullptr); simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), nullptr); simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc, process_hookup)); @@ -263,9 +258,10 @@ int smx_cleaned = 0; * * This functions remove the memory used by SIMIX */ -void SIMIX_clean(void) +void SIMIX_clean() { - if (smx_cleaned) return; // to avoid double cleaning by java and C + if (smx_cleaned) + return; // to avoid double cleaning by java and C #if HAVE_SMPI if (SIMIX_process_count()>0){ @@ -280,7 +276,7 @@ void SIMIX_clean(void) 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 (!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."); @@ -327,7 +323,7 @@ void SIMIX_clean(void) * * \return Return the clock. */ -double SIMIX_get_clock(void) +double SIMIX_get_clock() { if(MC_is_active() || MC_record_replay_is_active()){ return MC_process_clock_get(SIMIX_process_self()); @@ -352,15 +348,13 @@ static int process_syscall_color(void *p) /** Wake up all processes waiting for a Surf action to finish */ static void SIMIX_wake_processes() { - unsigned int iter; - surf_model_t model; surf_action_t action; - xbt_dynar_foreach(all_existing_models, iter, model) { + for(auto 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_synchro_t) action->getData()); + SIMIX_simcall_exit((smx_activity_t) action->getData()); } XBT_DEBUG("Handling the processes whose action terminated normally (if any)"); while ((action = surf_model_extract_done_action_set(model))) { @@ -368,7 +362,7 @@ static void SIMIX_wake_processes() if (action->getData() == nullptr) XBT_DEBUG("probably vcpu's action %p, skip", action); else - SIMIX_simcall_exit((smx_synchro_t) action->getData()); + SIMIX_simcall_exit((smx_activity_t) action->getData()); } } } @@ -423,7 +417,7 @@ static bool SIMIX_execute_tasks() * \ingroup SIMIX_API * \brief Run the main simulation loop. */ -void SIMIX_run(void) +void SIMIX_run() { if (MC_record_path) { simgrid::mc::replay(MC_record_path); @@ -434,14 +428,12 @@ void SIMIX_run(void) smx_process_t process; do { - XBT_DEBUG("New Schedule Round; size(queue)=%lu", - xbt_dynar_length(simix_global->process_to_run)); + XBT_DEBUG("New Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run)); 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)); + 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 */ SIMIX_process_runall(); @@ -519,7 +511,7 @@ void SIMIX_run(void) } time = SIMIX_timer_next(); - if (time != -1.0 || xbt_swag_size(simix_global->process_list) != 0) { + if (time > -1.0 || xbt_swag_size(simix_global->process_list) != 0) { XBT_DEBUG("Calling surf_solve"); time = surf_solve(time); XBT_DEBUG("Moving time ahead : %g", time); @@ -552,7 +544,7 @@ void SIMIX_run(void) XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run)); - } while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run)); + } while (time > -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run)); if (xbt_swag_size(simix_global->process_list) != 0) { @@ -613,13 +605,12 @@ void SIMIX_function_register_process_create(smx_creation_func_t function) /** * \brief Registers a function to kill a process. * - * This function registers a function to be called when a - * process is killed. The function has to call the SIMIX_process_kill(). + * This function registers a function to be called when a process is killed. The function has to call the + * SIMIX_process_kill(). * * \param function Kill process function */ -void SIMIX_function_register_process_kill(void_pfn_smxprocess_t - function) +void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function) { simix_global->kill_process_function = function; } @@ -627,19 +618,17 @@ void SIMIX_function_register_process_kill(void_pfn_smxprocess_t /** * \brief Registers a function to cleanup a process. * - * This function registers a user function to be called when - * a process ends properly. + * This function registers a user function to be called when a process ends properly. * * \param function cleanup process function */ -void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t - function) +void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function) { simix_global->cleanup_process_function = function; } -void SIMIX_display_process_status(void) +void SIMIX_display_process_status() { if (simix_global->process_list == nullptr) { return; @@ -650,27 +639,26 @@ void SIMIX_display_process_status(void) 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 (@): \""); + XBT_INFO("Legend of the following listing: \"Process (@): \""); xbt_swag_foreach(process, simix_global->process_list) { if (process->waiting_synchro) { const char* synchro_description = "unknown"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "execution"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "communication"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "sleeping"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "synchronization"; - if (dynamic_cast(process->waiting_synchro) != nullptr) + if (dynamic_cast(process->waiting_synchro) != nullptr) synchro_description = "I/O"; @@ -701,7 +689,7 @@ xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char } xbt_dict_t SIMIX_asr_get_properties(const char *name) { - return (xbt_dict_t) xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL); + return static_cast(xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL)); } int SIMIX_is_maestro()