X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/087d11a0d22c93b0d9289684ceca2a8ed1db7e89..232df979b87bc271f4fbb61a2059c6539bc23012:/include/simgrid/s4u/host.hpp

diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index 54399ece84..2f5ef50fdc 100644
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -7,15 +7,21 @@
 #define SIMGRID_S4U_HOST_HPP
 
 #include <boost/unordered_map.hpp>
+#include <vector>
 
-#include "simgrid/simix.h"
+#include <xbt/base.h>
+#include <xbt/string.hpp>
+#include <xbt/signal.hpp>
+#include <xbt/Extendable.hpp>
+
+#include <simgrid/simix.h>
+#include <simgrid/datatypes.h>
+#include <simgrid/s4u/forward.hpp>
 
 namespace simgrid {
 namespace s4u {
 
-class Process;
-
-/** @brief Simulated machine that can host some processes
+/** @brief Simulated machine that can host some actors
  *
  * It represents some physical resource with computing and networking capabilities.
  *
@@ -24,47 +30,88 @@ class Process;
  * You cannot create a host yourself.
  *
  * You can retrieve a particular host using @link{simgrid::s4u::Host.byName()},
- * and processes can retrieve the host on which they run using @link{simgrid::s4u::Host.current()}.
+ * and actors can retrieve the host on which they run using @link{simgrid::s4u::Host.current()}.
  */
-class Host {
+XBT_PUBLIC_CLASS Host :
+  public simgrid::xbt::Extendable<Host> {
+
+	// friend Actor;
+	// friend File;
 private:
 	Host(const char *name);
+public: // TODO, make me private
+	~Host();
 public:
+
+  static Host* by_name_or_null(const char* name);
+  static Host* by_name_or_create(const char* name);
 	/** Retrieves an host from its name. */
-	static s4u::Host *byName(std::string name);
-	/** Retrieves the host on which the current process is running */
+	static s4u::Host *by_name(std::string name);
+	/** Retrieves the host on which the current actor is running */
 	static s4u::Host *current();
 
-	const char* getName();
+	simgrid::xbt::string const& name() const { return name_; }
 
-	/** Turn sthat host on if it was previously off
+	/** Turns that host on if it was previously off
 	 *
-	 * All processes on that host which were marked autorestart will be restarted automatically.
+	 * All actors on that host which were marked autorestart will be restarted automatically.
 	 * This call does nothing if the host is already on.
 	 */
-	void turnOn();
-	/** Turns that host off. All processes are forcefully stopped. */
-	void turnOff();
+	void turn_on();
+	/** Turns that host off. All actors are forcefully stopped. */
+	void turn_off();
 	/** Returns if that host is currently up and running */
-	bool isOn();
+	bool is_on();
+	bool is_off() { return !is_on(); }
+
+	double speed();
+	int core_count();
+	xbt_dict_t properties();
+	xbt_swag_t processes();
+	double current_power_peak();
+	double power_peak_at(int pstate_index);
+	void set_pstate(int pstate_index);
+	int pstates_count() const;
+	int pstate();
+	void get_parameters(vm_params_t params);
+	void set_parameters(vm_params_t params);
+	xbt_dict_t mounted_storages_as_dict(); // HACK
+	xbt_dynar_t attached_storages();
+
+	/** Get an associative list [mount point]->[Storage] off all local mount points.
+	 *
+	 *	This is defined in the platform file, and cannot be modified programatically (yet).
+	 */
+	boost::unordered_map<std::string, Storage*> const &mounted_storages();
 
+private:
+	simgrid::xbt::string name_ = "noname";
+	boost::unordered_map<std::string, Storage*> *mounts = NULL; // caching
 
-	/** Allows to store user data on that host */
-	void setData(void *data) {p_userdata = data;}
-	/** Retrieves the previously stored data */
-	void* getData() {return p_userdata;}
+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
+	surf::Cpu     *pimpl_cpu = nullptr;
+	surf::NetCard *pimpl_netcard = nullptr;
 
-protected:
-	friend Process;
-	sg_host_t getInferior() {return p_sghost;}
-private:
-	void*p_userdata=NULL;
-	sg_host_t p_sghost;
-	static boost::unordered_map<std::string, s4u::Host *> *hosts;
+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;
 };
 
 }} // namespace simgrid::s4u
 
+extern int MSG_HOST_LEVEL;
+extern int SD_HOST_LEVEL;
+extern int SIMIX_HOST_LEVEL;
+extern int ROUTING_HOST_LEVEL;
+extern int USER_HOST_LEVEL;
+
 #endif /* SIMGRID_S4U_HOST_HPP */
 
 #if 0
@@ -149,11 +196,6 @@ public class Host {
 	 */
 	public native void setProperty(String name, String value);
 
-	/** This methods returns the list of mount point names on an host
-	 * @return An array containing all mounted storages on the host
-	 */
-	public native Storage[] getMountedStorage();
-
 	/** This methods returns the list of storages attached to an host
 	 * @return An array containing all storages (name) attached to the host
 	 */