XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, "Logging specific to SimDag (kernel)");
-SD_global_t sd_global = NULL;
+SD_global_t sd_global = nullptr;
/**
* \brief Initializes SD internal data
{
TRACE_global_init(argc, argv);
- xbt_assert(sd_global == NULL, "SD_init() already called");
+ xbt_assert(sd_global == nullptr, "SD_init() already called");
sd_global = xbt_new(s_SD_global_t, 1);
sd_global->watch_point_reached = 0;
sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f, SD_task_free_f, SD_task_recycle_f);
- sd_global->initial_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
- sd_global->executable_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
- sd_global->completed_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
- sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
+ sd_global->initial_tasks = new std::set<SD_task_t>();
+ sd_global->executable_tasks = new std::set<SD_task_t>();
+ sd_global->completed_tasks = new std::set<SD_task_t>();
+ sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), nullptr);
surf_init(argc, argv);
/* we stop the simulation when total_time >= how_long */
double total_time = 0.0;
SD_task_t task, dst;
- SD_dependency_t dependency;
surf_action_t action;
- unsigned int iter, depcnt;
+ unsigned int iter;
XBT_VERB("Run simulation for %f seconds", how_long);
sd_global->watch_point_reached = 0;
xbt_dynar_reset(sd_global->return_set);
/* explore the runnable tasks */
- xbt_dynar_foreach(sd_global->executable_task_set , iter, task) {
+ std::set<SD_task_t>::iterator it=sd_global->executable_tasks->begin();
+ while(it != sd_global->executable_tasks->end()){
+ task = *it;
+ it++;
XBT_VERB("Executing task '%s'", SD_task_get_name(task));
SD_task_run(task);
xbt_dynar_push(sd_global->return_set, &task);
- iter--;
}
/* main loop */
double elapsed_time = 0.0;
while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
!sd_global->watch_point_reached) {
- surf_model_t model = NULL;
+ surf_model_t model = nullptr;
XBT_DEBUG("Total time: %f", total_time);
XBT_VERB("Task '%s' done", SD_task_get_name(task));
SD_task_set_state(task, SD_DONE);
task->surf_action->unref();
- task->surf_action = NULL;
+ task->surf_action = nullptr;
/* the state has changed. Add it only if it's the first change */
if (xbt_dynar_member(sd_global->return_set, &task) == 0) {
}
/* remove the dependencies after this task */
- xbt_dynar_foreach(task->tasks_after, depcnt, dependency) {
- dst = dependency->dst;
+ for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it){
+ dst=*it;
dst->unsatisfied_dependencies--;
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 == 0) {
if (SD_task_get_state(dst) == SD_SCHEDULED)
SD_task_set_state(dst, SD_RUNNABLE);
if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && dst->is_not_ready == 0) {
SD_task_set_state(dst, SD_SCHEDULABLE);
}
+ if (SD_task_get_state(dst) == SD_RUNNABLE && !sd_global->watch_point_reached) {
+ XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
+ SD_task_run(dst);
+ xbt_dynar_push(sd_global->return_set, &dst);
+ }
+ }
- if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E) {
- SD_dependency_t comm_dep;
- SD_task_t comm_dst;
- xbt_dynar_get_cpy(dst->tasks_after, 0, &comm_dep);
- comm_dst = comm_dep->dst;
- if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->is_not_ready > 0) {
- comm_dst->is_not_ready--;
+ for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
+ dst=*it;
+ dst->unsatisfied_dependencies = 0;
+ dst->is_not_ready = 0;
+ if (SD_task_get_state(dst) == SD_SCHEDULED)
+ SD_task_set_state(dst, SD_RUNNABLE);
+ else
+ SD_task_set_state(dst, SD_SCHEDULABLE);
+ SD_task_t comm_dst = *(dst->successors->begin());
+ if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && 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);
+ SD_task_get_name(dst), SD_task_get_name(comm_dst), comm_dst->is_not_ready);
- if (comm_dst->is_not_ready == 0) {
- SD_task_set_state(comm_dst, SD_SCHEDULABLE);
- }
+ if (comm_dst->is_not_ready == 0) {
+ SD_task_set_state(comm_dst, SD_SCHEDULABLE);
}
}
-
- /* is dst runnable now? */
if (SD_task_get_state(dst) == SD_RUNNABLE && !sd_global->watch_point_reached) {
XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
SD_task_run(dst);
XBT_VERB("Task '%s' failed", SD_task_get_name(task));
SD_task_set_state(task, SD_FAILED);
action->unref();
- task->surf_action = NULL;
+ task->surf_action = nullptr;
xbt_dynar_push(sd_global->return_set, &task);
}
}
}
- if (!sd_global->watch_point_reached && how_long<0 &&
- xbt_dynar_is_empty(sd_global->initial_task_set) == 0) {
- XBT_WARN("Simulation is finished but %lu tasks are still not done",
- xbt_dynar_length(sd_global->initial_task_set));
+ if (!sd_global->watch_point_reached && how_long<0 && !sd_global->initial_tasks->empty()) {
+ XBT_WARN("Simulation is finished but %zu tasks are still not done", sd_global->initial_tasks->size());
static const char* state_names[] =
{ "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", "SD_RUNNABLE", "SD_RUNNING", "SD_DONE","SD_FAILED" };
- xbt_dynar_foreach(sd_global->initial_task_set, iter, task){
+ for (std::set<SD_task_t>::iterator it=sd_global->initial_tasks->begin();
+ it!=sd_global->initial_tasks->end(); ++it){
+ task = *it;
XBT_WARN("%s is in %s state", SD_task_get_name(task), state_names[SD_task_get_state(task)]);
}
}
#endif
xbt_mallocator_free(sd_global->task_mallocator);
- xbt_dynar_free_container(&(sd_global->initial_task_set));
- xbt_dynar_free_container(&(sd_global->executable_task_set));
- xbt_dynar_free_container(&(sd_global->completed_task_set));
+ delete sd_global->initial_tasks;
+ delete sd_global->executable_tasks;
+ delete sd_global->completed_tasks;
xbt_dynar_free_container(&(sd_global->return_set));
xbt_free(sd_global);
- sd_global = NULL;
+ sd_global = nullptr;
}
