Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
move a function to a righter place
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Wed, 20 Feb 2019 13:08:55 +0000 (14:08 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Wed, 20 Feb 2019 13:08:55 +0000 (14:08 +0100)
src/s4u/s4u_Host.cpp
src/simix/smx_host.cpp

index 16f419a..68698e8 100644 (file)
@@ -7,6 +7,7 @@
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Exec.hpp"
+#include "src/simix/smx_private.hpp"
 #include "src/surf/HostImpl.hpp"
 
 #include <string>
@@ -639,6 +640,16 @@ sg_host_t sg_host_self()
   return (process == nullptr) ? nullptr : process->get_host();
 }
 
+/* needs to be public and without simcall for exceptions and logging events */
+const char* sg_host_self_get_name()
+{
+  sg_host_t host = sg_host_self();
+  if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
+    return "";
+
+  return host->get_cname();
+}
+
 double sg_host_load(sg_host_t host)
 {
   return host->get_load();
index c30ee97..37c3479 100644 (file)
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
 
-/* needs to be public and without simcall for exceptions and logging events */
-const char* sg_host_self_get_name()
-{
-  sg_host_t host = sg_host_self();
-  if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
-    return "";
-
-  return host->get_cname();
-}
-
 simgrid::kernel::activity::ExecImplPtr
 SIMIX_execution_parallel_start(std::string name, int host_nb, const sg_host_t* host_list, const double* flops_amount,
                                const double* bytes_amount, double rate, double timeout)