summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3290913)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6313
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
int argc, char **argv,
xbt_dict_t properties)
{
int argc, char **argv,
xbt_dict_t properties)
{
- simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
+ simdata_process_t simdata = NULL;
m_process_t process = xbt_new0(s_m_process_t, 1);
m_process_t process = xbt_new0(s_m_process_t, 1);
+ smx_process_t smx_process = NULL;
xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
+ smx_process = SIMIX_process_create(name, code,
+ (void *) process, host->name,
+ argc, argv, properties);
+ if (!smx_process) {
+ xbt_free(process);
+ return NULL;
+ }
+
+ simdata = xbt_new0(s_simdata_process_t, 1);
+
/* Simulator Data */
simdata->PID = msg_global->PID++;
simdata->waiting_task = NULL;
simdata->m_host = host;
simdata->argc = argc;
simdata->argv = argv;
/* Simulator Data */
simdata->PID = msg_global->PID++;
simdata->waiting_task = NULL;
simdata->m_host = host;
simdata->argc = argc;
simdata->argv = argv;
- simdata->s_process = SIMIX_process_create(name, code,
- (void *) process, host->name,
- argc, argv, properties);
+ simdata->s_process = smx_process;
if (SIMIX_process_self()) {
simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);
if (SIMIX_process_self()) {
simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);
process = SIMIX_process_create(parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv, /*the props */
current_property_set);
process = SIMIX_process_create(parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv, /*the props */
current_property_set);
- if (kill_time > SIMIX_get_clock()) {
+ if (process && kill_time > SIMIX_get_clock()) {
if (simix_global->kill_process_function)
if (simix_global->kill_process_function)
- surf_timer_model->extension_public->set(start_time, (void *)
- simix_global->kill_process_function,
- arg);
+ surf_timer_model->extension_public->set(start_time, (void *)
+ simix_global->kill_process_function,
+ process);
else
surf_timer_model->extension_public->set(kill_time, (void *)
&SIMIX_process_kill,
else
surf_timer_model->extension_public->set(kill_time, (void *)
&SIMIX_process_kill,
args->data, args->hostname,
args->argc, args->argv,
args->properties);
args->data, args->hostname,
args->argc, args->argv,
args->properties);
- if (args->kill_time > SIMIX_get_clock()) {
+ if (process && args->kill_time > SIMIX_get_clock()) {
surf_timer_model->extension_public->set(args->kill_time, (void *)
&SIMIX_process_kill,
(void *) process);
surf_timer_model->extension_public->set(args->kill_time, (void *)
&SIMIX_process_kill,
(void *) process);