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

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index 6b7bfec6fe..aa7ad8ca1e 100644
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -1,101 +1,32 @@
-/* Copyright (c) 2010-2017. The SimGrid Team.
+/* Copyright (c) 2010-2019. 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 <string>
-#include <unordered_map>
 
 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 std::unordered_map<std::string, std::string> 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
-  std::string key = std::string(resource) + variable;
-
-  // check if key exists: if it doesn't, set the variable to zero and mark this in the dict
-  if (platform_variables.find(key) == platform_variables.end()) {
-    container_t container = PJ_container_get (resource);
-    simgrid::instr::Type* type = container->type_->getChild(variable);
-    new simgrid::instr::SetVariableEvent(now, container, type, 0);
-    platform_variables[key] = std::string("");
-  }
-}
-
-static void instr_event(double now, double delta, simgrid::instr::Type* variable, container_t resource, double value)
-{
-  __TRACE_surf_check_variable_set_to_zero(now, variable->name_, resource->name_);
-  new simgrid::instr::AddVariableEvent(now, resource, variable, value);
-  new simgrid::instr::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 (not PJ_container_get_or_null(resource))
-    return;
-  if (not 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);
-    simgrid::instr::Type* type = container->type_->getChild("bandwidth_used");
-    instr_event (now, delta, type, container, value);
-  }
-
-  //trace categorized utilization
-  if (TRACE_categorized()){
-    if (not 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);
-    simgrid::instr::Type* type = container->type_->getChild(category_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)
+void TRACE_surf_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);
+  // 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)
     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);
-    simgrid::instr::Type* type = container->type_->getChild("power_used");
-    instr_event (now, delta, type, container, value);
+    XBT_DEBUG("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 (not 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);
-    simgrid::instr::Type* type = container->type_->getChild(category_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);
   }
 }