-/* Copyright (c) 2006-2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "simdag_private.hpp"
+#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.h"
-#include "simgrid/host.h"
+#include "src/include/instr/instr_interface.h"
#include "src/surf/surf_interface.hpp"
-#include "simgrid/s4u/engine.hpp"
-#include "simdag_private.hpp"
XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, "Logging specific to SimDag (kernel)");
double total_time = 0.0;
/* 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);
total_time += elapsed_time;
/* let's see which tasks are done */
- unsigned int iter;
- xbt_dynar_foreach(all_existing_models, iter, model) {
+ for (const auto& model : *all_existing_models) {
surf_action_t action = surf_model_extract_done_action_set(model);
while (action != nullptr) {
SD_task_t task = static_cast<SD_task_t>(action->getData());
sd_global->return_set->insert(task);
/* remove the dependencies after this task */
- for (auto succ : *task->successors) {
+ for (const auto& succ : *task->successors) {
succ->predecessors->erase(task);
succ->inputs->erase(task);
XBT_DEBUG("Release dependency on %s: %zu remain(s). Becomes schedulable if %zu=0", SD_task_get_name(succ),
}
task->successors->clear();
- for (auto output : *task->outputs) {
+ for (const auto& output : *task->outputs) {
output->start_time = task->finish_time;
output->predecessors->erase(task);
if (SD_task_get_state(output) == SD_SCHEDULED)
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());
- for (auto t : *sd_global->initial_tasks)
+ for (const auto& t : *sd_global->initial_tasks)
XBT_WARN("%s is in %s state", SD_task_get_name(t), __get_state_name(SD_task_get_state(t)));
}
* \return the equivalent as a readable string
*/
const char *__get_state_name(e_SD_task_state_t state){
- std::string state_names[7] = { "not scheduled", "schedulable", "scheduled", "runnable","running", "done", "failed" };
- return state_names[static_cast<int>(log2(static_cast<long double>(state)))].data();
+ static std::string state_names[7] =
+ { "not scheduled", "schedulable", "scheduled", "runnable","running", "done", "failed" };
+ return state_names[static_cast<int>(log2(static_cast<double>(state)))].data();
}
/**
xbt_cfg_setdefault_string("host/model", "ptask_L07");
-#if HAVE_JEDULE
- jedule_sd_init();
-#endif
-
if (_sg_cfg_exit_asap) {
SD_exit();
exit(0);
XBT_DEBUG("Host number: %zu, link number: %d", sg_host_count(), sg_link_count());
#if HAVE_JEDULE
- jedule_setup_platform();
+ jedule_sd_init();
#endif
XBT_VERB("Starting simulation...");
surf_presolve(); /* Takes traces into account */
* \return a dynar of \ref SD_task_t whose state has changed.
* \see SD_task_schedule(), SD_task_watch()
*/
+void SD_simulate(double how_long)
+{
+ simgrid::sd::simulate(how_long);
+}
-xbt_dynar_t SD_simulate(double how_long) {
+void SD_simulate_with_update(double how_long, xbt_dynar_t changed_tasks_dynar)
+{
std::set<SD_task_t> *changed_tasks = simgrid::sd::simulate(how_long);
- xbt_dynar_t changed_tasks_dynar = xbt_dynar_new(sizeof(SD_task_t), nullptr);
- for (auto task: *changed_tasks)
+ for (const auto& task : *changed_tasks)
xbt_dynar_push(changed_tasks_dynar, &task);
- return changed_tasks_dynar;
}
/** @brief Returns the current clock, in seconds */
*/
void SD_exit()
{
+ TRACE_end();
#if HAVE_JEDULE
- jedule_sd_cleanup();
jedule_sd_exit();
#endif
delete sd_global;