-/* 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)
{
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();
}
if (is_on()) {
const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
kernel::actor::simcall([this, self] {
- for (VirtualMachine* const& vm : vm::VirtualMachineImpl::allVms_)
+ 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
{
// ========== 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)
{