return actor->iface();
}
+void intrusive_ptr_add_ref(Actor* actor)
+{
+ xbt_assert(actor != nullptr);
+ intrusive_ptr_add_ref(actor->pimpl_);
+}
+void intrusive_ptr_release(Actor* actor)
+{
+ xbt_assert(actor != nullptr);
+ intrusive_ptr_release(actor->pimpl_);
+}
+
// ***** Actor methods *****
void Actor::join() {
}
void Actor::setAutoRestart(bool autorestart) {
- simcall_process_auto_restart_set(pimpl_,autorestart);
+ simgrid::simix::kernelImmediate([this, autorestart]() { pimpl_->auto_restart = autorestart; });
}
void Actor::onExit(int_f_pvoid_pvoid_t fun, void* data)
void Actor::migrate(Host* new_host)
{
- simcall_process_set_host(pimpl_, new_host);
+ simgrid::simix::kernelImmediate([this, new_host]() { pimpl_->new_host = new_host; });
}
-s4u::Host* Actor::host()
+s4u::Host* Actor::getHost()
{
return this->pimpl_->host;
}
-const char* Actor::cname()
+void Actor::daemonize()
+{
+ simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); });
+}
+
+const char* Actor::getCname()
{
return this->pimpl_->name.c_str();
}
-simgrid::xbt::string Actor::name()
+simgrid::xbt::string Actor::getName()
{
return this->pimpl_->name;
}
-aid_t Actor::pid()
+aid_t Actor::getPid()
{
return this->pimpl_->pid;
}
-aid_t Actor::ppid()
+aid_t Actor::getPpid()
{
return this->pimpl_->ppid;
}
void Actor::resume()
{
- simcall_process_resume(pimpl_);
+ simgrid::simix::kernelImmediate([this] { pimpl_->resume(); });
}
int Actor::isSuspended()
{
- return simcall_process_is_suspended(pimpl_);
+ return simgrid::simix::kernelImmediate([this] { return pimpl_->suspended; });
}
void Actor::setKillTime(double time) {
simcall_process_set_kill_time(pimpl_,time);
}
-double Actor::killTime()
+/** \brief Get the kill time of an actor(or 0 if unset). */
+double Actor::getKillTime()
{
- return simcall_process_get_kill_time(pimpl_);
+ return SIMIX_timer_get_date(pimpl_->kill_timer);
}
void Actor::kill(aid_t pid)
{
smx_actor_t process = SIMIX_process_from_PID(pid);
if(process != nullptr) {
- simcall_process_kill(process);
+ simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); });
} else {
std::ostringstream oss;
oss << "kill: ("<< pid <<") - No such process" << std::endl;
}
void Actor::kill() {
- simcall_process_kill(pimpl_);
+ smx_actor_t process = SIMIX_process_self();
+ simgrid::simix::kernelImmediate(
+ [this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); });
}
// ***** Static functions *****
}
/** Retrieve the property value (or nullptr if not set) */
-const char* Actor::property(const char* key)
+const char* Actor::getProperty(const char* key)
{
- return (char*)xbt_dict_get_or_null(simcall_process_get_properties(pimpl_), key);
+ return simgrid::simix::kernelImmediate([this, key] { return pimpl_->getProperty(key); });
}
+
void Actor::setProperty(const char* key, const char* value)
{
- simgrid::simix::kernelImmediate([this, key, value] {
- xbt_dict_set(simcall_process_get_properties(pimpl_), key, (char*)value, (void_f_pvoid_t) nullptr);
- });
+ simgrid::simix::kernelImmediate([this, key, value] { pimpl_->setProperty(key, value); });
+}
+
+Actor* Actor::restart()
+{
+ return simgrid::simix::kernelImmediate([this]() { return pimpl_->restart(); });
}
// ***** this_actor *****
simcall_process_sleep(timeout - now);
}
-e_smx_state_t execute(double flops) {
+void execute(double flops)
+{
smx_activity_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/);
- return simcall_execution_wait(s);
-}
-
-void* recv(MailboxPtr chan) {
- void *res = nullptr;
- CommPtr c = Comm::recv_init(chan);
- c->setDstData(&res, sizeof(res));
- c->wait();
- return res;
+ simcall_execution_wait(s);
}
-void* recv(MailboxPtr chan, double timeout)
+void* recv(MailboxPtr chan) // deprecated
{
- void* res = nullptr;
- CommPtr c = Comm::recv_init(chan);
- c->setDstData(&res, sizeof(res));
- c->wait(timeout);
- return res;
+ return chan->get();
}
-void send(MailboxPtr chan, void* payload, double simulatedSize)
+void* recv(MailboxPtr chan, double timeout) // deprecated
{
- CommPtr c = Comm::send_init(chan);
- c->setRemains(simulatedSize);
- c->setSrcData(payload);
- // c->start() is optional.
- c->wait();
+ return chan->get(timeout);
}
-void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout)
+void send(MailboxPtr chan, void* payload, double simulatedSize) // deprecated
{
- CommPtr c = Comm::send_init(chan);
- c->setRemains(simulatedSize);
- c->setSrcData(payload);
- // c->start() is optional.
- c->wait(timeout);
+ chan->put(payload, simulatedSize);
}
-CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize)
+void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout) // deprecated
{
- return Comm::send_async(chan, payload, simulatedSize);
+ chan->put(payload, simulatedSize, timeout);
}
-void dsend(MailboxPtr chan, void* payload, double simulatedSize)
+CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize) // deprecated
{
- Comm::send_detached(chan, payload, simulatedSize);
+ return chan->put_async(payload, simulatedSize);
}
-CommPtr irecv(MailboxPtr chan, void** data)
+CommPtr irecv(MailboxPtr chan, void** data) // deprecated
{
- return Comm::recv_async(chan, data);
+ return chan->get_async(data);
}
-aid_t pid()
+aid_t getPid()
{
return SIMIX_process_self()->pid;
}
-aid_t ppid()
+aid_t getPpid()
{
return SIMIX_process_self()->ppid;
}
-std::string name()
+std::string getName()
{
return SIMIX_process_self()->name;
}
-Host* host()
+Host* getHost()
{
return SIMIX_process_self()->host;
}
void resume()
{
- simcall_process_resume(SIMIX_process_self());
+ smx_actor_t process = SIMIX_process_self();
+ simgrid::simix::kernelImmediate([process] { process->resume(); });
}
-int isSuspended()
+bool isSuspended()
{
- return simcall_process_is_suspended(SIMIX_process_self());
+ smx_actor_t process = SIMIX_process_self();
+ return simgrid::simix::kernelImmediate([process] { return process->suspended; });
}
void kill()
{
- simcall_process_kill(SIMIX_process_self());
+ smx_actor_t process = SIMIX_process_self();
+ simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); });
}
void onExit(int_f_pvoid_pvoid_t fun, void* data)
void migrate(Host* new_host)
{
- simcall_process_set_host(SIMIX_process_self(), new_host);
+ smx_actor_t process = SIMIX_process_self();
+ simgrid::simix::kernelImmediate([process, new_host] { process->new_host = new_host; });
}
}
}
