Moving surf_double_update (in surf_private.h) to double_update (in maxmin.h)

[simgrid.git] / src / surf / surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 3d0665282d15777272cd70d4e30177d2e50b8a14..56266fbf809dbd5783fbeb0b6158603a0243c0e4 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -12,9 +12,12 @@
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"
-#include "surf/surf_parse_private.h"
+#include "surf/surfxml_parse_private.h"
 
 #define NO_MAX_DURATION -1.0
+#define SG_TCP_CTE_GAMMA 20000.0
+
+extern const char *surf_action_state_names[6];
 
 typedef enum {
   SURF_NETWORK_LINK_ON = 1,    /* Ready        */
@@ -49,6 +52,8 @@ double generic_maxmin_share_resources2(xbt_swag_t running_actions,
 
 /* Generic functions common to all ressources */
 e_surf_action_state_t surf_action_get_state(surf_action_t action);
+double surf_action_get_start_time(surf_action_t action);
+double surf_action_get_finish_time(surf_action_t action);
 void surf_action_free(surf_action_t * action);
 void surf_action_change_state(surf_action_t action,
                              e_surf_action_state_t state);
@@ -56,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;