Merge branch 'simgrid-udpor-integration' into 'master'

[simgrid.git] / include / simgrid / instr.h

diff --git a/include/simgrid/instr.h b/include/simgrid/instr.h
index f197973..7fee147 100644 (file)
--- a/include/simgrid/instr.h
+++ b/include/simgrid/instr.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2022. 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. */
@@ -17,7 +17,7 @@ namespace simgrid {
 namespace instr {
 /* User-variables related functions*/
 /* for host variables */
-XBT_PUBLIC void declare_host_variable(const std::string& variable, const std::string& color = std::string(""));
+XBT_PUBLIC void declare_host_variable(const std::string& variable, const std::string& color = "");
 XBT_PUBLIC void set_host_variable(const std::string& host, const std::string& variable, double value,
                                   double time = simgrid_get_clock());
 XBT_PUBLIC void add_host_variable(const std::string& host, const std::string& variable, double value,
@@ -27,7 +27,7 @@ XBT_PUBLIC void sub_host_variable(const std::string& host, const std::string& va
 XBT_PUBLIC const std::set<std::string, std::less<>>& get_host_variables();
 
 /* for link variables */
-XBT_PUBLIC void declare_link_variable(const std::string& variable, const std::string& color = std::string(""));
+XBT_PUBLIC void declare_link_variable(const std::string& variable, const std::string& color = "");
 XBT_PUBLIC void set_link_variable(const std::string& link, const std::string& variable, double value,
                                   double time = simgrid_get_clock());
 XBT_PUBLIC void add_link_variable(const std::string& link, const std::string& variable, double value,
@@ -44,7 +44,7 @@ XBT_PUBLIC void sub_link_variable(const std::string& src, const std::string& dst
 XBT_PUBLIC const std::set<std::string, std::less<>>& get_link_variables();
 
 /* for VM variables */
-XBT_PUBLIC void declare_vm_variable(const std::string& variable, const std::string& color = std::string(""));
+XBT_PUBLIC void declare_vm_variable(const std::string& variable, const std::string& color = "");
 XBT_PUBLIC void set_vm_variable(const std::string& vm, const std::string& variable, double value,
                                 double time = simgrid_get_clock());
 XBT_PUBLIC void add_vm_variable(const std::string& vm, const std::string& variable, double value,
@@ -56,7 +56,7 @@ XBT_PUBLIC const std::set<std::string, std::less<>>& get_vm_variables();
 /*  Functions to manage tracing marks (used for trace comparison experiments) */
 XBT_PUBLIC void declare_mark(const std::string& mark_type);
 XBT_PUBLIC void declare_mark_value(const std::string& mark_type, const std::string& mark_value,
-                                   const std::string& mark_color = std::string("1 1 1"));
+                                   const std::string& mark_color = "1 1 1");
 XBT_PUBLIC void mark(const std::string& mark_type, const std::string& mark_value);
 XBT_PUBLIC const std::set<std::string, std::less<>>& get_marks();
 
@@ -65,6 +65,8 @@ XBT_PUBLIC const std::set<std::string, std::less<>>& get_tracing_categories();
 
 /* Function used by graphicator (transform a SimGrid platform file in a graphviz dot file with the network topology) */
 XBT_PUBLIC void platform_graph_export_graphviz(const std::string& output_filename);
+/* Function used by graphicator (transform a SimGrid platform file in a CSV file with the network topology) */
+XBT_PUBLIC void platform_graph_export_csv(const std::string& output_filename);
 } // namespace instr
 } // namespace simgrid