Merge branch 'master' into mc

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

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index a4d0401..7972de2 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -190,7 +190,7 @@ msg_vm_t MSG_vm_create(msg_host_t ind_pm, const char *name,
   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; // working set memory is 90%
+  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);
@@ -503,7 +503,7 @@ void MSG_host_add_task(msg_host_t host, msg_task_t task)
 {
   msg_host_priv_t priv = msg_host_resource_priv(host);
   double remaining = MSG_task_get_remaining_computation(task);
-  char *key = bprintf("%s-%lld", task->name, task->counter);
+  char *key = bprintf("%s-%p", task->name, task);
 
   dirty_page_t dp = xbt_new0(s_dirty_page, 1);
   dp->task = task;
@@ -525,7 +525,7 @@ void MSG_host_del_task(msg_host_t host, msg_task_t task)
 {
   msg_host_priv_t priv = msg_host_resource_priv(host);
 
-  char *key = bprintf("%s-%lld", task->name, task->counter);
+  char *key = bprintf("%s-%p", task->name, task);
 
   dirty_page_t dp = xbt_dict_get_or_null(priv->dp_objs, key);
   xbt_assert(dp->task == task);