X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e49a7949060118737703106058657735cf3892d6..656d24a575ca26a64c94174ff3573272979e081d:/src/simix/smx_process.cpp diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp index 1bd0a3b6a1..f696d92b30 100644 --- a/src/simix/smx_process.cpp +++ b/src/simix/smx_process.cpp @@ -83,7 +83,7 @@ void SIMIX_process_cleanup(smx_process_t process) if (comm->detached) XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender"); else - SIMIX_comm_destroy(comm); + comm->unref(); } else if (comm->dst_proc == process){ @@ -91,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); } @@ -135,7 +136,7 @@ void SIMIX_process_empty_trash(void) xbt_dynar_free(&process->on_exit); xbt_free(process->name); - xbt_free(process); + delete process; } } @@ -146,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*) ""; @@ -155,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"); @@ -218,7 +219,7 @@ smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) { args->properties, args->auto_restart, NULL); - xbt_free(args); + delete args; return process; } @@ -276,7 +277,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 */ @@ -314,7 +315,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); @@ -367,7 +370,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); @@ -502,20 +505,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); 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); @@ -627,15 +630,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 */ } @@ -859,46 +861,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);