separate the energy plugin from surf in the doc + improvements

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

diff --git a/src/surf/instr_surf.cpp b/src/surf/instr_surf.cpp
index b0003d6..df986ab 100644 (file)
--- a/src/surf/instr_surf.cpp
+++ b/src/surf/instr_surf.cpp
@@ -5,16 +5,16 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/instr/instr_private.h"
-#include "src/surf/surf_private.h"
+#include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
 
-void TRACE_surf_alloc(void)
+void TRACE_surf_alloc()
 {
   TRACE_surf_resource_utilization_alloc();
 }
 
-void TRACE_surf_release(void)
+void TRACE_surf_release()
 {
   TRACE_surf_resource_utilization_release();
 }
@@ -24,7 +24,7 @@ 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);
+    new SetVariableEvent(date, container, type, speed);
   }
 }
 
@@ -33,18 +33,18 @@ 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_pajeSetVariable(date, container, type, bandwidth);
+    new 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_set_category(surf_action, category);
+  surf_action->setCategory(category);
 }