#include "surf/trace_mgr.h"
#include "xbt/log.h"
#include "surf/surfxml_parse_private.h"
+#include "surf/random_mgr.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 */
- SURF_NETWORK_LINK_OFF = 0 /* Running */
-} e_surf_network_link_state_t;
+ SURF_LINK_ON = 1, /* Ready */
+ SURF_LINK_OFF = 0 /* Running */
+} e_surf_link_state_t;
typedef enum {
- SURF_NETWORK_LINK_SHARED = 1,
- SURF_NETWORK_LINK_FATPIPE = 0
-} e_surf_network_link_sharing_policy_t;
+ SURF_LINK_SHARED = 1,
+ SURF_LINK_FATPIPE = 0
+} e_surf_link_sharing_policy_t;
-typedef struct surf_resource_private {
+typedef struct surf_model_private {
int (*resource_used) (void *resource_id);
/* Share the resources to the actions and return in hom much time
the next action may terminate */
/* Update the actions' state */
void (*update_actions_state) (double now, double delta);
void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
- double value);
+ double value, double time);
void (*finalize) (void);
-} s_surf_resource_private_t;
+} s_surf_model_private_t;
-/* #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)))) */
+/* #define pub2priv(r) ((surf_model_private_t) ((char *)(r) -(sizeof(struct surf_model_private_part)))) */
+/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_model_private_part)))) */
+
+extern int use_sdp_solver;
+extern int use_lagrange_solver;
double generic_maxmin_share_resources(xbt_swag_t running_actions,
- size_t offset);
-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 */
+/* Generic functions common to all modelss */
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 *data);
FILE * surf_fopen(const char *name, const char *mode);
-extern lmm_system_t maxmin_system;
extern tmgr_history_t history;
extern xbt_dynar_t surf_path;
-
/*
* Returns the initial path. On Windows the initial path is
* the current directory for the current process in the other