* 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"
+
+#include "src/kernel/context/Context.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
-using namespace simgrid;
+namespace simgrid {
+namespace s4u {
+
+// ***** Actor creation *****
+ActorPtr Actor::self()
+{
+ smx_context_t self_context = SIMIX_context_self();
+ if (self_context == nullptr)
+ return simgrid::s4u::ActorPtr();
+
+ 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<void()> 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<void()> code)
+ActorPtr Actor::createActor(const char* name, s4u::Host* host, const char* function, std::vector<std::string> args)
{
- // TODO, when autorestart is used, the std::function is copied so the new
- // instance will get a fresh (reinitialized) state. Is this what we want?
- this->pimpl_ = simcall_process_create(
- name, std::move(code), nullptr, host->name().c_str(),
- killTime, 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_)));
+s4u::Host* Actor::host()
+{
+ return this->pimpl_->host;
}
-const char* s4u::Actor::getName() {
- return simcall_process_get_name(pimpl_);
+simgrid::xbt::string Actor::name()
+{
+ return this->pimpl_->name;
}
-int s4u::Actor::getPid(){
- return simcall_process_get_PID(pimpl_);
+int Actor::pid()
+{
+ return this->pimpl_->pid;
}
-void s4u::Actor::setKillTime(double time) {
+int Actor::ppid()
+{
+ return this->pimpl_->ppid;
+}
+
+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(int PID) {
- msg_process_t process = SIMIX_process_from_PID(PID);
- if(process != NULL) {
+void Actor::kill(int pid) {
+ msg_process_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;
+ oss << "kill: ("<< pid <<") - No such process" << std::endl;
throw std::runtime_error(oss.str());
}
}
-void s4u::Actor::kill() {
+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);
}
+// ***** this_actor *****
-namespace simgrid {
-namespace s4u {
namespace this_actor {
-void sleep(double duration) {
- simcall_process_sleep(duration);
+void sleep_for(double duration)
+{
+ if (duration > 0)
+ simcall_process_sleep(duration);
+}
+
+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_synchro_t s = simcall_execution_start(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+ smx_activity_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/);
return simcall_execution_wait(s);
}
-void* 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 send(Mailbox &chan, void *payload, size_t simulatedSize) {
- Comm c = Comm::send_init(chan);
+void send(MailboxPtr chan, void *payload, size_t 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;
+}
}
}
}
