X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..bab95efa441e58479b322318e5bd63c25981f70c:/src/simdag/sd_global.cpp diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index e466ff038d..ee13102558 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2020. 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. */ @@ -33,7 +33,6 @@ std::set* simulate(double how_long){ /* main loop */ while (elapsed_time >= 0 && (how_long < 0 || 0.00001 < (how_long - total_time)) && not sd_global->watch_point_reached) { - XBT_DEBUG("Total time: %f", total_time); elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long - total_time: -1.0); @@ -43,7 +42,7 @@ std::set* simulate(double how_long){ /* let's see which tasks are done */ for (auto const& model : all_existing_models) { - simgrid::kernel::resource::Action* action = model->extract_done_action(); + const simgrid::kernel::resource::Action* action = model->extract_done_action(); while (action != nullptr && action->get_data() != nullptr) { SD_task_t task = static_cast(action->get_data()); XBT_VERB("Task '%s' done", SD_task_get_name(task)); @@ -148,7 +147,7 @@ void SD_init_nocheck(int *argc, char **argv) sd_global = new simgrid::sd::Global(); simgrid::config::set_default("host/model", "ptask_L07"); - if (simgrid::config::get_value("clean-atexit")) + if (simgrid::config::get_value("debug/clean-atexit")) atexit(SD_exit); } @@ -214,7 +213,7 @@ void SD_simulate(double how_long) void SD_simulate_with_update(double how_long, xbt_dynar_t changed_tasks_dynar) { - std::set *changed_tasks = simgrid::sd::simulate(how_long); + const std::set* changed_tasks = simgrid::sd::simulate(how_long); for (auto const& task : *changed_tasks) xbt_dynar_push(changed_tasks_dynar, &task); }