A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put ns3 sources in place.
[simgrid.git]
/
src
/
surf
/
surf_private.h
diff --git
a/src/surf/surf_private.h
b/src/surf/surf_private.h
index
fe5fbc4
..
42ec82a
100644
(file)
--- a/
src/surf/surf_private.h
+++ b/
src/surf/surf_private.h
@@
-12,12
+12,13
@@
#include "xbt/log.h"
#include "surf/surfxml_parse_private.h"
#include "surf/random_mgr.h"
#include "xbt/log.h"
#include "surf/surfxml_parse_private.h"
#include "surf/random_mgr.h"
-#include "instr/private.h"
+#include "instr/
instr_
private.h"
#define NO_MAX_DURATION -1.0
/* user-visible parameters */
extern double sg_tcp_gamma;
#define NO_MAX_DURATION -1.0
/* user-visible parameters */
extern double sg_tcp_gamma;
+extern double sg_sender_gap;
extern double sg_latency_factor;
extern double sg_bandwidth_factor;
extern double sg_weight_S_parameter;
extern double sg_latency_factor;
extern double sg_bandwidth_factor;
extern double sg_weight_S_parameter;
@@
-49,6
+50,8
@@
double generic_maxmin_share_resources(xbt_swag_t running_actions,
void (*solve) (lmm_system_t));
/* Generic functions common to all models */
void (*solve) (lmm_system_t));
/* Generic functions common to all models */
+void surf_action_init(void);
+void surf_action_exit(void);
e_surf_action_state_t surf_action_state_get(surf_action_t action); /* cannot declare inline since we use a pointer to it */
double surf_action_get_start_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
double surf_action_get_finish_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
e_surf_action_state_t surf_action_state_get(surf_action_t action); /* cannot declare inline since we use a pointer to it */
double surf_action_get_start_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
double surf_action_get_finish_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
@@
-139,13
+142,6
@@
typedef enum {
SURF_ROUTING_RECURSIVE /**< Recursive case: also return gateway informations */
} e_surf_routing_hierarchy_t;
SURF_ROUTING_RECURSIVE /**< Recursive case: also return gateway informations */
} e_surf_routing_hierarchy_t;
-typedef enum {
- SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */
- SURF_NETWORK_ELEMENT_HOST, /* host type */
- SURF_NETWORK_ELEMENT_ROUTER, /* router type */
- SURF_NETWORK_ELEMENT_AS, /* AS type */
-} e_surf_network_element_type_t;
-
typedef struct s_routing_component *routing_component_t;
typedef struct s_routing_component {
xbt_dict_t to_index; /* char* -> network_element_t */
typedef struct s_routing_component *routing_component_t;
typedef struct s_routing_component {
xbt_dict_t to_index; /* char* -> network_element_t */
@@
-158,7
+154,7
@@
typedef struct s_routing_component {
route_extended_t(*get_route) (routing_component_t rc, const char *src,
const char *dst);
double(*get_latency) (routing_component_t rc, const char *src,
route_extended_t(*get_route) (routing_component_t rc, const char *src,
const char *dst);
double(*get_latency) (routing_component_t rc, const char *src,
- const char *dst);
+ const char *dst
, route_extended_t e_route
);
xbt_dynar_t(*get_onelink_routes) (routing_component_t rc);
e_surf_network_element_type_t(*get_network_element_type) (const char
*name);
xbt_dynar_t(*get_onelink_routes) (routing_component_t rc);
e_surf_network_element_type_t(*get_network_element_type) (const char
*name);
@@
-184,7
+180,6
@@
typedef int *network_element_t;
struct s_routing_global {
routing_component_t root;
struct s_routing_global {
routing_component_t root;
- xbt_dict_t where_network_elements; /* char* -> network_element_info_t */
void *loopback;
size_t size_of_link;
xbt_dynar_t(*get_route) (const char *src, const char *dst);
void *loopback;
size_t size_of_link;
xbt_dynar_t(*get_route) (const char *src, const char *dst);
@@
-197,7
+192,9
@@
struct s_routing_global {
xbt_dynar_t last_route;
};
xbt_dynar_t last_route;
};
-XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_pvoid_t get_link_latency_fun);
+XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_cpvoid_t get_link_latency_fun);
+
+XBT_PUBLIC(void) routing_parse_Scluster(void); /* cluster bypass */
/**
* Resource protected methods
/**
* Resource protected methods