X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5b29830df70e823202e384a7655e4371193ecd7..360d1e6510190d279551d9ca0510badccb1f8b37:/include/simgrid/s4u/Host.hpp

diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index 31ecd57f3e..6743001dbc 100644
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2015. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -6,14 +6,13 @@
 #ifndef SIMGRID_S4U_HOST_HPP
 #define SIMGRID_S4U_HOST_HPP
 
+#include <map>
 #include <string>
 #include <unordered_map>
 
 #include "xbt/Extendable.hpp"
-#include "xbt/dict.h"
 #include "xbt/signal.hpp"
 #include "xbt/string.hpp"
-#include "xbt/swag.h"
 
 #include "simgrid/forward.h"
 #include "simgrid/s4u/forward.hpp"
@@ -66,8 +65,10 @@ public:
   /** 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(); }
+  /** Retrieves the name of that host as a C++ string */
+  simgrid::xbt::string const& getName() const { return name_; }
+  /** Retrieves the name of that host as a C string */
+  const char* getCname() const { return name_.c_str(); }
 
   void actorList(std::vector<ActorPtr> * whereto);
 
@@ -84,29 +85,36 @@ public:
   /** Returns if that host is currently down and offline */
   bool isOff() { return not isOn(); }
 
-  double speed();
-  int coreCount();
-  xbt_dict_t properties();
-  const char* property(const char* key);
-  void setProperty(const char* key, const char* value);
-  void processes(std::vector<ActorPtr> * list);
+  double getSpeed();
+  int getCoreCount();
+  std::map<std::string, std::string>* getProperties();
+  const char* getProperty(const char* key);
+  void setProperty(std::string key, std::string value);
+  void getProcesses(std::vector<ActorPtr> * list);
   double getPstateSpeed(int pstate_index);
-  int pstatesCount() const;
+  int getPstatesCount() const;
   void setPstate(int pstate_index);
-  int pstate();
-  void attachedStorages(std::vector<const char*> * storages);
+  int getPstate();
+  void getAttachedStorages(std::vector<const char*> * storages);
 
   /** Get an associative list [mount point]->[Storage] of all local mount points.
    *
    *  This is defined in the platform file, and cannot be modified programatically (yet).
    */
-  std::unordered_map<std::string, Storage*> const& mountedStorages();
+  std::unordered_map<std::string, Storage*> const& getMountedStorages();
 
-  void routeTo(Host * dest, std::vector<Link*> * links, double* latency);
-  void routeTo(Host * dest, std::vector<surf::LinkImpl*> * links, double* latency);
+  void routeTo(Host* dest, std::vector<Link*>& links, double* latency);
+  void routeTo(Host* dest, std::vector<surf::LinkImpl*>& links, double* latency);
+
+  /** Block the calling actor on an execution located on the called host
+   *
+   * It is not a problem if the actor is not located on the called host.
+   * The actor will not be migrated in this case. Such remote execution are easy in simulation.
+   */
+  void execute(double flops);
 
 private:
-  simgrid::xbt::string name_ = "noname";
+  simgrid::xbt::string name_{"noname"};
   std::unordered_map<std::string, Storage*>* mounts = nullptr; // caching
 
 public: