Simplify the API between Engine and EngineImpl when registering functions

[simgrid.git] / src / simix / smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 9408952..20b1f4a 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -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. */
@@ -264,7 +264,7 @@ config::Flag<double> cfg_breakpoint{
 } // namespace simix
 } // namespace simgrid
 
-static simgrid::simix::ActorCode maestro_code;
+static simgrid::kernel::actor::ActorCode maestro_code;
 void SIMIX_set_maestro(void (*code)(void*), void* data)
 {
 #ifdef _WIN32
@@ -305,11 +305,6 @@ void SIMIX_global_init(int *argc, char **argv)
     /* register a function to be called by SURF after the environment creation */
     sg_platf_init();
     simgrid::s4u::Engine::on_platform_created.connect(surf_presolve);
-
-    simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage const& storage) {
-      sg_storage_t s = simgrid::s4u::Storage::by_name(storage.get_name());
-      xbt_assert(s != nullptr, "Storage not found for name %s", storage.get_cname());
-    });
   }
 
   if (simgrid::config::get_value<bool>("debug/clean-atexit"))
@@ -600,6 +595,6 @@ int SIMIX_is_maestro()
 {
   if (simix_global == nullptr) // SimDag
     return true;
-  simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self();
+  const simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self();
   return self == nullptr || self == simix_global->maestro_;
 }