static double share_resources(double now)
{
s_surf_action_cpu_Cas01_t action;
- return generic_maxmin_share_resources2(surf_cpu_model->common_public->
- states.running_action_set,
- xbt_swag_offset(action, variable),
- cpu_maxmin_system, lmm_solve);
+ return generic_maxmin_share_resources(surf_cpu_model->common_public->
+ states.running_action_set,
+ xbt_swag_offset(action, variable),
+ cpu_maxmin_system, lmm_solve);
}
static void update_actions_state(double now, double delta)
surf_network_model->common_public->states.running_action_set;
double min;
- min = generic_maxmin_share_resources2(running_actions,
- xbt_swag_offset(s_action,
- variable),
- network_maxmin_system,
- network_solve);
+ min = generic_maxmin_share_resources(running_actions,
+ xbt_swag_offset(s_action,
+ variable),
+ network_maxmin_system,
+ network_solve);
xbt_swag_foreach(action, running_actions) {
if (action->latency > 0) {
}
double generic_maxmin_share_resources(xbt_swag_t running_actions,
- size_t offset)
-{
- return generic_maxmin_share_resources2(running_actions, offset,
- maxmin_system, lmm_solve);
-}
-
-double generic_maxmin_share_resources2(xbt_swag_t running_actions,
- size_t offset,
- lmm_system_t sys,
- void (*solve) (lmm_system_t))
+ size_t offset,
+ lmm_system_t sys,
+ void (*solve) (lmm_system_t))
{
surf_action_t action = NULL;
double min = -1;
extern int use_lagrange_solver;
double generic_maxmin_share_resources(xbt_swag_t running_actions,
- size_t offset);
-double generic_maxmin_share_resources2(xbt_swag_t running_actions,
size_t offset,
lmm_system_t sys,
void (*solve)(lmm_system_t));
xbt_swag_t running_actions =
surf_workstation_model->common_public->states.running_action_set;
- double min = generic_maxmin_share_resources2(running_actions,
- xbt_swag_offset(s_action,
- variable),
- maxmin_system,
- lmm_solve);
+ double min = generic_maxmin_share_resources(running_actions,
+ xbt_swag_offset(s_action,
+ variable),
+ maxmin_system,
+ lmm_solve);
xbt_swag_foreach(action, running_actions) {
if (action->latency > 0) {
xbt_swag_t running_actions =
surf_workstation_model->common_public->states.running_action_set;
- double min = generic_maxmin_share_resources2(running_actions,
- xbt_swag_offset(s_action,
- variable),
- ptask_maxmin_system,
- bottleneck_solve);
+ double min = generic_maxmin_share_resources(running_actions,
+ xbt_swag_offset(s_action,
+ variable),
+ ptask_maxmin_system,
+ bottleneck_solve);
xbt_swag_foreach(action, running_actions) {
if (action->latency > 0) {