X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec353ddb75a8fc57fb3b1243fed37e0df06f7305..5d4c47baed3b8ae7aac5e5bbdcd4bf11229b38d1:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index f725f86c22..d0f4ae723c 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -38,21 +38,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX unsigned long simix_process_maxpid = 0; -/** Increase the refcount for this process */ -smx_actor_t SIMIX_process_ref(smx_actor_t process) -{ - if (process != nullptr) - intrusive_ptr_add_ref(process); - return process; -} - -/** Decrease the refcount for this process */ -void SIMIX_process_unref(smx_actor_t process) -{ - if (process != nullptr) - intrusive_ptr_release(process); -} - /** * \brief Returns the current agent. * @@ -81,7 +66,8 @@ int SIMIX_process_has_pending_comms(smx_actor_t process) { */ void SIMIX_process_cleanup(smx_actor_t process) { - XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->name.c_str(), process, process->waiting_synchro); + XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->name.c_str(), process, + process->waiting_synchro.get()); process->finished = true; SIMIX_process_on_exit_runall(process); @@ -93,27 +79,22 @@ void SIMIX_process_cleanup(smx_actor_t process) xbt_os_mutex_acquire(simix_global->mutex); /* cancel non-blocking communications */ - smx_activity_t synchro = static_cast(process->comms.front()); + smx_activity_t synchro = process->comms.front(); while (not process->comms.empty()) { - simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_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 */ - comm->cancel(); if (comm->src_proc == process) { - XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", - comm, comm->detached, (int)comm->state, comm->src_proc, comm->dst_proc); + XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(), + comm->detached, (int)comm->state, comm->src_proc, comm->dst_proc); comm->src_proc = nullptr; - /* I'm not supposed to destroy a detached comm from the sender side, */ - if (comm->detached) - XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender"); - else - comm->unref(); } else if (comm->dst_proc == process) { - XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", - comm, (int)comm->state, comm->src_proc, comm->dst_proc); + XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state, + comm->src_proc, comm->dst_proc); comm->dst_proc = nullptr; if (comm->detached && comm->src_proc != nullptr) { @@ -121,10 +102,11 @@ void SIMIX_process_cleanup(smx_actor_t process) comm->src_proc->comms.remove(comm); } } else { - xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro); + xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro.get()); } process->comms.pop_front(); - synchro = static_cast(process->comms.front()); + synchro = process->comms.front(); + comm->cancel(); } XBT_DEBUG("%p should not be run anymore",process); @@ -278,7 +260,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v if (host->extension() == nullptr) host->extension_set(new simgrid::simix::Host()); - /* Add the process to it's host process list */ + /* Add the process to its host process list */ xbt_swag_insert(process, host->extension()->process_list); XBT_DEBUG("Start context '%s'", process->name.c_str()); @@ -287,6 +269,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v simix_global->process_list[process->pid] = process; XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->cname()); xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); + intrusive_ptr_add_ref(process); /* Tracing the process creation */ TRACE_msg_process_create(process->cname(), process->pid, process->host); @@ -421,20 +404,21 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { process->exception = nullptr; /* destroy the blocking synchro if any */ - if (process->waiting_synchro) { - - simgrid::kernel::activity::ExecImpl* exec = - dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::CommImpl* comm = - dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::SleepImpl* 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 (process->waiting_synchro != nullptr) { + + simgrid::kernel::activity::ExecImplPtr exec = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::SleepImplPtr sleep = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::RawImplPtr raw = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::IoImplPtr io = + boost::dynamic_pointer_cast(process->waiting_synchro); if (exec != nullptr) { - exec->unref(); - + /* Nothing to do */ } else if (comm != nullptr) { process->comms.remove(process->waiting_synchro); comm->cancel(); @@ -442,16 +426,16 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { auto i = boost::range::find(process->waiting_synchro->simcalls, &process->simcall); if (i != process->waiting_synchro->simcalls.end()) process->waiting_synchro->simcalls.remove(&process->simcall); - comm->unref(); } else if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); } else if (raw != nullptr) { SIMIX_synchro_stop_waiting(process, &process->simcall); - delete process->waiting_synchro; } else if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); + } else { + xbt_die("Unknown type of activity"); } /* @@ -485,21 +469,21 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const /* cancel the blocking synchro if any */ if (process->waiting_synchro) { - simgrid::kernel::activity::ExecImpl* exec = - dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::ExecImplPtr exec = + boost::dynamic_pointer_cast(process->waiting_synchro); if (exec != nullptr) { SIMIX_execution_cancel(process->waiting_synchro); } - simgrid::kernel::activity::CommImpl* comm = - dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::dynamic_pointer_cast(process->waiting_synchro); if (comm != nullptr) { process->comms.remove(comm); comm->cancel(); } - simgrid::kernel::activity::SleepImpl* sleep = - dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::SleepImplPtr sleep = + boost::dynamic_pointer_cast(process->waiting_synchro); if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); if (not xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) { @@ -508,12 +492,14 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const } } - simgrid::kernel::activity::Raw *raw = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::RawImplPtr raw = + boost::dynamic_pointer_cast(process->waiting_synchro); if (raw != nullptr) { SIMIX_synchro_stop_waiting(process, &process->simcall); } - simgrid::kernel::activity::Io *io = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::IoImplPtr io = + boost::dynamic_pointer_cast(process->waiting_synchro); if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); } @@ -694,7 +680,8 @@ void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, do simcall->issuer->waiting_synchro = sync; } -static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_activity_t synchro){ +static int SIMIX_process_join_finish(smx_process_exit_status_t status, void* synchro) +{ simgrid::kernel::activity::SleepImpl* sleep = static_cast(synchro); if (sleep->surf_sleep) { @@ -716,7 +703,6 @@ static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_activ sleep->surf_sleep->unref(); sleep->surf_sleep = nullptr; } - sleep->unref(); // intrusive_ptr_release(process); // FIXME: We are leaking here. See comment in SIMIX_process_join() return 0; } @@ -724,14 +710,14 @@ static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_activ smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout) { smx_activity_t res = SIMIX_process_sleep(issuer, timeout); - static_cast(res)->ref(); + intrusive_ptr_add_ref(res.get()); /* We are leaking the process here, but if we don't take the ref, we get a "use after free". * The correct solution would be to derivate the type SynchroSleep into a SynchroProcessJoin, * but the code is not clean enough for now for this. * The C API should first be properly replaced with the C++ one, which is a fair amount of work. */ intrusive_ptr_add_ref(process); - SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res); + SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, &*res); return res; } @@ -757,7 +743,7 @@ smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration) simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); synchro->host = host; - synchro->surf_sleep = host->pimpl_cpu->sleep(duration); + synchro->surf_sleep = host->pimpl_cpu->sleep(duration); synchro->surf_sleep->setData(synchro); XBT_DEBUG("Create sleep synchronization %p", synchro); @@ -766,13 +752,13 @@ smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration) void SIMIX_process_sleep_destroy(smx_activity_t synchro) { - XBT_DEBUG("Destroy synchro %p", synchro); - simgrid::kernel::activity::SleepImpl* sleep = static_cast(synchro); + XBT_DEBUG("Destroy sleep synchro %p", synchro.get()); + simgrid::kernel::activity::SleepImplPtr sleep = + boost::dynamic_pointer_cast(synchro); if (sleep->surf_sleep) { sleep->surf_sleep->unref(); sleep->surf_sleep = nullptr; - sleep->unref(); } } @@ -879,10 +865,9 @@ xbt_dynar_t SIMIX_processes_as_dynar() { } void SIMIX_process_on_exit_runall(smx_actor_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; while (not process->on_exit.empty()) { - exit_fun = process->on_exit.back(); + s_smx_process_exit_fun_t exit_fun = process->on_exit.back(); (exit_fun.fun)((void*)exit_status, exit_fun.arg); process->on_exit.pop_back(); } @@ -958,6 +943,7 @@ void SIMIX_segment_index_set(smx_actor_t proc, int index){ * \param properties the properties of the process * \param auto_restart either it is autorestarting or not. */ +extern "C" smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc, char** argv, xbt_dict_t properties) {