CommWaitTransition mailbox is now valid

[simgrid.git] / src / s4u / s4u_Host.cpp

diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp
index 00f359e460c472f51140e2f458aa7d6412cee144..53d3418baace25ad093e4c91390d91cb550acc8f 100644 (file)
--- a/src/s4u/s4u_Host.cpp
+++ b/src/s4u/s4u_Host.cpp
@@ -20,7 +20,7 @@
 #include <string>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_host, s4u, "Logging specific to the S4U hosts");
-XBT_LOG_EXTERNAL_CATEGORY(surf_route);
+XBT_LOG_EXTERNAL_CATEGORY(ker_routing);
 
 namespace simgrid {
 
@@ -28,10 +28,12 @@ template class xbt::Extendable<s4u::Host>;
 
 namespace s4u {
 
+#ifndef DOXYGEN
 xbt::signal<void(Host&)> Host::on_creation;
 xbt::signal<void(Host const&)> Host::on_destruction;
 xbt::signal<void(Host const&)> Host::on_state_change;
 xbt::signal<void(Host const&)> Host::on_speed_change;
+#endif
 
 Host* Host::set_cpu(kernel::resource::CpuImpl* cpu)
 {
@@ -77,7 +79,7 @@ Host* Host::by_name_or_null(const std::string& name)
 
 Host* Host::current()
 {
-  kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
+  const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
   xbt_assert(self != nullptr, "Cannot call Host::current() from the maestro context");
   return self->get_host();
 }
@@ -171,11 +173,11 @@ void Host::route_to(const Host* dest, std::vector<Link*>& links, double* latency
 void Host::route_to(const Host* dest, std::vector<kernel::resource::StandardLinkImpl*>& links, double* latency) const
 {
   kernel::routing::NetZoneImpl::get_global_route(pimpl_netpoint_, dest->get_netpoint(), links, latency);
-  if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) {
-    XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(),
+  if (XBT_LOG_ISENABLED(ker_routing, xbt_log_priority_debug)) {
+    XBT_CDEBUG(ker_routing, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(),
                (latency == nullptr ? -1 : *latency));
     for (auto const* link : links)
-      XBT_CDEBUG(surf_route, "  Link '%s'", link->get_cname());
+      XBT_CDEBUG(ker_routing, "  Link '%s'", link->get_cname());
   }
 }
 
@@ -185,18 +187,6 @@ NetZone* Host::get_englobing_zone() const
   return pimpl_netpoint_->get_englobing_zone()->get_iface();
 }
 
-#ifndef DOXYGEN
-void Host::sendto(Host* dest, double byte_amount) // XBT_ATTRIB_DEPRECATED_v331
-{
-  Comm::sendto_async(this, dest, byte_amount)->wait();
-}
-
-CommPtr Host::sendto_async(Host* dest, double byte_amount) // XBT_ATTRIB_DEPRECATED_v331
-{
-  return Comm::sendto_async(this, dest, byte_amount);
-}
-#endif
-
 /** Get the properties assigned to a host */
 const std::unordered_map<std::string, std::string>* Host::get_properties() const
 {
@@ -460,7 +450,7 @@ sg_host_t sg_host_by_name(const char* name)
 // ========== User data Layer ==========
 void* sg_host_get_data(const_sg_host_t host)
 {
-  return host->get_data();
+  return host->get_data<void>();
 }
 void sg_host_set_data(sg_host_t host, void* userdata)
 {