smx_process_arg_t arg = NULL;
smx_process_t process_created = NULL;
- arg = xbt_new0(s_smx_process_arg_t, 1);
+ arg = new simgrid::simix::ProcessArg();
+ arg->name = std::string(process->argv[0]);
arg->code = parse_code;
arg->data = NULL;
arg->hostname = sg_host_get_name(host);
- arg->argc = process->argc;
- arg->argv = xbt_new(char *,process->argc);
- int i;
- for (i=0; i<process->argc; i++)
- arg->argv[i] = xbt_strdup(process->argv[i]);
- arg->name = xbt_strdup(arg->argv[0]);
+ arg->args.assign(process->argc, process->argv);
arg->kill_time = kill_time;
arg->properties = current_property_set;
if (!sg_host_simix(host)->boot_processes)
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);
- arg->name = (char*)(process->argv)[0];
+ arg = new simgrid::simix::ProcessArg();
+ arg->name = std::string(process->argv[0]);
arg->code = parse_code;
arg->data = NULL;
arg->hostname = sg_host_get_name(host);
- arg->argc = process->argc;
- arg->argv = (char**)(process->argv);
+ arg->args.assign(process->argc, process->argv);
arg->kill_time = kill_time;
arg->properties = current_property_set;
- XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name, arg->hostname, start_time);
- SIMIX_timer_set(start_time, [](void* arg) {
- SIMIX_process_create_from_wrapper((smx_process_arg_t) arg);
+ XBT_DEBUG("Process %s(%s) will be started at time %f",
+ arg->name.c_str(), arg->hostname, start_time);
+ SIMIX_timer_set(start_time, [](void* p) {
+ smx_process_arg_t arg = static_cast<smx_process_arg_t>(p);
+ simix_global->create_process_function(
+ arg->name.c_str(),
+ arg->code,
+ arg->data,
+ arg->hostname,
+ arg->kill_time,
+ std::move(arg->args),
+ arg->properties,
+ arg->auto_restart,
+ NULL);
+ delete arg;
}, arg);
} else { // start_time <= SIMIX_get_clock()
- XBT_DEBUG("Starting Process %s(%s) right now", arg->name, sg_host_get_name(host));
+ XBT_DEBUG("Starting Process %s(%s) right now",
+ arg->name.c_str(), sg_host_get_name(host));
if (simix_global->create_process_function)
process_created = simix_global->create_process_function(
- arg->name,
+ arg->name.c_str(),
parse_code,
NULL,
sg_host_get_name(host),
kill_time,
- process->argc,
- (char**)(process->argv),
+ arg->args,
current_property_set,
auto_restart, NULL);
else
- process_created = simcall_process_create(arg->name, parse_code, NULL, sg_host_get_name(host), kill_time, process->argc,
- (char**)process->argv, current_property_set,auto_restart);
+ process_created = simcall_process_create(
+ arg->name.c_str(), parse_code, NULL, sg_host_get_name(host), kill_time,
+ arg->args, 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) */
if (!process_created) {
* Once this function was called, the configuration concerning the used
* models cannot be changed anymore.
*
- * @param AS_id name of this autonomous system. Must be unique in the platform
- * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
+ * @param AS the parameters defining the AS to build.
*/
simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
{