Sort include lists according to clang-format.

[simgrid.git] / src / surf / instr_surf.cpp

diff --git a/src/surf/instr_surf.cpp b/src/surf/instr_surf.cpp
index df986ab..43c84ed 100644 (file)
--- a/src/surf/instr_surf.cpp
+++ b/src/surf/instr_surf.cpp
@@ -1,30 +1,20 @@
-/* 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()
-{
-  TRACE_surf_resource_utilization_alloc();
-}
-
-void TRACE_surf_release()
-{
-  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 SetVariableEvent(date, container, type, speed);
+    simgrid::instr::Type* type = container->type_->getChild("power");
+    new simgrid::instr::SetVariableEvent(date, container, type, speed);
   }
 }
 
@@ -32,8 +22,8 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
 {
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
     container_t container = PJ_container_get(resource);
-    type_t type = PJ_type_get ("bandwidth", container->type);
-    new SetVariableEvent(date, container, type, bandwidth);
+    simgrid::instr::Type* type = container->type_->getChild("bandwidth");
+    new simgrid::instr::SetVariableEvent(date, container, type, bandwidth);
   }
 }