X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3b553ed36fe1119ceee50c0c6c5ac1cc6d47fd3..bfb1e611d8d12a8d6b3611449c067ee0a39893ec:/src/surf/instr_surf.cpp

diff --git a/src/surf/instr_surf.cpp b/src/surf/instr_surf.cpp
index 230805a286..ea05489e4c 100644
--- a/src/surf/instr_surf.cpp
+++ b/src/surf/instr_surf.cpp
@@ -1,49 +1,39 @@
-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2017. 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 "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
 
-void TRACE_surf_alloc(void)
-{
-  TRACE_surf_resource_utilization_alloc();
-}
-
-void TRACE_surf_release(void)
-{
-  TRACE_surf_resource_utilization_release();
-}
-
 void TRACE_surf_host_set_speed(double date, const char *resource, double speed)
 {
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
-    container_t container = PJ_container_get(resource);
-    type_t type = PJ_type_get ("power", container->type);
-    new_pajeSetVariable(date, container, type, speed);
+    container_t container      = simgrid::instr::Container::byName(resource);
+    simgrid::instr::Type* type = container->type_->getChild("power");
+    new simgrid::instr::SetVariableEvent(date, container, type, speed);
   }
 }
 
 void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
 {
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
-    container_t container = PJ_container_get(resource);
-    type_t type = PJ_type_get ("bandwidth", container->type);
-    new_pajeSetVariable(date, container, type, bandwidth);
+    container_t container      = simgrid::instr::Container::byName(resource);
+    simgrid::instr::Type* type = container->type_->getChild("bandwidth");
+    new simgrid::instr::SetVariableEvent(date, container, type, bandwidth);
   }
 }
 
 void TRACE_surf_action(surf_action_t surf_action, const char *category)
 {
-  if (!TRACE_is_enabled())
+  if (not TRACE_is_enabled())
     return;
-  if (!TRACE_categorized ())
+  if (not TRACE_categorized())
     return;
-  if (!category)
+  if (not category)
     return;
 
   surf_action->setCategory(category);