X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd33e946a7ea1e4e00053ff43475566229f5c40a..29e444d885c6079db52621b1edfd4f5411ef7bff:/src/instr/instr_resource_utilization.cpp

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index ace1ff0bd0..1e52e6919a 100644
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team.
+/* Copyright (c) 2010-2020. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,24 +9,28 @@
 
 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 {
+namespace 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::by_name_or_null(resource);
-  if (not container || not value)
+  container_t 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);
+    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->get_variable(name)->instr_event(now, delta, resource, value);
   }
 }
+} // namespace instr
+} // namespace simgrid