try to avoid that others fall into the trap where I was yesterday

[simgrid.git] / include / simgrid / s4u / engine.hpp

diff --git a/include/simgrid/s4u/engine.hpp b/include/simgrid/s4u/engine.hpp
index 8db94fb..ea09d3e 100644 (file)
--- a/include/simgrid/s4u/engine.hpp
+++ b/include/simgrid/s4u/engine.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2015. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2017. 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. */
@@ -57,6 +57,9 @@ public:
   /** @brief Load a deployment file and launch the actors that it contains */
   void loadDeployment(const char *deploy);
 
+  size_t hostCount();
+  void hostList(std::vector<Host*> * whereTo);
+
   /** @brief Run the simulation */
   void run();
 
@@ -73,10 +76,10 @@ public:
   simgrid::s4u::NetZone* netzoneByNameOrNull(const char* name);
 
   /** @brief Retrieve the netcard of the given name (or nullptr if not found) */
-  simgrid::kernel::routing::NetCard* netcardByNameOrNull(const char* name);
-  void netcardList(std::vector<simgrid::kernel::routing::NetCard*> * list);
-  void netcardRegister(simgrid::kernel::routing::NetCard*);
-  void netcardUnregister(simgrid::kernel::routing::NetCard*);
+  simgrid::kernel::routing::NetPoint* netpointByNameOrNull(const char* name);
+  void netpointList(std::vector<simgrid::kernel::routing::NetPoint*> * list);
+  void netpointRegister(simgrid::kernel::routing::NetPoint * card);
+  void netpointUnregister(simgrid::kernel::routing::NetPoint * card);
 
   template<class F>
   void registerFunction(const char* name)
@@ -99,11 +102,24 @@ public:
     });
   }
 
+  /** Returns whether SimGrid was initialized yet -- mostly for internal use */
+  static bool isInitialized();
+
   simgrid::kernel::EngineImpl* pimpl;
 
 private:
   static s4u::Engine *instance_;
 };
+
+/** Callback fired when the platform is created (ie, the xml file parsed),
+ * right before the actual simulation starts. */
+extern XBT_PRIVATE xbt::signal<void()> onPlatformCreated;
+
+/** Callback fired when the main simulation loop ends, just before MSG_run (or similar) ends */
+extern XBT_PRIVATE xbt::signal<void()> onSimulationEnd;
+
+/** Callback fired when the time jumps into the future */
+extern XBT_PRIVATE xbt::signal<void(double)> onTimeAdvance;
 }} // namespace simgrid::s4u
 
 #endif /* SIMGRID_S4U_ENGINE_HPP */