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
I comment all the calls to used_routing, in order to use global routing.
[simgrid.git]
/
src
/
surf
/
network_private.h
diff --git
a/src/surf/network_private.h
b/src/surf/network_private.h
index
eeac6d0
..
56237db
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. */
@@
-9,22
+8,15
@@
#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"
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;
@@
-35,11
+27,15
@@
typedef struct surf_action_network_CM02 {
double weight;
lmm_variable_t variable;
double rate;
double weight;
lmm_variable_t variable;
double rate;
+ int latency_limited;
int suspended;
int suspended;
-#ifdef KILLME
- int src;
- int dst;
-#endif
+
+ int src; /* saving source id for tracing */
+ int dst; /* saving dest id for tracing */
+
+ char* src_name; /* saving source id for tracing */ // ADDED BY DAVID
+ char* dst_name; /* saving dest id for tracing */ // ADDED BY DAVID
+
} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
#endif /* _SURF_NETWORK_PRIVATE_H */
} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
#endif /* _SURF_NETWORK_PRIVATE_H */