A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix a failure about mutex freed too early in RMA
[simgrid.git]
/
examples
/
cpp
/
plugin-link-load
/
s4u-plugin-link-load.cpp
diff --git
a/examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp
b/examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp
index c402de2ac5750a9fb57903bd06d9fce822bf4157..5f962a18545647f7bc4190ef4cab63f1739adbde 100644
(file)
--- a/
examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp
+++ b/
examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
3
. 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. */
/* 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,43
+7,43
@@
#include "simgrid/s4u.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
#include "simgrid/s4u.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
static void sender(const std::string& mailbox, uint64_t msg_size)
{
static void sender(const std::string& mailbox, uint64_t msg_size)
{
- auto
mbox = simgrid::s4u
::Mailbox::by_name(mailbox);
+ auto
* mbox = sg4
::Mailbox::by_name(mailbox);
static int payload = 42;
mbox->put(&payload, msg_size);
}
static void receiver(const std::string& mailbox)
{
static int payload = 42;
mbox->put(&payload, msg_size);
}
static void receiver(const std::string& mailbox)
{
- auto
mbox = simgrid::s4u
::Mailbox::by_name(mailbox);
+ auto
* mbox = sg4
::Mailbox::by_name(mailbox);
mbox->get<int>();
}
mbox->get<int>();
}
-static void run_transfer(simgrid::s4u::Host* src_host, simgrid::s4u::Host* dst_host, const std::string& mailbox,
- unsigned long msg_size)
+static void run_transfer(sg4::Host* src_host, sg4::Host* dst_host, const std::string& mailbox, unsigned long msg_size)
{
XBT_INFO("Launching the transfer of %lu bytes", msg_size);
{
XBT_INFO("Launching the transfer of %lu bytes", msg_size);
- s
imgrid::s4u
::Actor::create("sender", src_host, sender, mailbox, msg_size);
- s
imgrid::s4u
::Actor::create("receiver", dst_host, receiver, mailbox);
+ s
g4
::Actor::create("sender", src_host, sender, mailbox, msg_size);
+ s
g4
::Actor::create("receiver", dst_host, receiver, mailbox);
}
static void execute_load_test()
{
}
static void execute_load_test()
{
- auto
host0 = simgrid::s4u
::Host::by_name("node-0.simgrid.org");
- auto
host1 = simgrid::s4u
::Host::by_name("node-1.simgrid.org");
+ auto
* host0 = sg4
::Host::by_name("node-0.simgrid.org");
+ auto
* host1 = sg4
::Host::by_name("node-1.simgrid.org");
- s
imgrid::s4u
::this_actor::sleep_for(1);
+ s
g4
::this_actor::sleep_for(1);
run_transfer(host0, host1, "1", 1000 * 1000 * 1000);
run_transfer(host0, host1, "1", 1000 * 1000 * 1000);
- s
imgrid::s4u
::this_actor::sleep_for(10);
+ s
g4
::this_actor::sleep_for(10);
run_transfer(host0, host1, "2", 1000 * 1000 * 1000);
run_transfer(host0, host1, "2", 1000 * 1000 * 1000);
- s
imgrid::s4u
::this_actor::sleep_for(3);
+ s
g4
::this_actor::sleep_for(3);
run_transfer(host0, host1, "3", 1000 * 1000 * 1000);
}
run_transfer(host0, host1, "3", 1000 * 1000 * 1000);
}
-static void show_link_load(const std::string& link_name, const s
imgrid::s4u
::Link* link)
+static void show_link_load(const std::string& link_name, const s
g4
::Link* link)
{
XBT_INFO("%s link load (cum, avg, min, max): (%g, %g, %g, %g)", link_name.c_str(), sg_link_get_cum_load(link),
sg_link_get_avg_load(link), sg_link_get_min_instantaneous_load(link),
{
XBT_INFO("%s link load (cum, avg, min, max): (%g, %g, %g, %g)", link_name.c_str(), sg_link_get_cum_load(link),
sg_link_get_avg_load(link), sg_link_get_min_instantaneous_load(link),
@@
-52,9
+52,9
@@
static void show_link_load(const std::string& link_name, const simgrid::s4u::Lin
static void monitor()
{
static void monitor()
{
-
auto link_backbone = simgrid::s4u
::Link::by_name("cluster0_backbone");
-
auto link_host0 = simgrid::s4u
::Link::by_name("cluster0_link_0_UP");
-
auto link_host1 = simgrid::s4u
::Link::by_name("cluster0_link_1_DOWN");
+
const auto* link_backbone = sg4
::Link::by_name("cluster0_backbone");
+
const auto* link_host0 = sg4
::Link::by_name("cluster0_link_0_UP");
+
const auto* link_host1 = sg4
::Link::by_name("cluster0_link_1_DOWN");
XBT_INFO("Tracking desired links");
sg_link_load_track(link_backbone);
XBT_INFO("Tracking desired links");
sg_link_load_track(link_backbone);
@@
-62,8
+62,8
@@
static void monitor()
sg_link_load_track(link_host1);
show_link_load("Backbone", link_backbone);
sg_link_load_track(link_host1);
show_link_load("Backbone", link_backbone);
- while (s
imgrid::s4u
::Engine::get_clock() < 5) {
- s
imgrid::s4u
::this_actor::sleep_for(1);
+ while (s
g4
::Engine::get_clock() < 5) {
+ s
g4
::this_actor::sleep_for(1);
show_link_load("Backbone", link_backbone);
}
show_link_load("Backbone", link_backbone);
}
@@
-75,11
+75,11
@@
static void monitor()
XBT_INFO("Now resetting and probing host links each second.");
XBT_INFO("Now resetting and probing host links each second.");
- while (s
imgrid::s4u
::Engine::get_clock() < 29) {
+ while (s
g4
::Engine::get_clock() < 29) {
sg_link_load_reset(link_host0);
sg_link_load_reset(link_host1);
sg_link_load_reset(link_host0);
sg_link_load_reset(link_host1);
- s
imgrid::s4u
::this_actor::sleep_for(1);
+ s
g4
::this_actor::sleep_for(1);
show_link_load("Host0_UP", link_host0);
show_link_load("Host1_UP", link_host1);
show_link_load("Host0_UP", link_host0);
show_link_load("Host1_UP", link_host1);
@@
-88,18
+88,18
@@
static void monitor()
int main(int argc, char* argv[])
{
int main(int argc, char* argv[])
{
- s
imgrid::s4u
::Engine e(&argc, argv);
+ s
g4
::Engine e(&argc, argv);
sg_link_load_plugin_init();
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]);
sg_link_load_plugin_init();
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]);
- s
imgrid::s4u
::Actor::create("load_test", e.host_by_name("node-42.simgrid.org"), execute_load_test);
- s
imgrid::s4u
::Actor::create("monitor", e.host_by_name("node-51.simgrid.org"), monitor);
+ s
g4
::Actor::create("load_test", e.host_by_name("node-42.simgrid.org"), execute_load_test);
+ s
g4
::Actor::create("monitor", e.host_by_name("node-51.simgrid.org"), monitor);
e.run();
e.run();
- XBT_INFO("Total simulation time: %.2f", s
imgrid::s4u
::Engine::get_clock());
+ XBT_INFO("Total simulation time: %.2f", s
g4
::Engine::get_clock());
return 0;
}
return 0;
}