#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/mailbox.hpp"
+#include "src/simix/smx_private.h"
+
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
using namespace simgrid;
-s4u::Actor::Actor(smx_process_t smx_proc) : pimpl_(smx_proc) {}
-
s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
{
// 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(
+ this->pimpl_ = SIMIX_process_ref(simcall_process_create(
name, std::move(code), nullptr, host->name().c_str(),
- killTime, nullptr, 0);
+ killTime, nullptr, 0));
}
-s4u::Actor::~Actor() {}
+s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, const char* function, simgrid::xbt::args args)
+{
+ simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
+ simgrid::simix::ActorCode code = factory(std::move(args));
+ this->pimpl_ = SIMIX_process_ref(simcall_process_create(
+ name, std::move(code), nullptr, host->name().c_str(),
+ killTime, nullptr, 0));
+}
void s4u::Actor::join() {
simcall_process_join(pimpl_, -1);
simcall_process_kill(pimpl_);
}
+simgrid::s4u::Actor s4u::Actor::forPid(int pid)
+{
+ // Should we throw if we did not find it?
+ smx_process_t process = SIMIX_process_from_PID(pid);
+ return simgrid::s4u::Actor(process);
+}
+
// static stuff:
void s4u::Actor::killAll() {
c.wait();
}
+int getPid() {
+ return simcall_process_get_PID(SIMIX_process_self());
+}
+
}
}
}