X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a28a7366da96137a0daadb54842c5bf87c6f2ee..19cd5a52131b50275fa26e0e53c4a8bd333f2937:/src/surf/instr_surf.cpp diff --git a/src/surf/instr_surf.cpp b/src/surf/instr_surf.cpp index d1e986c8ca..83f7e1e227 100644 --- a/src/surf/instr_surf.cpp +++ b/src/surf/instr_surf.cpp @@ -9,22 +9,12 @@ 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); - SetVariableEvent(date, container, type, speed); + simgrid::instr::Type* type = container->type_->getChild("power"); + new simgrid::instr::SetVariableEvent(date, container, type, speed); } } @@ -32,18 +22,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); - SetVariableEvent(date, container, type, bandwidth); + 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);