From: Frederic Suter Date: Sun, 19 May 2019 15:10:07 +0000 (+0200) Subject: Merge branch 'master' of https://framagit.org/simgrid/simgrid X-Git-Tag: v3.22.4~96 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/113bf5945d989f0b88d728d6883f30a3d1152b28?hp=790bc42a166bb18ab81a5e7fea812880e50f31b1 Merge branch 'master' of https://framagit.org/simgrid/simgrid --- diff --git a/examples/s4u/actor-exiting/s4u-actor-exiting.cpp b/examples/s4u/actor-exiting/s4u-actor-exiting.cpp index 9895d9f16d..64cd98185a 100644 --- a/examples/s4u/actor-exiting/s4u-actor-exiting.cpp +++ b/examples/s4u/actor-exiting/s4u-actor-exiting.cpp @@ -45,7 +45,7 @@ static void actor_b() 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]); + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/small_platform.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); /* - Load the platform description */ diff --git a/examples/s4u/actor-join/s4u-actor-join.cpp b/examples/s4u/actor-join/s4u-actor-join.cpp index d39512bc12..2be0244c1f 100644 --- a/examples/s4u/actor-join/s4u-actor-join.cpp +++ b/examples/s4u/actor-join/s4u-actor-join.cpp @@ -50,7 +50,7 @@ static void master() 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]); + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/small_platform.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); diff --git a/examples/s4u/actor-kill/s4u-actor-kill.cpp b/examples/s4u/actor-kill/s4u-actor-kill.cpp index 3226e94cf8..34ec395862 100644 --- a/examples/s4u/actor-kill/s4u-actor-kill.cpp +++ b/examples/s4u/actor-kill/s4u-actor-kill.cpp @@ -65,7 +65,7 @@ static void killer() 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]); + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/small_platform.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); /* - Load the platform description */ /* - Create and deploy killer process, that will create the victim actors */ diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp b/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp index fb2990ff5b..d73b50912d 100644 --- a/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp +++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp @@ -33,8 +33,9 @@ int main(int argc, char* argv[]) { simgrid::s4u::Engine e(&argc, argv); - xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n" - "\tExample: %s msg_platform.xml msg_deployment.xml\n", + xbt_assert(argc > 2, + "Usage: %s platform_file deployment_file\n" + "\tExample: %s ../platforms/cluster_backbone.xml ./s4u_actor_lifetime_d.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); /* Load the platform description */ diff --git a/examples/s4u/actor-migrate/s4u-actor-migrate.cpp b/examples/s4u/actor-migrate/s4u-actor-migrate.cpp index 4faa4d6d03..c1b3608a3e 100644 --- a/examples/s4u/actor-migrate/s4u-actor-migrate.cpp +++ b/examples/s4u/actor-migrate/s4u-actor-migrate.cpp @@ -61,7 +61,7 @@ static void monitor() 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]); + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/small_platform.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); simgrid::s4u::Actor::create("monitor", simgrid::s4u::Host::by_name("Boivin"), monitor); diff --git a/examples/s4u/actor-suspend/s4u-actor-suspend.cpp b/examples/s4u/actor-suspend/s4u-actor-suspend.cpp index 3a295777ec..3e1a93ec03 100644 --- a/examples/s4u/actor-suspend/s4u-actor-suspend.cpp +++ b/examples/s4u/actor-suspend/s4u-actor-suspend.cpp @@ -70,7 +70,7 @@ static void dream_master() 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]); + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/small_platform.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); /* - Load the platform description */ std::vector list = e.get_all_hosts(); diff --git a/examples/s4u/async-ready/s4u-async-ready.cpp b/examples/s4u/async-ready/s4u-async-ready.cpp index 17367532a1..d73f2ce2b5 100644 --- a/examples/s4u/async-ready/s4u-async-ready.cpp +++ b/examples/s4u/async-ready/s4u-async-ready.cpp @@ -23,7 +23,7 @@ #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_ready, "Messages specific for this s4u example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_ready, "Messages specific for this s4u example"); static int peer(int argc, char** argv) { diff --git a/examples/s4u/async-wait/s4u-async-wait.cpp b/examples/s4u/async-wait/s4u-async-wait.cpp index 2898edb6b4..009c9fadf6 100644 --- a/examples/s4u/async-wait/s4u-async-wait.cpp +++ b/examples/s4u/async-wait/s4u-async-wait.cpp @@ -16,7 +16,7 @@ #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_wait, "Messages specific for this s4u example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_wait, "Messages specific for this s4u example"); static int sender(int argc, char** argv) { diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp index 0b6f83fdf0..f23e55c449 100644 --- a/examples/s4u/async-waitall/s4u-async-waitall.cpp +++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp @@ -17,7 +17,7 @@ #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this s4u example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_waitall, "Messages specific for this s4u example"); class Sender { long messages_count; /* - number of tasks */ diff --git a/examples/s4u/async-waitany/s4u-async-waitany.cpp b/examples/s4u/async-waitany/s4u-async-waitany.cpp index ca5c0851c8..407b4e56f6 100644 --- a/examples/s4u/async-waitany/s4u-async-waitany.cpp +++ b/examples/s4u/async-waitany/s4u-async-waitany.cpp @@ -22,7 +22,7 @@ #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this msg example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_waitall, "Messages specific for this s4u example"); class Sender { long messages_count; /* - number of tasks */ diff --git a/examples/s4u/async-waituntil/s4u-async-waituntil.cpp b/examples/s4u/async-waituntil/s4u-async-waituntil.cpp index f741f5a583..33974081c8 100644 --- a/examples/s4u/async-waituntil/s4u-async-waituntil.cpp +++ b/examples/s4u/async-waituntil/s4u-async-waituntil.cpp @@ -15,7 +15,7 @@ #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_wait, "Messages specific for this s4u example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_waituntil, "Messages specific for this s4u example"); static int sender(int argc, char** argv) { diff --git a/examples/s4u/dht-chord/s4u-dht-chord.cpp b/examples/s4u/dht-chord/s4u-dht-chord.cpp index 0b01f2985c..ca06eb4a41 100644 --- a/examples/s4u/dht-chord/s4u-dht-chord.cpp +++ b/examples/s4u/dht-chord/s4u-dht-chord.cpp @@ -15,8 +15,9 @@ int timeout = 50; int main(int argc, char* argv[]) { simgrid::s4u::Engine e(&argc, argv); - xbt_assert(argc > 2, "Usage: %s [-nb_bits=n] [-timeout=t] platform_file deployment_file\n" - "\tExample: %s ../msg_platform.xml chord.xml\n", + xbt_assert(argc > 2, + "Usage: %s [-nb_bits=n] [-timeout=t] platform_file deployment_file\n" + "\tExample: %s ../platforms/cluster_backbone.xml ./s4u-dht-chord_d.xml\n", argv[0], argv[0]); char** options = &argv[1]; while (not strncmp(options[0], "-", 1)) { diff --git a/examples/s4u/energy-exec/s4u-energy-exec.cpp b/examples/s4u/energy-exec/s4u-energy-exec.cpp index aae8e41c0e..7e90219ece 100644 --- a/examples/s4u/energy-exec/s4u-energy-exec.cpp +++ b/examples/s4u/energy-exec/s4u-energy-exec.cpp @@ -68,7 +68,7 @@ int main(int argc, char* argv[]) sg_host_energy_plugin_init(); 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]); + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/energy_platform.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); simgrid::s4u::Actor::create("dvfs_test", simgrid::s4u::Host::by_name("MyHost1"), dvfs); diff --git a/examples/s4u/energy-vm/s4u-energy-vm.cpp b/examples/s4u/energy-vm/s4u-energy-vm.cpp index 580a88b57a..81a8c19b6a 100644 --- a/examples/s4u/energy-vm/s4u-energy-vm.cpp +++ b/examples/s4u/energy-vm/s4u-energy-vm.cpp @@ -55,7 +55,7 @@ int main(int argc, char* argv[]) sg_host_energy_plugin_init(); simgrid::s4u::Engine e(&argc, argv); - 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/energy_platform.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); diff --git a/examples/s4u/exec-basic/s4u-exec-basic.cpp b/examples/s4u/exec-basic/s4u-exec-basic.cpp index caee3709b5..ba018efa17 100644 --- a/examples/s4u/exec-basic/s4u-exec-basic.cpp +++ b/examples/s4u/exec-basic/s4u-exec-basic.cpp @@ -38,7 +38,7 @@ static void privileged() int main(int argc, char* argv[]) { simgrid::s4u::Engine e(&argc, argv); - 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.load_platform(argv[1]); diff --git a/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp b/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp index 5fde1fd8cc..8ae88ea325 100644 --- a/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp +++ b/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp @@ -50,7 +50,7 @@ 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]); + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/energy_platform.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); diff --git a/examples/s4u/maestro-set/s4u-maestro-set.cpp b/examples/s4u/maestro-set/s4u-maestro-set.cpp index 3a9f24e651..108855976e 100644 --- a/examples/s4u/maestro-set/s4u-maestro-set.cpp +++ b/examples/s4u/maestro-set/s4u-maestro-set.cpp @@ -70,7 +70,7 @@ int main(int argc, char* argv[]) if (argc != 2) { XBT_CRITICAL("Usage: %s platform_file\n", argv[0]); - xbt_die("example: %s msg_platform.xml\n", argv[0]); + xbt_die("example: %s ../platforms/small_platform.xml\n", argv[0]); } e.load_platform(argv[1]); diff --git a/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp b/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp index b78cfbf8df..a1e5f86581 100644 --- a/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp +++ b/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp @@ -88,7 +88,7 @@ int main(int argc, char* argv[]) sg_host_load_plugin_init(); 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]); + xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/energy_platform.xml\n", argv[0], argv[0]); e.load_platform(argv[1]); simgrid::s4u::Actor::create("load_test", simgrid::s4u::Host::by_name("MyHost1"), execute_load_test); diff --git a/examples/s4u/replay-comm/s4u-replay-comm.cpp b/examples/s4u/replay-comm/s4u-replay-comm.cpp index 2b73587ac3..95affd0985 100644 --- a/examples/s4u/replay-comm/s4u-replay-comm.cpp +++ b/examples/s4u/replay-comm/s4u-replay-comm.cpp @@ -81,11 +81,12 @@ int main(int argc, char* argv[]) { simgrid::s4u::Engine e(&argc, argv); - xbt_assert(argc > 2, "Usage: %s platform_file deployment_file [action_files]\n" - "\t# if all actions are in the same file\n" - "\tExample: %s msg_platform.xml msg_deployment.xml actions\n" - "\t# if actions are in separate files, specified in deployment\n" - "\tExample: %s msg_platform.xml msg_deployment.xml ", + xbt_assert(argc > 2, + "Usage: %s platform_file deployment_file [action_files]\n" + "\t# if all actions are in the same file\n" + "\tExample: %s platform.xml deployment.xml actions\n" + "\t# if actions are in separate files, specified in deployment\n" + "\tExample: %s platform.xml deployment.xml ", argv[0], argv[0], argv[0]); e.load_platform(argv[1]); diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index e7d8a2c7e9..5b60a5781a 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -54,10 +54,7 @@ void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kerne if (timeout < 0.0) { simcall->timer = nullptr; } else { - simcall->timer = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() { - simgrid::kernel::activity::ExecImpl** execs = simcall_execution_waitany_for__get__execs(simcall); - size_t count = simcall_execution_waitany_for__get__count(simcall); - + simcall->timer = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() { for (size_t i = 0; i < count; i++) { // Remove the first occurence of simcall: auto* exec = execs[i];