From 9fab0eca31af8ed80d8af4c4eddc983e685d0168 Mon Sep 17 00:00:00 2001 From: schnorr Date: Mon, 9 Aug 2010 15:51:19 +0000 Subject: [PATCH] fix on trace: correct way to trace the amount of data transferred by gtnets Conflicts: src/surf/network_gtnets.c git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8136 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/surf/network_gtnets.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index 26b05d2f2b..bde9bb8a41 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -270,6 +270,11 @@ static void update_actions_state(double now, double delta) double sent = gtnets_get_flow_rx(action); #ifdef HAVE_TRACING + double trace_sent = sent; + if (trace_sent == 0){ + //if sent is equals to 0, means that gtnets sent all the bytes + trace_sent = action->generic_action.cost; + } // tracing resource utilization int src = TRACE_surf_gtnets_get_src (action); int dst = TRACE_surf_gtnets_get_dst (action); @@ -278,9 +283,8 @@ static void update_actions_state(double now, double delta) network_link_GTNETS_t link; unsigned int i; xbt_dynar_foreach(route, i, link) { - TRACE_surf_link_set_utilization (link->generic_resource.name, - action->generic_action.data, (action->generic_action.remains-remain)/delta, now-delta, delta); + action->generic_action.data, trace_sent/delta, now-delta, delta); } } #endif -- 2.20.1