#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"
#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)
{
// 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?
- smx_process_t process = simcall_process_create(
- name, std::move(code), nullptr, host->name().c_str(),
- killTime, nullptr, 0);
- return Ptr(&process->actor());
+ smx_actor_t process = simcall_process_create(
+ name, std::move(code), nullptr, host, killTime, nullptr, 0);
+ return ActorPtr(&process->getIface());
}
ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
{
simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
simgrid::simix::ActorCode code = factory(std::move(args));
- smx_process_t process = simcall_process_create(
- name, std::move(code), nullptr, host->name().c_str(),
- killTime, nullptr, 0);
- return ActorPtr(&process->actor());
+ smx_actor_t process = simcall_process_create(
+ name, std::move(code), nullptr, host, killTime, nullptr, 0);
+ 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;
+}
+
+int Actor::getPpid() {
+ return pimpl_->ppid;
}
void Actor::setKillTime(double time) {
}
}
-smx_process_t Actor::getInferior() {
+smx_actor_t Actor::getImpl() {
return pimpl_;
}
ActorPtr Actor::forPid(int pid)
{
- smx_process_t process = SIMIX_process_from_PID(pid);
+ smx_actor_t process = SIMIX_process_from_PID(pid);
if (process != nullptr)
- return ActorPtr(&process->actor());
+ return ActorPtr(&process->getIface());
else
return nullptr;
}
}
e_smx_state_t execute(double flops) {
- smx_synchro_t s = simcall_execution_start(nullptr,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* recv(MailboxPtr chan) {
void *res = nullptr;
- Comm c = Comm::recv_init(chan);
+ 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.
}
int getPid() {
- return simcall_process_get_PID(SIMIX_process_self());
+ return SIMIX_process_self()->pid;
+}
+
+int getPpid() {
+ return SIMIX_process_self()->ppid;
}
}