another bunch of include cuts. The last one for today

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

diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index 3583def..ea5d00a 100644 (file)
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -10,14 +10,14 @@
 
 #include <boost/unordered_map.hpp>
 
-#include <xbt/base.h>
-#include <xbt/string.hpp>
-#include <xbt/signal.hpp>
-#include <xbt/Extendable.hpp>
+#include "xbt/Extendable.hpp"
+#include "xbt/dict.h"
+#include "xbt/signal.hpp"
+#include "xbt/string.hpp"
+#include "xbt/swag.h"
 
-#include <simgrid/simix.h>
-#include <simgrid/datatypes.h>
-#include <simgrid/s4u/forward.hpp>
+#include "simgrid/forward.h"
+#include "simgrid/s4u/forward.hpp"
 
 namespace simgrid {
 
@@ -44,23 +44,30 @@ XBT_PUBLIC_CLASS Host :
 
 public:
   explicit Host(const char *name);
+
   /** Host destruction logic */
 protected:
-  ~Host(); // TODO, make me private
+  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);
+  /** Retrieves an host from its name, or return nullptr */
+  static Host* by_name_or_null(std::string name);
   /** Retrieves an host from its name, or die */
   static s4u::Host *by_name(std::string name);
   /** Retrieves the host on which the current actor is running */
   static s4u::Host *current();
 
   simgrid::xbt::string const& name() const { return name_; }
+  const char* cname() { return name_.c_str(); }
 
   /** Turns that host on if it was previously off
    *
@@ -72,6 +79,7 @@ public:
   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();
@@ -85,8 +93,6 @@ public:
   int pstatesCount() const;
   void setPstate(int pstate_index);
   int pstate();
-  void parameters(vm_params_t params);
-  void setParameters(vm_params_t params);
   xbt_dict_t mountedStoragesAsDict(); // HACK
   xbt_dynar_t attachedStorages();
 
@@ -96,12 +102,15 @@ public:
    */
   boost::unordered_map<std::string, Storage*> const &mountedStorages();
 
+  void routeTo(Host * dest, std::vector<Link*> * links, double* latency);
+
 private:
   simgrid::xbt::string name_ = "noname";
   boost::unordered_map<std::string, Storage*> *mounts = nullptr; // caching
 
 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) */