internal dynar--

[simgrid.git] / src / simix / smx_deployment.cpp

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index db1becc..492e147 100644 (file)
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -7,18 +7,19 @@
 #include <string>
 #include <vector>
 
+#include "simgrid/s4u/host.hpp"
 #include "smx_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
+#include "xbt/dict.h"
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
+#include <xbt/ex.hpp>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
-                                "Logging specific to SIMIX (deployment)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
 
 extern int surf_parse_lineno;
 
-void SIMIX_init_application(void)
+void SIMIX_init_application()
 {
   sg_platf_exit();
   sg_platf_init();
@@ -41,8 +42,7 @@ void SIMIX_init_application(void)
 void SIMIX_launch_application(const char *file)
 {
   XBT_ATTRIB_UNUSED int parse_status;
-  xbt_assert(simix_global,
-              "SIMIX_global_init has to be called before SIMIX_launch_application.");
+  xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
 
   SIMIX_init_application();
 
@@ -95,12 +95,12 @@ void SIMIX_function_register_default(xbt_main_func_t code)
 }
 
 /**
- * \brief Gets a #smx_process_t code from the global table.
+ * \brief Gets a #smx_actor_t code from the global table.
  *
  * Gets a code function from the global table. Returns nullptr if there are no function registered with the name.
  * This table is then used by #SIMIX_launch_application.
  * \param name the reference name of the function.
- * \return The #smx_process_t or nullptr.
+ * \return The #smx_actor_t or nullptr.
  */
 simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name)
 {
@@ -130,7 +130,7 @@ void SIMIX_process_set_function(const char *process_host,
   sg_host_t host = sg_host_by_name(process_host);
   if (!host)
     THROWF(arg_error, 0, "Host '%s' unknown", process_host);
-  process.host = sg_host_get_name(host);
+  process.host = host->cname();
 
   process.argc = 1 + xbt_dynar_length(arguments);
   process.argv = (const char**)xbt_new(char *, process.argc + 1);
@@ -164,4 +164,4 @@ void registerFunction(const char* name, ActorCodeFactory factory)
 }
 
 }
-}
\ No newline at end of file
+}