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

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 0f8914e..5d9f7a0 100644 (file)
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -9,6 +9,13 @@
 #define _SURF_MAXMIN_H
 
 #include "xbt/misc.h"
 #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;
 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 e2fe78e..240ee53 100644 (file)
--- 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) {
   */
 
   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)
        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();
     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 a7d23a1..3f31f74 100644 (file)
--- 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) {
     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 {
        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);
     }
        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)
        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; */
 
 
     /*   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 f878ad6..696286a 100644 (file)
--- 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) {
     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 {
        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);
     }
        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)
        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; */
 
 
     /*   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 d53793b..56266fb 100644 (file)
--- 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);
 
                          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;
 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 f9a3ac3..352b760 100644 (file)
--- 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) {
   */
 
   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)
        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();
     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 43ba290..72194bd 100644 (file)
--- 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) {
     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 {
        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)) {
        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);
       }
     }
                                     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)
                       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; */
 
 
     /*   if(action->generic_action.remains<.00001) action->generic_action.remains=0; */