X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad5365a072943b2b0bacc486fa504e93a99ea940..49c66599a16037090462b50df22bc1c7f14db56b:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index a6b47963b6..88dc20abfc 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -44,22 +44,26 @@ typedef struct surf_resource_private { /* #define pub2priv(r) ((surf_resource_private_t) ((char *)(r) -(sizeof(struct surf_resource_private_part)))) */ /* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_resource_private_part)))) */ -XBT_PUBLIC(double) generic_maxmin_share_resources(xbt_swag_t running_actions, +extern int use_sdp_solver; +extern int use_lagrange_solver; + +double generic_maxmin_share_resources(xbt_swag_t running_actions, size_t offset); -XBT_PUBLIC(double) generic_maxmin_share_resources2(xbt_swag_t running_actions, +double generic_maxmin_share_resources2(xbt_swag_t running_actions, size_t offset, - lmm_system_t sys); + lmm_system_t sys, + void (*solve)(lmm_system_t)); /* Generic functions common to all ressources */ -XBT_PUBLIC(e_surf_action_state_t) surf_action_get_state(surf_action_t action); -XBT_PUBLIC(double) surf_action_get_start_time(surf_action_t action); -XBT_PUBLIC(double) surf_action_get_finish_time(surf_action_t action); -XBT_PUBLIC(void) surf_action_free(surf_action_t * action); -XBT_PUBLIC(void) surf_action_change_state(surf_action_t action, +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); -XBT_PUBLIC(void) surf_action_set_data(surf_action_t action, +void surf_action_set_data(surf_action_t action, void *data); -XBT_PUBLIC(FILE *) surf_fopen(const char *name, const char *mode); +FILE * surf_fopen(const char *name, const char *mode); extern lmm_system_t maxmin_system; extern tmgr_history_t history;