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

diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index 5ed606fea4..74ee42b4f2 100644
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -6,7 +6,7 @@
 
 #include "simgrid_config.h"
 #include "src/instr/instr_private.h"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/surf_private.h"
 #include "surf/surf.h"
@@ -56,7 +56,7 @@ static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter)
  *
  *  \param category The name of the new tracing category to be created.
  *
- *  \see TRACE_category_with_color, MSG_task_set_category
+ *  \see TRACE_category_with_color, MSG_task_set_category, SD_task_set_category
  */
 void TRACE_category(const char *category)
 {
@@ -76,7 +76,7 @@ void TRACE_category(const char *category)
  *  \param color The color of the category (see \ref outcomes_vizu to
  *  know how to correctly specify the color)
  *
- *  \see MSG_task_set_category
+ *  \see MSG_task_set_category, SD_task_set_category
  */
 void TRACE_category_with_color (const char *category, const char *color)
 {
@@ -97,7 +97,10 @@ void TRACE_category_with_color (const char *category, const char *color)
   char final_color[INSTR_DEFAULT_STR_SIZE];
   if (!color){
     //generate a random color
-    snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%f %f %f", /*red*/drand48(), /*green*/drand48(), /*blue*/drand48());
+    double red = drand48();
+    double green = drand48();
+    double blue = drand48();
+    snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%f %f %f", red, green, blue);
   }else{
     snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
   }
@@ -111,13 +114,14 @@ void TRACE_category_with_color (const char *category, const char *color)
 /** \ingroup TRACE_category
  *  \brief Get declared categories
  *
- * This function should be used to get categories declared with #TRACE_category or with #TRACE_category_with_color.
+ * This function should be used to get categories that were already declared with #TRACE_category or with
+ * #TRACE_category_with_color.
  *
  * See \ref outcomes_vizu for details on how to trace the (categorized) resource utilization.
  *
  * \return A dynar with the declared categories, must be freed with xbt_dynar_free.
  *
- *  \see MSG_task_set_category
+ *  \see MSG_task_set_category, SD_task_set_category
  */
 xbt_dynar_t TRACE_get_categories ()
 {
@@ -147,8 +151,9 @@ void TRACE_declare_mark(const char *mark_type)
     THROWF (tracing_error, 1, "mark_type is nullptr");
 
   //check if mark_type is already declared
-  if (xbt_dict_get_or_null(declared_marks, mark_type) != nullptr)
+  if (xbt_dict_get_or_null(declared_marks, mark_type) != nullptr) {
     THROWF (tracing_error, 1, "mark_type with name (%s) is already declared", mark_type);
+  }
 
   XBT_DEBUG("MARK,declare %s", mark_type);
   PJ_type_event_new(mark_type, PJ_type_get_root());
@@ -160,8 +165,9 @@ void TRACE_declare_mark(const char *mark_type)
  *
  * This function declares a new colored value for a Paje event type in the trace file that can be used by simulators to
  * declare application-level marks. This function is independent of which API is used in SimGrid. The color needs to be
- * a string with three numbers separated by spaces in the range [0,1]. A light-gray color can be specified using
- * "0.7 0.7 0.7" as color. If a nullptr color is provided, the color used will be white ("1 1 1").
+ * a string with three numbers separated by spaces in the range [0,1].
+ * A light-gray color can be specified using "0.7 0.7 0.7" as color. If a nullptr color is provided, the color used will
+ * be white ("1 1 1").
  *
  * \param mark_type The name of the new type.
  * \param mark_value The name of the new value for this type.
@@ -181,8 +187,9 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar
     THROWF (tracing_error, 1, "mark_value is nullptr");
 
   type_t type = PJ_type_get (mark_type, PJ_type_get_root());
-  if (!type)
+  if (!type){
     THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
+  }
 
   char white[INSTR_DEFAULT_STR_SIZE] = "1.0 1.0 1.0";
   if (!mark_color)
@@ -196,7 +203,8 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar
  * \brief Declare a new value for a previously declared mark type.
  *
  * This function declares a new value for a Paje event type in the trace file that can be used by simulators to declare
- * application-level marks. This function is independent of which API is used in SimGrid.
+ * application-level marks. This function is independent of which API is used in SimGrid. Calling this function is the
+ * same as calling \ref TRACE_declare_mark_value_with_color with a nullptr color.
  *
  * \param mark_type The name of the new type.
  * \param mark_value The name of the new value for this type.
@@ -235,8 +243,9 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
 
   //check if mark_type is already declared
   type_t type = PJ_type_get (mark_type, PJ_type_get_root());
-  if (!type)
+  if (!type){
     THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
+  }
 
   val_t value = PJ_value_get (mark_value, type);
   XBT_DEBUG("MARK %s %s", mark_type, mark_value);
@@ -268,16 +277,12 @@ static void instr_user_variable(double time, const char *resource, const char *v
   //check if variable is already declared
   char *created = (char*)xbt_dict_get_or_null(filter, variable);
   if (what == INSTR_US_DECLARE){
-    if (created){//already declared
-      return;
-    }else{
+    if (!created) { // not declared yet
       xbt_dict_set (filter, variable, xbt_strdup("1"), nullptr);
       instr_new_user_variable_type (father_type, variable, color);
     }
   }else{
-    if (!created){//not declared, ignore
-      return;
-    } else {
+    if (created) { // declared, let's work
       char valuestr[100];
       snprintf(valuestr, 100, "%g", value);
       container_t container = PJ_container_get(resource);
@@ -303,11 +308,11 @@ static void instr_user_variable(double time, const char *resource, const char *v
 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)
 {
-  sg_netcard_t src_elm = sg_netcard_by_name_or_null(src);
+  sg_netpoint_t src_elm = sg_netpoint_by_name_or_null(src);
   if(!src_elm)
     xbt_die("Element '%s' not found!",src);
 
-  sg_netcard_t dst_elm = sg_netcard_by_name_or_null(dst);
+  sg_netpoint_t dst_elm = sg_netpoint_by_name_or_null(dst);
   if(!dst_elm)
     xbt_die("Element '%s' not found!",dst);