From: Frederic Suter Date: Tue, 11 Jul 2017 09:58:58 +0000 (+0200) Subject: crappy fix of cloud examples that mix host and VMs X-Git-Tag: v3_17~416^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/57e13ab95885f11dae52bfc84d269a2314db06e8 crappy fix of cloud examples that mix host and VMs --- diff --git a/examples/msg/cloud-capping/cloud-capping.c b/examples/msg/cloud-capping/cloud-capping.c index 5ecfd7bdb4..73b3edaf1e 100644 --- a/examples/msg/cloud-capping/cloud-capping.c +++ b/examples/msg/cloud-capping/cloud-capping.c @@ -66,15 +66,15 @@ static void test_dynamic_change(void) { msg_host_t pm0 = MSG_host_by_name("Fafard"); - msg_host_t vm0 = MSG_vm_create_core(pm0, "VM0"); - msg_host_t vm1 = MSG_vm_create_core(pm0, "VM1"); + msg_vm_t vm0 = MSG_vm_create_core(pm0, "VM0"); + msg_vm_t vm1 = MSG_vm_create_core(pm0, "VM1"); MSG_vm_start(vm0); MSG_vm_start(vm1); msg_task_t task0 = MSG_task_create("Task0", DOUBLE_MAX, 0, NULL); msg_task_t task1 = MSG_task_create("Task1", DOUBLE_MAX, 0, NULL); - MSG_process_create("worker0", worker_busy_loop_main, &task0, vm0); - MSG_process_create("worker1", worker_busy_loop_main, &task1, vm1); + MSG_process_create("worker0", worker_busy_loop_main, &task0, (msg_host_t)vm0); + MSG_process_create("worker1", worker_busy_loop_main, &task1, (msg_host_t)vm1); double task0_remain_prev = MSG_task_get_flops_amount(task0); double task1_remain_prev = MSG_task_get_flops_amount(task1); @@ -203,15 +203,15 @@ static int master_main(int argc, char *argv[]) test_two_tasks(pm0, pm0); XBT_INFO(" "); - msg_host_t vm0 = MSG_vm_create_core(pm0, "VM0"); + msg_vm_t vm0 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); XBT_INFO("# 3. Put a single task on a VM. "); - test_one_task(vm0); + test_one_task((msg_host_t)vm0); XBT_INFO(" "); XBT_INFO("# 4. Put two tasks on a VM."); - test_two_tasks(vm0, vm0); + test_two_tasks((msg_host_t)vm0, (msg_host_t)vm0); XBT_INFO(" "); MSG_vm_destroy(vm0); @@ -220,7 +220,7 @@ static int master_main(int argc, char *argv[]) MSG_vm_start(vm0); XBT_INFO("# 6. Put a task on a PM and a task on a VM."); - test_two_tasks(pm0, vm0); + test_two_tasks(pm0, (msg_host_t)vm0); XBT_INFO(" "); MSG_vm_destroy(vm0); @@ -231,15 +231,15 @@ static int master_main(int argc, char *argv[]) MSG_vm_start(vm0); XBT_INFO("# 7. Put a single task on the VM capped by 10%%."); - test_one_task(vm0); + test_one_task((msg_host_t)vm0); XBT_INFO(" "); XBT_INFO("# 8. Put two tasks on the VM capped by 10%%."); - test_two_tasks(vm0, vm0); + test_two_tasks((msg_host_t)vm0, (msg_host_t)vm0); XBT_INFO(" "); XBT_INFO("# 9. Put a task on a PM and a task on the VM capped by 10%%."); - test_two_tasks(pm0, vm0); + test_two_tasks(pm0, (msg_host_t)vm0); XBT_INFO(" "); MSG_vm_destroy(vm0); @@ -259,13 +259,13 @@ static int master_main(int argc, char *argv[]) const double computation_amount = cpu_speed * 10; XBT_INFO("# 10. (a) Put a task on a VM without any bound."); - launch_worker(vm0, "worker0", computation_amount, 0, 0); + launch_worker((msg_host_t)vm0, "worker0", computation_amount, 0, 0); MSG_process_sleep(1000); XBT_INFO(" "); XBT_INFO("# 10. (b) set 10%% bound to the VM, and then put a task on the VM."); MSG_vm_set_bound(vm0, cpu_speed / 10); - launch_worker(vm0, "worker0", computation_amount, 0, 0); + launch_worker((msg_host_t)vm0, "worker0", computation_amount, 0, 0); MSG_process_sleep(1000); XBT_INFO(" "); @@ -274,7 +274,7 @@ static int master_main(int argc, char *argv[]) XBT_INFO(" "); XBT_INFO("# 10. (d) Put a task again on the VM."); - launch_worker(vm0, "worker0", computation_amount, 0, 0); + launch_worker((msg_host_t)vm0, "worker0", computation_amount, 0, 0); MSG_process_sleep(1000); XBT_INFO(" "); diff --git a/examples/msg/cloud-masterworker/cloud-masterworker.c b/examples/msg/cloud-masterworker/cloud-masterworker.c index 41fa98969a..17242ba56d 100644 --- a/examples/msg/cloud-masterworker/cloud-masterworker.c +++ b/examples/msg/cloud-masterworker/cloud-masterworker.c @@ -92,7 +92,7 @@ static int master_fun(int argc, char *argv[]) xbt_dynar_push(vms, &vm); XBT_INFO("put a process (%s) on %s", pr_name, vm_name); - MSG_process_create(pr_name, worker_fun, NULL, vm); + MSG_process_create(pr_name, worker_fun, NULL, (msg_host_t)vm); xbt_free(vm_name); xbt_free(pr_name); @@ -104,7 +104,7 @@ static int master_fun(int argc, char *argv[]) XBT_INFO("# Suspend all VMs"); xbt_dynar_foreach(vms, i, vm) { - XBT_INFO("suspend %s", MSG_host_get_name(vm)); + XBT_INFO("suspend %s", MSG_vm_get_name(vm)); MSG_vm_suspend(vm); } @@ -126,7 +126,7 @@ static int master_fun(int argc, char *argv[]) char *pr_name = bprintf("WRK%02d", index); XBT_INFO("put a process (%s) on %s", pr_name, vm_name); - MSG_process_create(pr_name, worker_fun, NULL, vm); + MSG_process_create(pr_name, worker_fun, NULL, (msg_host_t)vm); xbt_free(vm_name); xbt_free(pr_name); @@ -161,9 +161,9 @@ static int master_fun(int argc, char *argv[]) XBT_INFO("# Shutdown and destroy all the VMs. The remaining worker processes will be forcibly killed."); xbt_dynar_foreach(vms, i, vm) { - XBT_INFO("shutdown %s", MSG_host_get_name(vm)); + XBT_INFO("shutdown %s", MSG_vm_get_name(vm)); MSG_vm_shutdown(vm); - XBT_INFO("destroy %s", MSG_host_get_name(vm)); + XBT_INFO("destroy %s", MSG_vm_get_name(vm)); MSG_vm_destroy(vm); } diff --git a/examples/msg/cloud-migration/cloud-migration.c b/examples/msg/cloud-migration/cloud-migration.c index 32265f50ca..29b10c9794 100644 --- a/examples/msg/cloud-migration/cloud-migration.c +++ b/examples/msg/cloud-migration/cloud-migration.c @@ -26,7 +26,7 @@ static int migration_worker_main(int argc, char *argv[]) char *vm_name = argv[1]; char *dst_pm_name = argv[2]; - msg_vm_t vm = MSG_host_by_name(vm_name); + msg_vm_t vm = (msg_vm_t)MSG_host_by_name(vm_name); msg_host_t dst_pm = MSG_host_by_name(dst_pm_name); vm_migrate(vm, dst_pm); diff --git a/examples/msg/cloud-simple/cloud-simple.c b/examples/msg/cloud-simple/cloud-simple.c index 6f9d25d231..76dbf948de 100644 --- a/examples/msg/cloud-simple/cloud-simple.c +++ b/examples/msg/cloud-simple/cloud-simple.c @@ -134,7 +134,7 @@ static int master_main(int argc, char *argv[]) XBT_INFO("### Put a VM on a PM, and put a task to the VM"); msg_vm_t vm0 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); - launch_computation_worker(vm0); + launch_computation_worker((msg_host_t)vm0); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -159,8 +159,8 @@ static int master_main(int argc, char *argv[]) msg_vm_t vm1 = MSG_vm_create_core(pm0, "VM1"); MSG_vm_start(vm0); MSG_vm_start(vm1); - launch_computation_worker(vm0); - launch_computation_worker(vm1); + launch_computation_worker((msg_host_t)vm0); + launch_computation_worker((msg_host_t)vm1); MSG_process_sleep(2); MSG_vm_destroy(vm0); MSG_vm_destroy(vm1); @@ -170,8 +170,8 @@ static int master_main(int argc, char *argv[]) vm1 = MSG_vm_create_core(pm1, "VM1"); MSG_vm_start(vm0); MSG_vm_start(vm1); - launch_computation_worker(vm0); - launch_computation_worker(vm1); + launch_computation_worker((msg_host_t)vm0); + launch_computation_worker((msg_host_t)vm1); MSG_process_sleep(2); MSG_vm_destroy(vm0); MSG_vm_destroy(vm1); @@ -190,29 +190,29 @@ static int master_main(int argc, char *argv[]) XBT_INFO("### Make a connection between PM0 and VM0@PM0"); vm0 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); - launch_communication_worker(pm0, vm0); + launch_communication_worker(pm0, (msg_host_t)vm0); MSG_process_sleep(5); MSG_vm_destroy(vm0); XBT_INFO("### Make a connection between PM0 and VM0@PM1"); vm0 = MSG_vm_create_core(pm1, "VM0"); MSG_vm_start(vm0); - launch_communication_worker(pm0, vm0); + launch_communication_worker(pm0, (msg_host_t)vm0); MSG_process_sleep(5); MSG_vm_destroy(vm0); XBT_INFO("### Make two connections between PM0 and VM0@PM1"); vm0 = MSG_vm_create_core(pm1, "VM0"); MSG_vm_start(vm0); - launch_communication_worker(pm0, vm0); - launch_communication_worker(pm0, vm0); + launch_communication_worker(pm0, (msg_host_t)vm0); + launch_communication_worker(pm0, (msg_host_t)vm0); MSG_process_sleep(5); MSG_vm_destroy(vm0); XBT_INFO("### Make a connection between PM0 and VM0@PM1, and also make a connection between PM0 and PM1"); vm0 = MSG_vm_create_core(pm1, "VM0"); MSG_vm_start(vm0); - launch_communication_worker(pm0, vm0); + launch_communication_worker(pm0, (msg_host_t)vm0); launch_communication_worker(pm0, pm1); MSG_process_sleep(5); MSG_vm_destroy(vm0); @@ -222,8 +222,8 @@ static int master_main(int argc, char *argv[]) vm1 = MSG_vm_create_core(pm1, "VM1"); MSG_vm_start(vm0); MSG_vm_start(vm1); - launch_communication_worker(vm0, vm1); - launch_communication_worker(vm0, vm1); + launch_communication_worker((msg_host_t)vm0, (msg_host_t)vm1); + launch_communication_worker((msg_host_t)vm0, (msg_host_t)vm1); MSG_process_sleep(5); MSG_vm_destroy(vm0); MSG_vm_destroy(vm1); @@ -240,7 +240,7 @@ static int master_main(int argc, char *argv[]) MSG_vm_set_params(vm0, ¶ms); MSG_vm_start(vm0); - launch_communication_worker(vm0, pm2); + launch_communication_worker((msg_host_t)vm0, pm2); MSG_process_sleep(0.01); MSG_vm_migrate(vm0, pm1); MSG_process_sleep(0.01); diff --git a/examples/msg/cloud-two-tasks/cloud-two-tasks.c b/examples/msg/cloud-two-tasks/cloud-two-tasks.c index 6ba0ebec62..e8b2d0bb50 100644 --- a/examples/msg/cloud-two-tasks/cloud-two-tasks.c +++ b/examples/msg/cloud-two-tasks/cloud-two-tasks.c @@ -59,7 +59,7 @@ static int master_main(int argc, char *argv[]) msg_vm_t vm0 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); - launch_computation_worker(vm0); + launch_computation_worker((msg_host_t)vm0); while(MSG_get_clock()<100) { if (atask != NULL) diff --git a/examples/msg/energy-vm/energy-vm.c b/examples/msg/energy-vm/energy-vm.c index c423c26f06..9b3a0020a8 100644 --- a/examples/msg/energy-vm/energy-vm.c +++ b/examples/msg/energy-vm/energy-vm.c @@ -31,11 +31,11 @@ static int dvfs(int argc, char *argv[]) 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, vm_host1); + MSG_process_create("p11", worker_func, NULL, (msg_host_t)vm_host1); + MSG_process_create("p12", worker_func, NULL, (msg_host_t)vm_host1); XBT_INFO("Create two tasks on Host2: both directly on the host"); - MSG_process_create("p21", worker_func, NULL, vm_host2); + MSG_process_create("p21", worker_func, NULL, (msg_host_t)vm_host2); MSG_process_create("p22", worker_func, NULL, host2); XBT_INFO("Create two tasks on Host3: both inside a VM"); diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index f1d0abb1b2..3991f2b93c 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -471,8 +471,7 @@ XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t vm); XBT_PUBLIC(int) MSG_vm_is_migrating(msg_vm_t vm); XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t vm); -#define MSG_vm_get_name(vm) MSG_host_get_name(vm) - +XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t vm); XBT_PUBLIC(void) MSG_vm_get_params(msg_vm_t vm, vm_params_t params); XBT_PUBLIC(void) MSG_vm_set_params(msg_vm_t vm, vm_params_t params); diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index 8772432cc8..79ebf4ed18 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -32,6 +32,10 @@ typedef struct dirty_page* dirty_page_t; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API"); /* **** ******** GENERAL ********* **** */ +const char* MSG_vm_get_name(msg_vm_t vm) +{ + return vm->getCname(); +} /** \ingroup m_vm_management * \brief Set the parameters of a given host diff --git a/teshsuite/msg/cloud-sharing/cloud-sharing.c b/teshsuite/msg/cloud-sharing/cloud-sharing.c index 0a0c0434d1..31242e0e9c 100644 --- a/teshsuite/msg/cloud-sharing/cloud-sharing.c +++ b/teshsuite/msg/cloud-sharing/cloud-sharing.c @@ -51,7 +51,7 @@ static void run_test(const char* chooser) msg_host_t pm2 = MSG_host_by_name("node-0.2cores.org"); // 2 cores msg_host_t pm4 = MSG_host_by_name("node-0.4cores.org"); - msg_host_t vm0; + msg_vm_t vm0; xbt_assert(pm0, "Host node-0.1core.org does not seem to exist"); xbt_assert(pm2, "Host node-0.2cores.org does not seem to exist"); xbt_assert(pm4, "Host node-0.4cores.org does not seem to exist"); @@ -83,7 +83,7 @@ static void run_test(const char* chooser) XBT_INFO("### Test '%s'. A task in a VM on a PM.", chooser); vm0 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); - run_test_process("( [X]1 )1", vm0, flop_amount); + run_test_process("( [X]1 )1", (msg_host_t)vm0, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -91,8 +91,8 @@ static void run_test(const char* chooser) XBT_INFO("### Test '%s'. 2 tasks co-located in a VM on a PM.", chooser); vm0 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); - run_test_process("( [Xo]1 )1", vm0, flop_amount / 2); - run_test_process("( [oX]1 )1", vm0, flop_amount / 2); + run_test_process("( [Xo]1 )1", (msg_host_t)vm0, flop_amount / 2); + run_test_process("( [oX]1 )1", (msg_host_t)vm0, flop_amount / 2); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -108,7 +108,7 @@ static void run_test(const char* chooser) XBT_INFO("### Test '%s'. A task in a VM, plus a task", chooser); vm0 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); - run_test_process("( [X]1 o )1", vm0, flop_amount / 2); + run_test_process("( [X]1 o )1", (msg_host_t)vm0, flop_amount / 2); run_test_process("( [o]1 X )1", pm0, flop_amount / 2); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -117,8 +117,8 @@ static void run_test(const char* chooser) XBT_INFO("### Test '%s'. 2 tasks in a VM, plus a task", chooser); vm0 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); - run_test_process("( [Xo]1 o )1", vm0, flop_amount / 4); - run_test_process("( [oX]1 o )1", vm0, flop_amount / 4); + run_test_process("( [Xo]1 o )1", (msg_host_t)vm0, flop_amount / 4); + run_test_process("( [oX]1 o )1", (msg_host_t)vm0, flop_amount / 4); run_test_process("( [oo]1 X )1", pm0, flop_amount / 2); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -145,7 +145,7 @@ static void run_test(const char* chooser) XBT_INFO("### Test '%s'. A task in a VM on a bicore PM", chooser); vm0 = MSG_vm_create_core(pm2, "VM0"); MSG_vm_start(vm0); - run_test_process("( [X]1 )2", vm0, flop_amount); + run_test_process("( [X]1 )2", (msg_host_t)vm0, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -153,8 +153,8 @@ static void run_test(const char* chooser) XBT_INFO("### Test '%s'. 2 tasks in a VM on a bicore PM", chooser); vm0 = MSG_vm_create_core(pm2, "VM0"); MSG_vm_start(vm0); - run_test_process("( [Xx]1 )2", vm0, flop_amount / 2); - run_test_process("( [xX]1 )2", vm0, flop_amount / 2); + run_test_process("( [Xx]1 )2", (msg_host_t)vm0, flop_amount / 2); + run_test_process("( [xX]1 )2", (msg_host_t)vm0, flop_amount / 2); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -170,7 +170,7 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, put a task to the PM and a task to the VM"); vm0 = MSG_vm_create_core(pm2, "VM0"); MSG_vm_start(vm0); - run_test_process("( [X]1 x )2", vm0, flop_amount); + run_test_process("( [X]1 x )2", (msg_host_t)vm0, flop_amount); run_test_process("( [x]1 X )2", pm2, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -181,7 +181,7 @@ static void run_test(const char* chooser) msg_vm_t vm1 = MSG_vm_create_core(pm2, "VM1"); MSG_vm_start(vm0); MSG_vm_start(vm1); - run_test_process("( [X]1 [ ]1 )2", vm0, flop_amount); + run_test_process("( [X]1 [ ]1 )2", (msg_host_t)vm0, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); MSG_vm_destroy(vm1); @@ -192,8 +192,8 @@ static void run_test(const char* chooser) msg_vm_t vm1 = MSG_vm_create_core(pm2, "VM1"); MSG_vm_start(vm0); MSG_vm_start(vm1); - run_test_process("( [X]1 [x]1 )2", vm0, flop_amount); - run_test_process("( [x]1 [X]1 )2", vm1, flop_amount); + run_test_process("( [X]1 [x]1 )2", (msg_host_t)vm0, flop_amount); + run_test_process("( [x]1 [X]1 )2", (msg_host_t)vm1, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); MSG_vm_destroy(vm1); @@ -206,8 +206,8 @@ static void run_test(const char* chooser) MSG_vm_start(vm0); MSG_vm_start(vm1); MSG_vm_start(vm2); - run_test_process("( [X]1 [x]1 [ ]1 )2", vm0, flop_amount); - run_test_process("( [x]1 [X]1 [ ]1 )2", vm1, flop_amount); + run_test_process("( [X]1 [x]1 [ ]1 )2", (msg_host_t)vm0, flop_amount); + run_test_process("( [x]1 [X]1 [ ]1 )2", (msg_host_t)vm1, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); MSG_vm_destroy(vm1); @@ -221,9 +221,9 @@ static void run_test(const char* chooser) MSG_vm_start(vm0); MSG_vm_start(vm1); MSG_vm_start(vm2); - run_test_process("( [X]1 [o]1 [o]1 )2", vm0, flop_amount * 2 / 3); - run_test_process("( [o]1 [X]1 [o]1 )2", vm1, flop_amount * 2 / 3); - run_test_process("( [o]1 [o]1 [X]1 )2", vm2, flop_amount * 2 / 3); + run_test_process("( [X]1 [o]1 [o]1 )2", (msg_host_t)vm0, flop_amount * 2 / 3); + run_test_process("( [o]1 [X]1 [o]1 )2", (msg_host_t)vm1, flop_amount * 2 / 3); + run_test_process("( [o]1 [o]1 [X]1 )2", (msg_host_t)vm2, flop_amount * 2 / 3); MSG_process_sleep(2); MSG_vm_destroy(vm0); MSG_vm_destroy(vm1); @@ -233,7 +233,7 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put a task to the VM"); vm0 = MSG_vm_create_multicore(pm2, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [X]2 )2", vm0, flop_amount); + run_test_process("( [X]2 )2", (msg_host_t)vm0, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -241,8 +241,8 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put two tasks to the VM"); vm0 = MSG_vm_create_multicore(pm2, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [Xo]2 )2", vm0, flop_amount); - run_test_process("( [oX]2 )2", vm0, flop_amount); + run_test_process("( [Xo]2 )2", (msg_host_t)vm0, flop_amount); + run_test_process("( [oX]2 )2", (msg_host_t)vm0, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -250,9 +250,9 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put three tasks to the VM"); vm0 = MSG_vm_create_multicore(pm2, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [Xoo]2 )2", vm0, flop_amount * 2 / 3); - run_test_process("( [oXo]2 )2", vm0, flop_amount * 2 / 3); - run_test_process("( [ooX]2 )2", vm0, flop_amount * 2 / 3); + run_test_process("( [Xoo]2 )2", (msg_host_t)vm0, flop_amount * 2 / 3); + run_test_process("( [oXo]2 )2", (msg_host_t)vm0, flop_amount * 2 / 3); + run_test_process("( [ooX]2 )2", (msg_host_t)vm0, flop_amount * 2 / 3); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -269,7 +269,7 @@ static void run_test(const char* chooser) vm0 = MSG_vm_create_multicore(pm2, "VM0", 2); MSG_vm_start(vm0); run_test_process("( [o]2 X )2", pm2, flop_amount); - run_test_process("( [X]2 o )2", vm0, flop_amount); + run_test_process("( [X]2 o )2", (msg_host_t)vm0, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -278,8 +278,8 @@ static void run_test(const char* chooser) vm0 = MSG_vm_create_multicore(pm2, "VM0", 2); MSG_vm_start(vm0); run_test_process("( [oo]2 X )2", pm2, flop_amount * 2 / 3); - run_test_process("( [Xo]2 o )2", vm0, flop_amount * 2 / 3); - run_test_process("( [oX]2 o )2", vm0, flop_amount * 2 / 3); + run_test_process("( [Xo]2 o )2", (msg_host_t)vm0, flop_amount * 2 / 3); + run_test_process("( [oX]2 o )2", (msg_host_t)vm0, flop_amount * 2 / 3); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -288,9 +288,9 @@ static void run_test(const char* chooser) vm0 = MSG_vm_create_multicore(pm2, "VM0", 2); MSG_vm_start(vm0); run_test_process("( [ooo]2 X )2", pm2, flop_amount * 2 / 3); - run_test_process("( [Xoo]2 o )2", vm0, flop_amount * (2. / 3 * 2) / 3); // VM_share/3 - run_test_process("( [oXo]2 o )2", vm0, flop_amount * (2. / 3 * 2) / 3); // VM_share/3 - run_test_process("( [ooX]2 o )2", vm0, flop_amount * (2. / 3 * 2) / 3); // VM_share/3 + run_test_process("( [Xoo]2 o )2", (msg_host_t)vm0, flop_amount * (2. / 3 * 2) / 3); // VM_share/3 + run_test_process("( [oXo]2 o )2", (msg_host_t)vm0, flop_amount * (2. / 3 * 2) / 3); // VM_share/3 + run_test_process("( [ooX]2 o )2", (msg_host_t)vm0, flop_amount * (2. / 3 * 2) / 3); // VM_share/3 MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -309,7 +309,7 @@ static void run_test(const char* chooser) MSG_vm_start(vm0); run_test_process("( [o]2 Xo )2", pm2, flop_amount * 2 / 3); run_test_process("( [o]2 oX )2", pm2, flop_amount * 2 / 3); - run_test_process("( [X]2 oo )2", vm0, flop_amount * 2 / 3); + run_test_process("( [X]2 oo )2", (msg_host_t)vm0, flop_amount * 2 / 3); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -319,8 +319,8 @@ static void run_test(const char* chooser) MSG_vm_start(vm0); run_test_process("( [oo]2 Xo )2", pm2, flop_amount / 2); run_test_process("( [oo]2 oX )2", pm2, flop_amount / 2); - run_test_process("( [Xo]2 oo )2", vm0, flop_amount / 2); - run_test_process("( [oX]2 oo )2", vm0, flop_amount / 2); + run_test_process("( [Xo]2 oo )2", (msg_host_t)vm0, flop_amount / 2); + run_test_process("( [oX]2 oo )2", (msg_host_t)vm0, flop_amount / 2); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -330,9 +330,9 @@ static void run_test(const char* chooser) MSG_vm_start(vm0); run_test_process("( [ooo]2 Xo )2", pm2, flop_amount * 2 / 4); run_test_process("( [ooo]2 oX )2", pm2, flop_amount * 2 / 4); - run_test_process("( [Xoo]2 oo )2", vm0, flop_amount / 3); - run_test_process("( [oXo]2 oo )2", vm0, flop_amount / 3); - run_test_process("( [ooX]2 oo )2", vm0, flop_amount / 3); + run_test_process("( [Xoo]2 oo )2", (msg_host_t)vm0, flop_amount / 3); + run_test_process("( [oXo]2 oo )2", (msg_host_t)vm0, flop_amount / 3); + run_test_process("( [ooX]2 oo )2", (msg_host_t)vm0, flop_amount / 3); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -340,7 +340,7 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put a task to the VM"); vm0 = MSG_vm_create_multicore(pm4, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [X]2 )4", vm0, flop_amount); + run_test_process("( [X]2 )4", (msg_host_t)vm0, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -348,8 +348,8 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put two tasks to the VM"); vm0 = MSG_vm_create_multicore(pm4, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [Xo]2 )4", vm0, flop_amount); - run_test_process("( [oX]2 )4", vm0, flop_amount); + run_test_process("( [Xo]2 )4", (msg_host_t)vm0, flop_amount); + run_test_process("( [oX]2 )4", (msg_host_t)vm0, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -357,9 +357,9 @@ static void run_test(const char* chooser) XBT_INFO("### ( [ooo]2 )4: Put a VM on a PM, and put three tasks to the VM"); vm0 = MSG_vm_create_multicore(pm4, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [Xoo]2 )4", vm0, flop_amount * 2 / 3); - run_test_process("( [oXo]2 )4", vm0, flop_amount * 2 / 3); - run_test_process("( [ooX]2 )4", vm0, flop_amount * 2 / 3); + run_test_process("( [Xoo]2 )4", (msg_host_t)vm0, flop_amount * 2 / 3); + run_test_process("( [oXo]2 )4", (msg_host_t)vm0, flop_amount * 2 / 3); + run_test_process("( [ooX]2 )4", (msg_host_t)vm0, flop_amount * 2 / 3); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -405,7 +405,7 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put one task to the PM and one task to the VM"); vm0 = MSG_vm_create_multicore(pm4, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [X]2 o )4", vm0, flop_amount); + run_test_process("( [X]2 o )4", (msg_host_t)vm0, flop_amount); run_test_process("( [o]2 X )4", pm4, flop_amount); MSG_process_sleep(2); MSG_vm_destroy(vm0); @@ -414,7 +414,7 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put two tasks to the PM and one task to the VM"); vm0 = MSG_vm_create_multicore(pm4, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [X]2 oo )4", vm0, flop_amount); + run_test_process("( [X]2 oo )4", (msg_host_t)vm0, flop_amount); run_test_process("( [o]2 Xo )4", pm4, flop_amount); run_test_process("( [o]2 oX )4", pm4, flop_amount); MSG_process_sleep(2); @@ -424,8 +424,8 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put two tasks to the PM and two tasks to the VM"); vm0 = MSG_vm_create_multicore(pm4, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [Xo]2 oo )4", vm0, flop_amount); - run_test_process("( [oX]2 oo )4", vm0, flop_amount); + run_test_process("( [Xo]2 oo )4", (msg_host_t)vm0, flop_amount); + run_test_process("( [oX]2 oo )4", (msg_host_t)vm0, flop_amount); run_test_process("( [oo]2 Xo )4", pm4, flop_amount); run_test_process("( [oo]2 oX )4", pm4, flop_amount); MSG_process_sleep(2); @@ -435,7 +435,7 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put three tasks to the PM and one tasks to the VM"); vm0 = MSG_vm_create_multicore(pm4, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [X]2 ooo )4", vm0, flop_amount); + run_test_process("( [X]2 ooo )4", (msg_host_t)vm0, flop_amount); run_test_process("( [o]2 Xoo )4", pm4, flop_amount); run_test_process("( [o]2 oXo )4", pm4, flop_amount); run_test_process("( [o]2 ooX )4", pm4, flop_amount); @@ -446,8 +446,8 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put three tasks to the PM and two tasks to the VM"); vm0 = MSG_vm_create_multicore(pm4, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [Xo]2 ooo )4", vm0, flop_amount * 4 / 5); - run_test_process("( [oX]2 ooo )4", vm0, flop_amount * 4 / 5); + run_test_process("( [Xo]2 ooo )4", (msg_host_t)vm0, flop_amount * 4 / 5); + run_test_process("( [oX]2 ooo )4", (msg_host_t)vm0, flop_amount * 4 / 5); run_test_process("( [oo]2 Xoo )4", pm4, flop_amount * 4 / 5); run_test_process("( [oo]2 oXo )4", pm4, flop_amount * 4 / 5); run_test_process("( [oo]2 ooX )4", pm4, flop_amount * 4 / 5); @@ -458,9 +458,9 @@ static void run_test(const char* chooser) XBT_INFO("### Put a VM on a PM, and put three tasks to the PM and three tasks to the VM"); vm0 = MSG_vm_create_multicore(pm4, "VM0", 2); MSG_vm_start(vm0); - run_test_process("( [Xoo]2 ooo )4", vm0, flop_amount * (8. / 5) * 1 / 3); // The VM has 8/5 of the PM - run_test_process("( [oXo]2 ooo )4", vm0, flop_amount * (8. / 5) * 1 / 3); - run_test_process("( [ooX]2 ooo )4", vm0, flop_amount * (8. / 5) * 1 / 3); + run_test_process("( [Xoo]2 ooo )4", (msg_host_t)vm0, flop_amount * (8. / 5) * 1 / 3); // The VM has 8/5 of the PM + run_test_process("( [oXo]2 ooo )4", (msg_host_t)vm0, flop_amount * (8. / 5) * 1 / 3); + run_test_process("( [ooX]2 ooo )4", (msg_host_t)vm0, flop_amount * (8. / 5) * 1 / 3); run_test_process("( [ooo]2 Xoo )4", pm4, flop_amount * 4 / 5); run_test_process("( [ooo]2 oXo )4", pm4, flop_amount * 4 / 5); diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c index 754264b097..a06400025c 100644 --- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c +++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c @@ -179,7 +179,7 @@ static int test_launcher(int argc, char *argv[]) argvF = xbt_new(char*, 2); argvF[0] = xbt_strdup("process_daemon"); - daemon = MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, vm0, 1, argvF); + daemon = MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, (msg_host_t)vm0, 1, argvF); argvF = xbt_new(char*, 2); argvF[0] = xbt_strdup("process_daemonJUPI");