summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3ed4ea9)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7290
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
surf_timer_model->extension.timer.set(start_time, (void *)
&SIMIX_process_create, arg);
surf_timer_model->extension.timer.set(start_time, (void *)
&SIMIX_process_create, arg);
- }
- if ((start_time < 0) || (start_time == SIMIX_get_clock())) {
+ } else { // start_time <= SIMIX_get_clock()
DEBUG2("Starting Process %s(%s) right now", parse_argv[0], parse_host);
if (simix_global->create_process_function)
DEBUG2("Starting Process %s(%s) right now", parse_argv[0], parse_host);
if (simix_global->create_process_function)
current_property_set);
/* verify if process has been created */
if (!process) {
current_property_set);
/* verify if process has been created */
if (!process) {
- xbt_free(parse_host);
- return;
+ xbt_free(parse_host);
+ return;
}
if (kill_time > SIMIX_get_clock()) {
if (simix_global->kill_process_function)
}
if (kill_time > SIMIX_get_clock()) {
if (simix_global->kill_process_function)
xbt_free(args);
continue;
}
xbt_free(args);
continue;
}
if (args->kill_time > SIMIX_get_clock()) {
surf_timer_model->extension.timer.set(args->kill_time, (void *)
&SIMIX_process_kill,
(void *) process);
}
xbt_free(args);
if (args->kill_time > SIMIX_get_clock()) {
surf_timer_model->extension.timer.set(args->kill_time, (void *)
&SIMIX_process_kill,
(void *) process);
}
xbt_free(args);
- }
- if (fun == simix_global->create_process_function) {
+ } else if (fun == simix_global->create_process_function) {
smx_process_arg_t args = arg;
DEBUG2("Launching %s on %s", args->name, args->hostname);
process =
smx_process_arg_t args = arg;
DEBUG2("Launching %s on %s", args->name, args->hostname);
process =
(void *) process);
}
xbt_free(args);
(void *) process);
}
xbt_free(args);
- }
- if (fun == SIMIX_process_kill) {
+ } else if (fun == SIMIX_process_kill) {
process = arg;
DEBUG2("Killing %s on %s", process->name, process->smx_host->name);
SIMIX_process_kill(process);
process = arg;
DEBUG2("Killing %s on %s", process->name, process->smx_host->name);
SIMIX_process_kill(process);
- }
- if (fun == simix_global->kill_process_function) {
+ } else if (fun == simix_global->kill_process_function) {
process = arg;
(*simix_global->kill_process_function) (process);
process = arg;
(*simix_global->kill_process_function) (process);
+ } else {
+ THROW_IMPOSSIBLE;