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
Allow to cross compile simgrid.dll using the autotools suite
[simgrid.git]
/
src
/
surf
/
network_gtnets.c
diff --git
a/src/surf/network_gtnets.c
b/src/surf/network_gtnets.c
index
57355b7
..
11e6089
100644
(file)
--- a/
src/surf/network_gtnets.c
+++ b/
src/surf/network_gtnets.c
@@
-1,4
+1,5
@@
-/* Copyright (c) 2005 Henri Casanova. 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. */
@@
-39,7
+40,7
@@
static void link_new(char *name, double bw, double lat, xbt_dict_t props)
gtnets_link->lat_current = lat;
gtnets_link->id = link_count;
#ifdef HAVE_TRACING
gtnets_link->lat_current = lat;
gtnets_link->id = link_count;
#ifdef HAVE_TRACING
- TRACE_surf_
net_link_new
(name, bw, lat);
+ TRACE_surf_
link_declaration
(name, bw, lat);
#endif
xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
surf_resource_free);
#endif
xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
surf_resource_free);
@@
-235,10
+236,6
@@
static void update_actions_state(double now, double delta)
double remain = gtnets_get_flow_rx(action);
#ifdef HAVE_TRACING
double remain = gtnets_get_flow_rx(action);
#ifdef HAVE_TRACING
- // tracing surf action
- TRACE_surf_update_action_state (action, action->generic_action.data,
- (action->generic_action.remains-remain)/delta, "BandwidthUsed", now-delta, delta);
-
// tracing resource utilization
int src = TRACE_surf_gtnets_get_src (action);
int dst = TRACE_surf_gtnets_get_dst (action);
// tracing resource utilization
int src = TRACE_surf_gtnets_get_src (action);
int dst = TRACE_surf_gtnets_get_dst (action);
@@
-248,7
+245,7
@@
static void update_actions_state(double now, double delta)
unsigned int i;
xbt_dynar_foreach(route, i, link) {
unsigned int i;
xbt_dynar_foreach(route, i, link) {
-
TRACE_surf_update_action_state_net_resource
(link->generic_resource.name,
+
TRACE_surf_link_set_utilization
(link->generic_resource.name,
action->generic_action.data, (action->generic_action.remains-remain)/delta, now-delta, delta);
}
}
action->generic_action.data, (action->generic_action.remains-remain)/delta, now-delta, delta);
}
}