-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2021. 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 "src/surf/network_interface.hpp"
#include "src/surf/surf_private.hpp"
#include "surf/surf.hpp"
+#include "xbt/random.hpp"
#include <algorithm>
#include <cmath>
-#include <random>
enum class InstrUserVariable { DECLARE, SET, ADD, SUB };
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
-std::set<std::string> created_categories;
-std::set<std::string> declared_marks;
-std::set<std::string> user_host_variables;
-std::set<std::string> user_vm_variables;
-std::set<std::string> user_link_variables;
+std::set<std::string, std::less<>> created_categories;
+std::set<std::string, std::less<>> declared_marks;
+std::set<std::string, std::less<>> user_host_variables;
+std::set<std::string, std::less<>> user_vm_variables;
+std::set<std::string, std::less<>> user_link_variables;
-static xbt_dynar_t instr_set_to_dynar(const std::set<std::string>& filter)
+static xbt_dynar_t instr_set_to_dynar(const std::set<std::string, std::less<>>& filter)
{
if (not TRACE_is_enabled() || not TRACE_needs_platform())
return nullptr;
/** @ingroup TRACE_category
* @brief Declare a new category with a color.
*
- * Same as #TRACE_category, but let user specify a color encoded as a RGB-like string with three floats from 0 to 1.
+ * Same as #TRACE_category, but let user specify a color encoded as an RGB-like string with three floats from 0 to 1.
* So, to specify a red color, pass "1 0 0" as color parameter. A light-gray color can be specified using "0.7 0.7 0.7"
* as color. This function has no effect if a category with the same name has been already declared.
*
//check if category is already created
if (created_categories.find(category) != created_categories.end())
return;
- else
- created_categories.insert(category);
+
+ created_categories.emplace(category);
//define final_color
std::string final_color;
if (not color) {
//generate a random color
- static std::default_random_engine rnd_engine;
- std::uniform_real_distribution<double> prng(0.0, std::nextafter(1.0, 2.0));
- double red = prng(rnd_engine);
- double green = prng(rnd_engine);
- double blue = prng(rnd_engine);
+ double red = simgrid::xbt::random::uniform_real(0.0, std::nextafter(1.0, 2.0));
+ double green = simgrid::xbt::random::uniform_real(0.0, std::nextafter(1.0, 2.0));
+ double blue = simgrid::xbt::random::uniform_real(0.0, std::nextafter(1.0, 2.0));
final_color = std::to_string(red) + " " + std::to_string(green) + " " + std::to_string(blue);
}else{
final_color = std::string(color);
}
XBT_DEBUG("MARK,declare %s", mark_type);
- simgrid::instr::Container::get_root()->type_->by_name_or_create<simgrid::instr::EventType>(mark_type);
- declared_marks.insert(mark_type);
+ simgrid::instr::Container::get_root()->get_type()->by_name_or_create<simgrid::instr::EventType>(mark_type);
+ declared_marks.emplace(mark_type);
}
/** @ingroup TRACE_mark
xbt_assert(mark_type, "mark_type is nullptr");
xbt_assert(mark_value, "mark_value is nullptr");
- simgrid::instr::EventType* type =
- static_cast<simgrid::instr::EventType*>(simgrid::instr::Container::get_root()->type_->by_name(mark_type));
+ auto* type =
+ static_cast<simgrid::instr::EventType*>(simgrid::instr::Container::get_root()->get_type()->by_name(mark_type));
if (not type) {
throw simgrid::TracingError(XBT_THROW_POINT,
simgrid::xbt::string_printf("mark_type with name (%s) is not declared", mark_type));
xbt_assert(mark_value, "mark_value is nullptr");
//check if mark_type is already declared
- simgrid::instr::EventType* type =
- static_cast<simgrid::instr::EventType*>(simgrid::instr::Container::get_root()->type_->by_name(mark_type));
+ auto* type =
+ static_cast<simgrid::instr::EventType*>(simgrid::instr::Container::get_root()->get_type()->by_name(mark_type));
if (not type) {
throw simgrid::TracingError(XBT_THROW_POINT,
simgrid::xbt::string_printf("mark_type with name (%s) is not declared", mark_type));
return instr_set_to_dynar(declared_marks);
}
-static void instr_user_variable(double time, const char* resource, const char* variable_name, const char* father_type,
- double value, InstrUserVariable what, const char* color, std::set<std::string>* filter)
+static void instr_user_variable(double time, const char* resource, const char* variable_name, const char* parent_type,
+ double value, InstrUserVariable what, const char* color,
+ std::set<std::string, std::less<>>* filter)
{
/* safe switches. tracing has to be activated and if platform is not traced, we don't allow user variables */
if (not TRACE_is_enabled() || not TRACE_needs_platform())
if (what == InstrUserVariable::DECLARE) {
if (created == filter->end()) { // not declared yet
filter->insert(variable_name);
- instr_new_user_variable_type(father_type, variable_name, color == nullptr ? "" : color);
+ instr_new_user_variable_type(parent_type, variable_name, color == nullptr ? "" : color);
}
}else{
if (created != filter->end()) { // declared, let's work
}
}
-static void instr_user_srcdst_variable(double time, const char *src, const char *dst, const char *variable,
- const char *father_type, double value, InstrUserVariable what)
+static void instr_user_srcdst_variable(double time, const char* src, const char* dst, const char* variable,
+ const char* parent_type, double value, InstrUserVariable what)
{
- simgrid::kernel::routing::NetPoint* src_elm = sg_netpoint_by_name_or_null(src);
- if (not src_elm)
- xbt_die("Element '%s' not found!",src);
+ const simgrid::kernel::routing::NetPoint* src_elm = sg_netpoint_by_name_or_null(src);
+ xbt_assert(src_elm, "Element '%s' not found!", src);
- simgrid::kernel::routing::NetPoint* dst_elm = sg_netpoint_by_name_or_null(dst);
- if (not dst_elm)
- xbt_die("Element '%s' not found!",dst);
+ const simgrid::kernel::routing::NetPoint* dst_elm = sg_netpoint_by_name_or_null(dst);
+ xbt_assert(dst_elm, "Element '%s' not found!", dst);
std::vector<simgrid::kernel::resource::LinkImpl*> route;
simgrid::kernel::routing::NetZoneImpl::get_global_route(src_elm, dst_elm, route, nullptr);
for (auto const& link : route)
- instr_user_variable(time, link->get_cname(), variable, father_type, value, what, nullptr, &user_link_variables);
+ instr_user_variable(time, link->get_cname(), variable, parent_type, value, what, nullptr, &user_link_variables);
}
/** @ingroup TRACE_API
*
* The graph topology will have the following properties: all hosts, links and routers of the platform file are mapped
* to graph nodes; routes are mapped to edges.
- * The platform's AS are not represented in the output.
+ * The platform's zones are not represented in the output.
*
* @param filename The name of the file that will hold the graph.
*
*/
int TRACE_platform_graph_export_graphviz (const char *filename)
{
- /* returns 1 if successful, 0 otherwise */
- if (not TRACE_is_enabled())
- return 0;
- xbt_graph_t g = instr_routing_platform_graph();
- if (g == nullptr)
- return 0;
- instr_routing_platform_graph_export_graphviz (g, filename);
- xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, nullptr);
+ simgrid::instr::platform_graph_export_graphviz(filename);
return 1;
}
