Update info

[simgrid.git] / src / msg / msg_vm.cpp

diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp
index e2bd508..6d1d5c3 100644 (file)
--- a/src/msg/msg_vm.cpp
+++ b/src/msg/msg_vm.cpp
@@ -11,22 +11,24 @@
 
 #include <xbt/ex.hpp>
 
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/plugins/vm/VmHostExt.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include <simgrid/s4u/VirtualMachine.hpp>
-#include <simgrid/s4u/host.hpp>
 
-#include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
 #include "simgrid/host.h"
+#include "simgrid/simix.hpp"
 
-#include "src/simix/smx_host_private.h" /* don't ask me why the VM functions are in there (FIXME:KILLME) */
+struct dirty_page {
+  double prev_clock;
+  double prev_remaining;
+  msg_task_t task;
+};
+typedef struct dirty_page s_dirty_page;
+typedef struct dirty_page* dirty_page_t;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API");
 
-
 /* **** ******** GENERAL ********* **** */
 
 /** \ingroup m_vm_management
@@ -43,7 +45,7 @@ void MSG_vm_set_params(msg_vm_t vm, vm_params_t params)
 /** \ingroup m_vm_management
  * \brief Get the parameters of a given host
  *
- * \param host a host
+ * \param vm the vm you are interested into
  * \param params a prameter object
  */
 void MSG_vm_get_params(msg_vm_t vm, vm_params_t params)
@@ -117,8 +119,8 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ramsize, int mig_net
   params.dp_cap = params.ramsize * 0.9; // assume working set memory is 90% of ramsize
   params.mig_speed = (double)mig_netspeed * 1024 * 1024; // mig_speed
 
-  //XBT_INFO("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f",params.dp_rate,
-  //         params.mig_speed, dp_intensity, update_speed, host_speed);
+  XBT_DEBUG("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f", params.dp_rate,
+            params.mig_speed, dp_intensity, update_speed, host_speed);
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->setParameters(&params);
 
   return vm;
@@ -288,11 +290,10 @@ static int migration_rx_fun(int argc, char *argv[])
   // This is clearly ugly but I (Adrien) need more time to do something cleaner (actually we should copy the whole ms
   // structure at the beginning and free it at the end of each function)
   simgrid::s4u::VirtualMachine* vm = static_cast<simgrid::s4u::VirtualMachine*>(ms->vm);
-  msg_host_t src_pm                = ms->src_pm;
   msg_host_t dst_pm                = ms->dst_pm;
 
   // Make sure that we cannot get interrupted between the migrate and the resume to not end in an inconsistent state
-  simgrid::simix::kernelImmediate([vm, src_pm, dst_pm]() {
+  simgrid::simix::kernelImmediate([vm, dst_pm]() {
     /* Update the vm location */
     /* precopy migration makes the VM temporally paused */
     xbt_assert(vm->pimpl_vm_->getState() == SURF_VM_STATE_SUSPENDED);