X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d805d3e2b617db73c7c28cf4e4683cd9e6b928d4..30563d26d6d84d528cda7deda5baa6730cebd948:/src/simdag/simdag_private.hpp diff --git a/src/simdag/simdag_private.hpp b/src/simdag/simdag_private.hpp index fc9403fedf..734cb6ee80 100644 --- a/src/simdag/simdag_private.hpp +++ b/src/simdag/simdag_private.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2006-2018. 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. */ @@ -20,15 +19,11 @@ namespace simgrid{ namespace sd{ class Global { public: - explicit Global(); - Global(const Global&) = delete; - Global& operator=(const Global&) = delete; - ~Global(); - bool watch_point_reached; /* has a task just reached a watch point? */ - std::set *initial_tasks; - std::set *runnable_tasks; - std::set *completed_tasks; - std::set *return_set; + bool watch_point_reached = false; /* has a task just reached a watch point? */ + std::set initial_tasks; + std::set runnable_tasks; + std::set completed_tasks; + std::set return_set; }; std::set* simulate (double how_long); @@ -52,7 +47,7 @@ struct s_SD_task_t { bool marked = false; /* used to check if the task DAG has some cycle*/ - /* dependencies */ + /* dependencies -- cannot be embedded in the struct since it's not handled as a real C++ class */ std::set *inputs; std::set *outputs; std::set *predecessors; @@ -68,7 +63,7 @@ struct s_SD_task_t { /* SimDag private functions */ XBT_PRIVATE void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state); XBT_PRIVATE void SD_task_run(SD_task_t task); -XBT_PRIVATE bool acyclic_graph_detail(xbt_dynar_t dag); +XBT_PRIVATE bool acyclic_graph_detail(const_xbt_dynar_t dag); XBT_PRIVATE void uniq_transfer_task_name(SD_task_t task); XBT_PRIVATE const char *__get_state_name(e_SD_task_state_t state); #endif