X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c0f3756528127131a1947179f56871657a084259..d7c957a488bb2ebd0ef5ea7a3323f1ccea620f30:/teshsuite/surf/surf_usage/surf_usage.cpp diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/surf/surf_usage/surf_usage.cpp index b483226a97..f6d4a8ecff 100644 --- a/teshsuite/surf/surf_usage/surf_usage.cpp +++ b/teshsuite/surf/surf_usage/surf_usage.cpp @@ -1,6 +1,6 @@ /* A few basic tests for the surf library */ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2021. 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. */ @@ -31,9 +31,9 @@ static const char* string_action(simgrid::kernel::resource::Action::State state) } } -int main(int argc, char **argv) +int main(int argc, char** argv) { - surf_init(&argc, argv); /* Initialize some common structures */ + surf_init(&argc, argv); /* Initialize some common structures */ simgrid::config::set_parse("cpu/model:Cas01"); simgrid::config::set_parse("network/model:CM02"); @@ -46,9 +46,9 @@ int main(int argc, char **argv) simgrid::s4u::Host* hostB = sg_host_by_name("Cpu B"); /* Let's do something on it */ - simgrid::kernel::resource::Action* actionA = hostA->pimpl_cpu->execution_start(1000.0); - simgrid::kernel::resource::Action* actionB = hostB->pimpl_cpu->execution_start(1000.0); - simgrid::kernel::resource::Action* actionC = hostB->pimpl_cpu->sleep(7.32); + const simgrid::kernel::resource::Action* actionA = hostA->pimpl_cpu->execution_start(1000.0); + const simgrid::kernel::resource::Action* actionB = hostB->pimpl_cpu->execution_start(1000.0); + const simgrid::kernel::resource::Action* actionC = hostB->pimpl_cpu->sleep(7.32); simgrid::kernel::resource::Action::State stateActionA = actionA->get_state(); simgrid::kernel::resource::Action::State stateActionB = actionB->get_state(); @@ -59,7 +59,6 @@ int main(int argc, char **argv) XBT_INFO("actionB state: %s", string_action(stateActionB)); XBT_INFO("actionC state: %s", string_action(stateActionC)); - /* Let's do something on it */ surf_network_model->communicate(hostA, hostB, 150.0, -1.0); @@ -99,7 +98,6 @@ int main(int argc, char **argv) XBT_DEBUG("\t * Done : %p", &action); action.unref(); } - } while ( (surf_network_model->get_started_action_set()->size() || surf_cpu_model_pm->get_started_action_set()->size()) && surf_solve(-1.0) >= 0.0);