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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
network.c
diff --git
a/src/surf/network.c
b/src/surf/network.c
index
5afe01f
..
2680406
100644
(file)
--- a/
src/surf/network.c
+++ b/
src/surf/network.c
@@
-538,7
+538,10
@@
static void net_update_actions_state_full(double now, double delta)
link_CM02_t link = lmm_constraint_id(constraint);
TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
((surf_action_t)action)->category,
link_CM02_t link = lmm_constraint_id(constraint);
TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
((surf_action_t)action)->category,
- lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+ (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)*
+ lmm_get_cnst_weight_from_var(network_maxmin_system,
+ GENERIC_LMM_ACTION(action).variable,
+ i)),
now - delta,
delta);
}
now - delta,
delta);
}
@@
-599,7
+602,10
@@
static void net_update_actions_state_lazy(double now, double delta)
link_CM02_t link = lmm_constraint_id(constraint);
TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
((surf_action_t)action)->category,
link_CM02_t link = lmm_constraint_id(constraint);
TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
((surf_action_t)action)->category,
- lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+ (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)*
+ lmm_get_cnst_weight_from_var(network_maxmin_system,
+ GENERIC_LMM_ACTION(action).variable,
+ i)),
GENERIC_LMM_ACTION(action).last_update,
now - GENERIC_LMM_ACTION(action).last_update);
}
GENERIC_LMM_ACTION(action).last_update,
now - GENERIC_LMM_ACTION(action).last_update);
}
@@
-746,8
+752,8
@@
static void net_update_resource_state(void *id,
}
}
-static surf_action_t net_communicate(
network_element
_t src,
-
network_element
_t dst,
+static surf_action_t net_communicate(
sg_routing_edge
_t src,
+
sg_routing_edge
_t dst,
double size, double rate)
{
unsigned int i;
double size, double rate)
{
unsigned int i;
@@
-759,7
+765,7
@@
static surf_action_t net_communicate(network_element_t src,
xbt_dynar_t back_route = NULL;
int constraints_per_variable = 0;
xbt_dynar_t back_route = NULL;
int constraints_per_variable = 0;
- xbt_dynar_t route = xbt_dynar_new(
global_routing->size_of_link
, NULL);
+ xbt_dynar_t route = xbt_dynar_new(
sizeof(sg_routing_link_t)
, NULL);
XBT_IN("(%s,%s,%g,%g)", src->name, dst->name, size, rate);
XBT_IN("(%s,%s,%g,%g)", src->name, dst->name, size, rate);
@@
-1085,8
+1091,7
@@
static void surf_network_model_init_internal(void)
if (!network_maxmin_system)
network_maxmin_system = lmm_system_new(net_selective_update);
if (!network_maxmin_system)
network_maxmin_system = lmm_system_new(net_selective_update);
- routing_model_create(sizeof(link_CM02_t),
- net_create_resource("__loopback__",
+ routing_model_create(net_create_resource("__loopback__",
498000000, NULL, 0.000015, NULL,
SURF_RESOURCE_ON, NULL,
SURF_LINK_FATPIPE, NULL));
498000000, NULL, 0.000015, NULL,
SURF_RESOURCE_ON, NULL,
SURF_LINK_FATPIPE, NULL));