Use ssize_t for Exec::wait_any and Io::wait_any too.

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

diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp
index 89ea5a50429b2e6ba77db61617b57341ae99269c..1519dd9a86b89902b553d3275a8da1496e2fe961 100644 (file)
--- a/include/simgrid/s4u/Engine.hpp
+++ b/include/simgrid/s4u/Engine.hpp
@@ -27,6 +27,8 @@ class XBT_PUBLIC Engine {
   friend simgrid::kernel::EngineImpl;
 
 public:
+  /** Constructor, taking only the name of your main function */
+  explicit Engine(std::string name);
   /** Constructor, taking the command line parameters of your main function */
   explicit Engine(int* argc, char** argv);
   /* Currently, only one instance is allowed to exist. This is why you can't copy or move it */
@@ -85,6 +87,7 @@ public:
 
 protected:
 #ifndef DOXYGEN
+  friend surf::HostImpl;
   friend Host;
   friend Link;
   friend Disk;
@@ -118,12 +121,21 @@ public:
   Link* link_by_name(const std::string& name) const;
   Link* link_by_name_or_null(const std::string& name) const;
 
+  Mailbox* mailbox_by_name_or_create(const std::string& name) const;
+
   size_t get_actor_count() const;
   std::vector<ActorPtr> get_all_actors() const;
   std::vector<ActorPtr> get_filtered_actors(const std::function<bool(ActorPtr)>& filter) const;
 
   std::vector<kernel::routing::NetPoint*> get_all_netpoints() const;
   kernel::routing::NetPoint* netpoint_by_name_or_null(const std::string& name) const;
+  /**
+   * @brief Get netpoint by its name
+   *
+   * @param name Netpoint name
+   * @throw std::invalid_argument if netpoint doesn't exist
+   */
+  kernel::routing::NetPoint* netpoint_by_name(const std::string& name) const;
 
   NetZone* get_netzone_root() const;
   void set_netzone_root(const NetZone* netzone);
@@ -133,16 +145,14 @@ public:
   /**
    * @brief Add a model to engine list
    *
-   * @param type Model type (network, disk, etc)
    * @param model Pointer to model
+   * @param list  List of dependencies for this model (optional)
    */
-  void add_model(simgrid::kernel::resource::Model::Type type, std::shared_ptr<simgrid::kernel::resource::Model> model);
-
-  /** @brief Get list of models created for a resource type */
-  const std::vector<simgrid::kernel::resource::Model*>& get_model_list(simgrid::kernel::resource::Model::Type type);
+  void add_model(std::shared_ptr<simgrid::kernel::resource::Model> model,
+                 const std::vector<kernel::resource::Model*>& dependencies = {});
 
   /** @brief Get list of all models managed by this engine */
-  const std::vector<std::shared_ptr<simgrid::kernel::resource::Model>>& get_all_models() const;
+  const std::vector<simgrid::kernel::resource::Model*>& get_all_models() const;
 
   /** @brief Retrieves all netzones of the type indicated by the template argument */
   template <class T> std::vector<T*> get_filtered_netzones() const
@@ -193,6 +203,7 @@ public:
 private:
   kernel::EngineImpl* const pimpl;
   static Engine* instance_;
+  void initialize(int* argc, char** argv);
 };
 
 #ifndef DOXYGEN /* Internal use only, no need to expose it */