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

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 444fa6cbc9..fbd34dc674 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -10,7 +10,7 @@
 #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"
@@ -35,10 +35,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 +45,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 +95,7 @@ void Actor::kill(int pid) {
   }
 }
 
-smx_process_t Actor::getImpl() {
+smx_actor_t Actor::getImpl() {
   return pimpl_;
 }
 
@@ -109,7 +107,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 +140,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 +148,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);