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
Bug fix.
[simgrid.git]
/
src
/
surf
/
network_private.h
diff --git
a/src/surf/network_private.h
b/src/surf/network_private.h
index
cba58fb
..
b22d08a
100644
(file)
--- a/
src/surf/network_private.h
+++ b/
src/surf/network_private.h
@@
-9,6
+9,7
@@
#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 {
@@
-37,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;
@@
-44,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 link_CM02_t **routing_table;
extern int *routing_table_size;
extern int card_number;
extern link_CM02_t **routing_table;
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 */