X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c85e43e7cc3034aefc758257a387d32026c05ef4..87116782db3154fb79cd353db446bd226cf15976:/src/msg/msg_vm.c

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index e68d1dd22d..c4cb96d6ed 100644
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -164,21 +164,26 @@ int MSG_vm_is_restoring(msg_vm_t vm)
 
 /** @brief Create a new VM with specified parameters.
  *  @ingroup msg_VMs*
- *  All parameters are in MBytes
+ *  @param pm        Physical machine that will host the VM
+ *  @param net_cap   Maximal bandwidth that the VM can consume (in MByte/s)
+ *  @param disk_path (unused) Path to the image that boots
+ *  @param disksize  (unused) will represent the size of the VM (will be used during migrations)
+ *  @param mig_netspeed Amount of Mbyte/s allocated to the migration (cannot be larger than net_cap). Use 0 if unsure.
+ *  @param dp_intensity Dirty page percentage according to migNetSpeed, [0-100]. Use 0 if unsure.
  *
  */
-msg_vm_t MSG_vm_create(msg_host_t ind_pm, const char *name,
+msg_vm_t MSG_vm_create(msg_host_t 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 host_speed = MSG_get_host_speed(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;
+  msg_vm_t vm = MSG_vm_create_core(pm, name);
+  s_vm_params_t params;
   memset(&params, 0, sizeof(params));
   params.ramsize = (sg_size_t)ramsize * 1024 * 1024;
   //params.overcommit = 0;
@@ -354,7 +359,7 @@ static int migration_rx_fun(int argc, char *argv[])
   // The structure has been created in the do_migration function and should only be freed in the same place ;)
   struct migration_session *ms = MSG_process_get_data(MSG_process_self());
 
-  s_ws_params_t params;
+  s_vm_params_t params;
   simcall_host_get_params(ms->vm, &params);
 
   int need_exit = 0;
@@ -409,7 +414,7 @@ static int migration_rx_fun(int argc, char *argv[])
   /* install the affinity setting of the VM on the destination pm */
   {
 
-    unsigned long affinity_mask = (unsigned long) xbt_dict_get_or_null_ext(priv->affinity_mask_db, (char *)dst_pm, sizeof(msg_host_t));
+    unsigned long affinity_mask = (unsigned long)(uintptr_t) xbt_dict_get_or_null_ext(priv->affinity_mask_db, (char *)dst_pm, sizeof(msg_host_t));
     simcall_vm_set_affinity(vm, dst_pm, affinity_mask);
     XBT_DEBUG("set affinity(0x%04lx@%s) for %s", affinity_mask, MSG_host_get_name(dst_pm), MSG_host_get_name(vm));
   }
@@ -604,7 +609,7 @@ static sg_size_t send_migration_data(msg_vm_t vm, msg_host_t src_pm, msg_host_t
 {
   sg_size_t sent = 0;
   char *task_name = get_mig_task_name(vm, src_pm, dst_pm, stage);
-  msg_task_t task = MSG_task_create(task_name, 0, size, NULL);
+  msg_task_t task = MSG_task_create(task_name, 0, (double)size, NULL);
 
   /* TODO: clean up */
 
@@ -621,7 +626,7 @@ static sg_size_t send_migration_data(msg_vm_t vm, msg_host_t src_pm, msg_host_t
   if (ret == MSG_OK) {
     sent = size;
   } else if (ret == MSG_TIMEOUT) {
-    sg_size_t remaining = MSG_task_get_remaining_communication(task);
+    sg_size_t remaining = (sg_size_t)MSG_task_get_remaining_communication(task);
     sent = size - remaining;
     XBT_INFO("timeout (%lf s) in sending_migration_data, remaining %llu bytes of %llu",
         timeout, remaining, size);
@@ -699,7 +704,7 @@ static int migration_tx_fun(int argc, char *argv[])
   // Note that the ms structure has been allocated in do_migration and hence should be freed in the same function ;)
   struct migration_session *ms = MSG_process_get_data(MSG_process_self());
 
-  s_ws_params_t params;
+  s_vm_params_t params;
   simcall_host_get_params(ms->vm, &params);
   const sg_size_t ramsize   = params.ramsize;
   const sg_size_t devsize   = params.devsize;
@@ -714,7 +719,7 @@ static int migration_tx_fun(int argc, char *argv[])
 #define MIGRATION_TIMEOUT_DO_NOT_HARDCODE_ME 10000000.0
   double mig_timeout = MIGRATION_TIMEOUT_DO_NOT_HARDCODE_ME;
 
-  double remaining_size = ramsize + devsize;
+  double remaining_size = (double) (ramsize + devsize);
   double threshold = 0.0;
 
   /* check parameters */
@@ -851,7 +856,7 @@ stage3:
 
   TRY {
     XBT_DEBUG("Stage 3: Gonna send %f", remaining_size);
-    send_migration_data(ms->vm, ms->src_pm, ms->dst_pm, remaining_size, ms->mbox, 3, 0, mig_speed, -1);
+    send_migration_data(ms->vm, ms->src_pm, ms->dst_pm, (sg_size_t)remaining_size, ms->mbox, 3, 0, mig_speed, -1);
   } CATCH_ANONYMOUS {
     //hostfailure (if you want to know whether this is the SRC or the DST please check directly in send_migration_data code)
     // Stop the dirty page tracking an return (there is no memory space to release)
@@ -1115,7 +1120,7 @@ msg_host_t MSG_vm_get_pm(msg_vm_t vm)
  */
 void MSG_vm_set_bound(msg_vm_t vm, double bound)
 {
-  return simcall_vm_set_bound(vm, bound);
+  simcall_vm_set_bound(vm, bound);
 }
 
 
@@ -1132,7 +1137,7 @@ void MSG_vm_set_affinity(msg_vm_t vm, msg_host_t pm, unsigned long mask)
   if (mask == 0)
     xbt_dict_remove_ext(priv->affinity_mask_db, (char *) pm, sizeof(pm));
   else
-    xbt_dict_set_ext(priv->affinity_mask_db, (char *) pm, sizeof(pm), (void *) mask, NULL);
+    xbt_dict_set_ext(priv->affinity_mask_db, (char *) pm, sizeof(pm), (void *)(uintptr_t) mask, NULL);
 
   msg_host_t pm_now = MSG_vm_get_pm(vm);
   if (pm_now == pm) {