-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2011. 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. */
+
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "solver.hpp"
+#include "maxmin_private.hpp"
#include <stdlib.h>
#include <math.h>
void bottleneck_solve(lmm_system_t sys)
{
- lmm_variable_t var_next = NULL;
+ void *_var, *_var_next, *_cnst, *_cnst_next, *_elem;
+ lmm_variable_t var = NULL;
lmm_constraint_t cnst = NULL;
- //s_lmm_constraint_t s_cnst;
- lmm_constraint_t cnst_next = NULL;
+ s_lmm_constraint_t s_cnst;
+ lmm_element_t elem = NULL;
xbt_swag_t cnst_list = NULL;
-
+ xbt_swag_t var_list = NULL;
xbt_swag_t elem_list = NULL;
int i;
static s_xbt_swag_t cnst_to_update;
- vector<ConstraintPtr> cnstToUpdate;
- if (!(lmm_system_modified(sys)))
+ if (!(sys->modified))
return;
/* Init */
+ xbt_swag_init(&(cnst_to_update),
+ xbt_swag_offset(s_cnst, saturated_constraint_set_hookup));
- lmm_variable_t var = NULL;
- lmm_element_t elem = NULL;
- std::vector<VariablePtr> *varList;
- std::vector<VariablePtr>::iterator varIt;
- std::vector<ElementPtr> *elemList;
- std::vector<ElementPtr>::iterator elemIt;
- std::vector<ConstraintPtr> *cnstList;
- std::vector<ConstraintPtr>::iterator cnstIt;
-
- varList = &(sys->m_variableSet);
- XBT_DEBUG("Variable set : %d", varList->size());
- for (varIt=varList->begin(); varIt!=varList->end(); ++varIt) {
+ var_list = &(sys->variable_set);
+ XBT_DEBUG("Variable set : %d", xbt_swag_size(var_list));
+ xbt_swag_foreach(_var, var_list) {
+ var = (lmm_variable_t)_var;
int nb = 0;
- var = *varIt;
- var->m_value = 0.0;
+ var->value = 0.0;
XBT_DEBUG("Handling variable %p", var);
- sys->m_saturatedVariableSet.push_back(var);
- for (elemIt=var->m_cnsts.begin(); elemIt!=var->m_cnsts.end(); ++elemIt)
- if ((*elemIt)->m_value == 0.0)
- nb++;
- if ((nb == var->getNumberOfCnst()) && (var->m_weight > 0.0)) {
+ xbt_swag_insert(var, &(sys->saturated_variable_set));
+ for (i = 0; i < var->cnsts_number; i++) {
+ if (var->cnsts[i].value == 0.0)
+ nb++;
+ }
+ if ((nb == var->cnsts_number) && (var->weight > 0.0)) {
XBT_DEBUG("Err, finally, there is no need to take care of variable %p",
- var);
- sys->m_saturatedVariableSet.erase(std::find(sys->m_saturatedVariableSet.begin(), sys->m_saturatedVariableSet.end(), var));
- var->m_value = 1.0;
+ var);
+ xbt_swag_remove(var, &(sys->saturated_variable_set));
+ var->value = 1.0;
}
- if (var->m_weight <= 0.0) {
+ if (var->weight <= 0.0) {
XBT_DEBUG("Err, finally, there is no need to take care of variable %p",
var);
- sys->m_saturatedVariableSet.erase(std::find(sys->m_saturatedVariableSet.begin(), sys->m_saturatedVariableSet.end(), var));
+ xbt_swag_remove(var, &(sys->saturated_variable_set));
}
}
- varList = &(sys->m_saturatedVariableSet);
- cnstList = &(sys->m_activeConstraintSet);
- XBT_DEBUG("Active constraints : %d", cnstList->size());
- sys->m_saturatedConstraintSet.insert(sys->m_saturatedConstraintSet.end(), cnstList->begin(), cnstList->end());
- cnstList = &(sys->m_saturatedConstraintSet);
- for(cnstIt=cnstList->begin(); cnstIt!=cnstList->end(); ++cnstIt) {
- (*cnstIt)->m_remaining = (*cnstIt)->m_bound;
- (*cnstIt)->m_usage = 0.0;
+ var_list = &(sys->saturated_variable_set);
+
+ cnst_list = &(sys->active_constraint_set);
+ XBT_DEBUG("Active constraints : %d", xbt_swag_size(cnst_list));
+ xbt_swag_foreach(_cnst, cnst_list) {
+ cnst = (lmm_constraint_t)_cnst;
+ xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
+ }
+ cnst_list = &(sys->saturated_constraint_set);
+ xbt_swag_foreach(_cnst, cnst_list) {
+ cnst = (lmm_constraint_t)_cnst;
+ cnst->remaining = cnst->bound;
+ cnst->usage = 0.0;
}
+
XBT_DEBUG("Fair bottleneck Initialized");
/*
* Compute Usage and store the variables that reach the maximum.
*/
-
do {
if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
XBT_DEBUG("Fair bottleneck done");
lmm_print(sys);
}
XBT_DEBUG("******* Constraints to process: %d *******",
- cnstList->size());
- for (cnstIt=cnstList->begin(); cnstIt!=cnstList->end();){
- cnst = *cnstIt;
+ xbt_swag_size(cnst_list));
+ xbt_swag_foreach_safe(_cnst, _cnst_next, cnst_list) {
+ cnst = (lmm_constraint_t)_cnst;
int nb = 0;
XBT_DEBUG("Processing cnst %p ", cnst);
- elemList = &(cnst->m_elementSet);
- cnst->m_usage = 0.0;
- for(elemIt=elemList->begin(); elemIt!=elemList->end(); elemIt++) {
- if (elem->p_variable->m_weight <= 0)
+ elem_list = &(cnst->element_set);
+ cnst->usage = 0.0;
+ xbt_swag_foreach(_elem, elem_list) {
+ elem = (lmm_element_t)_elem;
+ if (elem->variable->weight <= 0)
break;
- if ((elem->m_value > 0)
- && std::find(varList->begin(), varList->end(), elem->p_variable)!=varList->end());
+ if ((elem->value > 0)
+ && xbt_swag_belongs(elem->variable, var_list))
nb++;
}
XBT_DEBUG("\tThere are %d variables", nb);
- if (nb > 0 && !cnst->m_shared)
+ if (nb > 0 && !cnst->shared)
nb = 1;
if (!nb) {
- cnst->m_remaining = 0.0;
- cnst->m_usage = cnst->m_remaining;
- cnstList->erase(std::find(cnstList->begin(), cnstList->end(), *cnstIt));
+ cnst->remaining = 0.0;
+ cnst->usage = cnst->remaining;
+ xbt_swag_remove(cnst, cnst_list);
continue;
}
- cnst->m_usage = cnst->m_remaining / nb;
+ cnst->usage = cnst->remaining / nb;
XBT_DEBUG("\tConstraint Usage %p : %f with %d variables", cnst,
- cnst->m_usage, nb);
- ++cnstIt;
+ cnst->usage, nb);
}
- for (varIt=varList->begin(); varIt!=varList->end();){
- var = *varIt;
- double minInc =
- var->m_cnsts.front()->p_constraint->m_usage / var->m_cnsts.front()->m_value;
- for (elemIt=++var->m_cnsts.begin(); elemIt!=var->m_cnsts.end(); ++elemIt) {
- elem = (*elemIt);
- minInc = MIN(minInc, elem->p_constraint->m_usage / elem->m_value);
+ xbt_swag_foreach_safe(_var, _var_next, var_list) {
+ var = (lmm_variable_t)_var;
+ double min_inc =
+ var->cnsts[0].constraint->usage / var->cnsts[0].value;
+ for (i = 1; i < var->cnsts_number; i++) {
+ lmm_element_t elm = &var->cnsts[i];
+ min_inc = MIN(min_inc, elm->constraint->usage / elm->value);
+ }
+ if (var->bound > 0)
+ min_inc = MIN(min_inc, var->bound - var->value);
+ var->mu = min_inc;
+ XBT_DEBUG("Updating variable %p maximum increment: %g", var, var->mu);
+ var->value += var->mu;
+ if (var->value == var->bound) {
+ xbt_swag_remove(var, var_list);
}
- if (var->m_bound > 0)
- minInc = MIN(minInc, var->m_bound - var->m_value);
- var->m_mu = minInc;
- XBT_DEBUG("Updating variable %p maximum increment: %g", var, var->m_mu);
- var->m_value += var->m_mu;
- if (var->m_value == var->m_bound) {
- varList->erase(std::find(varList->begin(), varList->end(), var));
- } else
- ++varIt;
}
- for (cnstIt=cnstList->begin(); cnstIt!=cnstList->end();) {
- cnst = *cnstIt;
+ xbt_swag_foreach_safe(_cnst, _cnst_next, cnst_list) {
+ cnst = (lmm_constraint_t)_cnst;
XBT_DEBUG("Updating cnst %p ", cnst);
- elemList = &(cnst->m_elementSet);
- for (elemIt=elemList->begin(); elemIt!=elemList->end();++elemIt) {
- elem = *elemIt;
- if (elem->p_variable->m_weight <= 0)
+ elem_list = &(cnst->element_set);
+ xbt_swag_foreach(_elem, elem_list) {
+ elem = (lmm_element_t)_elem;
+ if (elem->variable->weight <= 0)
break;
- if (cnst->m_shared) {
+ if (cnst->shared) {
XBT_DEBUG("\tUpdate constraint %p (%g) with variable %p by %g",
- cnst, cnst->m_remaining, elem->p_variable,
- elem->p_variable->m_mu);
- double_update(&(cnst->m_remaining),
- elem->m_value * elem->p_variable->m_mu);
+ cnst, cnst->remaining, elem->variable,
+ elem->variable->mu);
+ double_update(&(cnst->remaining),
+ elem->value * elem->variable->mu);
} else {
XBT_DEBUG
("\tNon-Shared variable. Update constraint usage of %p (%g) with variable %p by %g",
- cnst, cnst->m_usage, elem->p_variable, elem->p_variable->m_mu);
- cnst->m_usage = MIN(cnst->m_usage, elem->m_value * elem->p_variable->m_mu);
+ cnst, cnst->usage, elem->variable, elem->variable->mu);
+ cnst->usage = MIN(cnst->usage, elem->value * elem->variable->mu);
}
}
-
- if (!cnst->m_shared) {
+ if (!cnst->shared) {
XBT_DEBUG("\tUpdate constraint %p (%g) by %g",
- cnst, cnst->m_remaining, cnst->m_usage);
+ cnst, cnst->remaining, cnst->usage);
- double_update(&(cnst->m_remaining), cnst->m_usage);
+ double_update(&(cnst->remaining), cnst->usage);
}
- XBT_DEBUG("\tRemaining for %p : %g", cnst, cnst->m_remaining);
- if (cnst->m_remaining == 0.0) {
+ XBT_DEBUG("\tRemaining for %p : %g", cnst, cnst->remaining);
+ if (cnst->remaining == 0.0) {
XBT_DEBUG("\tGet rid of constraint %p", cnst);
- cnstList->erase(std::find(cnstList->begin(), cnstList->end(), cnst));
-
- for (elemIt=elemList->begin(); elemIt!=elemList->end();++elemIt) {
- if (elem->p_variable->m_weight <= 0)
+ xbt_swag_remove(cnst, cnst_list);
+ xbt_swag_foreach(_elem, elem_list) {
+ elem = (lmm_element_t)_elem;
+ if (elem->variable->weight <= 0)
break;
- if (elem->m_value > 0) {
- XBT_DEBUG("\t\tGet rid of variable %p", elem->p_variable);
- varList->erase(std::find(varList->begin(), varList->end(), elem->p_variable));
+ if (elem->value > 0) {
+ XBT_DEBUG("\t\tGet rid of variable %p", elem->variable);
+ xbt_swag_remove(elem->variable, var_list);
}
}
- } else
- ++cnstIt;
+ }
}
- } while (!varList->empty());
-
- cnstList->clear();
- sys->m_modified = 0;
+ } while (xbt_swag_size(var_list));
+
+ xbt_swag_reset(cnst_list);
+ sys->modified = 0;
if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
XBT_DEBUG("Fair bottleneck done");
- sys->print();
+ lmm_print(sys);
}
}
