Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / src / simix / smx_private.hpp

diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp
index 8ffc2ed..66e5c36 100644 (file)
--- 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-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. */
@@ -30,10 +30,10 @@ public:
    */
   void empty_trash();
   void run_all_actors();
-  void wake_all_waiting_actors();
-  void display_all_actor_status();
+  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<kernel::actor::ActorImpl*> actors_to_run;
   std::vector<kernel::actor::ActorImpl*> actors_that_ran;
   std::map<aid_t, kernel::actor::ActorImpl*> process_list;
@@ -55,12 +55,6 @@ public:
 #endif
   kernel::actor::ActorImpl* maestro_ = nullptr;
 
-  // Maps function names to actor code:
-  std::unordered_map<std::string, simix::ActorCodeFactory> registered_functions;
-
-  // This might be used when no corresponding function name is registered:
-  simix::ActorCodeFactory default_function;
-
   std::mutex mutex;
 
   std::vector<xbt::Task<void()>> tasks;