Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Prefer the C-ish sg_host_get_name() over sg_host_name()
[simgrid.git] / src / simix / smx_deployment.c
index da7cb74..c4ddb39 100644 (file)
@@ -39,7 +39,7 @@ static void parse_process(sg_platf_process_cbarg_t process)
   arg = xbt_new0(s_smx_process_arg_t, 1);
   arg->code = parse_code;
   arg->data = NULL;
-  arg->hostname = sg_host_name(host);
+  arg->hostname = sg_host_get_name(host);
   arg->argc = process->argc;
   arg->argv = xbt_new(char *,process->argc);
   int i;
@@ -58,7 +58,7 @@ static void parse_process(sg_platf_process_cbarg_t process)
     arg->name = (char*)(process->argv)[0];
     arg->code = parse_code;
     arg->data = NULL;
-    arg->hostname = sg_host_name(host);
+    arg->hostname = sg_host_get_name(host);
     arg->argc = process->argc;
     arg->argv = (char**)(process->argv);
     arg->kill_time = kill_time;
@@ -68,21 +68,21 @@ static void parse_process(sg_platf_process_cbarg_t process)
            arg->hostname, start_time);
     SIMIX_timer_set(start_time, &SIMIX_process_create_from_wrapper, arg);
   } else {                      // start_time <= SIMIX_get_clock()
-    XBT_DEBUG("Starting Process %s(%s) right now", process->argv[0], sg_host_name(host));
+    XBT_DEBUG("Starting Process %s(%s) right now", process->argv[0], sg_host_get_name(host));
 
     if (simix_global->create_process_function)
       process_created = simix_global->create_process_function(
                                             (char*)(process->argv)[0],
                                             parse_code,
                                             NULL,
-                                            sg_host_name(host),
+                                            sg_host_get_name(host),
                                             kill_time,
                                             process->argc,
                                             (char**)(process->argv),
                                             current_property_set,
                                             auto_restart, NULL);
     else
-      process_created = simcall_process_create((char*)(process->argv)[0], parse_code, NULL, sg_host_name(host), kill_time, process->argc,
+      process_created = simcall_process_create((char*)(process->argv)[0], parse_code, NULL, sg_host_get_name(host), kill_time, process->argc,
           (char**)process->argv, current_property_set,auto_restart);
     
     /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
@@ -199,7 +199,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_name(host);
+  process.host = sg_host_get_name(host);
 
   process.argc = 1 + xbt_dynar_length(arguments);
   process.argv = (const char**)xbt_new(char *, process.argc + 1);