Merge branch 'master' of https://github.com/mpoquet/simgrid

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

diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index ac7174d..b6e7eff 100644 (file)
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -46,20 +46,28 @@ public:
   explicit Host(const char *name);
 
   /** Host destruction logic */
+protected:
+  virtual ~Host();
+
 private:
-  ~Host();
   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
    *
@@ -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();