Merge branches 'master' and 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index 6a4103e..b197b72 100644 (file)
--- 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>
@@ -27,7 +28,7 @@ namespace s4u {
 
 /** @ingroup s4u_api
  *
- * @tableofcontents
+ * @tableofcontents 
  *
  * An host represents some physical resource with computing and networking capabilities.
  *
@@ -41,12 +42,20 @@ namespace s4u {
 XBT_PUBLIC_CLASS Host :
   public simgrid::xbt::Extendable<Host> {
 
-private:
+public:
   explicit Host(const char *name);
-public: // TODO, make me private
-  ~Host();
-  /** Do not use this function, it should be private */
-  static Host* by_name_or_create(const char* name);
+
+  /** Host destruction logic */
+protected:
+  virtual ~Host();
+
+private:
+  bool currentlyDestroying_ = false;
+public:
+  void destroy();
+  // No copy/move
+  Host(Host const&) = delete;
+  Host& operator=(Host const&) = delete;
 
   /** Retrieves an host from its name, or return nullptr */
   static Host* by_name_or_null(const char* name);
@@ -67,10 +76,11 @@ public: // TODO, make me private
   void turnOff();
   /** Returns if that host is currently up and running */
   bool isOn();
+  /** Returns if that host is currently down and offline */
   bool isOff() { return !isOn(); }
 
   double speed();
-  int coresCount();
+  int coreCount();
   xbt_dict_t properties();
   const char*property(const char*key);
   void setProperty(const char*key, const char *value);
@@ -80,8 +90,8 @@ public: // TODO, make me private
   int pstatesCount() const;
   void setPstate(int pstate_index);
   int pstate();
-  void parameters(vm_params_t params);
-  void setParameters(vm_params_t params);
+  virtual void parameters(vm_params_t params);
+  virtual void setParameters(vm_params_t params);
   xbt_dict_t mountedStoragesAsDict(); // HACK
   xbt_dynar_t attachedStorages();
 
@@ -97,10 +107,11 @@ private:
 
 public:
   // TODO, this could be a unique_ptr
+  surf::HostImpl* pimpl_ = nullptr;
   /** 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) */
-  surf::NetCard *pimpl_netcard = nullptr;
+  kernel::routing::NetCard *pimpl_netcard = nullptr;
 
 public:
   /*** Called on each newly created object */
@@ -114,7 +125,6 @@ public:
 }} // namespace simgrid::s4u
 
 extern int MSG_HOST_LEVEL;
-extern int SIMIX_HOST_LEVEL;
 extern int USER_HOST_LEVEL;
 
 #endif /* SIMGRID_S4U_HOST_HPP */