X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a4f00ba0c403c20a7eae8bea566371a4f131b3e..ddb45d457a6e56461f506cba0add22902ef2c7d7:/src/simix/smx_private.hpp diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp index c1cb4fce30..25ef012750 100644 --- a/src/simix/smx_private.hpp +++ b/src/simix/smx_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. 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. */ @@ -30,9 +30,10 @@ public: */ void empty_trash(); void run_all_actors(); - void wake_all_waiting_actors(); + void wake_all_waiting_actors() const; + void display_all_actor_status() const; - smx_context_factory_t context_factory = nullptr; + kernel::context::ContextFactory* context_factory = nullptr; std::vector actors_to_run; std::vector actors_that_ran; std::map process_list; @@ -52,13 +53,7 @@ public: 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_process = nullptr; - - // Maps function names to actor code: - std::unordered_map registered_functions; - - // This might be used when no corresponding function name is registered: - simix::ActorCodeFactory default_function; + kernel::actor::ActorImpl* maestro_ = nullptr; std::mutex mutex;