X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1e469ce075c0a1ad21a7fd0fdb587f9a3cb5289..da569645922cef374b902492c56c214e39455512:/src/simix/smx_deployment.cpp diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp index 569d96bfbb..6fad27e09a 100644 --- a/src/simix/smx_deployment.cpp +++ b/src/simix/smx_deployment.cpp @@ -46,7 +46,7 @@ void SIMIX_launch_application(const char *file) try { parse_status = surf_parse(); surf_parse_close(); - xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno); + xbt_assert(not parse_status, "Parse error at %s:%d", file, surf_parse_lineno); } catch (xbt_ex& e) { XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.", @@ -114,22 +114,19 @@ simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name) * \brief Bypass the parser, get arguments, and set function to each process */ -void SIMIX_process_set_function(const char *process_host, - const char *process_function, - xbt_dynar_t arguments, - double process_start_time, - double process_kill_time) +void SIMIX_process_set_function(const char* process_host, const char* process_function, xbt_dynar_t arguments, + double process_start_time, double process_kill_time) { s_sg_platf_process_cbarg_t process; memset(&process,0,sizeof(process)); sg_host_t host = sg_host_by_name(process_host); - if (!host) + if (not host) THROWF(arg_error, 0, "Host '%s' unknown", process_host); - process.host = host->cname(); + process.host = process_host; process.argc = 1 + xbt_dynar_length(arguments); - process.argv = (const char**)xbt_new(char *, process.argc + 1); + process.argv = static_cast(xbt_new(const char*, process.argc + 1)); process.argv[0] = xbt_strdup(process_function); /* add arguments */ unsigned int i; @@ -147,7 +144,7 @@ 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.on_failure = SURF_ACTOR_ON_FAILURE_DIE; sg_platf_new_process(&process); }