X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aae4c948093a006ed58369048fc0b8dcbdd21630..30e93357d63b0846afb6a60db2004b6761607103:/include/simgrid/s4u/Host.hpp

diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index a87405b258..b62ab7aa2e 100644
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -7,13 +7,11 @@
 #define SIMGRID_S4U_HOST_HPP
 
 #include <simgrid/forward.h>
-#include <simgrid/s4u/forward.hpp>
 #include <xbt/Extendable.hpp>
 #include <xbt/signal.hpp>
 #include <xbt/string.hpp>
 
 #include <map>
-#include <string>
 #include <unordered_map>
 
 namespace simgrid {
@@ -65,10 +63,16 @@ public:
   /** Retrieves the host on which the current actor is running */
   static s4u::Host* current();
 
+  XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_name()") simgrid::xbt::string const& getName() const
+  {
+    return name_;
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_cname()") const char* getCname() const { return name_.c_str(); }
+
   /** Retrieves the name of that host as a C++ string */
-  simgrid::xbt::string const& getName() const { return name_; }
+  simgrid::xbt::string const& get_name() const { return name_; }
   /** Retrieves the name of that host as a C string */
-  const char* getCname() const { return name_.c_str(); }
+  const char* get_cname() const { return name_.c_str(); }
 
   void actorList(std::vector<ActorPtr> * whereto);
 
@@ -86,11 +90,13 @@ public:
   bool isOff() { return not isOn(); }
 
   double getSpeed();
+  double get_available_speed();
   int getCoreCount();
   std::map<std::string, std::string>* getProperties();
   const char* getProperty(const char* key);
   void setProperty(std::string key, std::string value);
   void getProcesses(std::vector<ActorPtr> * list);
+  int get_actor_count();
   double getPstateSpeed(int pstate_index);
   int getPstatesCount() const;
   void setPstate(int pstate_index);
@@ -106,7 +112,7 @@ public:
   std::unordered_map<std::string, Storage*> const& getMountedStorages();
 
   void routeTo(Host* dest, std::vector<Link*>& links, double* latency);
-  void routeTo(Host* dest, std::vector<surf::LinkImpl*>& links, double* latency);
+  void routeTo(Host* dest, std::vector<kernel::resource::LinkImpl*>& links, double* latency);
 
   /** Block the calling actor on an execution located on the called host
    *
@@ -114,13 +120,19 @@ public:
    * The actor will not be migrated in this case. Such remote execution are easy in simulation.
    */
   void execute(double flops);
+  /** Block the calling actor on an execution located on the called host (with explicit priority) */
+  void execute(double flops, double priority);
 
-  /** @brief Returns the current computation load (in flops per second) */
+  /** @brief Returns the current computation load (in flops per second)
+   * The external load (coming from an availability trace) is not taken in account.
+   *
+   * @return      The number of activities currently running on a host (an activity at priority 2 is counted twice).
+   */
   double getLoad();
 
 private:
   simgrid::xbt::string name_{"noname"};
-  std::unordered_map<std::string, Storage*>* mounts = nullptr; // caching
+  std::unordered_map<std::string, Storage*>* mounts_ = nullptr; // caching
 
 public:
   // TODO, this could be a unique_ptr
@@ -131,14 +143,14 @@ public:
   kernel::routing::NetPoint* pimpl_netpoint = nullptr;
 
   /*** Called on each newly created host */
-  static simgrid::xbt::signal<void(Host&)> onCreation;
+  static simgrid::xbt::signal<void(Host&)> on_creation;
   /*** Called just before destructing an host */
-  static simgrid::xbt::signal<void(Host&)> onDestruction;
+  static simgrid::xbt::signal<void(Host&)> on_destruction;
   /*** Called when the machine is turned on or off (called AFTER the change) */
-  static simgrid::xbt::signal<void(Host&)> onStateChange;
+  static simgrid::xbt::signal<void(Host&)> on_state_change;
   /*** Called when the speed of the machine is changed (called AFTER the change)
    * (either because of a pstate switch or because of an external load event coming from the profile) */
-  static simgrid::xbt::signal<void(Host&)> onSpeedChange;
+  static simgrid::xbt::signal<void(Host&)> on_speed_change;
 };
 }
 } // namespace simgrid::s4u
@@ -146,18 +158,3 @@ public:
 extern int USER_HOST_LEVEL;
 
 #endif /* SIMGRID_S4U_HOST_HPP */
-
-#if 0
-
-public class Host {
-
-  /**
-   * This method returns the number of tasks currently running on a host.
-   * The external load (coming from an availability trace) is not taken in account.
-   *
-   * @return      The number of tasks currently running on a host.
-   */
-  public native int getLoad();
-
-}
-#endif