#define NO_MAX_DURATION -1.0
+typedef enum {
+ UM_FULL,
+ UM_LAZY,
+ UM_UNDEFINED
+} e_UM_t;
+
/* user-visible parameters */
extern double sg_tcp_gamma;
extern double sg_sender_gap;
extern double sg_bandwidth_factor;
extern double sg_weight_S_parameter;
extern int sg_maxmin_selective_update;
-extern int sg_network_fullduplex;
+extern int sg_network_crosstraffic;
#ifdef HAVE_GTNETS
extern double sg_gtnets_jitter;
extern int sg_gtnets_jitter_seed;
void surf_action_state_set(surf_action_t action,
e_surf_action_state_t state);
void surf_action_data_set(surf_action_t action, void *data); /* cannot declare inline since we use a pointer to it */
+
+void surf_action_lmm_update_index_heap(void *action, int i); /* callback for heap management shared by cpu and net models */
+void surf_action_lmm_heap_insert(xbt_heap_t heap, surf_action_lmm_t action,
+ double key, enum heap_action_type hat);
+void surf_action_lmm_heap_remove(xbt_heap_t heap,surf_action_lmm_t action);
+
+
FILE *surf_fopen(const char *name, const char *mode);
extern tmgr_history_t history;
struct s_as *routing_father;
xbt_dict_t routing_sons;
- void (*get_route) (AS_t as, const char *src, const char *dst, route_t into);
- double(*get_latency) (AS_t as,
- const char *src, const char *dst,
- route_t e_route);
+ void (*get_route_and_latency) (AS_t as, const char *src, const char *dst, route_t into, double *latency);
+
xbt_dynar_t(*get_onelink_routes) (AS_t as);
route_t(*get_bypass_route) (AS_t as, const char *src, const char *dst);
void (*finalize) (AS_t as);
typedef struct s_network_element_info {
AS_t rc_component;
e_surf_network_element_type_t rc_type;
+ int id;
+ char *name;
} s_network_element_info_t, *network_element_info_t;
typedef int *network_element_t;
AS_t root;
void *loopback;
size_t size_of_link;
- xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst);
+ xbt_dynar_t last_route;
xbt_dynar_t(*get_onelink_routes) (void);
};
XBT_PUBLIC(void) routing_exit(void);
XBT_PUBLIC(void) routing_register_callbacks(void);
XBT_PUBLIC(void) generic_free_route(route_t route); // FIXME rename to routing_route_free
+ // FIXME: make previous function private to routing again?
-XBT_PUBLIC(void) routing_get_route_and_latency(const char *src, const char *dst, //FIXME too much functions avail?
- xbt_dynar_t * route, double *latency, int cleanup);
+XBT_PUBLIC(void) routing_get_route_and_latency(const char *src, const char *dst,
+ xbt_dynar_t * route, double *latency);
/**
* Resource protected methods