From cec1bae69722560d255995bfe889d96c92e2ba77 Mon Sep 17 00:00:00 2001 From: schnorr Date: Tue, 28 Dec 2010 09:37:56 +0000 Subject: [PATCH 1/1] [trace] cosmetics, simpler code git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9317 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/instr/instr_surf.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c index 19a044b745..4318df001c 100644 --- a/src/instr/instr_surf.c +++ b/src/instr/instr_surf.c @@ -21,23 +21,14 @@ void TRACE_surf_release(void) TRACE_surf_resource_utilization_release(); } -static void TRACE_surf_set_resource_variable(double date, - const char *variable, - const char *resource, - double value) -{ - container_t container = getContainerByName(resource); - type_t type = getVariableType(variable, NULL, container->type); - new_pajeSetVariable(date, container, type, value); -} - void TRACE_surf_host_set_power(double date, const char *resource, double power) { if (!TRACE_is_active()) return; - char *variable_type = getVariableTypeIdByName("power", getContainerByName(resource)->type); - TRACE_surf_set_resource_variable(date, variable_type, resource, power); + container_t container = getContainerByName(resource); + type_t type = getVariableType("power", NULL, container->type); + new_pajeSetVariable(date, container, type, power); } void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth) @@ -45,8 +36,9 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban if (!TRACE_is_active()) return; - char *variable_type = getVariableTypeIdByName("bandwidth", getContainerByName(resource)->type); - TRACE_surf_set_resource_variable(date, variable_type, resource, bandwidth); + container_t container = getContainerByName(resource); + type_t type = getVariableType("bandwidth", NULL, container->type); + new_pajeSetVariable(date, container, type, bandwidth); } //FIXME: this function is not used (latency availability traces support exists in surf network models?) @@ -55,8 +47,9 @@ void TRACE_surf_link_set_latency(double date, const char *resource, double laten if (!TRACE_is_active()) return; - char *variable_type = getVariableTypeIdByName("latency", getContainerByName(resource)->type); - TRACE_surf_set_resource_variable(date, variable_type, resource, latency); + container_t container = getContainerByName(resource); + type_t type = getVariableType("latency", NULL, container->type); + new_pajeSetVariable(date, container, type, latency); } /* to trace gtnets */ -- 2.20.1