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

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index 120de2d352..8af9cc2dbb 100644
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -1,38 +1,35 @@
-/* Copyright (c) 2010-2018. 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.hpp"
+#include "xbt/log.h"
 #include <string>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_resource, instr, "tracing (un)-categorized resource utilization");
 
-void TRACE_surf_resource_set_utilization(const char* type, const char* name, 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 resource utilization if resource is known by tracing mechanism
-  container_t container = simgrid::instr::Container::byNameOrNull(resource);
-  if (not container || not value)
+  Container* container = Container::by_name_or_null(resource);
+  if (container == nullptr || value == 0.0)
     return;
 
   // trace uncategorized resource utilization
   if (TRACE_uncategorized()){
-    XBT_DEBUG("UNCAT %s [%f - %f] %s %s %f", type, now, now + delta, resource, name, value);
-    container->getVariable(name)->instr_event(now, delta, resource, 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 resource utilization
-  if (TRACE_categorized() && category) {
-    std::string category_type = name[0] + std::string(category);
+  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->getVariable(name)->instr_event(now, delta, resource, value);
+    container->get_variable(name)->instr_event(now, delta, resource, 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_resource_set_utilization("LINK", "bandwidth_used", resource, category, value, now, delta);
-}
+} // namespace simgrid::instr