X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ee4b856922e6a71a805e54ef5ae8c537155fa93..2fe56becb7b12edd78788a83dbc1d3e1d85d9dbc:/include/simgrid/s4u/host.hpp

diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index a50d15c2d5..8d7d2dd1ae 100644
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -6,8 +6,9 @@
 #ifndef SIMGRID_S4U_HOST_HPP
 #define SIMGRID_S4U_HOST_HPP
 
+#include <string>
+
 #include <boost/unordered_map.hpp>
-#include <vector>
 
 #include <xbt/base.h>
 #include <xbt/string.hpp>
@@ -25,7 +26,7 @@ namespace xbt {
 }
 namespace s4u {
 
-/** @ingroup s4u_host
+/** @ingroup s4u_api
  *
  * @tableofcontents
  *
@@ -70,13 +71,13 @@ public: // TODO, make me private
   bool isOff() { return !isOn(); }
 
   double speed();
-  int core_count();
+  int coresCount();
   xbt_dict_t properties();
   const char*property(const char*key);
   void setProperty(const char*key, const char *value);
   xbt_swag_t processes();
-  double currentPowerPeak();
-  double powerPeakAt(int pstate_index);
+  double getPstateSpeedCurrent();
+  double getPstateSpeed(int pstate_index);
   int pstatesCount() const;
   void setPstate(int pstate_index);
   int pstate();
@@ -96,11 +97,11 @@ private:
   boost::unordered_map<std::string, Storage*> *mounts = nullptr; // caching
 
 public:
-  // FIXME: these should be protected, but it leads to many errors
-  // Use the extensions stuff for this? Go through simgrid::surf::Host?
   // TODO, this could be a unique_ptr
+  /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */
   surf::Cpu     *pimpl_cpu = nullptr;
-  surf::NetCard *pimpl_netcard = nullptr;
+  /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */
+  routing::NetCard *pimpl_netcard = nullptr;
 
 public:
   /*** Called on each newly created object */
@@ -130,20 +131,6 @@ extern int USER_HOST_LEVEL;
 
 package org.simgrid.msg;
 
-import org.simgrid.msg.Storage;
-
-/*
-Host jacquelin;
-
-try { 
-  jacquelin = Host.getByName("Jacquelin");
-} catch(HostNotFoundException e) {
-  System.err.println(e.toString());
-}
-...
-\endverbatim
- *
- */ 
 public class Host {
   /**
    * This static method returns all of the hosts of the installed platform.
@@ -174,32 +161,6 @@ public class Host {
    */ 
   public native int getLoad();
 
-  /**
-   * This method returns the speed of the processor of a host,
-   * regardless of the current load of the machine.
-   *
-   * @return      The speed of the processor of the host in flops.
-   *
-   */ 
-  public native double getSpeed();
-
-  /**
-   * This method returns the number of core of a host.
-   *
-   * @return      The speed of the processor of the host in flops.
-   *
-   */ 
-  public native double getCoreNumber();
-
-  /**
-   * Returns the value of a given host property (set from the platform file).
-   */
-  public native String getProperty(String name);
-
-  /**
-   * Change the value of a given host property. 
-   */
-  public native void setProperty(String name, String value);
 
   /** This methods returns the list of storages attached to an host
    * @return An array containing all storages (name) attached to the host