From a2dc00a07f35b55028acdc61b2396b58cba3063b Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 22 Jul 2016 18:07:05 +0200 Subject: [PATCH] cleaning and trimming --- include/simgrid/simdag.h | 11 +--- src/simdag/sd_global.cpp | 66 ++++++++------------- src/simdag/sd_task.cpp | 92 +++++++++++------------------ teshsuite/simdag/basic3/basic3.tesh | 2 +- teshsuite/simdag/basic4/basic4.tesh | 2 +- 5 files changed, 63 insertions(+), 110 deletions(-) diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 48eff33ca2..2e4ed51d2f 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -58,10 +58,6 @@ typedef enum { SD_TASK_COMM_PAR_MXN_1D_BLOCK = 4 /**< @brief MxN data redistribution (1D Block distribution) */ } e_SD_task_kind_t; -/** @brief Storage datatype - @ingroup SD_storage_api */ -typedef xbt_dictelm_t SD_storage_t; - /************************** Workstation handling ****************************/ /** @addtogroup SD_host_api * @@ -75,11 +71,8 @@ typedef xbt_dictelm_t SD_storage_t; */ XBT_PUBLIC(SD_link_t *) SD_route_get_list(sg_host_t src, sg_host_t dst); XBT_PUBLIC(int) SD_route_get_size(sg_host_t src, sg_host_t dst); - XBT_PUBLIC(double) SD_route_get_latency(sg_host_t src, sg_host_t dst); XBT_PUBLIC(double) SD_route_get_bandwidth(sg_host_t src, sg_host_t dst); - -XBT_PUBLIC(const char*) SD_storage_get_host(SD_storage_t storage); /** @} */ /************************** Task handling ************************************/ @@ -137,9 +130,9 @@ XBT_PUBLIC(void) SD_task_schedulel(SD_task_t task, int count, ...); /** @brief A constant to use in SD_task_schedule to mean that there is no cost. * - * For example, create a pure computation task (no comm) like this: + * For example, create a pure computation task (i.e., with no communication) like this: * - * SD_task_schedule(task, my_host_count, my_host_list, my_flops_amount, SD_TASK_SCHED_NO_COST, my_rate); + * SD_task_schedule(task, my_host_count, my_host_list, my_flops_amount, SD_SCHED_NO_COST, my_rate); */ #define SD_SCHED_NO_COST NULL diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index 7579f31961..4f55b8395a 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -34,7 +34,7 @@ void SD_init(int *argc, char **argv) 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->watch_point_reached = false; sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f, SD_task_free_f, SD_task_recycle_f); @@ -114,29 +114,19 @@ void SD_create_environment(const char *platform_file) */ xbt_dynar_t SD_simulate(double how_long) { - /* we stop the simulation when total_time >= how_long */ - SD_task_t task; - SD_task_t dst; - surf_action_t action; - unsigned int iter; - XBT_VERB("Run simulation for %f seconds", how_long); - sd_global->watch_point_reached = false; + sd_global->watch_point_reached = false; xbt_dynar_reset(sd_global->return_set); /* explore the runnable tasks */ - while(!sd_global->runnable_tasks->empty()){ - task = *(sd_global->runnable_tasks->begin()); - XBT_VERB("Executing task '%s'", SD_task_get_name(task)); - SD_task_run(task); - } + while(!sd_global->runnable_tasks->empty()) + SD_task_run(*(sd_global->runnable_tasks->begin())); - /* main loop */ double elapsed_time = 0.0; double total_time = 0.0; - while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) && - !sd_global->watch_point_reached) { + /* main loop */ + while (elapsed_time >= 0 && (how_long < 0 || 0.00001 < (how_long -total_time)) && !sd_global->watch_point_reached) { surf_model_t model = nullptr; XBT_DEBUG("Total time: %f", total_time); @@ -147,16 +137,17 @@ xbt_dynar_t SD_simulate(double how_long) { total_time += elapsed_time; /* let's see which tasks are done */ + unsigned int iter; xbt_dynar_foreach(all_existing_models, iter, model) { + surf_action_t action; while ((action = surf_model_extract_done_action_set(model))) { - task = static_cast(action->getData()); + SD_task_t task = static_cast(action->getData()); XBT_VERB("Task '%s' done", SD_task_get_name(task)); SD_task_set_state(task, SD_DONE); /* the state has changed. Add it only if it's the first change */ - if (xbt_dynar_member(sd_global->return_set, &task) == 0) { + if (xbt_dynar_member(sd_global->return_set, &task) == 0) xbt_dynar_push(sd_global->return_set, &task); - } /* remove the dependencies after this task */ for (std::set::iterator succ = task->successors->begin(); succ != task->successors->end(); ++succ){ @@ -171,39 +162,34 @@ xbt_dynar_t SD_simulate(double how_long) { if (SD_task_get_state((*succ)) == SD_SCHEDULED && (*succ)->predecessors->empty() && (*succ)->inputs->empty()) SD_task_set_state((*succ), SD_RUNNABLE); - if (SD_task_get_state((*succ)) == SD_RUNNABLE && !sd_global->watch_point_reached) { - XBT_VERB("Executing task '%s'", SD_task_get_name((*succ))); + if (SD_task_get_state((*succ)) == SD_RUNNABLE && !sd_global->watch_point_reached) SD_task_run((*succ)); - } } task->successors->clear(); - for (std::set::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){ - dst=*it; - dst->start_time = task->finish_time; - dst->predecessors->erase(task); - if (SD_task_get_state(dst) == SD_SCHEDULED) - SD_task_set_state(dst, SD_RUNNABLE); + for (std::set::iterator output=task->outputs->begin(); output!=task->outputs->end(); ++output){ + (*output)->start_time = task->finish_time; + (*output)->predecessors->erase(task); + if (SD_task_get_state(*output) == SD_SCHEDULED) + SD_task_set_state(*output, SD_RUNNABLE); else - SD_task_set_state(dst, SD_SCHEDULABLE); + SD_task_set_state(*output, SD_SCHEDULABLE); - SD_task_t comm_dst = *(dst->successors->begin()); + SD_task_t comm_dst = *((*output)->successors->begin()); if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->predecessors->empty()){ XBT_DEBUG("%s is a transfer, %s may be ready now if %zu=0", - SD_task_get_name(dst), SD_task_get_name(comm_dst), comm_dst->predecessors->size()); + SD_task_get_name(*output), SD_task_get_name(comm_dst), comm_dst->predecessors->size()); SD_task_set_state(comm_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); - } + if (SD_task_get_state(*output) == SD_RUNNABLE && !sd_global->watch_point_reached) + SD_task_run(*output); } task->outputs->clear(); } /* let's see which tasks have just failed */ while ((action = surf_model_extract_failed_action_set(model))) { - task = static_cast(action->getData()); + SD_task_t task = static_cast(action->getData()); XBT_VERB("Task '%s' failed", SD_task_get_name(task)); SD_task_set_state(task, SD_FAILED); xbt_dynar_push(sd_global->return_set, &task); @@ -215,14 +201,12 @@ xbt_dynar_t SD_simulate(double how_long) { 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" }; - for (std::set::iterator t = sd_global->initial_tasks->begin(); t != sd_global->initial_tasks->end(); - ++t){ + for (std::set::iterator t = sd_global->initial_tasks->begin(); t != sd_global->initial_tasks->end(); ++t) XBT_WARN("%s is in %s state", SD_task_get_name(*t), state_names[SD_task_get_state(*t)]); - } } XBT_DEBUG("elapsed_time = %f, total_time = %f, watch_point_reached = %d", - elapsed_time, total_time, sd_global->watch_point_reached); + elapsed_time, total_time, sd_global->watch_point_reached); XBT_DEBUG("current time = %f", surf_get_clock()); return sd_global->return_set; @@ -235,9 +219,7 @@ double SD_get_clock() { /** * \brief Destroys all SD internal data - * * This function should be called when the simulation is over. Don't forget to destroy too. - * * \see SD_init(), SD_task_destroy() */ void SD_exit() diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index 33d2b5daa2..99f9b49b07 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -90,8 +90,7 @@ SD_task_t SD_task_create(const char *name, void *data, double amount) { SD_task_t task = static_cast(xbt_mallocator_get(sd_global->task_mallocator)); - /* general information */ - task->data = data; /* user data */ + task->data = data; task->name = xbt_strdup(name); task->amount = amount; task->remains = amount; @@ -596,51 +595,40 @@ void SD_task_dotty(SD_task_t task, void *out) */ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task_t dst) { - if (src == dst) THROWF(arg_error, 0, "Cannot add a dependency between task '%s' and itself", SD_task_get_name(src)); - e_SD_task_state_t state = SD_task_get_state(src); - if (state == SD_DONE || state == SD_FAILED) + if (src->state == SD_DONE || src->state == SD_FAILED) THROWF(arg_error, 0, "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, SD_RUNNABLE, or SD_RUNNING", - SD_task_get_name(src)); + src->name); - state = SD_task_get_state(dst); - if (state == SD_DONE || state == SD_FAILED || state == SD_RUNNING) + if (dst->state == SD_DONE || dst->state == SD_FAILED || dst->state == SD_RUNNING) THROWF(arg_error, 0, "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, or SD_RUNNABLE", - SD_task_get_name(dst)); - - if (src->successors->find(dst) != src->successors->end() || - dst->predecessors->find(src) != dst->predecessors->end() || - dst->inputs->find(src) != dst->inputs->end() || - src->outputs->find(dst) != src->outputs->end()) - THROWF(arg_error, 0, "A dependency already exists between task '%s' and task '%s'", - SD_task_get_name(src), SD_task_get_name(dst)); + dst->name); - XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", SD_task_get_name(src), SD_task_get_name(dst)); + if (dst->inputs->find(src) != dst->inputs->end() || src->outputs->find(dst) != src->outputs->end() || + src->successors->find(dst) != src->successors->end() || dst->predecessors->find(src) != dst->predecessors->end()) + THROWF(arg_error, 0, "A dependency already exists between task '%s' and task '%s'", src->name, dst->name); - e_SD_task_kind_t src_kind = SD_task_get_kind(src); - e_SD_task_kind_t dst_kind = SD_task_get_kind(dst); + XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", src->name, dst->name); - if (src_kind == SD_TASK_COMM_E2E || src_kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ - if (dst_kind == SD_TASK_COMP_SEQ || dst_kind == SD_TASK_COMP_PAR_AMDAHL){ + if (src->kind == SD_TASK_COMM_E2E || src->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ + if (dst->kind == SD_TASK_COMP_SEQ || dst->kind == SD_TASK_COMP_PAR_AMDAHL) dst->inputs->insert(src); - } else { + else dst->predecessors->insert(src); - } src->successors->insert(dst); } else { - if (dst_kind == SD_TASK_COMM_E2E|| dst_kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ + if (dst->kind == SD_TASK_COMM_E2E|| dst->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK) src->outputs->insert(dst); - } else { + else src->successors->insert(dst); - } dst->predecessors->insert(src); } /* if the task was runnable, the task goes back to SD_SCHEDULED because of the new dependency*/ - if (SD_task_get_state(dst) == SD_RUNNABLE) { - XBT_DEBUG("SD_task_dependency_add: %s was runnable and becomes scheduled!", SD_task_get_name(dst)); + if (dst->state == SD_RUNNABLE) { + XBT_DEBUG("SD_task_dependency_add: %s was runnable and becomes scheduled!", dst->name); SD_task_set_state(dst, SD_SCHEDULED); } } @@ -681,31 +669,26 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst) { XBT_DEBUG("SD_task_dependency_remove: src = %s, dst = %s", SD_task_get_name(src), SD_task_get_name(dst)); - if (src->successors->find(dst) == src->successors->end() && - src->outputs->find(dst) == src->outputs->end()) + if (src->successors->find(dst) == src->successors->end() && src->outputs->find(dst) == src->outputs->end()) THROWF(arg_error, 0, "No dependency found between task '%s' and '%s': task '%s' is not a successor of task '%s'", - SD_task_get_name(src), SD_task_get_name(dst), SD_task_get_name(dst), SD_task_get_name(src)); + src->name, dst->name, dst->name, src->name); - e_SD_task_kind_t src_kind = SD_task_get_kind(src); - e_SD_task_kind_t dst_kind = SD_task_get_kind(dst); - if (src_kind == SD_TASK_COMM_E2E || src_kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ - if (dst_kind == SD_TASK_COMP_SEQ || dst_kind == SD_TASK_COMP_PAR_AMDAHL){ + if (src->kind == SD_TASK_COMM_E2E || src->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ + if (dst->kind == SD_TASK_COMP_SEQ || dst->kind == SD_TASK_COMP_PAR_AMDAHL) dst->inputs->erase(src); - } else { + else dst->predecessors->erase(src); - } src->successors->erase(dst); } else { - if (dst_kind == SD_TASK_COMM_E2E|| dst_kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ + if (dst->kind == SD_TASK_COMM_E2E|| dst->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK) src->outputs->erase(dst); - } else { + else src->successors->erase(dst); - } dst->predecessors->erase(src); } /* if the task was scheduled and dependencies are satisfied, we can make it runnable */ - if (dst->predecessors->empty() && dst->inputs->empty() && SD_task_get_state(dst) == SD_SCHEDULED) + if (dst->predecessors->empty() && dst->inputs->empty() && dst->state == SD_SCHEDULED) SD_task_set_state(dst, SD_RUNNABLE); } @@ -850,13 +833,10 @@ void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * workstat */ void SD_task_unschedule(SD_task_t task) { - if (task->state != SD_SCHEDULED && task->state != SD_RUNNABLE && task->state != SD_RUNNING && - task->state != SD_FAILED) - THROWF(arg_error, 0, "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED", - SD_task_get_name(task)); + if (task->state == SD_NOT_SCHEDULED || task->state == SD_SCHEDULABLE) + THROWF(arg_error, 0, "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED", task->name); - if ((task->state == SD_SCHEDULED || task->state == SD_RUNNABLE) - /* if the task is scheduled or runnable */ + if ((task->state == SD_SCHEDULED || task->state == SD_RUNNABLE) /* if the task is scheduled or runnable */ && ((task->kind == SD_TASK_COMP_PAR_AMDAHL) || (task->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK))) { /* Don't free scheduling data for typed tasks */ __SD_task_destroy_scheduling_data(task); @@ -881,11 +861,10 @@ void SD_task_unschedule(SD_task_t task) /* Runs a task. */ void SD_task_run(SD_task_t task) { - xbt_assert(SD_task_get_state(task) == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d", - SD_task_get_name(task), (int)SD_task_get_state(task)); - xbt_assert(task->host_list != nullptr, "Task '%s': workstation_list is nullptr!", SD_task_get_name(task)); + xbt_assert(task->state == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d", task->name, (int) task->state); + xbt_assert(task->host_list != nullptr, "Task '%s': workstation_list is nullptr!", task->name); - XBT_DEBUG("Running task '%s'", SD_task_get_name(task)); + XBT_VERB("Executing task '%s'", task->name); /* Copy the elements of the task into the action */ int host_nb = task->host_count; @@ -950,18 +929,17 @@ double SD_task_get_finish_time(SD_task_t task) void SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count) { xbt_assert(task->kind == SD_TASK_COMP_PAR_AMDAHL, "Task %s is not a SD_TASK_COMP_PAR_AMDAHL typed task." - "Cannot use this function.", SD_task_get_name(task)); + "Cannot use this function.", task->name); task->flops_amount = xbt_new0(double, ws_count); task->bytes_amount = xbt_new0(double, ws_count * ws_count); xbt_free(task->host_list); task->host_count = ws_count; task->host_list = xbt_new0(sg_host_t, ws_count); - + for(int i=0;iflops_amount[i] = (task->alpha + (1 - task->alpha)/ws_count) * task->amount; } -} - +} /** @brief Auto-schedules a task. * @@ -976,7 +954,7 @@ void SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count) * - Point to point communication (done) * - Sequential computation (done) * - group communication (redistribution, several kinds) - * - parallel tasks with no internal communication (one kind per speedup model such as Amdahl) + * - parallel tasks with no internal communication (one kind per speedup model such as Amdahl) * - idem+ internal communication. Task type not enough since we cannot store comm cost alongside to comp one) */ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) @@ -1137,7 +1115,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) if (SD_task_get_state(output)< SD_SCHEDULED) { SD_task_do_schedule(output); XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.", - SD_task_get_name(output),output->amount, src_nb, dst_nb); + output->name, output->amount, src_nb, dst_nb); } } } diff --git a/teshsuite/simdag/basic3/basic3.tesh b/teshsuite/simdag/basic3/basic3.tesh index 7c3139c509..1039ecd8ab 100644 --- a/teshsuite/simdag/basic3/basic3.tesh +++ b/teshsuite/simdag/basic3/basic3.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/basic3 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose +$ ${bindir:=.}/basic3 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd.thresh:verbose > [ 0.000000] Switching to the L07 model to handle parallel tasks. > [ 0.000000] Starting simulation... > [ 0.000000] Run simulation for -1.000000 seconds diff --git a/teshsuite/simdag/basic4/basic4.tesh b/teshsuite/simdag/basic4/basic4.tesh index 01341d280e..9bf1889c10 100644 --- a/teshsuite/simdag/basic4/basic4.tesh +++ b/teshsuite/simdag/basic4/basic4.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/basic4 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose +$ ${bindir:=.}/basic4 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd.thresh:verbose > [ 0.000000] Switching to the L07 model to handle parallel tasks. > [ 0.000000] Starting simulation... > [ 0.000000] Run simulation for -1.000000 seconds -- 2.20.1