Define FairBottleneck and Lagrange as subclasses of lmm::System.

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

diff --git a/src/surf/instr_surf.cpp b/src/surf/instr_surf.cpp
index b53c55f..8cf1ecf 100644 (file)
--- a/src/surf/instr_surf.cpp
+++ b/src/surf/instr_surf.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012-2017. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,31 +12,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
 void TRACE_surf_host_set_speed(double date, const char *resource, double speed)
 {
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
-    container_t container      = simgrid::instr::Container::byName(resource);
-    simgrid::instr::VariableType* variable =
-        static_cast<simgrid::instr::VariableType*>(container->type_->byName("power"));
-    variable->setEvent(date, container, speed);
+    simgrid::instr::Container::byName(resource)->getVariable("power")->setEvent(date, speed);
   }
 }
 
 void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
 {
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
-    container_t container      = simgrid::instr::Container::byName(resource);
-    simgrid::instr::VariableType* variable =
-        static_cast<simgrid::instr::VariableType*>(container->type_->byName("bandwidth"));
-    variable->setEvent(date, container, bandwidth);
+    simgrid::instr::Container::byName(resource)->getVariable("bandwidth")->setEvent(date, bandwidth);
   }
 }
-
-void TRACE_surf_action(surf_action_t surf_action, const char *category)
-{
-  if (not TRACE_is_enabled())
-    return;
-  if (not TRACE_categorized())
-    return;
-  if (not category)
-    return;
-
-  surf_action->setCategory(category);
-}