no need for a lib to store the netcards. A dict is easier

[simgrid.git] / src / instr / instr_interface.cpp

diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index b8b28ef..78a41cf 100644 (file)
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -5,10 +5,11 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid_config.h"
-#include "src/surf/network_interface.hpp"
 #include "src/instr/instr_private.h"
-#include "surf/surf.h"
+#include "src/kernel/routing/NetCard.hpp"
+#include "src/surf/network_interface.hpp"
 #include "src/surf/surf_private.h"
+#include "surf/surf.h"
 
 typedef enum {
   INSTR_US_DECLARE,
@@ -29,9 +30,7 @@ extern xbt_dict_t trivaEdgeTypes;
 
 static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter)
 {
-  if (!TRACE_is_enabled())
-    return nullptr;
-  if (!TRACE_needs_platform())
+  if (!TRACE_is_enabled() || !TRACE_needs_platform())
     return nullptr;
 
   xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
@@ -81,21 +80,17 @@ void TRACE_category(const char *category)
  */
 void TRACE_category_with_color (const char *category, const char *color)
 {
-  /* safe switch */
-  if (!TRACE_is_enabled())
+  /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with categories */
+  if (!TRACE_is_enabled() || !TRACE_needs_platform())
     return;
 
   if (!(TRACE_categorized() && category != nullptr))
     return;
 
-  /* if platform is not traced, we can't deal with categories */
-  if (!TRACE_needs_platform())
-    return;
-
   //check if category is already created
-  char *created = static_cast<char*>(xbt_dict_get_or_null(created_categories, category));
-  if (created)
+  if (xbt_dict_get_or_null(created_categories, category) != nullptr)
     return;
+
   xbt_dict_set (created_categories, category, xbt_strdup("1"), nullptr);
 
   //define final_color
@@ -130,9 +125,7 @@ void TRACE_category_with_color (const char *category, const char *color)
  */
 xbt_dynar_t TRACE_get_categories ()
 {
-  if (!TRACE_is_enabled())
-    return nullptr;
-  if (!TRACE_categorized())
+  if (!TRACE_is_enabled() || !TRACE_categorized())
     return nullptr;
 
   return instr_dict_to_dynar (created_categories);
@@ -150,20 +143,15 @@ xbt_dynar_t TRACE_get_categories ()
  */
 void TRACE_declare_mark(const char *mark_type)
 {
-  /* safe switch */
-  if (!TRACE_is_enabled())
-    return;
-
-  /* if platform is not traced, we don't allow marks */
-  if (!TRACE_needs_platform())
+  /* safe switchs. tracing has to be activated and if platform is not traced, we can't deal with marks */
+  if (!TRACE_is_enabled() || !TRACE_needs_platform())
     return;
 
   if (!mark_type)
     THROWF (tracing_error, 1, "mark_type is nullptr");
 
   //check if mark_type is already declared
-  char *created = static_cast<char*>(xbt_dict_get_or_null(declared_marks, mark_type));
-  if (created) {
+  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);
   }
 
@@ -189,12 +177,8 @@ void TRACE_declare_mark(const char *mark_type)
  */
 void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mark_value, const char *mark_color)
 {
-  /* safe switch */
-  if (!TRACE_is_enabled())
-    return;
-
-  /* if platform is not traced, we don't allow marks */
-  if (!TRACE_needs_platform())
+  /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */
+  if (!TRACE_is_enabled() || !TRACE_needs_platform())
     return;
 
   if (!mark_type)
@@ -248,12 +232,8 @@ void TRACE_declare_mark_value (const char *mark_type, const char *mark_value)
  */
 void TRACE_mark(const char *mark_type, const char *mark_value)
 {
-  /* safe switch */
-  if (!TRACE_is_enabled())
-    return;
-
-  /* if platform is not traced, we don't allow marks */
-  if (!TRACE_needs_platform())
+  /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */
+  if (!TRACE_is_enabled() || !TRACE_needs_platform())
     return;
 
   if (!mark_type)
@@ -279,7 +259,7 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
  *
  * \return A dynar with the declared marks, must be freed with xbt_dynar_free.
  */
-xbt_dynar_t TRACE_get_marks (void)
+xbt_dynar_t TRACE_get_marks ()
 {
   if (!TRACE_is_enabled())
     return nullptr;
@@ -290,12 +270,8 @@ xbt_dynar_t TRACE_get_marks (void)
 static void instr_user_variable(double time, const char *resource, const char *variable, const char *father_type,
                          double value, InstrUserVariable what, const char *color, xbt_dict_t filter)
 {
-  /* safe switch */
-  if (!TRACE_is_enabled())
-    return;
-
-  /* if platform is not traced, we don't allow user variables */
-  if (!TRACE_needs_platform())
+  /* safe switches. tracing has to be activated and if platform is not traced, we don't allow user variables */
+  if (!TRACE_is_enabled() || !TRACE_needs_platform())
     return;
 
   //check if variable is already declared
@@ -344,11 +320,10 @@ static void instr_user_srcdst_variable(double time, const char *src, const char
   if(!dst_elm)
     xbt_die("Element '%s' not found!",dst);
 
-  std::vector<Link*> *route = new std::vector<Link*>();
-  routing_platf->getRouteAndLatency (src_elm, dst_elm, route,nullptr);
-  for (auto link : *route)
+  std::vector<Link*> route;
+  simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(src_elm, dst_elm, &route, nullptr);
+  for (auto link : route)
     instr_user_variable (time, link->getName(), variable, father_type, value, what, nullptr, user_link_variables);
-  delete route;
 }
 
 /** \ingroup TRACE_API
@@ -522,7 +497,7 @@ void TRACE_vm_variable_sub_with_time (double time, const char *vm, const char *v
  *
  * \return A dynar with the declared host variables, must be freed with xbt_dynar_free.
  */
-xbt_dynar_t TRACE_get_vm_variables (void)
+xbt_dynar_t TRACE_get_vm_variables ()
 {
   return instr_dict_to_dynar (user_vm_variables);
 }
@@ -669,7 +644,7 @@ void TRACE_host_variable_sub_with_time (double time, const char *host, const cha
  *
  * \return A dynar with the declared host variables, must be freed with xbt_dynar_free.
  */
-xbt_dynar_t TRACE_get_host_variables (void)
+xbt_dynar_t TRACE_get_host_variables ()
 {
   return instr_dict_to_dynar (user_host_variables);
 }
@@ -940,7 +915,7 @@ void TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, con
  *
  * \return A dynar with the declared link variables, must be freed with xbt_dynar_free.
  */
-xbt_dynar_t TRACE_get_link_variables (void)
+xbt_dynar_t TRACE_get_link_variables ()
 {
   return instr_dict_to_dynar (user_link_variables);
 }