X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..03b24505f40da4306ebf6f2b56c42941ae1d97e4:/src/simix/smx_private.hpp diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp index 66e5c36edc..054f2ecdf0 100644 --- a/src/simix/smx_private.hpp +++ b/src/simix/smx_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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. */ @@ -10,11 +10,6 @@ #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/context/Context.hpp" -#include -#include -#include -#include - /********************************** Simix Global ******************************/ namespace simgrid { @@ -22,45 +17,10 @@ namespace simix { class Global { public: - bool execute_tasks(); - /** - * Garbage collection - * - * Should be called some time to time to free the memory allocated for actors that have finished (or killed). - */ - void empty_trash(); - void run_all_actors(); - void wake_all_waiting_actors() const; - void display_all_actor_status() const; kernel::context::ContextFactory* context_factory = nullptr; - std::vector actors_to_run; - std::vector actors_that_ran; - std::map process_list; - boost::intrusive::list, - &kernel::actor::ActorImpl::smx_destroy_list_hook>> - actors_to_destroy; -#if SIMGRID_HAVE_MC - /* MCer cannot read members process_list and actors_to_destroy above in the remote process, so we copy the info it - * needs in a dynar. - * FIXME: This is supposed to be a temporary hack. - * A better solution would be to change the split between MCer and MCed, where the responsibility - * to compute the list of the enabled transitions goes to the MCed. - * That way, the MCer would not need to have the list of actors on its side. - * These info could be published by the MCed to the MCer in a way inspired of vd.so - */ - xbt_dynar_t actors_vector = xbt_dynar_new(sizeof(kernel::actor::ActorImpl*), nullptr); - xbt_dynar_t dead_actors_vector = xbt_dynar_new(sizeof(kernel::actor::ActorImpl*), nullptr); -#endif kernel::actor::ActorImpl* maestro_ = nullptr; - std::mutex mutex; - - std::vector> tasks; - std::vector> tasksTemp; - - std::vector daemons; }; } }