X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..8be89720f55b4ceeb2877531ae1602cc7ed947d6:/teshsuite/models/cloud-sharing/cloud-sharing.cpp diff --git a/teshsuite/models/cloud-sharing/cloud-sharing.cpp b/teshsuite/models/cloud-sharing/cloud-sharing.cpp index 5aa5d0a368..74a0194272 100644 --- a/teshsuite/models/cloud-sharing/cloud-sharing.cpp +++ b/teshsuite/models/cloud-sharing/cloud-sharing.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2022. The SimGrid Team. +/* Copyright (c) 2007-2023. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,38 +9,30 @@ #include "simgrid/s4u/VirtualMachine.hpp" #include -XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this msg example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this test"); -const int FAIL_ON_ERROR = 0; -const int flop_amount = 100000000; // 100Mf, so that computing this on a 1Gf core takes exactly 0.1s +constexpr double FLOP_AMOUNT = 100e6; // 100Mf, so that computing this on a 1Gf core takes exactly 0.1s int failed_test = 0; -static int computation_fun(std::vector argv) +static void computation_fun(double size) { - int size = std::stoi(argv[0]); - double begin = simgrid::s4u::Engine::get_clock(); simgrid::s4u::this_actor::execute(size); double end = simgrid::s4u::Engine::get_clock(); - if (0.1 - (end - begin) > 0.001) { - xbt_assert(not FAIL_ON_ERROR, "%s with %.4g load (%dflops) took %.4fs instead of 0.1s", - simgrid::s4u::this_actor::get_name().c_str(), ((double)size / flop_amount), size, (end - begin)); - XBT_INFO("FAILED TEST: %s with %.4g load (%dflops) took %.4fs instead of 0.1s", - simgrid::s4u::this_actor::get_name().c_str(), ((double)size / flop_amount), size, (end - begin)); + if (double duration = end - begin; 0.1 - duration > 0.001) { + XBT_INFO("FAILED TEST: %s with %.4g load (%.0f flops) took %.4fs instead of 0.1s", + simgrid::s4u::this_actor::get_name().c_str(), (size / FLOP_AMOUNT), size, duration); failed_test++; } else { - XBT_INFO("Passed: %s with %.4g load (%dflops) took 0.1s as expected", simgrid::s4u::this_actor::get_name().c_str(), - ((double)size / flop_amount), size); + XBT_INFO("Passed: %s with %.4g load (%.0f flops) took 0.1s as expected", + simgrid::s4u::this_actor::get_name().c_str(), (size / FLOP_AMOUNT), size); } - - return 0; } -static void run_test_process(const std::string& name, simgrid::s4u::Host* location, int size) +static void run_test_process(const std::string& name, simgrid::s4u::Host* location, double size) { - std::vector arg = {std::to_string(size)}; - simgrid::s4u::Actor::create(name, location, computation_fun, arg); + simgrid::s4u::Actor::create(name, location, computation_fun, floor(size)); } static void test_energy_consumption(const std::string& name, int nb_cores) @@ -87,28 +79,28 @@ static void run_test(const std::string& chooser) if (chooser == "(o)1") { XBT_INFO("### Test '%s'. A task on a regular PM", chooser.c_str()); - run_test_process("(X)1", pm0, flop_amount); + run_test_process("(X)1", pm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); } else if (chooser == "(oo)1") { XBT_INFO("### Test '%s'. 2 tasks on a regular PM", chooser.c_str()); - run_test_process("(Xo)1", pm0, flop_amount / 2); - run_test_process("(oX)1", pm0, flop_amount / 2); + run_test_process("(Xo)1", pm0, FLOP_AMOUNT / 2); + run_test_process("(oX)1", pm0, FLOP_AMOUNT / 2); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); } else if (chooser == "(o)1 (o)1") { XBT_INFO("### Test '%s'. 2 regular PMs, with a task each.", chooser.c_str()); - run_test_process("(X)1 (o)1", pm0, flop_amount); - run_test_process("(o)1 (X)1", pm1, flop_amount); + run_test_process("(X)1 (o)1", pm0, FLOP_AMOUNT); + run_test_process("(o)1 (X)1", pm1, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); } else if (chooser == "( [o]1 )1") { XBT_INFO("### Test '%s'. A task in a VM on a PM.", chooser.c_str()); vm0 = pm0->create_vm("VM0", 1); - run_test_process("( [X]1 )1", vm0, flop_amount); + run_test_process("( [X]1 )1", vm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -116,8 +108,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [oo]1 )1") { XBT_INFO("### Test '%s'. 2 tasks co-located in a VM on a PM.", chooser.c_str()); vm0 = pm0->create_vm("VM0", 1); - 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", vm0, FLOP_AMOUNT / 2); + run_test_process("( [oX]1 )1", vm0, FLOP_AMOUNT / 2); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -125,7 +117,7 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ ]1 o )1") { XBT_INFO("### Test '%s'. 1 task collocated with an empty VM", chooser.c_str()); vm0 = pm0->create_vm("VM0", 1); - run_test_process("( [ ]1 X )1", pm0, flop_amount); + run_test_process("( [ ]1 X )1", pm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -133,8 +125,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [o]1 o )1") { XBT_INFO("### Test '%s'. A task in a VM, plus a task", chooser.c_str()); vm0 = pm0->create_vm("VM0", 1); - run_test_process("( [X]1 o )1", vm0, flop_amount / 2); - run_test_process("( [o]1 X )1", pm0, flop_amount / 2); + run_test_process("( [X]1 o )1", vm0, FLOP_AMOUNT / 2); + run_test_process("( [o]1 X )1", pm0, FLOP_AMOUNT / 2); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -142,38 +134,38 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [oo]1 o )1") { XBT_INFO("### Test '%s'. 2 tasks in a VM, plus a task", chooser.c_str()); vm0 = pm0->create_vm("VM0", 1); - 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("( [oo]1 X )1", pm0, flop_amount / 2); + 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("( [oo]1 X )1", pm0, FLOP_AMOUNT / 2); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); } else if (chooser == "( o )2") { XBT_INFO("### Test '%s'. A task on bicore PM", chooser.c_str()); - run_test_process("(X)2", pm2, flop_amount); + run_test_process("(X)2", pm2, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); } else if (chooser == "( oo )2") { XBT_INFO("### Test '%s'. 2 tasks on a bicore PM", chooser.c_str()); - run_test_process("(Xx)2", pm2, flop_amount); - run_test_process("(xX)2", pm2, flop_amount); + run_test_process("(Xx)2", pm2, FLOP_AMOUNT); + run_test_process("(xX)2", pm2, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); } else if (chooser == "( ooo )2") { XBT_INFO("### Test '%s'. 3 tasks on a bicore PM", chooser.c_str()); - run_test_process("(Xxx)2", pm2, flop_amount * 2 / 3); - run_test_process("(xXx)2", pm2, flop_amount * 2 / 3); - run_test_process("(xxX)2", pm2, flop_amount * 2 / 3); + run_test_process("(Xxx)2", pm2, FLOP_AMOUNT * 2 / 3); + run_test_process("(xXx)2", pm2, FLOP_AMOUNT * 2 / 3); + run_test_process("(xxX)2", pm2, FLOP_AMOUNT * 2 / 3); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); } else if (chooser == "( [o]1 )2") { XBT_INFO("### Test '%s'. A task in a VM on a bicore PM", chooser.c_str()); vm0 = pm2->create_vm("VM0", 1); - run_test_process("( [X]1 )2", vm0, flop_amount); + run_test_process("( [X]1 )2", vm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -181,8 +173,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [oo]1 )2") { XBT_INFO("### Test '%s'. 2 tasks in a VM on a bicore PM", chooser.c_str()); vm0 = pm2->create_vm("VM0", 1); - 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", vm0, FLOP_AMOUNT / 2); + run_test_process("( [xX]1 )2", vm0, FLOP_AMOUNT / 2); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -190,7 +182,7 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ ]1 o )2") { XBT_INFO("### Put a VM on a PM, and put a task to the PM"); vm0 = pm2->create_vm("VM0", 1); - run_test_process("( [ ]1 X )2", pm2, flop_amount); + run_test_process("( [ ]1 X )2", pm2, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -198,8 +190,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [o]1 o )2") { XBT_INFO("### Put a VM on a PM, put a task to the PM and a task to the VM"); vm0 = pm2->create_vm("VM0", 1); - run_test_process("( [X]1 x )2", vm0, flop_amount); - run_test_process("( [x]1 X )2", pm2, flop_amount); + run_test_process("( [X]1 x )2", vm0, FLOP_AMOUNT); + run_test_process("( [x]1 X )2", pm2, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -208,7 +200,7 @@ static void run_test(const std::string& chooser) XBT_INFO("### Put two VMs on a PM, and put a task to one VM"); vm0 = pm2->create_vm("VM0", 1); auto* vm1 = pm2->create_vm("VM1", 1); - run_test_process("( [X]1 [ ]1 )2", vm0, flop_amount); + run_test_process("( [X]1 [ ]1 )2", vm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -218,8 +210,8 @@ static void run_test(const std::string& chooser) XBT_INFO("### Put two VMs on a PM, and put a task to each VM"); vm0 = pm2->create_vm("VM0", 1); auto* vm1 = pm2->create_vm("VM1", 1); - 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", vm0, FLOP_AMOUNT); + run_test_process("( [x]1 [X]1 )2", vm1, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -230,8 +222,8 @@ static void run_test(const std::string& chooser) vm0 = pm2->create_vm("VM0", 1); auto* vm1 = pm2->create_vm("VM1", 1); auto* vm2 = pm2->create_vm("VM2", 1); - 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", vm0, FLOP_AMOUNT); + run_test_process("( [x]1 [X]1 [ ]1 )2", vm1, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -243,9 +235,9 @@ static void run_test(const std::string& chooser) vm0 = pm2->create_vm("VM0", 1); auto* vm1 = pm2->create_vm("VM1", 1); auto* vm2 = pm2->create_vm("VM2", 1); - 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", 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); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -255,7 +247,7 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [o]2 )2") { XBT_INFO("### Put a VM on a PM, and put a task to the VM"); vm0 = pm2->create_vm("VM0", 2); - run_test_process("( [X]2 )2", vm0, flop_amount); + run_test_process("( [X]2 )2", vm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -263,8 +255,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [oo]2 )2") { XBT_INFO("### Put a VM on a PM, and put two tasks to the VM"); vm0 = pm2->create_vm("VM0", 2); - run_test_process("( [Xo]2 )2", vm0, flop_amount); - run_test_process("( [oX]2 )2", vm0, flop_amount); + run_test_process("( [Xo]2 )2", vm0, FLOP_AMOUNT); + run_test_process("( [oX]2 )2", vm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -272,9 +264,9 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ooo]2 )2") { XBT_INFO("### Put a VM on a PM, and put three tasks to the VM"); vm0 = pm2->create_vm("VM0", 2); - 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", 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); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -282,7 +274,7 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ ]2 o )2") { XBT_INFO("### Put a VM on a PM, and put a task to the PM"); vm0 = pm2->create_vm("VM0", 2); - run_test_process("( [ ]2 X )2", pm2, flop_amount); + run_test_process("( [ ]2 X )2", pm2, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -290,8 +282,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [o]2 o )2") { XBT_INFO("### Put a VM on a PM, put one task to the PM and one task to the VM"); vm0 = pm2->create_vm("VM0", 2); - run_test_process("( [o]2 X )2", pm2, flop_amount); - run_test_process("( [X]2 o )2", vm0, flop_amount); + run_test_process("( [o]2 X )2", pm2, FLOP_AMOUNT); + run_test_process("( [X]2 o )2", vm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -299,9 +291,9 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [oo]2 o )2") { XBT_INFO("### Put a VM on a PM, put one task to the PM and two tasks to the VM"); vm0 = pm2->create_vm("VM0", 2); - 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("( [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); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -309,10 +301,10 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ooo]2 o )2") { XBT_INFO("### Put a VM on a PM, put one task to the PM and three tasks to the VM"); vm0 = pm2->create_vm("VM0", 2); - run_test_process("( [ooo]2 X )2", pm2, flop_amount * 2 / 3); - run_test_process("( [Xoo]2 o )2", vm0, (flop_amount * 4 / 3) / 3); // VM_share/3 - run_test_process("( [oXo]2 o )2", vm0, (flop_amount * 4 / 3) / 3); // VM_share/3 - run_test_process("( [ooX]2 o )2", vm0, (flop_amount * 4 / 3) / 3); // VM_share/3 + run_test_process("( [ooo]2 X )2", pm2, FLOP_AMOUNT * 2 / 3); + run_test_process("( [Xoo]2 o )2", vm0, (FLOP_AMOUNT * 4 / 3) / 3); // VM_share/3 + run_test_process("( [oXo]2 o )2", vm0, (FLOP_AMOUNT * 4 / 3) / 3); // VM_share/3 + run_test_process("( [ooX]2 o )2", vm0, (FLOP_AMOUNT * 4 / 3) / 3); // VM_share/3 simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -320,8 +312,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ ]2 oo )2") { XBT_INFO("### Put a VM on a PM, and put two tasks to the PM"); vm0 = pm2->create_vm("VM0", 2); - run_test_process("( [ ]2 Xo )2", pm2, flop_amount); - run_test_process("( [ ]2 oX )2", pm2, flop_amount); + run_test_process("( [ ]2 Xo )2", pm2, FLOP_AMOUNT); + run_test_process("( [ ]2 oX )2", pm2, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -329,9 +321,9 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [o]2 oo )2") { XBT_INFO("### Put a VM on a PM, put one task to the PM and one task to the VM"); vm0 = pm2->create_vm("VM0", 2); - 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("( [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); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -339,10 +331,10 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [oo]2 oo )2") { XBT_INFO("### Put a VM on a PM, put one task to the PM and two tasks to the VM"); vm0 = pm2->create_vm("VM0", 2); - 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("( [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); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -350,11 +342,11 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ooo]2 oo )2") { XBT_INFO("### Put a VM on a PM, put one task to the PM and three tasks to the VM"); vm0 = pm2->create_vm("VM0", 2); - 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("( [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); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -362,7 +354,7 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [o]2 )4") { XBT_INFO("### Put a VM on a PM, and put a task to the VM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [X]2 )4", vm0, flop_amount); + run_test_process("( [X]2 )4", vm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -370,8 +362,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [oo]2 )4") { XBT_INFO("### Put a VM on a PM, and put two tasks to the VM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [Xo]2 )4", vm0, flop_amount); - run_test_process("( [oX]2 )4", vm0, flop_amount); + run_test_process("( [Xo]2 )4", vm0, FLOP_AMOUNT); + run_test_process("( [oX]2 )4", vm0, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -379,9 +371,9 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ooo]2 )4") { XBT_INFO("### ( [ooo]2 )4: Put a VM on a PM, and put three tasks to the VM"); vm0 = pm4->create_vm("VM0", 2); - 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", 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); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -389,7 +381,7 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ ]2 o )4") { XBT_INFO("### Put a VM on a PM, and put a task to the PM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [ ]2 X )4", pm4, flop_amount); + run_test_process("( [ ]2 X )4", pm4, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 1); vm0->destroy(); @@ -397,8 +389,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ ]2 oo )4") { XBT_INFO("### Put a VM on a PM, and put two tasks to the PM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [ ]2 Xo )4", pm4, flop_amount); - run_test_process("( [ ]2 oX )4", pm4, flop_amount); + run_test_process("( [ ]2 Xo )4", pm4, FLOP_AMOUNT); + run_test_process("( [ ]2 oX )4", pm4, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -406,9 +398,9 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ ]2 ooo )4") { XBT_INFO("### Put a VM on a PM, and put three tasks to the PM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [ ]2 Xoo )4", pm4, flop_amount); - run_test_process("( [ ]2 oXo )4", pm4, flop_amount); - run_test_process("( [ ]2 ooX )4", pm4, flop_amount); + run_test_process("( [ ]2 Xoo )4", pm4, FLOP_AMOUNT); + run_test_process("( [ ]2 oXo )4", pm4, FLOP_AMOUNT); + run_test_process("( [ ]2 ooX )4", pm4, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 3); vm0->destroy(); @@ -416,10 +408,10 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ ]2 oooo )4") { XBT_INFO("### Put a VM on a PM, and put four tasks to the PM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [ ]2 Xooo )4", pm4, flop_amount); - run_test_process("( [ ]2 oXoo )4", pm4, flop_amount); - run_test_process("( [ ]2 ooXo )4", pm4, flop_amount); - run_test_process("( [ ]2 oooX )4", pm4, flop_amount); + run_test_process("( [ ]2 Xooo )4", pm4, FLOP_AMOUNT); + run_test_process("( [ ]2 oXoo )4", pm4, FLOP_AMOUNT); + run_test_process("( [ ]2 ooXo )4", pm4, FLOP_AMOUNT); + run_test_process("( [ ]2 oooX )4", pm4, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 4); vm0->destroy(); @@ -427,8 +419,8 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [o]2 o )4") { XBT_INFO("### Put a VM on a PM, and put one task to the PM and one task to the VM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [X]2 o )4", vm0, flop_amount); - run_test_process("( [o]2 X )4", pm4, flop_amount); + run_test_process("( [X]2 o )4", vm0, FLOP_AMOUNT); + run_test_process("( [o]2 X )4", pm4, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 2); vm0->destroy(); @@ -436,9 +428,9 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [o]2 oo )4") { XBT_INFO("### Put a VM on a PM, and put two tasks to the PM and one task to the VM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [X]2 oo )4", vm0, flop_amount); - run_test_process("( [o]2 Xo )4", pm4, flop_amount); - run_test_process("( [o]2 oX )4", pm4, flop_amount); + run_test_process("( [X]2 oo )4", vm0, FLOP_AMOUNT); + run_test_process("( [o]2 Xo )4", pm4, FLOP_AMOUNT); + run_test_process("( [o]2 oX )4", pm4, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 3); vm0->destroy(); @@ -446,10 +438,10 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [oo]2 oo )4") { XBT_INFO("### Put a VM on a PM, and put two tasks to the PM and two tasks to the VM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [Xo]2 oo )4", vm0, flop_amount); - run_test_process("( [oX]2 oo )4", vm0, flop_amount); - run_test_process("( [oo]2 Xo )4", pm4, flop_amount); - run_test_process("( [oo]2 oX )4", pm4, flop_amount); + run_test_process("( [Xo]2 oo )4", vm0, FLOP_AMOUNT); + run_test_process("( [oX]2 oo )4", vm0, FLOP_AMOUNT); + run_test_process("( [oo]2 Xo )4", pm4, FLOP_AMOUNT); + run_test_process("( [oo]2 oX )4", pm4, FLOP_AMOUNT); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 4); vm0->destroy(); @@ -457,10 +449,10 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [o]2 ooo )4") { XBT_INFO("### Put a VM on a PM, and put three tasks to the PM and one tasks to the VM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [X]2 ooo )4", 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); + run_test_process("( [X]2 ooo )4", 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); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 4); vm0->destroy(); @@ -468,11 +460,11 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [oo]2 ooo )4") { XBT_INFO("### Put a VM on a PM, and put three tasks to the PM and two tasks to the VM"); vm0 = pm4->create_vm("VM0", 2); - 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("( [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); + 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("( [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); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 4); vm0->destroy(); @@ -480,13 +472,13 @@ static void run_test(const std::string& chooser) } else if (chooser == "( [ooo]2 ooo )4") { XBT_INFO("### Put a VM on a PM, and put three tasks to the PM and three tasks to the VM"); vm0 = pm4->create_vm("VM0", 2); - run_test_process("( [Xoo]2 ooo )4", vm0, (flop_amount * 8 / 5) / 3); // The VM has 8/5 of the PM - run_test_process("( [oXo]2 ooo )4", vm0, (flop_amount * 8 / 5) / 3); - run_test_process("( [ooX]2 ooo )4", vm0, (flop_amount * 8 / 5) / 3); + run_test_process("( [Xoo]2 ooo )4", vm0, (FLOP_AMOUNT * 8 / 5) / 3); // The VM has 8/5 of the PM + run_test_process("( [oXo]2 ooo )4", vm0, (FLOP_AMOUNT * 8 / 5) / 3); + run_test_process("( [ooX]2 ooo )4", vm0, (FLOP_AMOUNT * 8 / 5) / 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); - run_test_process("( [ooo]2 ooX )4", pm4, flop_amount * 4 / 5); + run_test_process("( [ooo]2 Xoo )4", pm4, FLOP_AMOUNT * 4 / 5); + run_test_process("( [ooo]2 oXo )4", pm4, FLOP_AMOUNT * 4 / 5); + run_test_process("( [ooo]2 ooX )4", pm4, FLOP_AMOUNT * 4 / 5); simgrid::s4u::this_actor::sleep_for(2); test_energy_consumption(chooser, 4); vm0->destroy(); @@ -495,7 +487,8 @@ static void run_test(const std::string& chooser) xbt_die("Unknown chooser: %s", chooser.c_str()); } } -static int master_main() + +static void master_main() { XBT_INFO("# TEST ON SINGLE-CORE PMs"); XBT_INFO("## Check computation on regular PMs"); @@ -573,8 +566,8 @@ static int master_main() XBT_INFO("."); XBT_INFO("## %d test failed", failed_test); XBT_INFO("."); - return 0; } + int main(int argc, char* argv[]) { /* Get the arguments */ @@ -592,6 +585,4 @@ int main(int argc, char* argv[]) simgrid::s4u::Actor::create("master", pm0, master_main); e.run(); - - return failed_test; }