Avoid costly exceptions when looking into a map.

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

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index 33d13c0..3135882 100644 (file)
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -12,15 +12,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_resource, instr, "tracing (un)-categorize
 static xbt_dict_t platform_variables;
 
 //used by all methods
-static void __TRACE_surf_check_variable_set_to_zero(double now,
-                                                    const char *variable,
-                                                    const char *resource)
+static void __TRACE_surf_check_variable_set_to_zero(double now, const char *variable, const char *resource)
 {
-  /*
-   * To trace resource utilization, we use pajeAddVariable and pajeSubVariable only.
-   * The Paje simulator needs a pajeSetVariable in the first place so it knows
-   * the initial value of all variables for subsequent adds/subs. If we don't do
-   * so, the first pajeAddVariable is added to a non-determined value within
+  /* To trace resource utilization, we use pajeAddVariable and pajeSubVariable only.
+   * The Paje simulator needs a pajeSetVariable in the first place so it knows the initial value of all variables for
+   * subsequent adds/subs. If we don't do so, the first pajeAddVariable is added to a non-determined value within
    * the Paje simulator, causing analysis problems.
    */
 
@@ -30,11 +26,11 @@ static void __TRACE_surf_check_variable_set_to_zero(double now,
   snprintf (key, n, "%s%s", resource, variable);
 
   // check if key exists: if it doesn't, set the variable to zero and mark this in the dict
-  if (!xbt_dict_get_or_null(platform_variables, key)) {
+  if (not xbt_dict_get_or_null(platform_variables, key)) {
     container_t container = PJ_container_get (resource);
     type_t type = PJ_type_get (variable, container->type);
-    new_pajeSetVariable (now, container, type, 0);
-    xbt_dict_set(platform_variables, key, (char*)"", NULL);
+    new SetVariableEvent (now, container, type, 0);
+    xbt_dict_set(platform_variables, key, (char*)"", nullptr);
   }
   xbt_free(key);
 }
@@ -42,23 +38,17 @@ static void __TRACE_surf_check_variable_set_to_zero(double now,
 static void instr_event (double now, double delta, type_t variable, container_t resource, double value)
 {
   __TRACE_surf_check_variable_set_to_zero(now, variable->name, resource->name);
-  new_pajeAddVariable(now, resource, variable, value);
-  new_pajeSubVariable(now + delta, resource, variable, value);
+  new AddVariableEvent(now, resource, variable, value);
+  new SubVariableEvent(now + delta, resource, variable, value);
 }
 
-/*
- * TRACE_surf_link_set_utilization: entry point from SimGrid
- */
-void TRACE_surf_link_set_utilization(const char *resource,
-                                     const char *category,
-                                     double value,
-                                     double now,
-                                     double delta)
+/* TRACE_surf_link_set_utilization: entry point from SimGrid */
+void TRACE_surf_link_set_utilization(const char *resource, const char *category, double value, double now, double delta)
 {
   //only trace link utilization if link is known by tracing mechanism
-  if (!PJ_container_get_or_null(resource))
+  if (not PJ_container_get_or_null(resource))
     return;
-  if (!value)
+  if (not value)
     return;
 
   //trace uncategorized link utilization
@@ -71,7 +61,7 @@ void TRACE_surf_link_set_utilization(const char *resource,
 
   //trace categorized utilization
   if (TRACE_categorized()){
-    if (!category)
+    if (not category)
       return;
     //variable of this category starts by 'b', because we have a link here
     char category_type[INSTR_DEFAULT_STR_SIZE];
@@ -81,23 +71,14 @@ void TRACE_surf_link_set_utilization(const char *resource,
     type_t type = PJ_type_get (category_type, container->type);
     instr_event (now, delta, type, container, value);
   }
-  return;
 }
 
-/*
- * TRACE_surf_host_set_utilization: entry point from SimGrid
- */
-void TRACE_surf_host_set_utilization(const char *resource,
-                                     const char *category,
-                                     double value,
-                                     double now,
-                                     double delta)
+/* TRACE_surf_host_set_utilization: entry point from SimGrid */
+void TRACE_surf_host_set_utilization(const char *resource, const char *category, double value, double now, double delta)
 {
   //only trace host utilization if host is known by tracing mechanism
   container_t container = PJ_container_get_or_null(resource);
-  if (!container)
-    return;
-  if (!value)
+  if (not container || not value)
     return;
 
   //trace uncategorized host utilization
@@ -109,7 +90,7 @@ void TRACE_surf_host_set_utilization(const char *resource,
 
   //trace categorized utilization
   if (TRACE_categorized()){
-    if (!category)
+    if (not category)
       return;
     //variable of this category starts by 'p', because we have a host here
     char category_type[INSTR_DEFAULT_STR_SIZE];
@@ -118,12 +99,11 @@ void TRACE_surf_host_set_utilization(const char *resource,
     type_t type = PJ_type_get (category_type, container->type);
     instr_event (now, delta, type, container, value);
   }
-  return;
 }
 
 void TRACE_surf_resource_utilization_alloc()
 {
-  platform_variables = xbt_dict_new_homogeneous(NULL);
+  platform_variables = xbt_dict_new_homogeneous(nullptr);
 }
 
 void TRACE_surf_resource_utilization_release()