#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 "src/kernel/context/Context.hpp"
#include "src/simix/smx_private.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
namespace s4u {
// ***** Actor creation *****
+ActorPtr Actor::self()
+{
+ smx_context_t self_context = SIMIX_context_self();
+ if (self_context == nullptr)
+ return simgrid::s4u::ActorPtr();
+
+ return simgrid::s4u::ActorPtr(&self_context->process()->getIface());
+}
+
ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
{
smx_process_t process = simcall_process_create(
name, std::move(code), nullptr, host->name().c_str(),
killTime, nullptr, 0);
- return Ptr(&process->actor());
+ return Ptr(&process->getIface());
}
ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
smx_process_t process = simcall_process_create(
name, std::move(code), nullptr, host->name().c_str(),
killTime, nullptr, 0);
- return ActorPtr(&process->actor());
+ return ActorPtr(&process->getIface());
}
// ***** Actor methods *****
}
s4u::Host *Actor::getHost() {
- return s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(pimpl_)));
+ return pimpl_->host;
}
-const char* Actor::getName() {
- return simcall_process_get_name(pimpl_);
+simgrid::xbt::string Actor::getName() {
+ return pimpl_->name;
}
int Actor::getPid(){
- return simcall_process_get_PID(pimpl_);
+ return pimpl_->pid;
}
void Actor::setKillTime(double time) {
{
smx_process_t process = SIMIX_process_from_PID(pid);
if (process != nullptr)
- return ActorPtr(&process->actor());
+ return ActorPtr(&process->getIface());
else
return nullptr;
}
}
int getPid() {
- return simcall_process_get_PID(SIMIX_process_self());
+ return SIMIX_process_self()->pid;
}
}