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
Fix format specifiers for sg_storage_size_t.
[simgrid.git]
/
src
/
surf
/
network_gtnets_private.h
diff --git
a/src/surf/network_gtnets_private.h
b/src/surf/network_gtnets_private.h
index
145c10f
..
293ac16
100644
(file)
--- a/
src/surf/network_gtnets_private.h
+++ b/
src/surf/network_gtnets_private.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2012
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-11,7
+11,7
@@
#include "xbt/dict.h"
typedef struct network_link_GTNETS {
#include "xbt/dict.h"
typedef struct network_link_GTNETS {
- s_surf_resource_t generic_resource; /* Must remain first to allow casting */
+ s_surf_resource_t generic_resource;
/* Must remain first to allow casting */
/* Using this object with the public part of
model does not make sense */
double bw_current;
/* Using this object with the public part of
model does not make sense */
double bw_current;
@@
-23,13
+23,20
@@
typedef struct surf_action_network_GTNETS {
s_surf_action_t generic_action;
double latency;
double lat_current;
s_surf_action_t generic_action;
double latency;
double lat_current;
+#ifdef HAVE_TRACING
+ int last_remains;
+#endif
lmm_variable_t variable;
double rate;
int suspended;
lmm_variable_t variable;
double rate;
int suspended;
+#ifdef HAVE_TRACING
+ sg_routing_edge_t src;
+ sg_routing_edge_t dst;
+#endif //HAVE_TRACING
} s_surf_action_network_GTNETS_t, *surf_action_network_GTNETS_t;
xbt_dict_t network_card_ids;
} s_surf_action_network_GTNETS_t, *surf_action_network_GTNETS_t;
xbt_dict_t network_card_ids;
-#endif /* _SURF_NETWORK_PRIVATE_H */
+#endif
/* _SURF_NETWORK_PRIVATE_H */