X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de74c92736a83f89b47de30f7603e25d4f6687a5..6157f90cc9d3cce63b341338c15e91af8ccd6347:/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..b14dbc6ad9 100644
--- a/src/surf/plugins/dirty_page_tracking.cpp
+++ b/src/surf/plugins/dirty_page_tracking.cpp
@@ -1,19 +1,22 @@
-/* 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 <map>
 
 namespace simgrid {
 namespace vm {
 class VmDirtyPageTrackingExt {
   bool dp_tracking = false;
   std::map<kernel::activity::ExecImplPtr, double> 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();
@@ -24,6 +27,13 @@ public:
   double getStoredRemains(kernel::activity::ExecImplPtr exec) { return dp_objs.at(exec); }
   void updateDirtyPageCount(double delta) { dp_updated_by_deleted_tasks += delta; }
   double computedFlopsLookup();
+  double getIntensity() { return dp_intensity; }
+  void setIntensity(double intensity) { dp_intensity = intensity; }
+  double getWorkingSetMemory() { return working_set_memory; }
+  void setWorkingSetMemory(sg_size_t size) { working_set_memory = size; }
+  void setMigrationSpeed(double speed) { mig_speed = speed; }
+  double getMigrationSpeed() { return mig_speed; }
+  double getMaxDowntime() { return max_downtime; }
 
   static simgrid::xbt::Extension<VirtualMachineImpl, VmDirtyPageTrackingExt> EXTENSION_ID;
   virtual ~VmDirtyPageTrackingExt() = default;
@@ -67,14 +77,14 @@ static void onExecCreation(simgrid::kernel::activity::ExecImplPtr exec)
   if (vm == nullptr)
     return;
 
-  if (vm->pimpl_vm_->extension<simgrid::vm::VmDirtyPageTrackingExt>()->isTracking()) {
-    vm->pimpl_vm_->extension<simgrid::vm::VmDirtyPageTrackingExt>()->track(exec, exec->remains());
+  if (vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->isTracking()) {
+    vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->track(exec, exec->remains());
   } else {
-    vm->pimpl_vm_->extension<simgrid::vm::VmDirtyPageTrackingExt>()->track(exec, 0.0);
+    vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->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<simgrid::s4u::VirtualMachine*>(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<simgrid::vm::VmDirtyPageTrackingExt>()->isTracking()) {
+  if (vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->isTracking()) {
     double delta =
-        vm->pimpl_vm_->extension<simgrid::vm::VmDirtyPageTrackingExt>()->getStoredRemains(exec) - exec->remains();
-    vm->pimpl_vm_->extension<simgrid::vm::VmDirtyPageTrackingExt>()->updateDirtyPageCount(delta);
+        vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->getStoredRemains(exec) - exec->remains();
+    vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->updateDirtyPageCount(delta);
   }
-  vm->pimpl_vm_->extension<simgrid::vm::VmDirtyPageTrackingExt>()->untrack(exec);
+  vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->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::VmDirtyPageTrackingExt>();
     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<simgrid::vm::VmDirtyPageTrackingExt>()->startTracking();
+  vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->startTracking();
 }
 
 void sg_vm_stop_dirty_page_tracking(sg_vm_t vm)
 {
-  vm->pimpl_vm_->extension<simgrid::vm::VmDirtyPageTrackingExt>()->stopTracking();
+  vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->stopTracking();
 }
 
 double sg_vm_lookup_computed_flops(sg_vm_t vm)
 {
-  return vm->pimpl_vm_->extension<simgrid::vm::VmDirtyPageTrackingExt>()->computedFlopsLookup();
+  return vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->computedFlopsLookup();
+}
+
+void sg_vm_set_dirty_page_intensity(sg_vm_t vm, double intensity)
+{
+  vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->setIntensity(intensity);
+}
+
+double sg_vm_get_dirty_page_intensity(sg_vm_t vm)
+{
+  return vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->getIntensity();
+}
+
+void sg_vm_set_working_set_memory(sg_vm_t vm, sg_size_t size)
+{
+  vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->setWorkingSetMemory(size);
+}
+
+sg_size_t sg_vm_get_working_set_memory(sg_vm_t vm)
+{
+  return vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->getWorkingSetMemory();
+}
+
+void sg_vm_set_migration_speed(sg_vm_t vm, double speed)
+{
+  vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->setMigrationSpeed(speed);
+}
+
+double sg_vm_get_migration_speed(sg_vm_t vm)
+{
+  return vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->getMigrationSpeed();
+}
+
+double sg_vm_get_max_downtime(sg_vm_t vm)
+{
+  return vm->getImpl()->extension<simgrid::vm::VmDirtyPageTrackingExt>()->getMaxDowntime();
 }
-SG_END_DECL()