X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..98326ffd7251e584d828e07c35aaba26f48ff28e:/examples/s4u/actor-suspend/s4u-actor-suspend.cpp diff --git a/examples/s4u/actor-suspend/s4u-actor-suspend.cpp b/examples/s4u/actor-suspend/s4u-actor-suspend.cpp index b663e8e026..d471ad75dc 100644 --- a/examples/s4u/actor-suspend/s4u-actor-suspend.cpp +++ b/examples/s4u/actor-suspend/s4u-actor-suspend.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-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. */ @@ -32,11 +32,14 @@ static void lazy_guy() static void dream_master() { XBT_INFO("Let's create a lazy guy."); /* - Create a lazy_guy process */ - simgrid::s4u::ActorPtr lazy = simgrid::s4u::Actor::createActor("Lazy", simgrid::s4u::this_actor::getHost(), lazy_guy); + simgrid::s4u::ActorPtr lazy = simgrid::s4u::Actor::create("Lazy", simgrid::s4u::this_actor::get_host(), lazy_guy); XBT_INFO("Let's wait a little bit..."); simgrid::s4u::this_actor::sleep_for(10); /* - Wait for 10 seconds */ XBT_INFO("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!"); - lazy->resume(); /* - Then wake up the lazy_guy */ + if (lazy->is_suspended()) + lazy->resume(); /* - Then wake up the lazy_guy */ + else + XBT_ERROR("I was thinking that the lazy guy would be suspended now"); simgrid::s4u::this_actor::sleep_for(5); /* Repeat two times: */ XBT_INFO("Suspend the lazy guy while he's sleeping..."); @@ -69,10 +72,9 @@ int main(int argc, char* argv[]) simgrid::s4u::Engine e(&argc, argv); xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]); - e.loadPlatform(argv[1]); /* - Load the platform description */ - std::vector list; - e.getHostList(&list); - simgrid::s4u::Actor::createActor("dream_master", list.front(), dream_master); + e.load_platform(argv[1]); /* - Load the platform description */ + std::vector list = e.get_all_hosts(); + simgrid::s4u::Actor::create("dream_master", list.front(), dream_master); e.run(); /* - Run the simulation */