X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc01999f5003e51cc1d12f93647999a1a143f23..0a95c78251f3ecbf1dfcb3ebe7904e44acf1beef:/src/s4u/s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 24a6bb8c3d..4d082c1e0b 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -5,14 +5,13 @@
  * 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/comm.hpp"
 #include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 
-#include "src/simix/smx_private.h"
+#include "src/kernel/context/Context.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 
@@ -20,55 +19,67 @@ 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 simgrid::s4u::ActorPtr(&self_context->process()->getIface());
+}
 
-ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
+ActorPtr Actor::createActor(const char* name, s4u::Host* host, 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, nullptr, 0);
+  return ActorPtr(&process->getIface());
 }
 
-ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
-  const char* function, std::vector<std::string> args)
+ActorPtr Actor::createActor(const char* name, s4u::Host* host, 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));
-  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, nullptr, 0);
+  return ActorPtr(&process->getIface());
 }
 
 // ***** Actor methods *****
 
 void Actor::join() {
-  simcall_process_join(pimpl_, -1);
+  simcall_process_join(this->pimpl_, -1);
 }
 
 void Actor::setAutoRestart(bool autorestart) {
   simcall_process_auto_restart_set(pimpl_,autorestart);
 }
 
-s4u::Host *Actor::getHost() {
-  return s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(pimpl_)));
+s4u::Host* Actor::host()
+{
+  return this->pimpl_->host;
+}
+
+simgrid::xbt::string Actor::name()
+{
+  return this->pimpl_->name;
 }
 
-const char* Actor::getName() {
-  return simcall_process_get_name(pimpl_);
+int Actor::pid()
+{
+  return this->pimpl_->pid;
 }
 
-int Actor::getPid(){
-  return simcall_process_get_PID(pimpl_);
+int Actor::ppid()
+{
+  return this->pimpl_->ppid;
 }
 
 void Actor::setKillTime(double time) {
   simcall_process_set_kill_time(pimpl_,time);
 }
 
-double Actor::getKillTime() {
+double Actor::killTime()
+{
   return simcall_process_get_kill_time(pimpl_);
 }
 
@@ -83,7 +94,7 @@ void Actor::kill(int pid) {
   }
 }
 
-smx_process_t Actor::getImpl() {
+smx_actor_t Actor::getImpl() {
   return pimpl_;
 }
 
@@ -93,11 +104,11 @@ void Actor::kill() {
 
 // ***** Static functions *****
 
-ActorPtr Actor::forPid(int pid)
+ActorPtr Actor::byPid(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;
 }
@@ -124,11 +135,11 @@ XBT_PUBLIC(void) sleep_until(double timeout)
 }
 
 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);
   c.setDstData(&res,sizeof(res));
@@ -136,7 +147,7 @@ void* recv(Mailbox &chan) {
   return res;
 }
 
-void send(Mailbox &chan, void *payload, size_t simulatedSize) {
+void send(MailboxPtr chan, void *payload, size_t simulatedSize) {
   Comm& c = Comm::send_init(chan);
   c.setRemains(simulatedSize);
   c.setSrcData(payload);
@@ -144,8 +155,14 @@ void send(Mailbox &chan, void *payload, size_t simulatedSize) {
   c.wait();
 }
 
-int getPid() {
-  return simcall_process_get_PID(SIMIX_process_self());
+int pid()
+{
+  return SIMIX_process_self()->pid;
+}
+
+int ppid()
+{
+  return SIMIX_process_self()->ppid;
 }
 
 }