Update copyright lines.

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

diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index 0375c7c..c6691d7 100644 (file)
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2021. 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. */
@@ -105,7 +105,7 @@ public:
   const char* get_property(const std::string& key) const;
   void set_property(const std::string& key, const std::string& value);
   const std::unordered_map<std::string, std::string>* get_properties() const;
-  void set_properties(const std::map<std::string, std::string>& properties);
+  void set_properties(const std::unordered_map<std::string, std::string>& properties);
 
   void set_state_profile(kernel::profile::Profile* p);
   void set_speed_profile(kernel::profile::Profile* p);
@@ -146,7 +146,7 @@ public:
   int get_pstate() const;
 
   std::vector<Disk*> get_disks() const;
-  void add_disk(Disk* disk);
+  void add_disk(const Disk* disk);
   void remove_disk(const std::string& disk_name);
 
   std::vector<const char*> get_attached_storages() const;
@@ -159,7 +159,28 @@ public:
 
   void route_to(const Host* dest, std::vector<Link*>& links, double* latency) const;
   void route_to(const Host* dest, std::vector<kernel::resource::LinkImpl*>& links, double* latency) const;
-  void send_to(Host* dest, double byte_amount);
+  /** Do a blocking communication between two arbitrary hosts.
+   *
+   * This starts a blocking communication right away, bypassing the mailbox and actors mechanism.
+   * The calling actor is blocked until the end of the communication; there is really no limit on the hosts involved.
+   * In particular, the actor does not have to be on one of the involved hosts. Enjoy the comfort of the simulator :)
+   */
+  void sendto(Host* dest, double byte_amount);
+
+  /** Do an asynchronous communication between two arbitrary hosts.
+   *
+   * This initializes a communication that completely bypass the mailbox and actors mechanism.
+   * There is really no limit on the hosts involved. In particular, the actor does not have to be on one of the involved
+   * hosts.
+   */
+  ActivityPtr sendto_async(Host* dest, double byte_amount);
+
+#ifndef DOXYGEN
+  XBT_ATTRIB_DEPRECATED_v330("Please use Host::sendto()") void send_to(Host* dest, double byte_amount)
+  {
+    sendto(dest, byte_amount);
+  }
+#endif
 
   NetZone* get_englobing_zone();
   /** Block the calling actor on an execution located on the called host
@@ -167,12 +188,12 @@ public:
    * 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);
+  void execute(double flops) const;
   /** Start an asynchronous computation on that host (possibly remote) */
-  ExecPtr exec_async(double flops_amounts);
+  ExecPtr exec_async(double flops_amounts) const;
 
   /** Block the calling actor on an execution located on the called host (with explicit priority) */
-  void execute(double flops, double priority);
+  void execute(double flops, double priority) const;
 
 private:
   xbt::string name_{"noname"};