From fb16f4c723e37838d8a7f216ad8616c139fc7f31 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 5 Dec 2017 09:28:33 +0100 Subject: [PATCH 1/1] fix another glitch --- examples/msg/energy-vm/energy-vm.c | 2 +- examples/msg/energy-vm/energy-vm.tesh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/msg/energy-vm/energy-vm.c b/examples/msg/energy-vm/energy-vm.c index 6afa6fabb3..1bdd14b87f 100644 --- a/examples/msg/energy-vm/energy-vm.c +++ b/examples/msg/energy-vm/energy-vm.c @@ -27,7 +27,7 @@ static int dvfs(int argc, char *argv[]) XBT_INFO("Creating and starting two VMs"); msg_vm_t vm_host1 = MSG_vm_create(host1, "vm_host1", 1, 2048, 10, 50); MSG_vm_start(vm_host1); - msg_vm_t vm_host2 = MSG_vm_create(host2, "vm_host3", 1, 2048, 10, 50); + msg_vm_t vm_host2 = MSG_vm_create(host2, "vm_host2", 1, 2048, 10, 50); MSG_vm_start(vm_host2); XBT_INFO("Create two tasks on Host1: both inside a VM"); diff --git a/examples/msg/energy-vm/energy-vm.tesh b/examples/msg/energy-vm/energy-vm.tesh index f6195e1210..47ba393355 100644 --- a/examples/msg/energy-vm/energy-vm.tesh +++ b/examples/msg/energy-vm/energy-vm.tesh @@ -14,7 +14,7 @@ $ ${bindir:=.}/energy-vm$EXEEXT ${platfdir}/energy_platform.xml "--log=root.fmt: > [ 6.000000] (6:p31@MyHost3) This worker is done. > [ 6.000000] (3:p12@vm_host1) This worker is done. > [ 6.000000] (2:p11@vm_host1) This worker is done. -> [ 6.000000] (4:p21@vm_host3) This worker is done. +> [ 6.000000] (4:p21@vm_host2) This worker is done. > [ 10.000000] (0:maestro@) Total energy consumption: 4320.000000 Joules (used hosts: 4320.000000 Joules; unused/idle hosts: 0.000000) > [ 10.000000] (0:maestro@) Total simulation time: 10.00; Host2 and Host3 must have the exact same energy consumption; Host1 is multi-core and will differ. > [ 10.000000] (0:maestro@) Energy consumption of host MyHost1: 1120.000000 Joules -- 2.20.1