X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e6b22bbbde4130f0b21491404f2af0f57df8019..7ee0641f32c8e47aa709bbd472a4d0d2b4cc3663:/src/simix/smx_process.cpp diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp index d7654ef19a..f3f986228d 100644 --- a/src/simix/smx_process.cpp +++ b/src/simix/smx_process.cpp @@ -4,23 +4,31 @@ /* 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. */ +#include +#include +#include +#include + #include #include +#include +#include +#include +#include + +#include + +#include #include "src/surf/surf_interface.hpp" #include "smx_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "xbt/dict.h" -#include "mc/mc.h" #include "src/mc/mc_replay.h" #include "src/mc/Client.hpp" #include "src/msg/msg_private.h" - -#include "src/simix/SynchroSleep.hpp" -#include "src/simix/SynchroRaw.hpp" -#include "src/simix/SynchroIo.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroIo.hpp" #ifdef HAVE_SMPI #include "src/smpi/private.h" @@ -52,11 +60,11 @@ void SIMIX_process_unref(smx_process_t process) * * \return The SIMIX process */ -smx_process_t SIMIX_process_self(void) +smx_process_t SIMIX_process_self() { smx_context_t self_context = SIMIX_context_self(); - return self_context ? self_context->process() : nullptr; + return (self_context != nullptr) ? self_context->process() : nullptr; } /** @@ -76,6 +84,7 @@ void SIMIX_process_cleanup(smx_process_t process) XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->name.c_str(), process, process->waiting_synchro); + process->finished = true; SIMIX_process_on_exit_runall(process); /* Unregister from the kill timer if any */ @@ -85,9 +94,9 @@ void SIMIX_process_cleanup(smx_process_t process) xbt_os_mutex_acquire(simix_global->mutex); /* cancel non-blocking communications */ - smx_synchro_t synchro; - while ((synchro = (smx_synchro_t) xbt_fifo_pop(process->comms))) { - simgrid::simix::Comm *comm = static_cast(synchro); + smx_synchro_t synchro = static_cast(xbt_fifo_pop(process->comms)); + while (synchro != nullptr) { + simgrid::kernel::activity::Comm *comm = static_cast(synchro); /* make sure no one will finish the comm after this process is destroyed, * because src_proc or dst_proc would be an invalid pointer */ @@ -119,6 +128,7 @@ void SIMIX_process_cleanup(smx_process_t process) } else { xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro); } + synchro = static_cast(xbt_fifo_pop(process->comms)); } XBT_DEBUG("%p should not be run anymore",process); @@ -137,7 +147,7 @@ void SIMIX_process_cleanup(smx_process_t process) * Should be called some time to time to free the memory allocated for processes * that have finished (or killed). */ -void SIMIX_process_empty_trash(void) +void SIMIX_process_empty_trash() { smx_process_t process = nullptr; @@ -203,6 +213,7 @@ void SIMIX_maestro_create(void (*code)(void*), void* data) * and stops its context. */ void SIMIX_process_stop(smx_process_t arg) { + arg->finished = true; /* execute the on_exit functions */ SIMIX_process_on_exit_runall(arg); /* Add the process to the list of process to restart, only if the host is down */ @@ -350,7 +361,7 @@ smx_process_t SIMIX_process_attach( process->ppid = SIMIX_process_get_PID(parent_process); /* SMPI process have their own data segment and each other inherit from their father */ - #if HAVE_SMPI +#if HAVE_SMPI if(smpi_privatize_global_variables){ if(parent_process->pid != 0){ SIMIX_segment_index_set(process, parent_process->segment_index); @@ -358,7 +369,7 @@ smx_process_t SIMIX_process_attach( SIMIX_segment_index_set(process, process->pid - 1); } } - #endif +#endif } /* Process data for auto-restart */ @@ -394,7 +405,7 @@ smx_process_t SIMIX_process_attach( return process; } -void SIMIX_process_detach(void) +void SIMIX_process_detach() { auto context = dynamic_cast(SIMIX_context_self()); if (!context) @@ -421,7 +432,7 @@ void SIMIX_process_detach(void) * The two lists are swapped so, be careful when using them before and after a * call to this function. */ -void SIMIX_process_runall(void) +void SIMIX_process_runall() { SIMIX_context_runall(); @@ -456,11 +467,11 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) { /* destroy the blocking synchro if any */ if (process->waiting_synchro) { - simgrid::simix::Exec *exec = dynamic_cast(process->waiting_synchro); - simgrid::simix::Comm *comm = dynamic_cast(process->waiting_synchro); - simgrid::simix::Sleep *sleep = dynamic_cast(process->waiting_synchro); - simgrid::simix::Raw *raw = dynamic_cast(process->waiting_synchro); - simgrid::simix::Io *io = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Exec *exec = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Comm *comm = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Sleep *sleep = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Raw *raw = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Io *io = dynamic_cast(process->waiting_synchro); if (exec != nullptr) { exec->unref(); @@ -469,7 +480,7 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) { xbt_fifo_remove(process->comms, process->waiting_synchro); comm->cancel(); - // Remove first occurence of &process->simcall: + // Remove first occurrence of &process->simcall: auto i = boost::range::find( process->waiting_synchro->simcalls, &process->simcall); @@ -502,7 +513,6 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) { XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str()); xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process); } - } /** @brief Ask another process to raise the given exception @@ -520,18 +530,18 @@ void SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, con /* cancel the blocking synchro if any */ if (process->waiting_synchro) { - simgrid::simix::Exec *exec = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Exec *exec = dynamic_cast(process->waiting_synchro); if (exec != nullptr) { SIMIX_execution_cancel(process->waiting_synchro); } - simgrid::simix::Comm *comm = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Comm *comm = dynamic_cast(process->waiting_synchro); if (comm != nullptr) { xbt_fifo_remove(process->comms, comm); comm->cancel(); } - simgrid::simix::Sleep *sleep = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Sleep *sleep = dynamic_cast(process->waiting_synchro); if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); if (!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) { @@ -540,12 +550,12 @@ void SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, con } } - simgrid::simix::Raw *raw = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Raw *raw = dynamic_cast(process->waiting_synchro); if (raw != nullptr) { SIMIX_synchro_stop_waiting(process, &process->simcall); } - simgrid::simix::Io *io = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::Io *io = dynamic_cast(process->waiting_synchro); if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); } @@ -583,8 +593,7 @@ void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_process_t proce { process->new_host = dest; } -void SIMIX_process_change_host(smx_process_t process, - sg_host_t dest) +void SIMIX_process_change_host(smx_process_t process, sg_host_t dest) { xbt_assert((process != nullptr), "Invalid parameters"); xbt_swag_remove(process, sg_host_simix(process->host)->process_list); @@ -658,11 +667,11 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer) XBT_OUT(); } -int SIMIX_process_get_maxpid(void) { +int SIMIX_process_get_maxpid() { return simix_process_maxpid; } -int SIMIX_process_count(void) +int SIMIX_process_count() { return xbt_swag_size(simix_global->process_list); } @@ -708,14 +717,9 @@ void SIMIX_process_set_data(smx_process_t process, void *data) process->data = data; } -sg_host_t SIMIX_process_get_host(smx_process_t process) -{ - return process->host; -} - /* needs to be public and without simcall because it is called by exceptions and logging events */ -const char* SIMIX_process_self_get_name(void) { +const char* SIMIX_process_self_get_name() { smx_process_t process = SIMIX_process_self(); if (process == nullptr || process == simix_global->maestro_process) @@ -751,13 +755,19 @@ xbt_dict_t SIMIX_process_get_properties(smx_process_t process) void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process, double timeout) { + if (process->finished) { + // The joined process is already finished, just wake up the issuer process right away + simcall_process_sleep__set__result(simcall, SIMIX_DONE); + SIMIX_simcall_answer(simcall); + return; + } smx_synchro_t sync = SIMIX_process_join(simcall->issuer, process, timeout); sync->simcalls.push_back(simcall); simcall->issuer->waiting_synchro = sync; } static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synchro_t synchro){ - simgrid::simix::Sleep *sleep = static_cast(synchro); + simgrid::kernel::activity::Sleep *sleep = static_cast(synchro); if (sleep->surf_sleep) { sleep->surf_sleep->cancel(); @@ -778,13 +788,14 @@ static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synch sleep->surf_sleep->unref(); sleep->surf_sleep = nullptr; } - delete sleep; + sleep->unref(); return 0; } smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout) { smx_synchro_t res = SIMIX_process_sleep(issuer, timeout); + static_cast(res)->ref(); SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res); return res; } @@ -810,7 +821,7 @@ smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration) if (host->isOff()) THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); - simgrid::simix::Sleep *synchro = new simgrid::simix::Sleep(); + simgrid::kernel::activity::Sleep *synchro = new simgrid::kernel::activity::Sleep(); synchro->host = host; synchro->surf_sleep = surf_host_sleep(host, duration); synchro->surf_sleep->setData(synchro); @@ -822,11 +833,12 @@ smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration) void SIMIX_process_sleep_destroy(smx_synchro_t synchro) { XBT_DEBUG("Destroy synchro %p", synchro); - simgrid::simix::Sleep *sleep = static_cast(synchro); + simgrid::kernel::activity::Sleep *sleep = static_cast(synchro); if (sleep->surf_sleep) { sleep->surf_sleep->unref(); sleep->surf_sleep = nullptr; + sleep->unref(); } } @@ -895,7 +907,7 @@ void SIMIX_process_set_context(smx_process_t p,smx_context_t c) { /** * \brief Returns the list of processes to run. */ -xbt_dynar_t SIMIX_process_get_runnable(void) +xbt_dynar_t SIMIX_process_get_runnable() { return simix_global->process_to_run; } @@ -907,14 +919,14 @@ smx_process_t SIMIX_process_from_PID(int PID) { smx_process_t proc; xbt_swag_foreach(proc, simix_global->process_list) { - if (proc->pid == (unsigned long) PID) + if (proc->pid == static_cast (PID)) return proc; } return nullptr; } -/** @brief returns a dynar containg all currently existing processes */ -xbt_dynar_t SIMIX_processes_as_dynar(void) { +/** @brief returns a dynar containing all currently existing processes */ +xbt_dynar_t SIMIX_processes_as_dynar() { smx_process_t proc; xbt_dynar_t res = xbt_dynar_new(sizeof(smx_process_t),nullptr); xbt_swag_foreach(proc, simix_global->process_list) { @@ -923,11 +935,9 @@ xbt_dynar_t SIMIX_processes_as_dynar(void) { return res; } - void SIMIX_process_on_exit_runall(smx_process_t process) { s_smx_process_exit_fun_t exit_fun; - smx_process_exit_status_t exit_status = (process->context->iwannadie) ? - SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; + smx_process_exit_status_t exit_status = (process->context->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; while (!xbt_dynar_is_empty(process->on_exit)) { exit_fun = xbt_dynar_pop_as(process->on_exit,s_smx_process_exit_fun_t); (exit_fun.fun)((void*)exit_status, exit_fun.arg); @@ -960,8 +970,7 @@ smx_process_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_process } /** @brief Restart a process, starting it again from the beginning. */ smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer) { - XBT_DEBUG("Restarting process %s on %s", - process->name.c_str(), sg_host_get_name(process->host)); + XBT_DEBUG("Restarting process %s on %s", process->name.c_str(), sg_host_get_name(process->host)); //retrieve the arguments of the old process //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? @@ -979,15 +988,10 @@ smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer) //start the new process if (simix_global->create_process_function) - return simix_global->create_process_function( - arg.name.c_str(), std::move(arg.code), arg.data, - arg.hostname, arg.kill_time, - arg.properties, arg.auto_restart, - nullptr); + return simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.hostname, + arg.kill_time, arg.properties, arg.auto_restart, nullptr); else - return simcall_process_create( - arg.name.c_str(), std::move(arg.code), arg.data, - arg.hostname, arg.kill_time, + return simcall_process_create(arg.name.c_str(), std::move(arg.code), arg.data, arg.hostname, arg.kill_time, arg.properties, arg.auto_restart); } @@ -1041,10 +1045,7 @@ smx_process_t simcall_process_create( if (name == nullptr) name = ""; smx_process_t self = SIMIX_process_self(); - return simgrid::simix::kernel([&] { - return SIMIX_process_create(name, - std::move(code), data, hostname, - kill_time, properties, auto_restart, - self); + return simgrid::simix::kernelImmediate([&] { + return SIMIX_process_create(name, std::move(code), data, hostname, kill_time, properties, auto_restart, self); }); }