X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/510ea77f511591c21735b013e0d857599e9d6870..41527b07b1aef8fe1c379f5b346e2110f3d228f8:/src/s4u/s4u_Host.cpp
diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp
index b66f81abbf..846790fadf 100644
--- a/src/s4u/s4u_Host.cpp
+++ b/src/s4u/s4u_Host.cpp
@@ -152,7 +152,7 @@ void Host::route_to(const Host* dest, std::vector& links, double* latency
{
std::vector linkImpls;
this->route_to(dest, linkImpls, latency);
- for (kernel::resource::LinkImpl* const& l : linkImpls)
+ for (auto* l : linkImpls)
links.push_back(l->get_iface());
}
@@ -163,8 +163,8 @@ void Host::route_to(const Host* dest, std::vector&
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(),
(latency == nullptr ? -1 : *latency));
- for (auto const& link : links)
- XBT_CDEBUG(surf_route, "Link %s", link->get_cname());
+ for (auto const* link : links)
+ XBT_CDEBUG(surf_route, " Link '%s'", link->get_cname());
}
}
@@ -174,12 +174,17 @@ NetZone* Host::get_englobing_zone()
return pimpl_netpoint_->get_englobing_zone()->get_iface();
}
-void Host::send_to(Host* dest, double byte_amount)
+void Host::sendto(Host* dest, double byte_amount)
+{
+ sendto_async(dest, byte_amount)->wait();
+}
+
+ActivityPtr Host::sendto_async(Host* dest, double byte_amount)
{
std::vector m_host_list = {this, dest};
std::vector flops_amount = {0, 0};
std::vector bytes_amount = {0, byte_amount, 0, 0};
- this_actor::parallel_execute(m_host_list, flops_amount, bytes_amount);
+ return this_actor::exec_init(m_host_list, flops_amount, bytes_amount)->start();
}
/** Get the properties assigned to a host */
@@ -199,7 +204,7 @@ void Host::set_property(const std::string& key, const std::string& value)
kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); });
}
-void Host::set_properties(const std::map& properties)
+void Host::set_properties(const std::unordered_map& properties)
{
kernel::actor::simcall([this, &properties] { this->pimpl_->set_properties(properties); });
}
@@ -282,23 +287,24 @@ std::vector Host::get_attached_storages() const
std::unordered_map const& Host::get_mounted_storages()
{
- if (mounts_ == nullptr)
- mounts_ = pimpl_->get_mounted_storages();
-
+ kernel::actor::simcall([this] {
+ if (mounts_ == nullptr)
+ mounts_ = pimpl_->get_mounted_storages();
+ });
return *mounts_;
}
-ExecPtr Host::exec_async(double flops)
+ExecPtr Host::exec_async(double flops) const
{
return this_actor::exec_init(flops);
}
-void Host::execute(double flops)
+void Host::execute(double flops) const
{
execute(flops, 1.0 /* priority */);
}
-void Host::execute(double flops, double priority)
+void Host::execute(double flops, double priority) const
{
this_actor::exec_init(flops)->set_priority(1 / priority)->start()->wait();
}
@@ -313,7 +319,7 @@ size_t sg_host_count()
}
sg_host_t* sg_host_list()
{
- simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance();
+ const simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance();
size_t host_count = e->get_host_count();
xbt_assert(host_count > 0, "There is no host!");
std::vector hosts = e->get_all_hosts();
@@ -344,7 +350,7 @@ sg_host_t sg_host_by_name(const char* name)
return simgrid::s4u::Host::by_name_or_null(name);
}
-xbt_dynar_t sg_hosts_as_dynar()
+xbt_dynar_t sg_hosts_as_dynar() // XBT_ATTRIB_DEPRECATED_v330
{
std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts();
@@ -384,7 +390,7 @@ void sg_host_user_destroy(sg_host_t host) // deprecated
}
// ========= storage related functions ============
-void sg_host_disks(sg_host_t host, unsigned int* disk_count, sg_disk_t** disks)
+void sg_host_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks)
{
std::vector list = host->get_disks();
*disk_count = list.size();
@@ -591,9 +597,9 @@ double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to)
return min_bandwidth;
}
-void sg_host_send_to(sg_host_t from, sg_host_t to, double byte_amount)
+void sg_host_sendto(sg_host_t from, sg_host_t to, double byte_amount)
{
- from->send_to(to, byte_amount);
+ from->sendto(to, byte_amount);
}
/** @brief Displays debugging information about a host */