/* let's see which tasks are done */
xbt_dynar_foreach(model_list, iter, model) {
- while ((action = xbt_swag_extract(model->states.done_action_set))) {
- task = action->data;
- task->start_time =
- surf_workstation_model->
- action_get_start_time(task->surf_action);
+ while ((action = xbt_swag_extract(surf_model_done_action_set(model)))) {
+ task = surf_action_get_data(action);
+ task->start_time = surf_action_get_start_time(task->surf_action);
+
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' done", SD_task_get_name(task));
XBT_DEBUG("Calling __SD_task_just_done");
}
/* let's see which tasks have just failed */
- while ((action = xbt_swag_extract(model->states.failed_action_set))) {
- task = action->data;
- task->start_time =
- surf_workstation_model->
- action_get_start_time(task->surf_action);
+ while ((action = xbt_swag_extract(surf_model_failed_action_set(model)))) {
+ task = surf_action_get_data(action);
+ task->start_time = surf_action_get_start_time(task->surf_action);
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' failed", SD_task_get_name(task));
__SD_task_set_state(task, SD_FAILED);
- surf_workstation_model->action_unref(action);
+ surf_action_unref(action);
task->surf_action = NULL;
xbt_swag_insert(task,sd_global->return_set);
TRACE_end();
#endif
- XBT_DEBUG("Exiting Surf...");
- surf_exit();
-
xbt_free(sd_global);
sd_global = NULL;
#ifdef HAVE_JEDULE
jedule_sd_dump();
jedule_sd_cleanup();
+ jedule_sd_exit();
#endif
+
+ XBT_DEBUG("Exiting Surf...");
+ surf_exit();
}