-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
static void worker(double computation_amount, bool use_bound, double bound)
{
- double clock_start = simgrid::s4u::Engine::getClock();
+ double clock_start = simgrid::s4u::Engine::get_clock();
simgrid::s4u::ExecPtr exec = simgrid::s4u::this_actor::exec_init(computation_amount);
if (use_bound) {
if (bound < 1e-12) /* close enough to 0 without any floating precision surprise */
XBT_INFO("bound == 0 means no capping (i.e., unlimited).");
- exec->setBound(bound);
+ exec->set_bound(bound);
}
exec->start();
exec->wait();
- double clock_end = simgrid::s4u::Engine::getClock();
+ double clock_end = simgrid::s4u::Engine::get_clock();
double duration = clock_end - clock_start;
double flops_per_sec = computation_amount / duration;
if (speed > 0) {
double new_bound = (speed / 10) * i;
XBT_INFO("set bound of VM1 to %f", new_bound);
- static_cast<simgrid::s4u::VirtualMachine*>(simgrid::s4u::this_actor::getHost())->setBound(new_bound);
+ static_cast<simgrid::s4u::VirtualMachine*>(simgrid::s4u::this_actor::get_host())->set_bound(new_bound);
}
simgrid::s4u::this_actor::sleep_for(100);
- double exec_remain_now = exec->getRemains();
+ double exec_remain_now = exec->get_remaining();
double flops_per_sec = exec_remain_prev - exec_remain_now;
- XBT_INFO("%s@%s: %.0f flops/s", name, simgrid::s4u::this_actor::getHost()->get_cname(), flops_per_sec / 100);
+ XBT_INFO("%s@%s: %.0f flops/s", name, simgrid::s4u::this_actor::get_host()->get_cname(), flops_per_sec / 100);
exec_remain_prev = exec_remain_now;
simgrid::s4u::this_actor::sleep_for(1);
}
vm0->start();
vm1->start();
- simgrid::s4u::Actor::createActor("worker0", vm0, worker_busy_loop, "Task0", -1);
- simgrid::s4u::Actor::createActor("worker1", vm1, worker_busy_loop, "Task1", pm0->getSpeed());
+ simgrid::s4u::Actor::create("worker0", vm0, worker_busy_loop, "Task0", -1);
+ simgrid::s4u::Actor::create("worker1", vm1, worker_busy_loop, "Task1", pm0->get_speed());
simgrid::s4u::this_actor::sleep_for(3000); // let the tasks end
vm0->destroy();
static void test_one_task(simgrid::s4u::Host* host)
{
- const double cpu_speed = host->getSpeed();
+ const double cpu_speed = host->get_speed();
const double computation_amount = cpu_speed * 10;
- XBT_INFO("### Test: with/without MSG_task_set_bound");
+ XBT_INFO("### Test: with/without task set_bound");
XBT_INFO("### Test: no bound for Task1@%s", host->get_cname());
- simgrid::s4u::Actor::createActor("worker0", host, worker, computation_amount, false, 0);
+ simgrid::s4u::Actor::create("worker0", host, worker, computation_amount, false, 0);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: 50%% for Task1@%s", host->get_cname());
- simgrid::s4u::Actor::createActor("worker0", host, worker, computation_amount, true, cpu_speed / 2);
+ simgrid::s4u::Actor::create("worker0", host, worker, computation_amount, true, cpu_speed / 2);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: 33%% for Task1@%s", host->get_cname());
- simgrid::s4u::Actor::createActor("worker0", host, worker, computation_amount, true, cpu_speed / 3);
+ simgrid::s4u::Actor::create("worker0", host, worker, computation_amount, true, cpu_speed / 3);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: zero for Task1@%s (i.e., unlimited)", host->get_cname());
- simgrid::s4u::Actor::createActor("worker0", host, worker, computation_amount, true, 0);
+ simgrid::s4u::Actor::create("worker0", host, worker, computation_amount, true, 0);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: 200%% for Task1@%s (i.e., meaningless)", host->get_cname());
- simgrid::s4u::Actor::createActor("worker0", host, worker, computation_amount, true, cpu_speed * 2);
+ simgrid::s4u::Actor::create("worker0", host, worker, computation_amount, true, cpu_speed * 2);
simgrid::s4u::this_actor::sleep_for(1000);
}
static void test_two_tasks(simgrid::s4u::Host* hostA, simgrid::s4u::Host* hostB)
{
- const double cpu_speed = hostA->getSpeed();
- xbt_assert(cpu_speed == hostB->getSpeed());
+ const double cpu_speed = hostA->get_speed();
+ xbt_assert(cpu_speed == hostB->get_speed());
const double computation_amount = cpu_speed * 10;
const char* hostA_name = hostA->get_cname();
const char* hostB_name = hostB->get_cname();
XBT_INFO("### Test: no bound for Task1@%s, no bound for Task2@%s", hostA_name, hostB_name);
- simgrid::s4u::Actor::createActor("worker0", hostA, worker, computation_amount, false, 0);
- simgrid::s4u::Actor::createActor("worker1", hostB, worker, computation_amount, false, 0);
+ simgrid::s4u::Actor::create("worker0", hostA, worker, computation_amount, false, 0);
+ simgrid::s4u::Actor::create("worker1", hostB, worker, computation_amount, false, 0);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: 0 for Task1@%s, 0 for Task2@%s (i.e., unlimited)", hostA_name, hostB_name);
- simgrid::s4u::Actor::createActor("worker0", hostA, worker, computation_amount, true, 0);
- simgrid::s4u::Actor::createActor("worker1", hostB, worker, computation_amount, true, 0);
+ simgrid::s4u::Actor::create("worker0", hostA, worker, computation_amount, true, 0);
+ simgrid::s4u::Actor::create("worker1", hostB, worker, computation_amount, true, 0);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: 50%% for Task1@%s, 50%% for Task2@%s", hostA_name, hostB_name);
- simgrid::s4u::Actor::createActor("worker0", hostA, worker, computation_amount, true, cpu_speed / 2);
- simgrid::s4u::Actor::createActor("worker1", hostB, worker, computation_amount, true, cpu_speed / 2);
+ simgrid::s4u::Actor::create("worker0", hostA, worker, computation_amount, true, cpu_speed / 2);
+ simgrid::s4u::Actor::create("worker1", hostB, worker, computation_amount, true, cpu_speed / 2);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: 25%% for Task1@%s, 25%% for Task2@%s", hostA_name, hostB_name);
- simgrid::s4u::Actor::createActor("worker0", hostA, worker, computation_amount, true, cpu_speed / 4);
- simgrid::s4u::Actor::createActor("worker1", hostB, worker, computation_amount, true, cpu_speed / 4);
+ simgrid::s4u::Actor::create("worker0", hostA, worker, computation_amount, true, cpu_speed / 4);
+ simgrid::s4u::Actor::create("worker1", hostB, worker, computation_amount, true, cpu_speed / 4);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: 75%% for Task1@%s, 100%% for Task2@%s", hostA_name, hostB_name);
- simgrid::s4u::Actor::createActor("worker0", hostA, worker, computation_amount, true, cpu_speed * 0.75);
- simgrid::s4u::Actor::createActor("worker1", hostB, worker, computation_amount, true, cpu_speed);
+ simgrid::s4u::Actor::create("worker0", hostA, worker, computation_amount, true, cpu_speed * 0.75);
+ simgrid::s4u::Actor::create("worker1", hostB, worker, computation_amount, true, cpu_speed);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: no bound for Task1@%s, 25%% for Task2@%s", hostA_name, hostB_name);
- simgrid::s4u::Actor::createActor("worker0", hostA, worker, computation_amount, false, 0);
- simgrid::s4u::Actor::createActor("worker1", hostB, worker, computation_amount, true, cpu_speed / 4);
+ simgrid::s4u::Actor::create("worker0", hostA, worker, computation_amount, false, 0);
+ simgrid::s4u::Actor::create("worker1", hostB, worker, computation_amount, true, cpu_speed / 4);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO("### Test: 75%% for Task1@%s, 25%% for Task2@%s", hostA_name, hostB_name);
- simgrid::s4u::Actor::createActor("worker0", hostA, worker, computation_amount, true, cpu_speed * 0.75);
- simgrid::s4u::Actor::createActor("worker1", hostB, worker, computation_amount, true, cpu_speed / 4);
+ simgrid::s4u::Actor::create("worker0", hostA, worker, computation_amount, true, cpu_speed * 0.75);
+ simgrid::s4u::Actor::create("worker1", hostB, worker, computation_amount, true, cpu_speed / 4);
simgrid::s4u::this_actor::sleep_for(1000);
}
vm0->destroy();
vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
- vm0->setBound(pm0->getSpeed() / 10);
+ vm0->set_bound(pm0->get_speed() / 10);
vm0->start();
XBT_INFO("# 7. Put a single task on the VM capped by 10%%.");
vm0->destroy();
vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
- vm0->setRamsize(1e9); // 1GB
+ vm0->set_ramsize(1e9); // 1GB
vm0->start();
- double cpu_speed = pm0->getSpeed();
+ double cpu_speed = pm0->get_speed();
XBT_INFO("# 10. Test migration");
const double computation_amount = cpu_speed * 10;
XBT_INFO("# 10. (a) Put a task on a VM without any bound.");
- simgrid::s4u::Actor::createActor("worker0", vm0, worker, computation_amount, false, 0);
+ simgrid::s4u::Actor::create("worker0", vm0, worker, computation_amount, false, 0);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO(" ");
XBT_INFO("# 10. (b) set 10%% bound to the VM, and then put a task on the VM.");
- vm0->setBound(cpu_speed / 10);
- simgrid::s4u::Actor::createActor("worker0", vm0, worker, computation_amount, false, 0);
+ vm0->set_bound(cpu_speed / 10);
+ simgrid::s4u::Actor::create("worker0", vm0, worker, computation_amount, false, 0);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO(" ");
XBT_INFO(" ");
XBT_INFO("# 10. (d) Put a task again on the VM.");
- simgrid::s4u::Actor::createActor("worker0", vm0, worker, computation_amount, false, 0);
+ simgrid::s4u::Actor::create("worker0", vm0, worker, computation_amount, false, 0);
simgrid::s4u::this_actor::sleep_for(1000);
XBT_INFO(" ");
/* load the platform file */
xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/small_platform.xml\n", argv[0], argv[0]);
- e.loadPlatform(argv[1]);
+ e.load_platform(argv[1]);
- simgrid::s4u::Actor::createActor("master_", simgrid::s4u::Host::by_name("Fafard"), master_main);
+ simgrid::s4u::Actor::create("master_", simgrid::s4u::Host::by_name("Fafard"), master_main);
e.run();
- XBT_INFO("Bye (simulation time %g)", simgrid::s4u::Engine::getClock());
+ XBT_INFO("Bye (simulation time %g)", simgrid::s4u::Engine::get_clock());
return 0;
}