X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c31bbbb83963c7db2b5970f5c81cbcdd7bc1c5d5..e19e409cb82832c9b1f71b3cfaef58676b5f7ac8:/src/plugins/dirty_page_tracking.cpp diff --git a/src/plugins/dirty_page_tracking.cpp b/src/plugins/dirty_page_tracking.cpp index df8961e148..9b469dc3c7 100644 --- a/src/plugins/dirty_page_tracking.cpp +++ b/src/plugins/dirty_page_tracking.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-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. */ @@ -23,22 +23,21 @@ class DirtyPageTrackingExt { public: void start_tracking(); void stop_tracking() { dp_tracking_ = false; } - bool is_tracking() { return dp_tracking_; } + 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; DirtyPageTrackingExt() = default; }; @@ -68,26 +67,26 @@ 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(const simgrid::s4u::VirtualMachine& vm) { - vm.extension_set(new simgrid::vm::DirtyPageTrackingExt()); + vm.get_vm_impl()->extension_set(new simgrid::vm::DirtyPageTrackingExt()); } -static void on_exec_creation(simgrid::s4u::Actor const&, simgrid::s4u::Exec const& e) +static void on_exec_creation(simgrid::s4u::Exec const& e) { - auto exec = static_cast(e.get_impl()); + auto exec = static_cast(e.get_impl()); const simgrid::s4u::VirtualMachine* vm = dynamic_cast(exec->get_host()); if (vm == nullptr) return; - if (vm->get_impl()->extension()->is_tracking()) { - vm->get_impl()->extension()->track(exec, exec->get_remaining()); + if (vm->get_vm_impl()->extension()->is_tracking()) { + vm->get_vm_impl()->extension()->track(exec, exec->get_remaining()); } else { - vm->get_impl()->extension()->track(exec, 0.0); + vm->get_vm_impl()->extension()->track(exec, 0.0); } } -static void on_exec_completion(simgrid::s4u::Actor const&, simgrid::s4u::Exec const& e) +static void on_exec_completion(simgrid::s4u::Exec const& e) { auto exec = static_cast(e.get_impl()); const simgrid::s4u::VirtualMachine* vm = dynamic_cast(exec->get_host()); @@ -96,11 +95,11 @@ static void on_exec_completion(simgrid::s4u::Actor const&, simgrid::s4u::Exec co /* 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); - vm->get_impl()->extension()->update_dirty_page_count(delta); + if (vm->get_vm_impl()->extension()->is_tracking()) { + double delta = vm->get_vm_impl()->extension()->get_stored_remains(exec); + vm->get_vm_impl()->extension()->update_dirty_page_count(delta); } - vm->get_impl()->extension()->untrack(exec); + vm->get_vm_impl()->extension()->untrack(exec); } void sg_vm_dirty_page_tracking_init() @@ -108,7 +107,7 @@ void sg_vm_dirty_page_tracking_init() if (not simgrid::vm::DirtyPageTrackingExt::EXTENSION_ID.valid()) { simgrid::vm::DirtyPageTrackingExt::EXTENSION_ID = simgrid::vm::VirtualMachineImpl::extension_create(); - simgrid::vm::VirtualMachineImpl::on_creation.connect(&on_virtual_machine_creation); + simgrid::s4u::VirtualMachine::on_creation.connect(&on_virtual_machine_creation); simgrid::s4u::Exec::on_start.connect(&on_exec_creation); simgrid::s4u::Exec::on_completion.connect(&on_exec_completion); } @@ -116,50 +115,50 @@ void sg_vm_dirty_page_tracking_init() void sg_vm_start_dirty_page_tracking(const_sg_vm_t vm) { - vm->get_impl()->extension()->start_tracking(); + vm->get_vm_impl()->extension()->start_tracking(); } void sg_vm_stop_dirty_page_tracking(const_sg_vm_t vm) { - vm->get_impl()->extension()->stop_tracking(); + vm->get_vm_impl()->extension()->stop_tracking(); } double sg_vm_lookup_computed_flops(const_sg_vm_t vm) { - return vm->get_impl()->extension()->computed_flops_lookup(); + return vm->get_vm_impl()->extension()->computed_flops_lookup(); } void sg_vm_set_dirty_page_intensity(const_sg_vm_t vm, double intensity) { - vm->get_impl()->extension()->set_intensity(intensity); + vm->get_vm_impl()->extension()->set_intensity(intensity); } double sg_vm_get_dirty_page_intensity(const_sg_vm_t vm) { - return vm->get_impl()->extension()->get_intensity(); + return vm->get_vm_impl()->extension()->get_intensity(); } 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); + vm->get_vm_impl()->extension()->set_working_set_memory(size); } sg_size_t sg_vm_get_working_set_memory(const_sg_vm_t vm) { - return vm->get_impl()->extension()->get_working_set_memory(); + return vm->get_vm_impl()->extension()->get_working_set_memory(); } void sg_vm_set_migration_speed(const_sg_vm_t vm, double speed) { - vm->get_impl()->extension()->set_migration_speed(speed); + vm->get_vm_impl()->extension()->set_migration_speed(speed); } double sg_vm_get_migration_speed(const_sg_vm_t vm) { - return vm->get_impl()->extension()->get_migration_speed(); + return vm->get_vm_impl()->extension()->get_migration_speed(); } double sg_vm_get_max_downtime(const_sg_vm_t vm) { - return vm->get_impl()->extension()->get_max_downtime(); + return vm->get_vm_impl()->extension()->get_max_downtime(); }