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
Use existing xbt_swag_reset().
[simgrid.git]
/
src
/
surf
/
network_private.h
diff --git
a/src/surf/network_private.h
b/src/surf/network_private.h
index
bf4c664
..
000acc7
100644
(file)
--- a/
src/surf/network_private.h
+++ b/
src/surf/network_private.h
@@
-1,6
+1,4
@@
-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-9,45
+7,33
@@
#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"
#include "xbt/dict.h"
+#include "xbt/fifo.h"
typedef struct network_link_CM02 {
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 {
typedef struct surf_action_network_CM02 {
- s_surf_action_
t generic
_action;
+ s_surf_action_
lmm_t generic_lmm
_action;
double latency;
double lat_current;
double weight;
double latency;
double lat_current;
double weight;
- lmm_variable_t variable;
double rate;
double rate;
- int suspended;
- network_card_CM02_t src;
- network_card_CM02_t dst;
+ struct {
+ const char* link_name;
+ double gap;
+ double size;
+ xbt_fifo_item_t fifo_item;
+ } sender;
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+ int latency_limited;
+#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 */