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 444fa6c..6b6f990 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -5,15 +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/kernel/context/Context.hpp"
-#include "src/simix/smx_private.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 
@@ -35,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->getIface());
+  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,
@@ -46,9 +43,8 @@ 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);
+  smx_actor_t process = simcall_process_create(
+    name, std::move(code), nullptr, host, killTime, nullptr, 0);
   return ActorPtr(&process->getIface());
 }
 
@@ -97,7 +93,7 @@ void Actor::kill(int pid) {
   }
 }
 
-smx_process_t Actor::getImpl() {
+smx_actor_t Actor::getImpl() {
   return pimpl_;
 }
 
@@ -109,7 +105,7 @@ 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->getIface());
   else
@@ -142,7 +138,7 @@ e_smx_state_t execute(double flops) {
   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));
@@ -150,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);