#endif
#ifdef HAVE_JEDULE
-#include "instr/jedule/jedule_sd_binding.h"
+#include "simgrid/jedule/jedule_sd_binding.h"
#endif
XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
parse_platform_file(platform_file);
- /* now let's create the SD wrappers for workstations, storages and links */
- {
- xbt_dict_cursor_t cursor = NULL;
- simgrid_Host* host = NULL;
- xbt_dict_foreach(host_list, cursor, name, host){
- __SD_workstation_create((const char*)name);
- }
- }
-
+ /* now let's create the SD wrappers for storage elements */
xbt_lib_foreach(storage_lib, cursor, name, surf_storage) {
- if(surf_storage[SURF_STORAGE_LEVEL])
- __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL);
+ if(surf_storage[SURF_STORAGE_LEVEL])
+ __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL);
}
-
- XBT_DEBUG("Workstation number: %d, link number: %d",
- SD_workstation_get_count(), sg_link_count());
+ XBT_DEBUG("Workstation number: %lu, link number: %d",
+ sg_host_count(), sg_link_count());
#ifdef HAVE_JEDULE
jedule_setup_platform();
#endif
/* explore the runnable tasks */
xbt_dynar_foreach(sd_global->executable_task_set , iter, task) {
XBT_VERB("Executing task '%s'", SD_task_get_name(task));
- if (__SD_task_try_to_run(task)){
- xbt_dynar_push(sd_global->return_set, &task);
- iter--;
- }
+ SD_task_run(task);
+ xbt_dynar_push(sd_global->return_set, &task);
+ iter--;
}
/* main loop */
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' done", SD_task_get_name(task));
- XBT_DEBUG("Calling __SD_task_just_done");
- __SD_task_just_done(task);
- XBT_DEBUG("__SD_task_just_done called on task '%s'",
- SD_task_get_name(task));
+ SD_task_set_state(task, SD_DONE);
+ task->surf_action->unref();
+ task->surf_action = NULL;
/* the state has changed. Add it only if it's the first change */
if (xbt_dynar_search_or_negative(sd_global->return_set, &task) < 0) {
if (SD_task_get_state(dst) == SD_RUNNABLE
&& !sd_global->watch_point_reached) {
XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
- if (__SD_task_try_to_run(dst))
- xbt_dynar_push(sd_global->return_set, &dst);
+ SD_task_run(dst);
+ xbt_dynar_push(sd_global->return_set, &dst);
}
}
}
(int) xbt_dynar_length(sd_global->completed_task_set)));
static const char* state_names[] =
{ "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED",
- "SD_RUNNABLE", "SD_IN_INFO", "SD_RUNNING", "SD_DONE",
+ "SD_RUNNABLE", "SD_RUNNING", "SD_DONE",
"SD_FAILED" };
xbt_dynar_foreach(sd_global->initial_task_set, iter, task){
XBT_WARN("%s is in %s state", SD_task_get_name(task),