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
bugfix revealed by making maxmin_system private...
[simgrid.git]
/
src
/
surf
/
network.c
diff --git
a/src/surf/network.c
b/src/surf/network.c
index
b09769e
..
ca825ae
100644
(file)
--- a/
src/surf/network.c
+++ b/
src/surf/network.c
@@
-229,15
+229,15
@@
static void *name_service(const char *name)
return card;
}
return card;
}
-static const char *get_
model_name(void *model
_id)
+static const char *get_
resource_name(void *resource
_id)
{
{
- return ((network_card_CM02_t)
model
_id)->name;
+ return ((network_card_CM02_t)
resource
_id)->name;
}
}
-static int
model_used(void *model
_id)
+static int
resource_used(void *resource
_id)
{
return lmm_constraint_used(network_maxmin_system,
{
return lmm_constraint_used(network_maxmin_system,
- ((network_link_CM02_t)
model
_id)->
+ ((network_link_CM02_t)
resource
_id)->
constraint);
}
constraint);
}
@@
-283,7
+283,7
@@
static void action_change_state(surf_action_t action,
return;
}
return;
}
-static double share_
model
s(double now)
+static double share_
resource
s(double now)
{
s_surf_action_network_CM02_t s_action;
surf_action_network_CM02_t action = NULL;
{
s_surf_action_network_CM02_t s_action;
surf_action_network_CM02_t action = NULL;
@@
-291,7
+291,7
@@
static double share_models(double now)
surf_network_model->common_public->states.running_action_set;
double min;
surf_network_model->common_public->states.running_action_set;
double min;
- min = generic_maxmin_share_
model
s2(running_actions,
+ min = generic_maxmin_share_
resource
s2(running_actions,
xbt_swag_offset(s_action,
variable),
network_maxmin_system,
xbt_swag_offset(s_action,
variable),
network_maxmin_system,
@@
-371,7
+371,7
@@
static void update_actions_state(double now, double delta)
return;
}
return;
}
-static void update_
model
_state(void *id,
+static void update_
resource
_state(void *id,
tmgr_trace_event_t event_type,
double value)
{
tmgr_trace_event_t event_type,
double value)
{
@@
-490,7
+490,7
@@
static surf_action_t communicate(void *src, void *dst, double size,
lmm_update_variable_bound(network_maxmin_system, action->variable,
action->rate);
}
lmm_update_variable_bound(network_maxmin_system, action->variable,
action->rate);
}
- lmm_update_variable_latency(maxmin_system, action->variable,
+ lmm_update_variable_latency(
network_
maxmin_system, action->variable,
action->latency);
for (i = 0; i < route_size; i++)
action->latency);
for (i = 0; i < route_size; i++)
@@
-616,8
+616,8
@@
static void surf_network_model_init_internal(void)
xbt_swag_new(xbt_swag_offset(action, state_hookup));
surf_network_model->common_public->name_service = name_service;
xbt_swag_new(xbt_swag_offset(action, state_hookup));
surf_network_model->common_public->name_service = name_service;
- surf_network_model->common_public->get_
model
_name =
- get_
model
_name;
+ surf_network_model->common_public->get_
resource
_name =
+ get_
resource
_name;
surf_network_model->common_public->action_get_state =
surf_action_get_state;
surf_network_model->common_public->action_get_start_time =
surf_network_model->common_public->action_get_state =
surf_action_get_state;
surf_network_model->common_public->action_get_start_time =
@@
-634,12
+634,12
@@
static void surf_network_model_init_internal(void)
surf_action_set_data;
surf_network_model->common_public->name = "network";
surf_action_set_data;
surf_network_model->common_public->name = "network";
- surf_network_model->common_private->
model_used = model
_used;
- surf_network_model->common_private->share_
models = share_model
s;
+ surf_network_model->common_private->
resource_used = resource
_used;
+ surf_network_model->common_private->share_
resources = share_resource
s;
surf_network_model->common_private->update_actions_state =
update_actions_state;
surf_network_model->common_private->update_actions_state =
update_actions_state;
- surf_network_model->common_private->update_
model
_state =
- update_
model
_state;
+ surf_network_model->common_private->update_
resource
_state =
+ update_
resource
_state;
surf_network_model->common_private->finalize = finalize;
surf_network_model->common_public->suspend = action_suspend;
surf_network_model->common_private->finalize = finalize;
surf_network_model->common_public->suspend = action_suspend;