void VivaldiZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat)
{
XBT_DEBUG("vivaldi getLocalRoute from '%s'[%lu] '%s'[%lu]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
- auto* engine = s4u::Engine::get_instance();
+ const auto* engine = s4u::Engine::get_instance();
if (src->is_netzone()) {
std::string srcName = "router_" + src->get_name();
std::string dstName = "router_" + dst->get_name();
} // namespace vm
} // namespace simgrid
-static void on_virtual_machine_creation(simgrid::s4u::VirtualMachine& vm)
+static void on_virtual_machine_creation(const simgrid::s4u::VirtualMachine& vm)
{
vm.get_vm_impl()->extension_set<simgrid::vm::DirtyPageTrackingExt>(new simgrid::vm::DirtyPageTrackingExt());
}
}
/** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */
-void VirtualMachineImpl::destroy()
+void VirtualMachineImpl::vm_destroy()
{
s4u::VirtualMachine::on_destruction(*piface_);
/* I was already removed from the allVms set if the VM was destroyed cleanly */
void suspend(kernel::actor::ActorImpl* issuer);
void resume();
void shutdown(kernel::actor::ActorImpl* issuer);
- void destroy();
+ void vm_destroy();
/** @brief Change the physical host on which the given VM is running */
void set_physical_host(s4u::Host* dest);
/* Then, destroy the VM object */
kernel::actor::simcall([this]() {
- get_vm_impl()->destroy();
+ get_vm_impl()->vm_destroy();
get_impl()->destroy();
/* Don't free these things twice: they are the ones of my physical host */
if (not this_actor::is_maestro() && this_actor::get_host() == this) {
XBT_VERB("Launch another actor on physical host %s to destroy my own VM: %s", get_pm()->get_cname(), get_cname());
- simgrid::s4u::Actor::create(get_cname() + std::string("-destroy"), get_pm(), destroy_code);
+ simgrid::s4u::Actor::create(get_cname() + std::string("-vm_destroy"), get_pm(), destroy_code);
simgrid::s4u::this_actor::yield();
XBT_CRITICAL("I should be dead now!");
DIE_IMPOSSIBLE;
Engine::~Engine()
{
- pimpl->shutdown();
+ kernel::EngineImpl::shutdown();
Engine::instance_ = nullptr;
}