X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0b434542d7de83f5e040e7c03d5e98cd9c9f5d8a..HEAD:/src/instr/instr_resource_utilization.cpp

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index e8d848902a..8af9cc2dbb 100644
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -1,112 +1,35 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
+/* 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. */
 
-#include "src/instr/instr_private.h"
+#include "src/instr/instr_private.hpp"
+#include "xbt/log.h"
+#include <string>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_resource, instr, "tracing (un)-categorized resource utilization");
 
-//to check if variables were previously set to 0, otherwise paje won't simulate them
-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)
-{
-  /* 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.
-   */
-
-  // create a key considering the resource and variable
-  int n = strlen(variable)+strlen(resource)+1;
-  char *key = (char*)xbt_malloc(n*sizeof(char));
-  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)) {
-    container_t container = PJ_container_get (resource);
-    type_t type = PJ_type_get (variable, container->type);
-    SetVariableEvent (now, container, type, 0);
-    xbt_dict_set(platform_variables, key, (char*)"", nullptr);
-  }
-  xbt_free(key);
-}
-
-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);
-  AddVariableEvent(now, resource, variable, value);
-  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)
-{
-  //only trace link utilization if link is known by tracing mechanism
-  if (!PJ_container_get_or_null(resource))
-    return;
-  if (!value)
-    return;
-
-  //trace uncategorized link utilization
-  if (TRACE_uncategorized()){
-    XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now+delta, resource, value);
-    container_t container = PJ_container_get (resource);
-    type_t type = PJ_type_get ("bandwidth_used", container->type);
-    instr_event (now, delta, type, container, value);
-  }
-
-  //trace categorized utilization
-  if (TRACE_categorized()){
-    if (!category)
-      return;
-    //variable of this category starts by 'b', because we have a link here
-    char category_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", category);
-    XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
-    container_t container = PJ_container_get (resource);
-    type_t type = PJ_type_get (category_type, container->type);
-    instr_event (now, delta, type, container, value);
-  }
-}
-
-/* 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)
+namespace simgrid::instr {
+void resource_set_utilization(const char* type, const char* name, const char* resource, const std::string& 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 || !value)
+  // only trace resource utilization if resource is known by tracing mechanism
+  Container* container = Container::by_name_or_null(resource);
+  if (container == nullptr || value == 0.0)
     return;
 
-  //trace uncategorized host utilization
+  // trace uncategorized resource utilization
   if (TRACE_uncategorized()){
-    XBT_DEBUG("UNCAT HOST [%f - %f] %s power_used %f", now, now+delta, resource, value);
-    type_t type = PJ_type_get ("power_used", container->type);
-    instr_event (now, delta, type, container, value);
+    XBT_VERB("UNCAT %s [%f - %f] %s %s %f", type, now, now + delta, resource, name, value);
+    container->get_variable(name)->instr_event(now, delta, resource, value);
   }
 
-  //trace categorized utilization
-  if (TRACE_categorized()){
-    if (!category)
-      return;
-    //variable of this category starts by 'p', because we have a host here
-    char category_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", category);
-    XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
-    type_t type = PJ_type_get (category_type, container->type);
-    instr_event (now, delta, type, container, value);
+  // trace categorized resource utilization
+  if (TRACE_categorized() && not category.empty()) {
+    std::string category_type = name[0] + category;
+    XBT_DEBUG("CAT %s [%f - %f] %s %s %f", type, now, now + delta, resource, category_type.c_str(), value);
+    container->get_variable(name)->instr_event(now, delta, resource, value);
   }
 }
-
-void TRACE_surf_resource_utilization_alloc()
-{
-  platform_variables = xbt_dict_new_homogeneous(nullptr);
-}
-
-void TRACE_surf_resource_utilization_release()
-{
-  xbt_dict_free(&platform_variables);
-}
+} // namespace simgrid::instr