X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f89671e0bd7450461d70d5ced6079123e73c2a63..c6e251509d3babdd3ab71eb043baf9ae8b8bee0a:/src/instr/instr_interface.cpp

diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index ba355e2458..0f353c7c2c 100644
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2019. 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. */
@@ -9,9 +9,9 @@
 #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 };
 
@@ -22,16 +22,14 @@ 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;
-extern std::set<std::string> trivaNodeTypes;
-extern std::set<std::string> trivaEdgeTypes;
 
-static xbt_dynar_t instr_set_to_dynar(std::set<std::string>* filter)
+static xbt_dynar_t instr_set_to_dynar(const std::set<std::string>& filter)
 {
   if (not TRACE_is_enabled() || not TRACE_needs_platform())
     return nullptr;
 
   xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
-  for (auto const& name : *filter)
+  for (auto const& name : filter)
     xbt_dynar_push_as(ret, char*, xbt_strdup(name.c_str()));
 
   return ret;
@@ -60,7 +58,7 @@ void TRACE_category(const char *category)
 /** @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.
  *
@@ -91,11 +89,9 @@ void TRACE_category_with_color (const char *category, const char *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);
@@ -123,7 +119,7 @@ xbt_dynar_t TRACE_get_categories ()
 {
   if (not TRACE_is_enabled() || not TRACE_categorized())
     return nullptr;
-  return instr_set_to_dynar(&created_categories);
+  return instr_set_to_dynar(created_categories);
 }
 
 /** @ingroup TRACE_mark
@@ -241,7 +237,7 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
                                 simgrid::xbt::string_printf("mark_type with name (%s) is not declared", mark_type));
   } else {
     XBT_DEBUG("MARK %s %s", mark_type, mark_value);
-    new simgrid::instr::NewEvent(MSG_get_clock(), simgrid::instr::Container::get_root(), type,
+    new simgrid::instr::NewEvent(simgrid_get_clock(), simgrid::instr::Container::get_root(), type,
                                  type->get_entity_value(mark_value));
   }
 }
@@ -258,7 +254,7 @@ xbt_dynar_t TRACE_get_marks ()
   if (not TRACE_is_enabled())
     return nullptr;
 
-  return instr_set_to_dynar(&declared_marks);
+  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,
@@ -318,7 +314,7 @@ static void instr_user_srcdst_variable(double time, const char *src, const char
  *
  *  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.
  *
@@ -326,14 +322,7 @@ static void instr_user_srcdst_variable(double time, const char *src, const char
  */
 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;
 }
 
@@ -385,7 +374,7 @@ void TRACE_vm_variable_declare_with_color (const char *variable, const char *col
  */
 void TRACE_vm_variable_set (const char *vm, const char *variable, double value)
 {
-  TRACE_vm_variable_set_with_time (MSG_get_clock(), vm, variable, value);
+  TRACE_vm_variable_set_with_time(simgrid_get_clock(), vm, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -399,7 +388,7 @@ void TRACE_vm_variable_set (const char *vm, const char *variable, double value)
  */
 void TRACE_vm_variable_add (const char *vm, const char *variable, double value)
 {
-  TRACE_vm_variable_add_with_time (MSG_get_clock(), vm, variable, value);
+  TRACE_vm_variable_add_with_time(simgrid_get_clock(), vm, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -413,7 +402,7 @@ void TRACE_vm_variable_add (const char *vm, const char *variable, double value)
  */
 void TRACE_vm_variable_sub (const char *vm, const char *variable, double value)
 {
-  TRACE_vm_variable_sub_with_time (MSG_get_clock(), vm, variable, value);
+  TRACE_vm_variable_sub_with_time(simgrid_get_clock(), vm, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -519,7 +508,7 @@ void TRACE_host_variable_declare_with_color (const char *variable, const char *c
  */
 void TRACE_host_variable_set (const char *host, const char *variable, double value)
 {
-  TRACE_host_variable_set_with_time (MSG_get_clock(), host, variable, value);
+  TRACE_host_variable_set_with_time(simgrid_get_clock(), host, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -533,7 +522,7 @@ void TRACE_host_variable_set (const char *host, const char *variable, double val
  */
 void TRACE_host_variable_add (const char *host, const char *variable, double value)
 {
-  TRACE_host_variable_add_with_time (MSG_get_clock(), host, variable, value);
+  TRACE_host_variable_add_with_time(simgrid_get_clock(), host, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -547,7 +536,7 @@ void TRACE_host_variable_add (const char *host, const char *variable, double val
  */
 void TRACE_host_variable_sub (const char *host, const char *variable, double value)
 {
-  TRACE_host_variable_sub_with_time (MSG_get_clock(), host, variable, value);
+  TRACE_host_variable_sub_with_time(simgrid_get_clock(), host, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -620,7 +609,7 @@ void TRACE_host_variable_sub_with_time (double time, const char *host, const cha
  */
 xbt_dynar_t TRACE_get_host_variables ()
 {
-  return instr_set_to_dynar(&user_host_variables);
+  return instr_set_to_dynar(user_host_variables);
 }
 
 /* for link variables */
@@ -666,7 +655,7 @@ void TRACE_link_variable_declare_with_color (const char *variable, const char *c
  */
 void TRACE_link_variable_set (const char *link, const char *variable, double value)
 {
-  TRACE_link_variable_set_with_time (MSG_get_clock(), link, variable, value);
+  TRACE_link_variable_set_with_time(simgrid_get_clock(), link, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -680,7 +669,7 @@ void TRACE_link_variable_set (const char *link, const char *variable, double val
  */
 void TRACE_link_variable_add (const char *link, const char *variable, double value)
 {
-  TRACE_link_variable_add_with_time (MSG_get_clock(), link, variable, value);
+  TRACE_link_variable_add_with_time(simgrid_get_clock(), link, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -694,7 +683,7 @@ void TRACE_link_variable_add (const char *link, const char *variable, double val
  */
 void TRACE_link_variable_sub (const char *link, const char *variable, double value)
 {
-  TRACE_link_variable_sub_with_time (MSG_get_clock(), link, variable, value);
+  TRACE_link_variable_sub_with_time(simgrid_get_clock(), link, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -774,7 +763,7 @@ void TRACE_link_variable_sub_with_time (double time, const char *link, const cha
  */
 void TRACE_link_srcdst_variable_set (const char *src, const char *dst, const char *variable, double value)
 {
-  TRACE_link_srcdst_variable_set_with_time (MSG_get_clock(), src, dst, variable, value);
+  TRACE_link_srcdst_variable_set_with_time(simgrid_get_clock(), src, dst, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -793,7 +782,7 @@ void TRACE_link_srcdst_variable_set (const char *src, const char *dst, const cha
  */
 void TRACE_link_srcdst_variable_add (const char *src, const char *dst, const char *variable, double value)
 {
-  TRACE_link_srcdst_variable_add_with_time (MSG_get_clock(), src, dst, variable, value);
+  TRACE_link_srcdst_variable_add_with_time(simgrid_get_clock(), src, dst, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -812,7 +801,7 @@ void TRACE_link_srcdst_variable_add (const char *src, const char *dst, const cha
  */
 void TRACE_link_srcdst_variable_sub (const char *src, const char *dst, const char *variable, double value)
 {
-  TRACE_link_srcdst_variable_sub_with_time (MSG_get_clock(), src, dst, variable, value);
+  TRACE_link_srcdst_variable_sub_with_time(simgrid_get_clock(), src, dst, variable, value);
 }
 
 /** @ingroup TRACE_user_variables
@@ -891,7 +880,7 @@ void TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, con
  */
 xbt_dynar_t TRACE_get_link_variables ()
 {
-  return instr_set_to_dynar(&user_link_variables);
+  return instr_set_to_dynar(user_link_variables);
 }
 
 /** @ingroup TRACE_user_variables
@@ -974,29 +963,3 @@ void TRACE_host_pop_state(const char* host, const char* state_name)
 {
   simgrid::instr::Container::by_name(host)->get_state(state_name)->pop_event();
 }
-
-/** @ingroup TRACE_API
- *  @brief Get Paje container types that can be mapped to the nodes of a graph.
- *
- *  This function can be used to create a user made  graph configuration file for Triva. Normally, it is used with the
- *  functions defined in @ref TRACE_user_variables.
- *
- *  @return A dynar with the types, must be freed with xbt_dynar_free.
- */
-xbt_dynar_t TRACE_get_node_types ()
-{
-  return instr_set_to_dynar(&trivaNodeTypes);
-}
-
-/** @ingroup TRACE_API
- *  @brief Get Paje container types that can be mapped to the edges of a graph.
- *
- *  This function can be used to create a user made graph configuration file for Triva. Normally, it is used with the
- *  functions defined in @ref TRACE_user_variables.
- *
- *  @return A dynar with the types, must be freed with xbt_dynar_free.
- */
-xbt_dynar_t TRACE_get_edge_types ()
-{
-  return instr_set_to_dynar(&trivaEdgeTypes);
-}