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
Changes in SimGrid DTD files for on_failure support.
[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
0a20d4c
..
2927abe
100644
(file)
--- a/
src/surf/network_gtnets_private.h
+++ b/
src/surf/network_gtnets_private.h
@@
-1,6
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2007, 2008, 2009, 2010. 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. */
@@
-12,40
+11,32
@@
#include "xbt/dict.h"
typedef struct network_link_GTNETS {
#include "xbt/dict.h"
typedef struct network_link_GTNETS {
- surf_resource_t resource; /* Any such object, added in a trace
- should start by this field!!! */
+ s_surf_resource_t generic_resource; /* Must remain first to allow casting */
/* Using this object with the public part of
/* Using this object with the public part of
- resource does not make sense */
- char *name;
+ model does not make sense */
double bw_current;
double lat_current;
int id;
} s_network_link_GTNETS_t, *network_link_GTNETS_t;
double bw_current;
double lat_current;
int id;
} s_network_link_GTNETS_t, *network_link_GTNETS_t;
-
-typedef struct network_card_GTNETS {
- char *name;
- int id;
-} s_network_card_GTNETS_t, *network_card_GTNETS_t;
-
typedef struct surf_action_network_GTNETS {
s_surf_action_t generic_action;
double latency;
double lat_current;
typedef struct surf_action_network_GTNETS {
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;
- network_card_GTNETS_t src;
- network_card_GTNETS_t dst;
+#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;
} s_surf_action_network_GTNETS_t, *surf_action_network_GTNETS_t;
-extern xbt_dict_t network_card_set;
-
-/* HC: I put this prototype here for now but it will have to go in
- src/include/surf.h when it is functionnal. */
-void surf_network_resource_init_GTNETS(const char *filename);
-
+xbt_dict_t network_card_ids;
-#endif /* _SURF_NETWORK_PRIVATE_H */
+#endif /* _SURF_NETWORK_PRIVATE_H */