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
Further work on objectification of resources: use s_surf_resource_lmm_t in s_link_CM02_t
[simgrid.git]
/
src
/
surf
/
network_private.h
diff --git
a/src/surf/network_private.h
b/src/surf/network_private.h
index
bf4c664
..
7120d46
100644
(file)
--- a/
src/surf/network_private.h
+++ b/
src/surf/network_private.h
@@
-13,26
+13,15
@@
#include "xbt/dict.h"
typedef struct network_link_CM02 {
#include "xbt/dict.h"
typedef struct network_link_CM02 {
- s_surf_resource_
t generic
_resource; /* must remain first to be added to a trace */
+ s_surf_resource_
lmm_t lmm
_resource; /* must remain first to be added to a trace */
- xbt_dict_t properties;
/* Using this object with the public part of
model does not make sense */
/* Using this object with the public part of
model does not make sense */
- double bw_current;
- tmgr_trace_event_t bw_event;
double lat_current;
tmgr_trace_event_t lat_event;
double lat_current;
tmgr_trace_event_t lat_event;
- e_surf_link_state_t state_current;
- tmgr_trace_event_t state_event;
- lmm_constraint_t constraint;
} s_link_CM02_t, *link_CM02_t;
} s_link_CM02_t, *link_CM02_t;
-typedef struct network_card_CM02 {
- s_surf_resource_t generic_resource; /* must remain first to allow casts */
- int id;
-} s_network_card_CM02_t, *network_card_CM02_t;
-
typedef struct surf_action_network_CM02 {
s_surf_action_t generic_action;
double latency;
typedef struct surf_action_network_CM02 {
s_surf_action_t generic_action;
double latency;
@@
-41,13
+30,10
@@
typedef struct surf_action_network_CM02 {
lmm_variable_t variable;
double rate;
int suspended;
lmm_variable_t variable;
double rate;
int suspended;
- network_card_CM02_t src;
- network_card_CM02_t dst;
+#ifdef KILLME
+ int src;
+ int dst;
+#endif
} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
-extern int card_number;
-extern xbt_dynar_t *routing_table;
-
-#define ROUTE(i,j) routing_table[(i)+(j)*host_number]
-
#endif /* _SURF_NETWORK_PRIVATE_H */
#endif /* _SURF_NETWORK_PRIVATE_H */