-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2022. 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/s4u/VirtualMachine.hpp>
#include <xbt/parse_units.hpp>
-#include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
+#include "src/kernel/resource/VirtualMachineImpl.hpp"
#include "src/surf/HostImpl.hpp"
#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 {
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)
{
*/
void Host::destroy()
{
- kernel::actor::simcall([this] { this->pimpl_->destroy(); });
+ kernel::actor::simcall_answered([this] { this->pimpl_->destroy(); });
}
Host* Host::by_name(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();
}
void Host::turn_on()
{
if (not is_on()) {
- kernel::actor::simcall([this] {
+ kernel::actor::simcall_answered([this] {
this->pimpl_cpu_->turn_on();
this->pimpl_->turn_on();
on_state_change(*this);
{
if (is_on()) {
const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
- kernel::actor::simcall([this, self] {
- for (VirtualMachine* const& vm : vm::VirtualMachineImpl::allVms_)
+ kernel::actor::simcall_answered([this, self] {
+ for (VirtualMachine* const& vm : kernel::resource::VirtualMachineImpl::allVms_)
if (vm->get_pm() == this) {
vm->shutdown();
vm->turn_off();
*/
void Host::route_to(const Host* dest, std::vector<Link*>& links, double* latency) const
{
- std::vector<kernel::resource::LinkImpl*> linkImpls;
+ std::vector<kernel::resource::StandardLinkImpl*> linkImpls;
this->route_to(dest, linkImpls, latency);
for (auto* l : linkImpls)
links.push_back(l->get_iface());
}
/** @brief Just like Host::routeTo, but filling an array of link implementations */
-void Host::route_to(const Host* dest, std::vector<kernel::resource::LinkImpl*>& links, double* latency) const
+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());
}
}
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
{
Host* Host::set_property(const std::string& key, const std::string& value)
{
- kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); });
+ kernel::actor::simcall_answered([this, &key, &value] { this->pimpl_->set_property(key, value); });
return this;
}
Host* Host::set_properties(const std::unordered_map<std::string, std::string>& properties)
{
- kernel::actor::simcall([this, &properties] { this->pimpl_->set_properties(properties); });
+ kernel::actor::simcall_answered([this, &properties] { this->pimpl_->set_properties(properties); });
return this;
}
* The profile must contain boolean values. */
Host* Host::set_state_profile(kernel::profile::Profile* p)
{
- kernel::actor::simcall([this, p] { pimpl_cpu_->set_state_profile(p); });
+ kernel::actor::simcall_answered([this, p] { pimpl_cpu_->set_state_profile(p); });
return this;
}
/** Specify a profile modeling the external load according to an exhaustive list or a stochastic law.
*/
Host* Host::set_speed_profile(kernel::profile::Profile* p)
{
- kernel::actor::simcall([this, p] { pimpl_cpu_->set_speed_profile(p); });
+ kernel::actor::simcall_answered([this, p] { pimpl_cpu_->set_speed_profile(p); });
return this;
}
Host* Host::set_sharing_policy(SharingPolicy policy, const s4u::NonLinearResourceCb& cb)
{
- kernel::actor::simcall([this, policy, &cb] { pimpl_cpu_->set_sharing_policy(policy, cb); });
+ kernel::actor::simcall_answered([this, policy, &cb] { pimpl_cpu_->set_sharing_policy(policy, cb); });
return this;
}
Host* Host::set_core_count(int core_count)
{
- kernel::actor::simcall([this, core_count] { this->pimpl_cpu_->set_core_count(core_count); });
+ kernel::actor::simcall_answered([this, core_count] { this->pimpl_cpu_->set_core_count(core_count); });
return this;
}
Host* Host::set_pstate_speed(const std::vector<double>& speed_per_state)
{
- kernel::actor::simcall([this, &speed_per_state] { pimpl_cpu_->set_pstate_speed(speed_per_state); });
+ kernel::actor::simcall_answered([this, &speed_per_state] { pimpl_cpu_->set_pstate_speed(speed_per_state); });
return this;
}
/** @brief Set the pstate at which the host should run */
Host* Host::set_pstate(unsigned long pstate_index)
{
- kernel::actor::simcall([this, pstate_index] { this->pimpl_cpu_->set_pstate(pstate_index); });
+ kernel::actor::simcall_answered([this, pstate_index] { this->pimpl_cpu_->set_pstate(pstate_index); });
return this;
}
Host* Host::set_factor_cb(const std::function<CpuFactorCb>& cb)
{
- kernel::actor::simcall([this, &cb] { pimpl_cpu_->set_factor_cb(cb); });
+ kernel::actor::simcall_answered([this, &cb] { pimpl_cpu_->set_factor_cb(cb); });
return this;
}
Host* Host::set_coordinates(const std::string& coords)
{
if (not coords.empty())
- kernel::actor::simcall([this, coords] { this->pimpl_netpoint_->set_coordinates(coords); });
+ kernel::actor::simcall_answered([this, coords] { this->pimpl_netpoint_->set_coordinates(coords); });
return this;
}
std::vector<Disk*> Host::get_disks() const
Disk* Host::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth)
{
- return kernel::actor::simcall([this, &name, read_bandwidth, write_bandwidth] {
+ return kernel::actor::simcall_answered([this, &name, read_bandwidth, write_bandwidth] {
auto* disk = pimpl_->create_disk(name, read_bandwidth, write_bandwidth);
pimpl_->add_disk(disk);
return disk;
void Host::add_disk(const Disk* disk)
{
- kernel::actor::simcall([this, disk] { this->pimpl_->add_disk(disk); });
+ kernel::actor::simcall_answered([this, disk] { this->pimpl_->add_disk(disk); });
}
void Host::remove_disk(const std::string& disk_name)
{
- kernel::actor::simcall([this, disk_name] { this->pimpl_->remove_disk(disk_name); });
+ kernel::actor::simcall_answered([this, disk_name] { this->pimpl_->remove_disk(disk_name); });
+}
+
+VirtualMachine* Host::create_vm(const std::string& name, int core_amount)
+{
+ return new VirtualMachine(name, this, core_amount);
+}
+
+VirtualMachine* Host::create_vm(const std::string& name, int core_amount, size_t ramsize)
+{
+ return new VirtualMachine(name, this, core_amount, ramsize);
}
ExecPtr Host::exec_init(double flops) const
Host* Host::seal()
{
- kernel::actor::simcall([this]() { this->pimpl_->seal(); });
+ kernel::actor::simcall_answered([this]() { this->pimpl_->seal(); });
simgrid::s4u::Host::on_creation(*this); // notify the signal
return this;
}
// ========== 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)
{
}
/** @brief Displays debugging information about a host */
-void sg_host_dump(const_sg_host_t host)
+void sg_host_dump(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v335
{
XBT_INFO("Displaying host %s", host->get_cname());
XBT_INFO(" - speed: %.0f", host->get_speed());