X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/maxmin_private.hpp diff --git a/src/surf/maxmin_private.hpp b/src/surf/maxmin_private.hpp index d3ab7f9be5..bccc21780a 100644 --- a/src/surf/maxmin_private.hpp +++ b/src/surf/maxmin_private.hpp @@ -7,6 +7,8 @@ #ifndef _SURF_MAXMIN_PRIVATE_H #define _SURF_MAXMIN_PRIVATE_H +#include + #include "surf/maxmin.h" #include "xbt/swag.h" #include "xbt/mallocator.h" @@ -47,7 +49,7 @@ typedef struct lmm_constraint { double remaining; double usage; double bound; - int shared; + int sharing_policy; /* see @e_surf_link_sharing_policy_t (0: FATPIPE, 1: SHARED, 2: FULLDUPLEX) */ void *id; int id_int; double lambda; @@ -97,7 +99,7 @@ typedef struct lmm_system { s_xbt_swag_t saturated_variable_set; /* a list of lmm_variable_t */ s_xbt_swag_t saturated_constraint_set; /* a list of lmm_constraint_t_t */ - ActionLmmListPtr keep_track; + simgrid::surf::ActionLmmListPtr keep_track; xbt_mallocator_t variable_mallocator; } s_lmm_system_t; @@ -119,10 +121,10 @@ typedef struct lmm_system { * * @param sys A lmm system */ -void lmm_print(lmm_system_t sys); +XBT_PRIVATE void lmm_print(lmm_system_t sys); -extern double (*func_f_def) (lmm_variable_t, double); -extern double (*func_fp_def) (lmm_variable_t, double); -extern double (*func_fpi_def) (lmm_variable_t, double); +extern XBT_PRIVATE double (*func_f_def) (lmm_variable_t, double); +extern XBT_PRIVATE double (*func_fp_def) (lmm_variable_t, double); +extern XBT_PRIVATE double (*func_fpi_def) (lmm_variable_t, double); #endif /* _SURF_MAXMIN_PRIVATE_H */