Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index 44bd5ca..c45ad9c 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -171,30 +171,32 @@ int MSG_vm_is_restoring(msg_vm_t vm)
  *  All parameters are in MBytes
  *
  */
-msg_vm_t MSG_vm_create(msg_host_t ind_pm, const char *name, int ncpus, int ramsize,
-                                            int net_cap, char *disk_path, int disksize,
-                                                int mig_netspeed, int dp_intensity)
+msg_vm_t MSG_vm_create(msg_host_t ind_pm, const char *name,
+                       int ncpus, int ramsize,
+                       int net_cap, char *disk_path, int disksize,
+                       int mig_netspeed, int dp_intensity)
 {
-       /* For the moment, intensity_rate is the percentage against the migration bandwidth */
-       double host_speed = MSG_get_host_speed(ind_pm);
-       double update_speed = ((double)dp_intensity/100) * mig_netspeed;
+  /* For the moment, intensity_rate is the percentage against the migration
+   * bandwidth */
+  double host_speed = MSG_get_host_speed(ind_pm);
+  double update_speed = ((double)dp_intensity/100) * mig_netspeed;
        
-       msg_vm_t vm = MSG_vm_create_core(ind_pm, name);
-       s_ws_params_t params;
-       memset(&params, 0, sizeof(params));
-       params.ramsize = 1L * 1024 * 1024 * ramsize;
-       //params.overcommit = 0;
-       params.devsize = 0;
-       params.skip_stage2 = 0;
-       params.max_downtime = 0.03;
-       params.dp_rate = (update_speed * 1L * 1024 * 1024 ) / host_speed; 
-       params.dp_cap = params.ramsize / 0.9; // working set memory is 90%
-       params.mig_speed = 1L * 1024 * 1024 * mig_netspeed; // 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);
-       simcall_host_set_params(vm, &params);
-
-       return vm;
+  msg_vm_t vm = MSG_vm_create_core(ind_pm, name);
+  s_ws_params_t params;
+  memset(&params, 0, sizeof(params));
+  params.ramsize = (sg_size_t)ramsize * 1024 * 1024;
+  //params.overcommit = 0;
+  params.devsize = 0;
+  params.skip_stage2 = 0;
+  params.max_downtime = 0.03;
+  params.dp_rate = (update_speed * 1024 * 1024) / host_speed;
+  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);
+  simcall_host_set_params(vm, &params);
+
+  return vm;
 }
 
 
@@ -924,7 +926,7 @@ static int migration_tx_fun(int argc, char *argv[])
   s_ws_params_t params;
   simcall_host_get_params(vm, &params);
   const sg_size_t ramsize   = params.ramsize;
-  const long devsize        = params.devsize;
+  const sg_size_t devsize   = params.devsize;
   const int skip_stage1     = params.skip_stage1;
   const int skip_stage2     = params.skip_stage2;
   const double dp_rate      = params.dp_rate;