X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de74c92736a83f89b47de30f7603e25d4f6687a5..b63adff37a6c05384b40d5c5bd5be49b246cf9fc:/src/surf/plugins/dirty_page_tracking.cpp diff --git a/src/surf/plugins/dirty_page_tracking.cpp b/src/surf/plugins/dirty_page_tracking.cpp index e923f55031..c130ea7ade 100644 --- a/src/surf/plugins/dirty_page_tracking.cpp +++ b/src/surf/plugins/dirty_page_tracking.cpp @@ -1,29 +1,39 @@ -/* Copyright (c) 2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-2018. 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.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" -#include namespace simgrid { namespace vm { class VmDirtyPageTrackingExt { bool dp_tracking = false; std::map dp_objs; - double dp_updated_by_deleted_tasks = 0; + 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; + sg_size_t working_set_memory = 0.0; + double max_downtime = 0.03; + double mig_speed = 0.0; public: - void startTracking(); - void stopTracking() { dp_tracking = false; } - bool isTracking() { return dp_tracking; } + 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 getStoredRemains(kernel::activity::ExecImplPtr exec) { return dp_objs.at(exec); } - void updateDirtyPageCount(double delta) { dp_updated_by_deleted_tasks += delta; } - double computedFlopsLookup(); + double get_stored_remains(kernel::activity::ExecImplPtr 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; } + void set_intensity(double intensity) { dp_intensity = intensity; } + double get_working_set_memory() { 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; } static simgrid::xbt::Extension EXTENSION_ID; virtual ~VmDirtyPageTrackingExt() = default; @@ -32,14 +42,14 @@ public: simgrid::xbt::Extension VmDirtyPageTrackingExt::EXTENSION_ID; -void VmDirtyPageTrackingExt::startTracking() +void VmDirtyPageTrackingExt::start_tracking() { dp_tracking = true; for (auto const& elm : dp_objs) dp_objs[elm.first] = elm.first->remains(); } -double VmDirtyPageTrackingExt::computedFlopsLookup() +double VmDirtyPageTrackingExt::computed_flops_lookup() { double total = 0; @@ -67,14 +77,14 @@ static void onExecCreation(simgrid::kernel::activity::ExecImplPtr exec) if (vm == nullptr) return; - if (vm->pimpl_vm_->extension()->isTracking()) { - vm->pimpl_vm_->extension()->track(exec, exec->remains()); + if (vm->getImpl()->extension()->is_tracking()) { + vm->getImpl()->extension()->track(exec, exec->remains()); } else { - vm->pimpl_vm_->extension()->track(exec, 0.0); + vm->getImpl()->extension()->track(exec, 0.0); } } -static void onExecDestruction(simgrid::kernel::activity::ExecImplPtr exec) +static void onExecCompletion(simgrid::kernel::activity::ExecImplPtr exec) { simgrid::s4u::VirtualMachine* vm = dynamic_cast(exec->host_); if (vm == nullptr) @@ -82,39 +92,71 @@ static void onExecDestruction(simgrid::kernel::activity::ExecImplPtr exec) /* 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->pimpl_vm_->extension()->isTracking()) { + if (vm->getImpl()->extension()->is_tracking()) { double delta = - vm->pimpl_vm_->extension()->getStoredRemains(exec) - exec->remains(); - vm->pimpl_vm_->extension()->updateDirtyPageCount(delta); + vm->getImpl()->extension()->get_stored_remains(exec) - exec->remains(); + vm->getImpl()->extension()->update_dirty_page_count(delta); } - vm->pimpl_vm_->extension()->untrack(exec); + vm->getImpl()->extension()->untrack(exec); } -SG_BEGIN_DECL() - -void sg_vm_live_migration_plugin_init() +void sg_vm_dirty_page_tracking_init() { if (not simgrid::vm::VmDirtyPageTrackingExt::EXTENSION_ID.valid()) { simgrid::vm::VmDirtyPageTrackingExt::EXTENSION_ID = simgrid::vm::VirtualMachineImpl::extension_create(); simgrid::vm::VirtualMachineImpl::onVmCreation.connect(&onVirtualMachineCreation); simgrid::kernel::activity::ExecImpl::onCreation.connect(&onExecCreation); - simgrid::kernel::activity::ExecImpl::onDestruction.connect(&onExecDestruction); + simgrid::kernel::activity::ExecImpl::onCompletion.connect(&onExecCompletion); } } void sg_vm_start_dirty_page_tracking(sg_vm_t vm) { - vm->pimpl_vm_->extension()->startTracking(); + vm->getImpl()->extension()->start_tracking(); } void sg_vm_stop_dirty_page_tracking(sg_vm_t vm) { - vm->pimpl_vm_->extension()->stopTracking(); + vm->getImpl()->extension()->stop_tracking(); } double sg_vm_lookup_computed_flops(sg_vm_t vm) { - return vm->pimpl_vm_->extension()->computedFlopsLookup(); + return vm->getImpl()->extension()->computed_flops_lookup(); +} + +void sg_vm_set_dirty_page_intensity(sg_vm_t vm, double intensity) +{ + vm->getImpl()->extension()->set_intensity(intensity); +} + +double sg_vm_get_dirty_page_intensity(sg_vm_t vm) +{ + return vm->getImpl()->extension()->get_intensity(); +} + +void sg_vm_set_working_set_memory(sg_vm_t vm, sg_size_t size) +{ + vm->getImpl()->extension()->set_working_set_memory(size); +} + +sg_size_t sg_vm_get_working_set_memory(sg_vm_t vm) +{ + return vm->getImpl()->extension()->get_working_set_memory(); +} + +void sg_vm_set_migration_speed(sg_vm_t vm, double speed) +{ + vm->getImpl()->extension()->set_migration_speed(speed); +} + +double sg_vm_get_migration_speed(sg_vm_t vm) +{ + return vm->getImpl()->extension()->get_migration_speed(); +} + +double sg_vm_get_max_downtime(sg_vm_t vm) +{ + return vm->getImpl()->extension()->get_max_downtime(); } -SG_END_DECL()