From 93aca7f5dc887d27c32e721953064501b10e662c Mon Sep 17 00:00:00 2001 From: alegrand Date: Thu, 31 Aug 2006 13:37:44 +0000 Subject: [PATCH] Moving surf_double_update (in surf_private.h) to double_update (in maxmin.h) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2773 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/surf/maxmin.h | 7 +++++++ src/surf/cpu.c | 4 ++-- src/surf/network.c | 8 ++++---- src/surf/network_dassf.c | 8 ++++---- src/surf/surf_private.h | 5 ----- src/surf/workstation.c | 4 ++-- src/surf/workstation_KCCFLN05.c | 8 ++++---- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h index 0f8914e9e8..5d9f7a0fcd 100644 --- a/src/include/surf/maxmin.h +++ b/src/include/surf/maxmin.h @@ -9,6 +9,13 @@ #define _SURF_MAXMIN_H #include "xbt/misc.h" + +static _XBT_INLINE void double_update(double *variable, double value) +{ + *variable -= value; + if(*variable< 0.00001) *variable = 0.0; +} + typedef struct lmm_variable *lmm_variable_t; typedef struct lmm_constraint *lmm_constraint_t; typedef struct lmm_system *lmm_system_t; diff --git a/src/surf/cpu.c b/src/surf/cpu.c index e2fe78e423..240ee5352c 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -163,10 +163,10 @@ static void update_actions_state(double now, double delta) */ xbt_swag_foreach_safe(action, next_action, running_actions) { - surf_double_update(&(action->generic_action.remains), + double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * delta); if (action->generic_action.max_duration != NO_MAX_DURATION) - surf_double_update(&(action->generic_action.max_duration), delta); + double_update(&(action->generic_action.max_duration), delta); if ((action->generic_action.remains <= 0) && (lmm_get_variable_weight(action->variable)>0)) { action->generic_action.finish = surf_get_clock(); diff --git a/src/surf/network.c b/src/surf/network.c index a7d23a1630..3f31f74304 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -299,20 +299,20 @@ static void update_actions_state(double now, double delta) deltap = delta; if (action->latency > 0) { if (action->latency > deltap) { - surf_double_update(&(action->latency),deltap); + double_update(&(action->latency),deltap); deltap = 0.0; } else { - surf_double_update(&(deltap), action->latency); + double_update(&(deltap), action->latency); action->latency = 0.0; } if ((action->latency == 0.0) && !(action->suspended)) lmm_update_variable_weight(maxmin_system, action->variable, action->lat_current); } - surf_double_update(&(action->generic_action.remains), + double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * deltap); if (action->generic_action.max_duration != NO_MAX_DURATION) - surf_double_update(&(action->generic_action.max_duration), delta); + double_update(&(action->generic_action.max_duration), delta); /* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */ diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c index f878ad61df..696286a8c5 100644 --- a/src/surf/network_dassf.c +++ b/src/surf/network_dassf.c @@ -263,19 +263,19 @@ static void update_actions_state(double now, double delta) deltap = delta; if (action->latency > 0) { if (action->latency > deltap) { - surf_double_update(&(action->latency),deltap); + double_update(&(action->latency),deltap); deltap = 0.0; } else { - surf_double_update(&(deltap), action->latency); + double_update(&(deltap), action->latency); action->latency = 0.0; } if ((action->latency == 0.0) && !(action->suspended)) lmm_update_variable_weight(maxmin_system, action->variable, 1.0); } - surf_double_update(&(action->generic_action.remains), + double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * deltap); if (action->generic_action.max_duration != NO_MAX_DURATION) - surf_double_update(&(action->generic_action.max_duration), delta); + double_update(&(action->generic_action.max_duration), delta); /* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */ diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index d53793bdd6..56266fbf80 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -61,11 +61,6 @@ void surf_action_set_data(surf_action_t action, void *data); FILE *surf_fopen(const char *name, const char *mode); -static _XBT_INLINE void surf_double_update(double *variable, double value) -{ - *variable -= value; - if(*variable< 0.00001) *variable = 0.0; -} extern lmm_system_t maxmin_system; extern tmgr_history_t history; extern xbt_dynar_t surf_path; diff --git a/src/surf/workstation.c b/src/surf/workstation.c index f9a3ac325a..352b760064 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -161,10 +161,10 @@ static void update_actions_state(double now, double delta) */ xbt_swag_foreach_safe(action, next_action, running_actions) { - surf_double_update(&(action->generic_action.remains), + double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * delta); if (action->generic_action.max_duration != NO_MAX_DURATION) - surf_double_update(&(action->generic_action.max_duration), delta); + double_update(&(action->generic_action.max_duration), delta); if ((action->generic_action.remains <= 0) && (lmm_get_variable_weight(action->variable)>0)) { action->generic_action.finish = surf_get_clock(); diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index 43ba290585..72194bd02d 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -252,10 +252,10 @@ static void update_actions_state(double now, double delta) deltap = delta; if (action->latency > 0) { if (action->latency > deltap) { - surf_double_update(&(action->latency), deltap); + double_update(&(action->latency), deltap); deltap = 0.0; } else { - surf_double_update(&(deltap), action->latency); + double_update(&(deltap), action->latency); action->latency = 0.0; } if ((action->latency == 0.0) && !(action->suspended)) { @@ -266,10 +266,10 @@ static void update_actions_state(double now, double delta) action->lat_current); } } - surf_double_update(&(action->generic_action.remains), + double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * deltap); if (action->generic_action.max_duration != NO_MAX_DURATION) - surf_double_update(&(action->generic_action.max_duration), delta); + double_update(&(action->generic_action.max_duration), delta); /* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */ -- 2.20.1