avoid double to size_t to double

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

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 4d082c1..abc984a 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -25,23 +25,21 @@ ActorPtr Actor::self()
   if (self_context == nullptr)
     return simgrid::s4u::ActorPtr();
 
-  return simgrid::s4u::ActorPtr(&self_context->process()->getIface());
+  return self_context->process()->iface();
 }
 
 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_actor_t process = simcall_process_create(name, std::move(code), nullptr, host, nullptr, 0);
-  return ActorPtr(&process->getIface());
+  smx_actor_t actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+  return actor->iface();
 }
 
 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_actor_t process                       = simcall_process_create(name, std::move(code), nullptr, host, nullptr, 0);
-  return ActorPtr(&process->getIface());
+  smx_actor_t actor                         = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+  return actor->iface();
 }
 
 // ***** Actor methods *****
@@ -59,6 +57,11 @@ s4u::Host* Actor::host()
   return this->pimpl_->host;
 }
 
+const char* Actor::cname()
+{
+  return this->pimpl_->name.c_str();
+}
+
 simgrid::xbt::string Actor::name()
 {
   return this->pimpl_->name;
@@ -84,7 +87,7 @@ double Actor::killTime()
 }
 
 void Actor::kill(int pid) {
-  msg_process_t process = SIMIX_process_from_PID(pid);
+  smx_actor_t process = SIMIX_process_from_PID(pid);
   if(process != nullptr) {
     simcall_process_kill(process);
   } else {
@@ -108,9 +111,9 @@ ActorPtr Actor::byPid(int pid)
 {
   smx_actor_t process = SIMIX_process_from_PID(pid);
   if (process != nullptr)
-    return ActorPtr(&process->getIface());
+    return process->iface();
   else
-    return nullptr;
+    return ActorPtr();
 }
 
 void Actor::killAll() {
@@ -147,7 +150,8 @@ void* recv(MailboxPtr chan) {
   return res;
 }
 
-void send(MailboxPtr chan, void *payload, size_t simulatedSize) {
+void send(MailboxPtr chan, void* payload, double simulatedSize)
+{
   Comm& c = Comm::send_init(chan);
   c.setRemains(simulatedSize);
   c.setSrcData(payload);
@@ -165,6 +169,10 @@ int ppid()
   return SIMIX_process_self()->ppid;
 }
 
+std::string name()
+{
+  return SIMIX_process_self()->name;
+}
 }
 }
 }