#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/mailbox.hpp"
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
+#include "src/simix/smx_private.h"
-using namespace simgrid;
+XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
-s4u::Actor::Actor(smx_process_t smx_proc) : pimpl_(smx_proc) {}
+namespace simgrid {
+namespace s4u {
-s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::function<int()> code)
+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));
+}
+
+Actor::Actor(const char* name, s4u::Host *host, double killTime,
+ const char* function, std::vector<std::string> 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, NULL, 0);
+ killTime, nullptr, 0));
}
-s4u::Actor::~Actor() {}
+void Actor::join() {
+ simcall_process_join(pimpl_, -1);
+}
-void s4u::Actor::setAutoRestart(bool autorestart) {
+void Actor::setAutoRestart(bool autorestart) {
simcall_process_auto_restart_set(pimpl_,autorestart);
}
-s4u::Host *s4u::Actor::getHost() {
+s4u::Host *Actor::getHost() {
return s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(pimpl_)));
}
-const char* s4u::Actor::getName() {
+const char* Actor::getName() {
return simcall_process_get_name(pimpl_);
}
-int s4u::Actor::getPid(){
+int Actor::getPid(){
return simcall_process_get_PID(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::getKillTime() {
return simcall_process_get_kill_time(pimpl_);
}
-void s4u::Actor::kill() {
+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;
+ throw std::runtime_error(oss.str());
+ }
+}
+
+void Actor::kill() {
simcall_process_kill(pimpl_);
}
+simgrid::s4u::Actor 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() {
+void Actor::killAll() {
simcall_process_killall(1);
}
-void s4u::Actor::sleep(double duration) {
+namespace this_actor {
+
+void sleep(double duration) {
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*/);
+e_smx_state_t execute(double flops) {
+ smx_synchro_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
return simcall_execution_wait(s);
}
-void *s4u::Actor::recv(Mailbox &chan) {
- void *res = NULL;
+void* recv(Mailbox &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) {
+void send(Mailbox &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 getPid() {
+ return simcall_process_get_PID(SIMIX_process_self());
+}
+
+}
+}
+}
