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
keep documentation in sync with implementation
[simgrid.git]
/
src
/
surf
/
network_private.h
diff --git
a/src/surf/network_private.h
b/src/surf/network_private.h
index
8b4ee26
..
b22d08a
100644
(file)
--- a/
src/surf/network_private.h
+++ b/
src/surf/network_private.h
@@
-9,22
+9,24
@@
#define _SURF_NETWORK_PRIVATE_H
#include "surf_private.h"
#define _SURF_NETWORK_PRIVATE_H
#include "surf_private.h"
+#include "network_common.h"
#include "xbt/dict.h"
typedef struct network_link_CM02 {
#include "xbt/dict.h"
typedef struct network_link_CM02 {
- surf_
resource_t resource;
/* Any such object, added in a trace
+ surf_
model_t model;
/* Any such object, added in a trace
should start by this field!!! */
should start by this field!!! */
+ xbt_dict_t properties;
/* Using this object with the public part of
/* Using this object with the public part of
-
resource
does not make sense */
+
model
does not make sense */
char *name;
double bw_current;
tmgr_trace_event_t bw_event;
double lat_current;
tmgr_trace_event_t lat_event;
char *name;
double bw_current;
tmgr_trace_event_t bw_event;
double lat_current;
tmgr_trace_event_t lat_event;
- e_surf_
network_
link_state_t state_current;
+ e_surf_link_state_t state_current;
tmgr_trace_event_t state_event;
lmm_constraint_t constraint;
tmgr_trace_event_t state_event;
lmm_constraint_t constraint;
-} s_
network_link_CM02_t, *network_
link_CM02_t;
+} s_
link_CM02_t, *
link_CM02_t;
typedef struct network_card_CM02 {
typedef struct network_card_CM02 {
@@
-36,6
+38,7
@@
typedef struct surf_action_network_CM02 {
s_surf_action_t generic_action;
double latency;
double lat_current;
s_surf_action_t generic_action;
double latency;
double lat_current;
+ double weight;
lmm_variable_t variable;
double rate;
int suspended;
lmm_variable_t variable;
double rate;
int suspended;
@@
-43,14
+46,11
@@
typedef struct surf_action_network_CM02 {
network_card_CM02_t dst;
} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
network_card_CM02_t dst;
} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
-extern xbt_dict_t network_card_set;
-
-
extern int card_number;
extern int card_number;
-extern
network_
link_CM02_t **routing_table;
+extern link_CM02_t **routing_table;
extern int *routing_table_size;
extern int *routing_table_size;
-#define ROUTE(i,j) routing_table[(i)+(j)*
card
_number]
-#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*
card
_number]
+#define ROUTE(i,j) routing_table[(i)+(j)*
host
_number]
+#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*
host
_number]
#endif /* _SURF_NETWORK_PRIVATE_H */
#endif /* _SURF_NETWORK_PRIVATE_H */