TESH: msg to s4u - act 1

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

diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index ea5d00a..7af3255 100644 (file)
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -33,7 +33,7 @@ namespace s4u {
  * An host represents some physical resource with computing and networking capabilities.
  *
  * All hosts are automatically created during the call of the method
- * @link{simgrid::s4u::Engine::loadPlatform()}.
+ * @ref simgrid::s4u::Engine::loadPlatform().
  * You cannot create a host yourself.
  *
  * You can retrieve a particular host using simgrid::s4u::Host::byName()
@@ -87,14 +87,13 @@ public:
   xbt_dict_t properties();
   const char*property(const char*key);
   void setProperty(const char*key, const char *value);
-  xbt_swag_t processes();
-  double getPstateSpeedCurrent();
+  void processes(std::vector<ActorPtr>* list);
   double getPstateSpeed(int pstate_index);
   int pstatesCount() const;
   void setPstate(int pstate_index);
   int pstate();
   xbt_dict_t mountedStoragesAsDict(); // HACK
-  xbt_dynar_t attachedStorages();
+  void attachedStorages(std::vector<const char*> * storages);
 
   /** Get an associative list [mount point]->[Storage] of all local mount points.
    *
@@ -103,6 +102,7 @@ public:
   boost::unordered_map<std::string, Storage*> const &mountedStorages();
 
   void routeTo(Host * dest, std::vector<Link*> * links, double* latency);
+  void routeTo(Host * dest, std::vector<surf::LinkImpl*> * links, double* latency);
 
 private:
   simgrid::xbt::string name_ = "noname";
@@ -114,20 +114,21 @@ public:
   /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */
   surf::Cpu     *pimpl_cpu = nullptr;
   /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */
-  kernel::routing::NetCard *pimpl_netcard = nullptr;
+  kernel::routing::NetPoint* pimpl_netpoint = nullptr;
 
-public:
   /*** Called on each newly created object */
   static simgrid::xbt::signal<void(Host&)> onCreation;
   /*** Called just before destructing an object */
   static simgrid::xbt::signal<void(Host&)> onDestruction;
   /*** Called when the machine is turned on or off */
   static simgrid::xbt::signal<void(Host&)> onStateChange;
+  /*** Called when the speed of the machine is changed
+   * (either because of a pstate switch or because of an external load event coming from the profile) */
+  static simgrid::xbt::signal<void(Host&)> onSpeedChange;
 };
 
 }} // namespace simgrid::s4u
 
-extern int MSG_HOST_LEVEL;
 extern int USER_HOST_LEVEL;
 
 #endif /* SIMGRID_S4U_HOST_HPP */