XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
-static unsigned long simix_process_maxpid = 0;
-
/**
* @brief Returns the current agent.
*
namespace kernel {
namespace actor {
+static unsigned long maxpid = 0;
+int get_maxpid()
+{
+ return maxpid;
+}
+
ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this)
{
- pid_ = simix_process_maxpid++;
+ pid_ = maxpid++;
simcall.issuer = this;
}
-ActorImpl::~ActorImpl() {
- context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
- simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); });
- context_->iwannadie = true;
+ActorImpl::~ActorImpl()
+{
+ if (simix_global != nullptr && this != simix_global->maestro_process) {
+ if (context_.get() != nullptr) /* the actor was not start()ed yet. This happens if its host was initially off */
+ context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
+ simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); });
+ if (context_.get() != nullptr)
+ context_->iwannadie = true;
+ }
}
/* Become an actor in the simulation
}
simix_global->mutex.unlock();
+
+ context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
+ simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_termination(*ciface()); });
+ context_->iwannadie = true;
}
void ActorImpl::exit()
suspended_ = false;
exception_ = nullptr;
- // Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that
- if (not host_->is_on())
- this->throw_exception(std::make_exception_ptr(ForcefulKillException("host failed")));
-
/* destroy the blocking synchro if any */
if (waiting_synchro != nullptr) {
waiting_synchro->cancel();
waiting_synchro = nullptr;
}
+
+ // Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that
+ this->throw_exception(std::make_exception_ptr(ForcefulKillException(host_->is_on() ? "exited" : "host failed")));
}
void ActorImpl::kill(ActorImpl* actor)
}
}
+void ActorImpl::simcall_answer()
+{
+ if (this != simix_global->maestro_process){
+ XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall.call), (int)simcall.call,
+ get_cname(), this);
+ simcall.call = SIMCALL_NONE;
+ xbt_assert(not XBT_LOG_ISENABLED(simix_process, xbt_log_priority_debug) ||
+ std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) ==
+ end(simix_global->actors_to_run),
+ "Actor %p should not exist in actors_to_run!", this);
+ simix_global->actors_to_run.push_back(this);
+ }
+}
+
void ActorImpl::set_host(s4u::Host* dest)
{
xbt::intrusive_erase(host_->pimpl_->process_list_, *this);
} // namespace kernel
} // namespace simgrid
-void SIMIX_process_detach()
+void SIMIX_process_detach() // deprecated v3.25
{
simgrid::kernel::actor::ActorImpl::detach();
}
smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname,
std::unordered_map<std::string, std::string>* properties,
- smx_actor_t /*parent_process*/)
+ smx_actor_t /*parent_process*/) // deprecated 3.25
{
return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get();
}
smx_activity_t sync_suspend = actor->suspend(simcall->issuer);
if (actor != simcall->issuer) {
- SIMIX_simcall_answer(simcall);
+ simcall->issuer->simcall_answer();
} else {
sync_suspend->simcalls_.push_back(simcall);
actor->waiting_synchro = sync_suspend;
/* If we are suspending ourselves, then just do not finish the simcall now */
}
-int SIMIX_process_get_maxpid()
-{
- return simix_process_maxpid;
-}
-
int SIMIX_process_count()
{
return simix_global->process_list.size();
return process->get_cname();
}
-void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_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_activity_t sync = simcall->issuer->join(process, timeout);
- sync->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = sync;
-}
-
void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration)
{
if (MC_is_active() || MC_record_replay_is_active()) {
MC_process_clock_add(simcall->issuer, duration);
simcall_process_sleep__set__result(simcall, SIMIX_DONE);
- SIMIX_simcall_answer(simcall);
+ simcall->issuer->simcall_answer();
return;
}
smx_activity_t sync = simcall->issuer->sleep(duration);
/** @brief Returns the process from PID. */
smx_actor_t SIMIX_process_from_PID(aid_t PID)
{
- auto actor = simix_global->process_list.find(PID);
- return actor == simix_global->process_list.end() ? nullptr : actor->second;
+ auto item = simix_global->process_list.find(PID);
+ if (item == simix_global->process_list.end()) {
+ for (auto& a : simix_global->actors_to_destroy)
+ if (a.get_pid() == PID)
+ return &a;
+ return nullptr; // Not found, even in the trash
+ }
+ return item->second;
}
void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data)
