X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/976ee462f4626798ebf76ca46d13f53e10e0e28d..0c539f5e2d25206246bb12e6dc036b108ea778e5:/src/surf/maxmin_private.h diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h index e492e6eae8..7b82d55a17 100644 --- a/src/surf/maxmin_private.h +++ b/src/surf/maxmin_private.h @@ -1,6 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -47,7 +46,6 @@ typedef struct lmm_variable { /* hookup to system */ s_xbt_swag_hookup_t variable_set_hookup; s_xbt_swag_hookup_t saturated_variable_set_hookup; - s_xbt_swag_hookup_t modified_variable_set_hookup; s_lmm_element_t *cnsts; int cnsts_size; @@ -79,8 +77,6 @@ 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 */ - s_xbt_swag_t modified_variable_set; /* list of modified variables used in new model CpuIM */ - xbt_mallocator_t variable_mallocator; } s_lmm_system_t; @@ -96,7 +92,8 @@ typedef struct lmm_system { #define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst) static void lmm_var_free(lmm_system_t sys, lmm_variable_t var); -static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst); +static XBT_INLINE void lmm_cnst_free(lmm_system_t sys, + lmm_constraint_t cnst); void lmm_print(lmm_system_t sys); @@ -104,4 +101,4 @@ 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); -#endif /* _SURF_MAXMIN_PRIVATE_H */ +#endif /* _SURF_MAXMIN_PRIVATE_H */