X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40ffa837924e30c9aa35eefef1711601419d8de7..f70ee620c8df5cdf749f4dfbc9777359cd3cb12a:/src/simix/smx_deployment.c diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c index d1fcee1a94..7a3b025474 100644 --- a/src/simix/smx_deployment.c +++ b/src/simix/smx_deployment.c @@ -23,7 +23,7 @@ extern int surf_parse_lineno; static void parse_process(sg_platf_process_cbarg_t process) { - smx_host_t host = SIMIX_host_get_by_name(process->host); + sg_host_t host = sg_host_by_name(process->host); if (!host) THROWF(arg_error, 0, "Host '%s' unknown", process->host); parse_code = SIMIX_get_registered_function(process->function); @@ -48,10 +48,10 @@ static void parse_process(sg_platf_process_cbarg_t process) arg->name = xbt_strdup(arg->argv[0]); arg->kill_time = kill_time; arg->properties = current_property_set; - if (!SIMIX_host_priv(host)->boot_processes) { - SIMIX_host_priv(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg); + if (!sg_host_simix(host)->boot_processes) { + sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg); } - xbt_dynar_push_as(SIMIX_host_priv(host)->boot_processes,smx_process_arg_t,arg); + xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg); if (start_time > SIMIX_get_clock()) { arg = xbt_new0(s_smx_process_arg_t, 1); @@ -194,10 +194,9 @@ void SIMIX_process_set_function(const char *process_host, double process_start_time, double process_kill_time) { - s_sg_platf_process_cbarg_t process; - memset(&process,0,sizeof(process)); + s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER; - smx_host_t host = SIMIX_host_get_by_name(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); @@ -220,8 +219,6 @@ void SIMIX_process_set_function(const char *process_host, process.host = process_host; process.kill_time = process_kill_time; process.start_time = process_start_time; - process.on_failure = SURF_PROCESS_ON_FAILURE_DIE; - process.properties = NULL; sg_platf_new_process(&process); }