X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d2995483b57463581ffdc4365fe1999ddc306c2..b372d23d3d8818b4547ef207f43b45709298a002:/src/plugins/dirty_page_tracking.cpp diff --git a/src/plugins/dirty_page_tracking.cpp b/src/plugins/dirty_page_tracking.cpp index 4097976bb3..5b3613ba89 100644 --- a/src/plugins/dirty_page_tracking.cpp +++ b/src/plugins/dirty_page_tracking.cpp @@ -1,9 +1,10 @@ -/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-2020. 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/plugins/live_migration.h" +#include "simgrid/s4u/Exec.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" @@ -11,7 +12,7 @@ namespace simgrid { namespace vm { class DirtyPageTrackingExt { bool dp_tracking_ = false; - std::map dp_objs_; + std::map dp_objs_; double dp_updated_by_deleted_tasks_ = 0.0; // Percentage of pages that get dirty compared to netspeed [0;1] bytes per 1 flop execution double dp_intensity_ = 0.0; @@ -22,19 +23,19 @@ class DirtyPageTrackingExt { public: void start_tracking(); void stop_tracking() { dp_tracking_ = false; } - bool is_tracking() { return dp_tracking_; } - void track(kernel::activity::ExecImplPtr exec, double amount) { dp_objs_.insert({exec, amount}); } - void untrack(kernel::activity::ExecImplPtr exec) { dp_objs_.erase(exec); } - double get_stored_remains(kernel::activity::ExecImplPtr exec) { return dp_objs_.at(exec); } + bool is_tracking() const { return dp_tracking_; } + void track(kernel::activity::ExecImpl const* exec, double amount) { dp_objs_.insert({exec, amount}); } + void untrack(kernel::activity::ExecImpl const* exec) { dp_objs_.erase(exec); } + double get_stored_remains(kernel::activity::ExecImpl const* exec) { return dp_objs_.at(exec); } void update_dirty_page_count(double delta) { dp_updated_by_deleted_tasks_ += delta; } double computed_flops_lookup(); - double get_intensity() { return dp_intensity_; } + double get_intensity() const { return dp_intensity_; } void set_intensity(double intensity) { dp_intensity_ = intensity; } - double get_working_set_memory() { return working_set_memory_; } + sg_size_t get_working_set_memory() const { return working_set_memory_; } void set_working_set_memory(sg_size_t size) { working_set_memory_ = size; } void set_migration_speed(double speed) { mig_speed_ = speed; } - double get_migration_speed() { return mig_speed_; } - double get_max_downtime() { return max_downtime_; } + double get_migration_speed() const { return mig_speed_; } + double get_max_downtime() const { return max_downtime_; } static simgrid::xbt::Extension EXTENSION_ID; virtual ~DirtyPageTrackingExt() = default; @@ -67,14 +68,15 @@ double DirtyPageTrackingExt::computed_flops_lookup() } // namespace vm } // namespace simgrid -static void on_virtual_machine_creation(simgrid::vm::VirtualMachineImpl* vm) +static void on_virtual_machine_creation(simgrid::vm::VirtualMachineImpl& vm) { - vm->extension_set(new simgrid::vm::DirtyPageTrackingExt()); + vm.extension_set(new simgrid::vm::DirtyPageTrackingExt()); } -static void on_exec_creation(simgrid::kernel::activity::ExecImplPtr exec) +static void on_exec_creation(simgrid::s4u::Exec const& e) { - simgrid::s4u::VirtualMachine* vm = dynamic_cast(exec->host_); + auto exec = static_cast(e.get_impl()); + const simgrid::s4u::VirtualMachine* vm = dynamic_cast(exec->get_host()); if (vm == nullptr) return; @@ -85,17 +87,17 @@ static void on_exec_creation(simgrid::kernel::activity::ExecImplPtr exec) } } -static void on_exec_completion(simgrid::kernel::activity::ExecImplPtr exec) +static void on_exec_completion(simgrid::s4u::Exec const& e) { - simgrid::s4u::VirtualMachine* vm = dynamic_cast(exec->host_); + auto exec = static_cast(e.get_impl()); + const simgrid::s4u::VirtualMachine* vm = dynamic_cast(exec->get_host()); if (vm == nullptr) return; /* If we are in the middle of dirty page tracking, we record how much computation has been done until now, and keep * the information for the lookup_() function that will called soon. */ if (vm->get_impl()->extension()->is_tracking()) { - double delta = vm->get_impl()->extension()->get_stored_remains(exec) - - exec->get_remaining(); + double delta = vm->get_impl()->extension()->get_stored_remains(exec); vm->get_impl()->extension()->update_dirty_page_count(delta); } vm->get_impl()->extension()->untrack(exec); @@ -107,57 +109,57 @@ void sg_vm_dirty_page_tracking_init() simgrid::vm::DirtyPageTrackingExt::EXTENSION_ID = simgrid::vm::VirtualMachineImpl::extension_create(); simgrid::vm::VirtualMachineImpl::on_creation.connect(&on_virtual_machine_creation); - simgrid::kernel::activity::ExecImpl::onCreation.connect(&on_exec_creation); - simgrid::kernel::activity::ExecImpl::onCompletion.connect(&on_exec_completion); + simgrid::s4u::Exec::on_start.connect(&on_exec_creation); + simgrid::s4u::Exec::on_completion.connect(&on_exec_completion); } } -void sg_vm_start_dirty_page_tracking(sg_vm_t vm) +void sg_vm_start_dirty_page_tracking(const_sg_vm_t vm) { vm->get_impl()->extension()->start_tracking(); } -void sg_vm_stop_dirty_page_tracking(sg_vm_t vm) +void sg_vm_stop_dirty_page_tracking(const_sg_vm_t vm) { vm->get_impl()->extension()->stop_tracking(); } -double sg_vm_lookup_computed_flops(sg_vm_t vm) +double sg_vm_lookup_computed_flops(const_sg_vm_t vm) { return vm->get_impl()->extension()->computed_flops_lookup(); } -void sg_vm_set_dirty_page_intensity(sg_vm_t vm, double intensity) +void sg_vm_set_dirty_page_intensity(const_sg_vm_t vm, double intensity) { vm->get_impl()->extension()->set_intensity(intensity); } -double sg_vm_get_dirty_page_intensity(sg_vm_t vm) +double sg_vm_get_dirty_page_intensity(const_sg_vm_t vm) { return vm->get_impl()->extension()->get_intensity(); } -void sg_vm_set_working_set_memory(sg_vm_t vm, sg_size_t size) +void sg_vm_set_working_set_memory(const_sg_vm_t vm, sg_size_t size) { vm->get_impl()->extension()->set_working_set_memory(size); } -sg_size_t sg_vm_get_working_set_memory(sg_vm_t vm) +sg_size_t sg_vm_get_working_set_memory(const_sg_vm_t vm) { return vm->get_impl()->extension()->get_working_set_memory(); } -void sg_vm_set_migration_speed(sg_vm_t vm, double speed) +void sg_vm_set_migration_speed(const_sg_vm_t vm, double speed) { vm->get_impl()->extension()->set_migration_speed(speed); } -double sg_vm_get_migration_speed(sg_vm_t vm) +double sg_vm_get_migration_speed(const_sg_vm_t vm) { return vm->get_impl()->extension()->get_migration_speed(); } -double sg_vm_get_max_downtime(sg_vm_t vm) +double sg_vm_get_max_downtime(const_sg_vm_t vm) { return vm->get_impl()->extension()->get_max_downtime(); }