-/* 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. */
+#include "simgrid/host.h"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Actor.hpp"
+#include "simgrid/s4u/Comm.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Exec.hpp"
#include "simgrid/s4u/VirtualMachine.hpp"
if (pimpl_netpoint_ != nullptr) // not removed yet by a children class
Engine::get_instance()->netpoint_unregister(pimpl_netpoint_);
delete pimpl_cpu;
- delete mounts_;
}
/** @brief Fire the required callbacks and destroy the object
void Host::turn_off()
{
if (is_on()) {
- kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
+ const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
kernel::actor::simcall([this, self] {
for (VirtualMachine* const& vm : vm::VirtualMachineImpl::allVms_)
if (vm->get_pm() == this) {
{
std::vector<kernel::resource::LinkImpl*> linkImpls;
this->route_to(dest, linkImpls, latency);
- for (kernel::resource::LinkImpl* const& l : linkImpls)
+ for (auto* l : linkImpls)
links.push_back(l->get_iface());
}
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());
}
}
sendto_async(dest, byte_amount)->wait();
}
-ActivityPtr Host::sendto_async(Host* dest, double byte_amount)
+CommPtr Host::sendto_async(Host* dest, double byte_amount)
{
- std::vector<Host*> m_host_list = {this, dest};
- std::vector<double> flops_amount = {0, 0};
- std::vector<double> bytes_amount = {0, byte_amount, 0, 0};
- return this_actor::exec_init(m_host_list, flops_amount, bytes_amount)->start();
+ return Comm::sendto_async(this, dest, byte_amount);
}
/** Get the properties assigned to a host */
kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); });
}
-void Host::set_properties(const std::map<std::string, std::string>& properties)
+void Host::set_properties(const std::unordered_map<std::string, std::string>& properties)
{
kernel::actor::simcall([this, &properties] { this->pimpl_->set_properties(properties); });
}
-/** Specify a profile turning the host on and off according to a exhaustive list or a stochastic law.
+/** Specify a profile turning the host on and off according to an exhaustive list or a stochastic law.
* The profile must contain boolean values. */
void Host::set_state_profile(kernel::profile::Profile* p)
{
return kernel::actor::simcall([this, p] { pimpl_cpu->set_state_profile(p); });
}
-/** Specify a profile modeling the external load according to a exhaustive list or a stochastic law.
+/** Specify a profile modeling the external load according to an exhaustive list or a stochastic law.
*
* Each event of the profile represent a peak speed change that is due to external load. The values are given as a rate
* of the initial value. This means that the actual value is obtained by multiplying the initial value (the peek speed
return kernel::actor::simcall([this] { return this->pimpl_->get_disks(); });
}
-void Host::add_disk(Disk* disk)
+void Host::add_disk(const Disk* disk)
{
kernel::actor::simcall([this, disk] { this->pimpl_->add_disk(disk); });
}
{
kernel::actor::simcall([this, disk_name] { this->pimpl_->remove_disk(disk_name); });
}
-/**
- * @ingroup simix_storage_management
- * @brief Returns the list of storages attached to a host.
- * @return a vector containing all storages attached to the host
- */
-std::vector<const char*> Host::get_attached_storages() const
-{
- return kernel::actor::simcall([this] { return this->pimpl_->get_attached_storages(); });
-}
-std::unordered_map<std::string, Storage*> const& Host::get_mounted_storages()
+ExecPtr Host::exec_init(double flops) const
{
- kernel::actor::simcall([this] {
- if (mounts_ == nullptr)
- mounts_ = pimpl_->get_mounted_storages();
- });
- return *mounts_;
+ return this_actor::exec_init(flops);
}
ExecPtr Host::exec_async(double flops) const
{
- return this_actor::exec_init(flops);
+ return this_actor::exec_async(flops);
}
void Host::execute(double flops) const
void Host::execute(double flops, double priority) const
{
- this_actor::exec_init(flops)->set_priority(1 / priority)->start()->wait();
+ this_actor::exec_init(flops)->set_priority(1 / priority)->vetoable_start()->wait();
}
} // namespace s4u
// ========= Layering madness ==============*
// ========== User data Layer ==========
-void* sg_host_data(const_sg_host_t host)
+void* sg_host_get_data(const_sg_host_t host)
{
return host->get_data();
}
-void sg_host_data_set(sg_host_t host, void* userdata)
+void sg_host_set_data(sg_host_t host, void* userdata)
{
host->set_data(userdata);
}
-void* sg_host_user(sg_host_t host) // deprecated
+void* sg_host_data(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
+{
+ return sg_host_get_data(host);
+}
+void sg_host_data_set(sg_host_t host, void* userdata) // XBT_ATTRIB_DEPRECATED_v330
+{
+ sg_host_set_data(host, userdata);
+}
+void* sg_host_user(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v328
{
return host->get_data();
}
-void sg_host_user_set(sg_host_t host, void* userdata) // deprecated
+void sg_host_user_set(sg_host_t host, void* userdata) // XBT_ATTRIB_DEPRECATED_v328
{
host->set_data(userdata);
}
-void sg_host_user_destroy(sg_host_t host) // deprecated
+void sg_host_user_destroy(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v328
{
host->set_data(nullptr);
}
-// ========= storage related functions ============
-void sg_host_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks)
+// ========= Disk related functions ============
+void sg_host_get_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks)
{
std::vector<sg_disk_t> list = host->get_disks();
*disk_count = list.size();
(*disks)[i] = list[i];
}
-xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
-{
- xbt_assert((host != nullptr), "Invalid parameters");
- xbt_dict_t res = xbt_dict_new_homogeneous(nullptr);
- for (auto const& elm : host->get_mounted_storages()) {
- const char* mount_name = elm.first.c_str();
- const simgrid::s4u::Storage* storage = elm.second;
- xbt_dict_set(res, mount_name, (void*)storage->get_cname());
- }
-
- return res;
-}
-
-xbt_dynar_t sg_host_get_attached_storage_list(const_sg_host_t host)
-{
- xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr);
- std::vector<const char*> storage_vector = host->get_attached_storages();
- for (auto const& name : storage_vector)
- xbt_dynar_push(storage_dynar, &name);
- return storage_dynar;
-}
-
// =========== user-level functions ===============
// ================================================
/** @brief Returns the total speed of a host */
-double sg_host_speed(const_sg_host_t host)
+double sg_host_get_speed(const_sg_host_t host)
{
return host->get_speed();
}
+double sg_host_speed(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
+{
+ return sg_host_get_speed(host);
+}
+
/** @brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref plugin_energy.
*
* @param host host to test
* @param to where to
* @param links [OUT] where to store the list of links (must exist, cannot be nullptr).
*/
-void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links)
+void sg_host_get_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links)
{
std::vector<simgrid::s4u::Link*> vlinks;
from->route_to(to, vlinks, nullptr);
* @param from where from
* @param to where to
*/
-double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to)
+double sg_host_get_route_latency(const_sg_host_t from, const_sg_host_t to)
{
std::vector<simgrid::s4u::Link*> vlinks;
double res = 0;
* @param from where from
* @param to where to
*/
-double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to)
+double sg_host_get_route_bandwidth(const_sg_host_t from, const_sg_host_t to)
{
double min_bandwidth = -1.0;
return min_bandwidth;
}
+void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) // XBT_ATTRIB_DEPRECATED_v330
+{
+ sg_host_get_route(from, to, links);
+}
+
+double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to) // XBT_ATTRIB_DEPRECATED_v330
+{
+ return sg_host_get_route_latency(from, to);
+}
+
+double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to) // XBT_ATTRIB_DEPRECATED_v330
+{
+ return sg_host_get_route_bandwidth(from, to);
+}
+
void sg_host_sendto(sg_host_t from, sg_host_t to, double byte_amount)
{
from->sendto(to, byte_amount);
return res;
}
-double sg_host_load(const_sg_host_t host)
+double sg_host_get_load(const_sg_host_t host)
{
return host->get_load();
}
+
+double sg_host_load(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
+{
+ return sg_host_get_load(host);
+}
