-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2023. 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. */
#include "simgrid/s4u.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
static void trace_fun()
{
// The functions will set/change the value of the variable for all links in the route between source and destination.
// Set the Link_Capacity variable
- TRACE_link_srcdst_variable_set("Tremblay", "Bourassa", "Link_Capacity", 12.34);
- TRACE_link_srcdst_variable_set("Fafard", "Ginette", "Link_Capacity", 56.78);
+ simgrid::instr::set_link_variable("Tremblay", "Bourassa", "Link_Capacity", 12.34);
+ simgrid::instr::set_link_variable("Fafard", "Ginette", "Link_Capacity", 56.78);
// Set the Link_Utilization variable
- TRACE_link_srcdst_variable_set("Tremblay", "Bourassa", "Link_Utilization", 1.2);
- TRACE_link_srcdst_variable_set("Fafard", "Ginette", "Link_Utilization", 3.4);
+ simgrid::instr::set_link_variable("Tremblay", "Bourassa", "Link_Utilization", 1.2);
+ simgrid::instr::set_link_variable("Fafard", "Ginette", "Link_Utilization", 3.4);
// run the simulation, update my variables accordingly
for (int i = 0; i < 10; i++) {
- simgrid::s4u::this_actor::execute(1e6);
+ sg4::this_actor::execute(1e6);
// Add to link user variables
- TRACE_link_srcdst_variable_add("Tremblay", "Bourassa", "Link_Utilization", 5.6);
- TRACE_link_srcdst_variable_add("Fafard", "Ginette", "Link_Utilization", 7.8);
+ simgrid::instr::add_link_variable("Tremblay", "Bourassa", "Link_Utilization", 5.6);
+ simgrid::instr::add_link_variable("Fafard", "Ginette", "Link_Utilization", 7.8);
}
for (int i = 0; i < 10; i++) {
- simgrid::s4u::this_actor::execute(1e6);
+ sg4::this_actor::execute(1e6);
// Subtract from link user variables
- TRACE_link_srcdst_variable_sub("Tremblay", "Bourassa", "Link_Utilization", 3.4);
- TRACE_link_srcdst_variable_sub("Fafard", "Ginette", "Link_Utilization", 5.6);
+ simgrid::instr::sub_link_variable("Tremblay", "Bourassa", "Link_Utilization", 3.4);
+ simgrid::instr::sub_link_variable("Fafard", "Ginette", "Link_Utilization", 5.6);
}
}
int main(int argc, char* argv[])
{
- simgrid::s4u::Engine e(&argc, argv);
+ sg4::Engine e(&argc, argv);
xbt_assert(argc > 1, "Usage: %s platform_file\n \tExample: %s small_platform.xml\n", argv[0], argv[0]);
e.load_platform(argv[1]);
// declaring link user variables (one without, another with an RGB color)
- TRACE_link_variable_declare("Link_Capacity");
- TRACE_link_variable_declare_with_color("Link_Utilization", "0.9 0.1 0.1");
-
- simgrid::s4u::Actor::create("master", e.host_by_name("Tremblay"), trace_fun);
- simgrid::s4u::Actor::create("worker", e.host_by_name("Tremblay"), trace_fun);
- simgrid::s4u::Actor::create("worker", e.host_by_name("Jupiter"), trace_fun);
- simgrid::s4u::Actor::create("worker", e.host_by_name("Fafard"), trace_fun);
- simgrid::s4u::Actor::create("worker", e.host_by_name("Ginette"), trace_fun);
- simgrid::s4u::Actor::create("worker", e.host_by_name("Bourassa"), trace_fun);
+ simgrid::instr::declare_link_variable("Link_Capacity");
+ simgrid::instr::declare_link_variable("Link_Utilization", "0.9 0.1 0.1");
+
+ sg4::Actor::create("master", e.host_by_name("Tremblay"), trace_fun);
+ sg4::Actor::create("worker", e.host_by_name("Tremblay"), trace_fun);
+ sg4::Actor::create("worker", e.host_by_name("Jupiter"), trace_fun);
+ sg4::Actor::create("worker", e.host_by_name("Fafard"), trace_fun);
+ sg4::Actor::create("worker", e.host_by_name("Ginette"), trace_fun);
+ sg4::Actor::create("worker", e.host_by_name("Bourassa"), trace_fun);
e.run();
return 0;