New callbacks: simgrid::s4u::onSimulationEnd (right after the main simulation loop)

[simgrid.git] / src / s4u / s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 68f66fd..6b6f990 100644 (file)
--- 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");
 
@@ -26,7 +25,7 @@ ActorPtr Actor::self()
   if (self_context == nullptr)
     return simgrid::s4u::ActorPtr();
 
-  return simgrid::s4u::ActorPtr(&self_context->process()->actor());
+  return simgrid::s4u::ActorPtr(&self_context->process()->getIface());
 }
 
 
@@ -34,10 +33,9 @@ ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
 {
   // 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,
@@ -45,10 +43,9 @@ 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 *****
@@ -73,6 +70,10 @@ int Actor::getPid(){
   return pimpl_->pid;
 }
 
+int Actor::getPpid() {
+  return pimpl_->ppid;
+}
+
 void Actor::setKillTime(double time) {
   simcall_process_set_kill_time(pimpl_,time);
 }
@@ -92,7 +93,7 @@ void Actor::kill(int pid) {
   }
 }
 
-smx_process_t Actor::getImpl() {
+smx_actor_t Actor::getImpl() {
   return pimpl_;
 }
 
@@ -104,9 +105,9 @@ void Actor::kill() {
 
 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;
 }
@@ -133,11 +134,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));
@@ -145,7 +146,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);
@@ -157,6 +158,10 @@ int getPid() {
   return SIMIX_process_self()->pid;
 }
 
+int getPpid() {
+  return SIMIX_process_self()->ppid;
+}
+
 }
 }
 }