From 53dcf8b54a048f0857300817356ccd8156c8e735 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 3 Aug 2016 14:13:06 +0200 Subject: [PATCH] catch some dumb "nested code block" --- examples/msg/cloud-capping/cloud-capping.c | 33 +++++++++---------- examples/msg/cloud-simple/cloud-simple.c | 16 ++++----- .../msg/host_on_off_recv/host_on_off_recv.c | 7 ++-- 3 files changed, 24 insertions(+), 32 deletions(-) diff --git a/examples/msg/cloud-capping/cloud-capping.c b/examples/msg/cloud-capping/cloud-capping.c index bf6bff6746..dcfcc7208d 100644 --- a/examples/msg/cloud-capping/cloud-capping.c +++ b/examples/msg/cloud-capping/cloud-capping.c @@ -60,7 +60,6 @@ static int worker_busy_loop_main(int argc, char *argv[]) return 0; } -/* FIXME: */ #define DOUBLE_MAX 1e11 static void test_dynamic_change(void) @@ -80,28 +79,26 @@ static void test_dynamic_change(void) double task0_remain_prev = MSG_task_get_flops_amount(task0); double task1_remain_prev = MSG_task_get_flops_amount(task1); - { - const double cpu_speed = MSG_host_get_speed(pm0); - int i = 0; - for (i = 0; i < 10; i++) { - double new_bound = (cpu_speed / 10) * i; - XBT_INFO("set bound of VM1 to %f", new_bound); - MSG_vm_set_bound(vm1, new_bound); - MSG_process_sleep(100); + const double cpu_speed = MSG_host_get_speed(pm0); + for (int i = 0; i < 10; i++) { + double new_bound = (cpu_speed / 10) * i; + XBT_INFO("set bound of VM1 to %f", new_bound); + MSG_vm_set_bound(vm1, new_bound); + MSG_process_sleep(100); - double task0_remain_now = MSG_task_get_flops_amount(task0); - double task1_remain_now = MSG_task_get_flops_amount(task1); + double task0_remain_now = MSG_task_get_flops_amount(task0); + double task1_remain_now = MSG_task_get_flops_amount(task1); - double task0_flops_per_sec = task0_remain_prev - task0_remain_now; - double task1_flops_per_sec = task1_remain_prev - task1_remain_now; + double task0_flops_per_sec = task0_remain_prev - task0_remain_now; + double task1_flops_per_sec = task1_remain_prev - task1_remain_now; - XBT_INFO("Task0@VM0: %f flops/s", task0_flops_per_sec / 100); - XBT_INFO("Task1@VM1: %f flops/s", task1_flops_per_sec / 100); + XBT_INFO("Task0@VM0: %f flops/s", task0_flops_per_sec / 100); + XBT_INFO("Task1@VM1: %f flops/s", task1_flops_per_sec / 100); - task0_remain_prev = task0_remain_now; - task1_remain_prev = task1_remain_now; - } + task0_remain_prev = task0_remain_now; + task1_remain_prev = task1_remain_now; } + MSG_process_sleep(2000); // let the tasks end MSG_vm_destroy(vm0); diff --git a/examples/msg/cloud-simple/cloud-simple.c b/examples/msg/cloud-simple/cloud-simple.c index 9be4c049c7..3af0a8c8c1 100644 --- a/examples/msg/cloud-simple/cloud-simple.c +++ b/examples/msg/cloud-simple/cloud-simple.c @@ -112,7 +112,6 @@ static int master_main(int argc, char *argv[]) msg_host_t pm0 = MSG_host_by_name("Fafard"); msg_host_t pm1 = MSG_host_by_name("Tremblay"); msg_host_t pm2 = MSG_host_by_name("Bourassa"); - msg_vm_t vm0, vm1; XBT_INFO("## Test 1 (started): check computation on normal PMs"); @@ -135,7 +134,7 @@ static int master_main(int argc, char *argv[]) XBT_INFO("## Test 2 (started): check impact of running a task inside a VM (there is no degradation for the moment)"); XBT_INFO("### Put a VM on a PM, and put a task to the VM"); - vm0 = MSG_vm_create_core(pm0, "VM0"); + msg_vm_t vm0 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); launch_computation_worker(vm0); MSG_process_sleep(2); @@ -159,7 +158,7 @@ static int master_main(int argc, char *argv[]) XBT_INFO("### Put two VMs on a PM, and put a task to each VM"); vm0 = MSG_vm_create_core(pm0, "VM0"); - vm1 = MSG_vm_create_core(pm0, "VM1"); + msg_vm_t vm1 = MSG_vm_create_core(pm0, "VM1"); MSG_vm_start(vm0); MSG_vm_start(vm1); launch_computation_worker(vm0); @@ -237,12 +236,11 @@ static int master_main(int argc, char *argv[]) " network one"); XBT_INFO("### Relocate VM0 between PM0 and PM1"); vm0 = MSG_vm_create_core(pm0, "VM0"); - { - s_vm_params_t params; - memset(¶ms, 0, sizeof(params)); - params.ramsize = 1L * 1024 * 1024 * 1024; // 1Gbytes - MSG_host_set_params(vm0, ¶ms); - } + s_vm_params_t params; + memset(¶ms, 0, sizeof(params)); + params.ramsize = 1L * 1024 * 1024 * 1024; // 1Gbytes + MSG_host_set_params(vm0, ¶ms); + MSG_vm_start(vm0); launch_communication_worker(vm0, pm2); MSG_process_sleep(0.01); diff --git a/teshsuite/msg/host_on_off_recv/host_on_off_recv.c b/teshsuite/msg/host_on_off_recv/host_on_off_recv.c index 4d27e38e5d..a170bd1d07 100644 --- a/teshsuite/msg/host_on_off_recv/host_on_off_recv.c +++ b/teshsuite/msg/host_on_off_recv/host_on_off_recv.c @@ -17,11 +17,8 @@ static int master(int argc, char *argv[]) XBT_INFO("Master starting"); MSG_process_sleep(0.5); - msg_comm_t comm = NULL; - { - msg_task_t task = MSG_task_create("COMM", 0, 100000000, NULL); - comm = MSG_task_isend(task, mailbox); - } + msg_task_t task = MSG_task_create("COMM", 0, 100000000, NULL); + msg_comm_t comm = MSG_task_isend(task, mailbox); MSG_process_sleep(0.5); -- 2.20.1