X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/666f14c5995d2584dbb8dea680f17e6a915da146..2ad536e710c5936ff8e525e4bbb5e7046f292aac:/src/s4u/s4u_Actor.cpp

diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp
index e4ec4be8c9..1e022aa5ea 100644
--- a/src/s4u/s4u_Actor.cpp
+++ b/src/s4u/s4u_Actor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -11,11 +11,11 @@
 #include <simgrid/s4u/Exec.hpp>
 #include <simgrid/s4u/VirtualMachine.hpp>
 
-#include "src/include/mc/mc.h"
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/resource/HostImpl.hpp"
+#include "src/mc/mc.h"
 #include "src/mc/mc_replay.hpp"
-#include "src/surf/HostImpl.hpp"
 
 #include <algorithm>
 
@@ -188,7 +188,7 @@ bool Actor::is_maestro()
   return self == nullptr || kernel::EngineImpl::get_instance()->is_maestro(self);
 }
 
-const simgrid::xbt::string& Actor::get_name() const
+const std::string& Actor::get_name() const
 {
   return this->pimpl_->get_name();
 }
@@ -313,13 +313,13 @@ void sleep_for(double duration)
   if (duration <= 0) /* that's a no-op */
     return;
 
-  if (duration < sg_surf_precision) {
+  if (duration < sg_precision_timing) {
     static unsigned int warned = 0; // At most 20 such warnings
     warned++;
     if (warned <= 20)
       XBT_INFO("The parameter to sleep_for() is smaller than the SimGrid numerical accuracy (%g < %g). "
                "Please refer to https://simgrid.org/doc/latest/Configuring_SimGrid.html#numerical-precision",
-               duration, sg_surf_precision);
+               duration, sg_precision_timing);
     if (warned == 20)
       XBT_VERB("(further warnings about the numerical accuracy of sleep_for() will be omitted).");
   }
@@ -359,7 +359,7 @@ void execute(double flops)
 
 void execute(double flops, double priority)
 {
-  exec_init(flops)->set_priority(priority)->vetoable_start()->wait();
+  exec_init(flops)->set_priority(priority)->start()->wait();
 }
 
 void parallel_execute(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
@@ -407,13 +407,14 @@ ExecPtr exec_init(const std::vector<s4u::Host*>& hosts, const std::vector<double
 ExecPtr exec_async(double flops)
 {
   ExecPtr res = exec_init(flops);
-  res->vetoable_start();
+  res->start();
   return res;
 }
 
 aid_t get_pid()
 {
-  return simgrid::kernel::actor::ActorImpl::self()->get_pid();
+  auto* self = simgrid::kernel::actor::ActorImpl::self();
+  return self ? self->get_pid() : 0;
 }
 
 aid_t get_ppid()
@@ -428,7 +429,8 @@ std::string get_name()
 
 const char* get_cname()
 {
-  return simgrid::kernel::actor::ActorImpl::self()->get_cname();
+  auto* self = simgrid::kernel::actor::ActorImpl::self();
+  return self ? self->get_cname() : nullptr;
 }
 
 Host* get_host()
@@ -753,6 +755,8 @@ aid_t sg_actor_self_get_ppid()
 
 const char* sg_actor_self_get_name()
 {
+  if (simgrid::s4u::Actor::is_maestro())
+    return "maestro";
   return simgrid::s4u::this_actor::get_cname();
 }