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
Forgot void inside parenthesis
[simgrid.git]
/
src
/
surf
/
network.c
diff --git
a/src/surf/network.c
b/src/surf/network.c
index
f4327ca
..
c69aaa4
100644
(file)
--- a/
src/surf/network.c
+++ b/
src/surf/network.c
@@
-188,9
+188,6
@@
static link_CM02_t net_link_new(char *name,
xbt_dict_set(surf_network_model->resource_set, name, nw_link,
surf_resource_free);
xbt_dict_set(surf_network_model->resource_set, name, nw_link,
surf_resource_free);
-#ifdef HAVE_TRACING
- TRACE_surf_link_declaration(nw_link, name, bw_initial, lat_initial);
-#endif
return nw_link;
}
return nw_link;
}
@@
-410,6
+407,8
@@
static double net_share_resources(double now)
}
}
}
}
+ DEBUG1("Min of share resources %f", min);
+
return min;
}
return min;
}
@@
-445,7
+444,7
@@
static void net_update_actions_state(double now, double delta)
link_CM02_t link;
unsigned int i;
xbt_dynar_foreach(route, i, link) {
link_CM02_t link;
unsigned int i;
xbt_dynar_foreach(route, i, link) {
- TRACE_surf_link_set_utilization(link,
+ TRACE_surf_link_set_utilization(link
->lmm_resource.generic_resource.name
,
action->generic_action.data,
(surf_action_t) action,
lmm_variable_getvalue
action->generic_action.data,
(surf_action_t) action,
lmm_variable_getvalue
@@
-509,7
+508,7
@@
static void net_update_resource_state(void *id,
(nw_link->lmm_resource.power.peak *
nw_link->lmm_resource.power.scale));
#ifdef HAVE_TRACING
(nw_link->lmm_resource.power.peak *
nw_link->lmm_resource.power.scale));
#ifdef HAVE_TRACING
- TRACE_surf_link_set_bandwidth(date, nw_link,
+ TRACE_surf_link_set_bandwidth(date, nw_link
->lmm_resource.generic_resource.name
,
sg_bandwidth_factor *
(nw_link->lmm_resource.power.peak *
nw_link->lmm_resource.power.scale));
sg_bandwidth_factor *
(nw_link->lmm_resource.power.peak *
nw_link->lmm_resource.power.scale));