s_SD_task_t task;
- XBT_DEBUG("Recreating the swags...");
+ SD_task_t done_task, next_done_task;
+
+ XBT_DEBUG("Recreating the swags...");
xbt_swag_free(sd_global->not_scheduled_task_set);
xbt_swag_free(sd_global->schedulable_task_set);
xbt_swag_free(sd_global->scheduled_task_set);
xbt_swag_free(sd_global->runnable_task_set);
xbt_swag_free(sd_global->in_fifo_task_set);
xbt_swag_free(sd_global->running_task_set);
- xbt_swag_free(sd_global->done_task_set);
xbt_swag_free(sd_global->failed_task_set);
sd_global->not_scheduled_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->schedulable_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ xbt_swag_foreach_safe(done_task, next_done_task, sd_global->done_task_set){
+ if (xbt_dynar_is_empty(done_task->tasks_before)){
+ __SD_task_set_state(done_task, SD_SCHEDULABLE);
+ } else{
+ __SD_task_set_state(done_task, SD_NOT_SCHEDULED);
+ done_task->unsatisfied_dependencies =
+ xbt_dynar_length(done_task->tasks_before);
+ done_task->is_not_ready = done_task->unsatisfied_dependencies;
+ }
+ free(done_task->workstation_list);
+ done_task->workstation_list = NULL;
+ done_task->workstation_nb = 0;
+ }
+
+ xbt_swag_free(sd_global->done_task_set);
+
sd_global->scheduled_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->runnable_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->task_number = 0;
+
#ifdef HAVE_JEDULE
+ jedule_sd_dump();
jedule_sd_cleanup();
jedule_sd_init();
#endif
if (dst->is_not_ready > 0)
dst->is_not_ready--;
+ XBT_DEBUG("Released a dependency on %s: %d remain(s). Became schedulable if %d=0",
+ SD_task_get_name(dst), dst->unsatisfied_dependencies,
+ dst->is_not_ready);
+
if (!(dst->unsatisfied_dependencies)) {
if (__SD_task_is_scheduled(dst))
__SD_task_set_state(dst, SD_RUNNABLE);
__SD_task_set_state(dst, SD_SCHEDULABLE);
}
+ if (__SD_task_is_not_scheduled(dst) && !(dst->is_not_ready)) {
+ __SD_task_set_state(dst, SD_SCHEDULABLE);
+ }
+
if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E) {
SD_dependency_t comm_dep;
SD_task_t comm_dst;
comm_dst->is_not_ready > 0) {
comm_dst->is_not_ready--;
+ XBT_DEBUG("%s is a transfer, %s may be ready now if %d=0",
+ SD_task_get_name(dst), SD_task_get_name(comm_dst),
+ comm_dst->is_not_ready);
+
if (!(comm_dst->is_not_ready)) {
__SD_task_set_state(comm_dst, SD_SCHEDULABLE);
}
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
-}
-/**
- * \brief load script file
- */
-
-void SD_load_environment_script(const char *script_file)
-{
-#ifdef HAVE_LUA
- lua_State *L = lua_open();
- luaL_openlibs(L);
-
- if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) {
- printf("error: %s\n", lua_tostring(L, -1));
- return;
- }
-#else
- xbt_die
- ("Lua is not available!! to call SD_load_environment_script, lua should be available...");
-#endif
- return;
+ XBT_DEBUG("Exiting Surf...");
+ surf_exit();
}