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
Preparing surf_parser to be hijacked
[simgrid.git]
/
src
/
surf
/
network_private.h
diff --git
a/src/surf/network_private.h
b/src/surf/network_private.h
index
898857b
..
8b4ee26
100644
(file)
--- a/
src/surf/network_private.h
+++ b/
src/surf/network_private.h
@@
-11,12
+11,7
@@
#include "surf_private.h"
#include "xbt/dict.h"
#include "surf_private.h"
#include "xbt/dict.h"
-typedef enum {
- SURF_NETWORK_LINK_ON = 1, /* Ready */
- SURF_NETWORK_LINK_OFF = 0 /* Running */
-} e_surf_network_link_state_t;
-
-typedef struct network_link {
+typedef struct network_link_CM02 {
surf_resource_t resource; /* Any such object, added in a trace
should start by this field!!! */
/* Using this object with the public part of
surf_resource_t resource; /* Any such object, added in a trace
should start by this field!!! */
/* Using this object with the public part of
@@
-29,24
+24,33
@@
typedef struct network_link {
e_surf_network_link_state_t state_current;
tmgr_trace_event_t state_event;
lmm_constraint_t constraint;
e_surf_network_link_state_t state_current;
tmgr_trace_event_t state_event;
lmm_constraint_t constraint;
-} s_network_link_
t, *network_link
_t;
+} s_network_link_
CM02_t, *network_link_CM02
_t;
-typedef struct network_card {
+typedef struct network_card
_CM02
{
char *name;
int id;
char *name;
int id;
-} s_network_card_
t, *network_card
_t;
+} s_network_card_
CM02_t, *network_card_CM02
_t;
-typedef struct surf_action_network {
+typedef struct surf_action_network
_CM02
{
s_surf_action_t generic_action;
double latency;
double lat_current;
lmm_variable_t variable;
s_surf_action_t generic_action;
double latency;
double lat_current;
lmm_variable_t variable;
+ double rate;
int suspended;
int suspended;
- network_card_t src;
- network_card_t dst;
-} s_surf_action_network_
t, *surf_action_network
_t;
+ network_card_
CM02_
t src;
+ network_card_
CM02_
t dst;
+} s_surf_action_network_
CM02_t, *surf_action_network_CM02
_t;
extern xbt_dict_t network_card_set;
extern xbt_dict_t network_card_set;
+
+extern int card_number;
+extern network_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]
+
#endif /* _SURF_NETWORK_PRIVATE_H */
#endif /* _SURF_NETWORK_PRIVATE_H */