X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79c2631ed5952cb7497574889f3ab78f1e4d8ebe..bd378fc5648e9c7a3b99ca26264d4904a5d187f5:/examples/msg/energy-vm/energy-vm.c diff --git a/examples/msg/energy-vm/energy-vm.c b/examples/msg/energy-vm/energy-vm.c index 68ca470078..c423c26f06 100644 --- a/examples/msg/energy-vm/energy-vm.c +++ b/examples/msg/energy-vm/energy-vm.c @@ -27,20 +27,20 @@ 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_host3 = MSG_vm_create(host3, "vm_host3", 1, 2048, 10, 50); - MSG_vm_start(vm_host3); + msg_vm_t vm_host2 = MSG_vm_create(host2, "vm_host3", 1, 2048, 10, 50); + MSG_vm_start(vm_host2); XBT_INFO("Create two tasks on Host1: one inside a VM, the other directly on the host"); MSG_process_create("p11", worker_func, NULL, vm_host1); - MSG_process_create("p12", worker_func, NULL, host1); + MSG_process_create("p12", worker_func, NULL, vm_host1); XBT_INFO("Create two tasks on Host2: both directly on the host"); - MSG_process_create("p21", worker_func, NULL, host2); + MSG_process_create("p21", worker_func, NULL, vm_host2); MSG_process_create("p22", worker_func, NULL, host2); XBT_INFO("Create two tasks on Host3: both inside a VM"); - MSG_process_create("p31", worker_func, NULL, vm_host3); - MSG_process_create("p32", worker_func, NULL, vm_host3); + MSG_process_create("p31", worker_func, NULL, host3); + MSG_process_create("p32", worker_func, NULL, host3); XBT_INFO("Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, " "so they run for 6 seconds)"); @@ -49,9 +49,9 @@ static int dvfs(int argc, char *argv[]) MSG_process_sleep(5); MSG_vm_shutdown(vm_host1); - MSG_vm_shutdown(vm_host3); + MSG_vm_shutdown(vm_host2); MSG_vm_destroy(vm_host1); - MSG_vm_destroy(vm_host3); + MSG_vm_destroy(vm_host2); return 0; } @@ -69,7 +69,9 @@ int main(int argc, char *argv[]) msg_error_t res = MSG_main(); - XBT_INFO("Total simulation time: %.2f; All hosts must have the exact same energy consumption.", MSG_get_clock()); + XBT_INFO("Total simulation time: %.2f; Host2 and Host3 must have the exact same energy consumption; Host1 is " + "multi-core and will differ.", + MSG_get_clock()); return res != MSG_OK; }