X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e51c90b78469c7c2067935ef62bf9474d09891d..9ea179ce187f56df358fc6f69c3e721b330df272:/src/s4u/s4u_actor.cpp diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index 40a9c30519..f16cabf607 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -5,98 +5,240 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/log.h" -#include "src/msg/msg_private.h" -#include "simgrid/s4u/actor.hpp" +#include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/comm.hpp" #include "simgrid/s4u/host.hpp" -#include "simgrid/s4u/mailbox.hpp" +#include "simgrid/s4u/Mailbox.hpp" -XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors"); +#include "src/kernel/context/Context.hpp" -static int s4u_actor_runner(int argc, char **argv) +XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors"); + +namespace simgrid { +namespace s4u { + +// ***** Actor creation ***** +ActorPtr Actor::self() { - // Move the callback from the heap to the stack: - std::unique_ptr> code2 = - std::unique_ptr>( - static_cast*>( - SIMIX_process_self_get_data())); - std::function code = std::move(*code2); - code2 = nullptr; - // Call it: - // TODO, handle exceptions - return code(); -} + smx_context_t self_context = SIMIX_context_self(); + if (self_context == nullptr) + return simgrid::s4u::ActorPtr(); -using namespace simgrid; + return self_context->process()->iface(); +} -s4u::Actor::Actor(smx_process_t smx_proc) : pimpl_(smx_proc) {} +ActorPtr Actor::createActor(const char* name, s4u::Host* host, std::function code) +{ + smx_actor_t actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); + return actor->iface(); +} -s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::function code) +ActorPtr Actor::createActor(const char* name, s4u::Host* host, const char* function, std::vector args) { - std::function* code2 = new std::function(std::move(code)); - this->pimpl_ = simcall_process_create( - name, s4u_actor_runner, code2, host->name().c_str(), - killTime, 0, NULL, NULL, 0); + simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function); + simgrid::simix::ActorCode code = factory(std::move(args)); + smx_actor_t actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); + return actor->iface(); } -s4u::Actor::~Actor() {} +// ***** Actor methods ***** -void s4u::Actor::setAutoRestart(bool autorestart) { +void Actor::join() { + simcall_process_join(this->pimpl_, -1); +} + +void Actor::setAutoRestart(bool autorestart) { simcall_process_auto_restart_set(pimpl_,autorestart); } -s4u::Host *s4u::Actor::getHost() { - return s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(pimpl_))); +void Actor::onExit(int_f_pvoid_pvoid_t fun, void* data) +{ + simcall_process_on_exit(pimpl_, fun, data); +} + +void Actor::migrate(Host* new_host) +{ + simcall_process_set_host(pimpl_, new_host); +} + +s4u::Host* Actor::host() +{ + return this->pimpl_->host; +} + +const char* Actor::cname() +{ + return this->pimpl_->name.c_str(); +} + +simgrid::xbt::string Actor::name() +{ + return this->pimpl_->name; +} + +int Actor::pid() +{ + return this->pimpl_->pid; } -const char* s4u::Actor::getName() { - return simcall_process_get_name(pimpl_); +int Actor::ppid() +{ + return this->pimpl_->ppid; } -int s4u::Actor::getPid(){ - return simcall_process_get_PID(pimpl_); +void Actor::suspend() +{ + simcall_process_suspend(pimpl_); +} + +void Actor::resume() +{ + simcall_process_resume(pimpl_); +} + +int Actor::isSuspended() +{ + return simcall_process_is_suspended(pimpl_); } -void s4u::Actor::setKillTime(double time) { +void Actor::setKillTime(double time) { simcall_process_set_kill_time(pimpl_,time); } -double s4u::Actor::getKillTime() { +double Actor::killTime() +{ return simcall_process_get_kill_time(pimpl_); } -void s4u::Actor::kill() { +void Actor::kill(int pid) { + smx_actor_t process = SIMIX_process_from_PID(pid); + if(process != nullptr) { + simcall_process_kill(process); + } else { + std::ostringstream oss; + oss << "kill: ("<< pid <<") - No such process" << std::endl; + throw std::runtime_error(oss.str()); + } +} + +smx_actor_t Actor::getImpl() { + return pimpl_; +} + +void Actor::kill() { simcall_process_kill(pimpl_); } -// static stuff: +// ***** Static functions ***** -void s4u::Actor::killAll() { +ActorPtr Actor::byPid(int pid) +{ + smx_actor_t process = SIMIX_process_from_PID(pid); + if (process != nullptr) + return process->iface(); + else + return ActorPtr(); +} + +void Actor::killAll() +{ simcall_process_killall(1); } -void s4u::Actor::sleep(double duration) { - simcall_process_sleep(duration); +void Actor::killAll(int resetPid) +{ + simcall_process_killall(resetPid); +} + +// ***** this_actor ***** + +namespace this_actor { + +void sleep_for(double duration) +{ + if (duration > 0) + simcall_process_sleep(duration); } -e_smx_state_t s4u::Actor::execute(double flops) { - smx_synchro_t s = simcall_execution_start(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/); +XBT_PUBLIC(void) sleep_until(double timeout) +{ + double now = SIMIX_get_clock(); + if (timeout > now) + simcall_process_sleep(timeout - now); +} + +e_smx_state_t execute(double flops) { + smx_activity_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/); return simcall_execution_wait(s); } -void *s4u::Actor::recv(Mailbox &chan) { - void *res = NULL; - Comm c = Comm::recv_init(chan); +void* recv(MailboxPtr chan) { + void *res = nullptr; + Comm& c = Comm::recv_init(chan); c.setDstData(&res,sizeof(res)); c.wait(); return res; } -void s4u::Actor::send(Mailbox &chan, void *payload, size_t simulatedSize) { - Comm c = Comm::send_init(chan); +void send(MailboxPtr chan, void* payload, double simulatedSize) +{ + Comm& c = Comm::send_init(chan); c.setRemains(simulatedSize); c.setSrcData(payload); // c.start() is optional. c.wait(); } + +int pid() +{ + return SIMIX_process_self()->pid; +} + +int ppid() +{ + return SIMIX_process_self()->ppid; +} + +std::string name() +{ + return SIMIX_process_self()->name; +} + +Host* host() +{ + return SIMIX_process_self()->host; +} + +void suspend() +{ + simcall_process_suspend(SIMIX_process_self()); +} + +void resume() +{ + simcall_process_resume(SIMIX_process_self()); +} + +int isSuspended() +{ + return simcall_process_is_suspended(SIMIX_process_self()); +} + +void kill() +{ + simcall_process_kill(SIMIX_process_self()); +} + +void onExit(int_f_pvoid_pvoid_t fun, void* data) +{ + simcall_process_on_exit(SIMIX_process_self(), fun, data); +} + +void migrate(Host* new_host) +{ + simcall_process_set_host(SIMIX_process_self(), new_host); +} +} +} +}