From cac608fff2de795994fa9ca839bca1e1a436dc6a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christophe=20Thi=C3=A9ry?= Date: Tue, 29 Nov 2011 14:39:17 +0100 Subject: [PATCH] Revert "The latency is constant with the constant network model." Because actually, it's not. This reverts commit 123eb94b4e6a8db258c498d38ac1b21656f0f840. --- src/surf/network_constant.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c index 75f0634cea..4d2fd380e3 100644 --- a/src/surf/network_constant.c +++ b/src/surf/network_constant.c @@ -52,10 +52,21 @@ static void netcste_action_cancel(surf_action_t action) static double netcste_share_resources(double now) { - if (!xbt_swag_size(surf_network_model->states.running_action_set)) { - return -1.0; + surf_action_network_Constant_t action = NULL; + xbt_swag_t running_actions = + surf_network_model->states.running_action_set; + double min = -1.0; + + xbt_swag_foreach(action, running_actions) { + if (action->latency > 0) { + if (min < 0) + min = action->latency; + else if (action->latency < min) + min = action->latency; + } } - return sg_latency_factor; + + return min; } static void netcste_update_actions_state(double now, double delta) -- 2.20.1