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
[trace] links are identified by their names (the same used in the platform file)
[simgrid.git]
/
src
/
surf
/
network_private.h
diff --git
a/src/surf/network_private.h
b/src/surf/network_private.h
index
c9dd0b5
..
363bb18
100644
(file)
--- a/
src/surf/network_private.h
+++ b/
src/surf/network_private.h
@@
-1,6
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 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. */
@@
-10,44
+9,41
@@
#include "surf_private.h"
#include "xbt/dict.h"
#include "surf_private.h"
#include "xbt/dict.h"
+#include "xbt/fifo.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_CM02 {
+ s_surf_resource_lmm_t lmm_resource; /* must remain first to be added to a trace */
-typedef struct network_link {
- surf_resource_t resource; /* Any such object, added in a trace
- should start by this field!!! */
/* Using this object with the public part of
/* Using this object with the public part of
- resource does not make sense */
- char *name;
- double bw_current;
- tmgr_trace_event_t bw_event;
+ model does not make sense */
double lat_current;
tmgr_trace_event_t lat_event;
double lat_current;
tmgr_trace_event_t lat_event;
- 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_link_CM02_t, *link_CM02_t;
-typedef struct network_card {
- char *name;
- int id;
-} s_network_card_t, *network_card_t;
-typedef struct surf_action_network {
+typedef struct surf_action_network
_CM02
{
s_surf_action_t generic_action;
double latency;
double lat_current;
s_surf_action_t generic_action;
double latency;
double lat_current;
+ double weight;
lmm_variable_t variable;
double rate;
lmm_variable_t variable;
double rate;
+ 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
int suspended;
int suspended;
- network_card_t src;
- network_card_t dst;
-} s_surf_action_network_t, *surf_action_network_t;
-extern xbt_dict_t network_card_set;
+#ifdef HAVE_TRACING
+ char *src_name;
+ char *dst_name;
+#endif
+
+} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
-#endif /* _SURF_NETWORK_PRIVATE_H */
+#endif
/* _SURF_NETWORK_PRIVATE_H */