X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/334e868fd56cf359ef71557b7eba026687fbef73..001a723e0c10af5facba4f0bb5de625bc3da00e1:/src/simix/smx_process.cpp diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp index ed6a6d0ebb..0effb83035 100644 --- a/src/simix/smx_process.cpp +++ b/src/simix/smx_process.cpp @@ -12,7 +12,6 @@ #include "mc/mc.h" #include "src/mc/mc_replay.h" #include "src/mc/Client.hpp" -#include "src/simix/smx_private.hpp" #include "src/msg/msg_private.h" #include "src/simix/SynchroSleep.hpp" @@ -38,7 +37,7 @@ smx_process_t SIMIX_process_self(void) { smx_context_t self_context = SIMIX_context_self(); - return self_context ? SIMIX_context_get_process(self_context) : NULL; + return self_context ? self_context->process() : NULL; } /** @@ -73,7 +72,7 @@ void SIMIX_process_cleanup(smx_process_t process) /* make sure no one will finish the comm after this process is destroyed, * because src_proc or dst_proc would be an invalid pointer */ - SIMIX_comm_cancel(comm); + comm->cancel(); if (comm->src_proc == process) { XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", @@ -81,10 +80,10 @@ void SIMIX_process_cleanup(smx_process_t process) comm->src_proc = NULL; /* I'm not supposed to destroy a detached comm from the sender side, */ - if (!comm->detached) - SIMIX_comm_destroy(comm); + if (comm->detached) + XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender"); else - XBT_DEBUG("Don't destroy it since it's a detached comm"); + comm->unref(); } else if (comm->dst_proc == process){ @@ -92,11 +91,12 @@ void SIMIX_process_cleanup(smx_process_t process) comm, (int)comm->state, comm->src_proc, comm->dst_proc); comm->dst_proc = NULL; - if (comm->detached && comm->refcount == 1 && comm->src_proc != NULL) { + if (comm->detached && comm->src_proc != NULL) { /* the comm will be freed right now, remove it from the sender */ xbt_fifo_remove(comm->src_proc->comms, comm); } - SIMIX_comm_destroy(comm); + + comm->unref(); } else { xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro); } @@ -125,7 +125,7 @@ void SIMIX_process_empty_trash(void) while ((process = (smx_process_t) xbt_swag_extract(simix_global->process_to_destroy))) { XBT_DEBUG("Getting rid of %p",process); - SIMIX_context_free(process->context); + delete process->context; /* Free the exception allocated at creation time */ free(process->running_ctx); @@ -136,7 +136,7 @@ void SIMIX_process_empty_trash(void) xbt_dynar_free(&process->on_exit); xbt_free(process->name); - xbt_free(process); + delete process; } } @@ -147,7 +147,7 @@ void create_maestro(std::function code) { smx_process_t maestro = NULL; /* Create maestro process and intilialize it */ - maestro = xbt_new0(s_smx_process_t, 1); + maestro = new simgrid::simix::Process(); maestro->pid = simix_process_maxpid++; maestro->ppid = -1; maestro->name = (char*) ""; @@ -156,7 +156,7 @@ void create_maestro(std::function code) XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx); if (!code) { - maestro->context = SIMIX_context_new(NULL, 0, nullptr, NULL, maestro); + maestro->context = SIMIX_context_new(std::function(), NULL, maestro); } else { if (!simix_global) xbt_die("simix is not initialized, please call MSG_init first"); @@ -198,33 +198,9 @@ void SIMIX_process_stop(smx_process_t arg) { arg->auto_restart); } XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_get_name(arg->host)); - /* stop the context */ - SIMIX_context_stop(arg->context); + arg->context->stop(); } -/** - * \brief Same as SIMIX_process_create() but with only one argument (used by timers). - * This function frees the argument. - * \return the process created - */ -smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) { - - smx_process_t process = simix_global->create_process_function( - args->name, - args->code, - args->data, - args->hostname, - args->kill_time, - args->argc, - args->argv, - args->properties, - args->auto_restart, - NULL); - xbt_free(args); - return process; -} - - void* simcall_HANDLER_process_create(smx_simcall_t simcall, const char *name, xbt_main_func_t code, @@ -278,7 +254,7 @@ smx_process_t SIMIX_process_create( xbt_free(argv); } else { - process = xbt_new0(s_smx_process_t, 1); + process = new simgrid::simix::Process(); xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters"); /* Process data */ @@ -316,7 +292,9 @@ smx_process_t SIMIX_process_create( XBT_VERB("Create context %s", process->name); - process->context = SIMIX_context_new(code, argc, argv, simix_global->cleanup_process_function, process); + process->context = SIMIX_context_new( + simgrid::simix::wrap_main(code, argc, argv), + simix_global->cleanup_process_function, process); process->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t)); XBT_RUNNING_CTX_INITIALIZE(process->running_ctx); @@ -369,7 +347,7 @@ smx_process_t SIMIX_process_attach( return nullptr; } - smx_process_t process = xbt_new0(s_smx_process_t, 1); + smx_process_t process = new simgrid::simix::Process(); /* Process data */ process->pid = simix_process_maxpid++; process->name = xbt_strdup(name); @@ -504,20 +482,20 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) { simgrid::simix::Io *io = dynamic_cast(process->waiting_synchro); if (exec != nullptr) { - SIMIX_execution_destroy(process->waiting_synchro); + exec->unref(); } else if (comm != nullptr) { xbt_fifo_remove(process->comms, process->waiting_synchro); - SIMIX_comm_cancel(process->waiting_synchro); + comm->cancel(); xbt_fifo_remove(process->waiting_synchro->simcalls, &process->simcall); - SIMIX_comm_destroy(process->waiting_synchro); + comm->unref(); } else if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); } else if (raw != nullptr) { SIMIX_synchro_stop_waiting(process, &process->simcall); - SIMIX_synchro_destroy(process->waiting_synchro); + delete process->waiting_synchro; } else if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); @@ -561,8 +539,8 @@ void SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, con simgrid::simix::Comm *comm = dynamic_cast(process->waiting_synchro); if (comm != nullptr) { - xbt_fifo_remove(process->comms, process->waiting_synchro); - SIMIX_comm_cancel(process->waiting_synchro); + xbt_fifo_remove(process->comms, comm); + comm->cancel(); } simgrid::simix::Sleep *sleep = dynamic_cast(process->waiting_synchro); @@ -629,15 +607,14 @@ void SIMIX_process_change_host(smx_process_t process, void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process) { - smx_synchro_t sync_suspend = - SIMIX_process_suspend(process, simcall->issuer); + smx_synchro_t sync_suspend = SIMIX_process_suspend(process, simcall->issuer); if (process != simcall->issuer) { SIMIX_simcall_answer(simcall); } else { xbt_fifo_push(sync_suspend->simcalls, simcall); process->waiting_synchro = sync_suspend; - SIMIX_execution_suspend(process->waiting_synchro); + process->waiting_synchro->suspend(); } /* If we are suspending ourselves, then just do not finish the simcall now */ } @@ -861,46 +838,6 @@ smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration) return synchro; } -void SIMIX_post_process_sleep(smx_synchro_t synchro) -{ - smx_simcall_t simcall; - e_smx_state_t state; - simgrid::simix::Sleep *sleep = static_cast(synchro); - - while ((simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls))) { - - switch (sleep->surf_sleep->getState()){ - case simgrid::surf::Action::State::failed: - simcall->issuer->context->iwannadie = 1; - //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); - state = SIMIX_SRC_HOST_FAILURE; - break; - - case simgrid::surf::Action::State::done: - state = SIMIX_DONE; - break; - - default: - THROW_IMPOSSIBLE; - break; - } - if (simcall->issuer->host->isOff()) { - simcall->issuer->context->iwannadie = 1; - } - simcall_process_sleep__set__result(simcall, state); - simcall->issuer->waiting_synchro = NULL; - if (simcall->issuer->suspended) { - XBT_DEBUG("Wait! This process is suspended and can't wake up now."); - simcall->issuer->suspended = 0; - simcall_HANDLER_process_suspend(simcall, simcall->issuer); - } else { - SIMIX_simcall_answer(simcall); - } - } - - SIMIX_process_sleep_destroy(synchro); -} - void SIMIX_process_sleep_destroy(smx_synchro_t synchro) { XBT_DEBUG("Destroy synchro %p", synchro); @@ -912,16 +849,6 @@ void SIMIX_process_sleep_destroy(smx_synchro_t synchro) } } -void SIMIX_process_sleep_suspend(smx_synchro_t synchro) -{ - synchro->suspend(); //FIXME: USELESS -} - -void SIMIX_process_sleep_resume(smx_synchro_t synchro) -{ - synchro->resume(); //FIXME: USELESS -} - /** * \brief Calling this function makes the process to yield. * @@ -935,7 +862,7 @@ void SIMIX_process_yield(smx_process_t self) XBT_DEBUG("Yield process '%s'", self->name); /* Go into sleep and return control to maestro */ - SIMIX_context_suspend(self->context); + self->context->suspend(); /* Ok, maestro returned control to us */ XBT_DEBUG("Control returned to me: '%s'", self->name); @@ -1064,7 +991,7 @@ smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer) XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_get_name(process->host)); //retrieve the arguments of the old process //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? - s_smx_process_arg_t arg; + simgrid::simix::ProcessArg arg; arg.code = process->code; arg.hostname = sg_host_get_name(process->host); arg.kill_time = SIMIX_timer_get_date(process->kill_timer);