X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ff3a4cf6e03165421f65616a22be86b8f528e21..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/examples/s4u/exec-basic/s4u-exec-basic.cpp diff --git a/examples/s4u/exec-basic/s4u-exec-basic.cpp b/examples/s4u/exec-basic/s4u-exec-basic.cpp index 8a9683c420..c9727e8e24 100644 --- a/examples/s4u/exec-basic/s4u-exec-basic.cpp +++ b/examples/s4u/exec-basic/s4u-exec-basic.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2020. 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. */ @@ -7,7 +7,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example"); -static int executor(std::vector /*args*/) +static void executor() { /* this_actor::execute() tells SimGrid to pause the calling actor * until its host has computed the amount of flops passed as a parameter */ @@ -15,10 +15,9 @@ static int executor(std::vector /*args*/) XBT_INFO("Done."); /* This simple example does not do anything beyond that */ - return 0; } -static int privileged(std::vector /*args*/) +static void privileged() { /* This version of this_actor::execute() specifies that this execution * gets a larger share of the resource. @@ -34,19 +33,17 @@ static int privileged(std::vector /*args*/) * because the uneven sharing only last until the privileged actor ends. * After this point, the unprivileged one gets 100% of the CPU and finishes * quite quickly. */ - return 0; } int main(int argc, char* argv[]) { simgrid::s4u::Engine e(&argc, argv); - std::vector args; - xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]); + xbt_assert(argc > 1, "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::create("executor", simgrid::s4u::Host::by_name("Tremblay"), executor, args); - simgrid::s4u::Actor::create("privileged", simgrid::s4u::Host::by_name("Tremblay"), privileged, args); + simgrid::s4u::Actor::create("executor", simgrid::s4u::Host::by_name("Tremblay"), executor); + simgrid::s4u::Actor::create("privileged", simgrid::s4u::Host::by_name("Tremblay"), privileged); e.run();