-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2019. 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. */
-/* \file callbacks.h */
-
#include "src/kernel/lmm/maxmin.hpp"
+#include "src/surf/surf_interface.hpp"
#include "xbt/backtrace.hpp"
-#include "xbt/log.h"
-#include "xbt/mallocator.h"
-#include "xbt/sysdep.h"
-#include "xbt/utility.hpp"
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <cxxabi.h>
-#include <limits>
-#include <vector>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)");
System::System(bool selective_update) : selective_update_active(selective_update)
{
XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
+
+ if (selective_update)
+ modified_set_ = new kernel::resource::Action::ModifiedSet();
}
System::~System()
concurrency_limit = sg_concurrency_limit;
concurrency_current = 0;
concurrency_maximum = 0;
- sharing_policy = 1; /* FIXME: don't hardcode the value */
+ sharing_policy = s4u::Link::SharingPolicy::SHARED;
lambda = 0.0;
new_lambda = 0.0;
delete static_cast<Variable*>(var);
}
-Variable* System::variable_new(simgrid::kernel::resource::Action* id, double sharing_weight, double bound,
- int number_of_constraints)
+Variable* System::variable_new(resource::Action* id, double sharing_weight, double bound, size_t number_of_constraints)
{
- XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)", this, id, sharing_weight, bound, number_of_constraints);
+ XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%zu)", this, id, sharing_weight, bound, number_of_constraints);
Variable* var = static_cast<Variable*>(xbt_mallocator_get(variable_mallocator_));
var->initialize(id, sharing_weight, bound, number_of_constraints, visited_counter_ - 1);
- if (sharing_weight)
+ if (sharing_weight > 0)
variable_set.push_front(*var);
else
variable_set.push_back(*var);
if (var->sharing_weight)
elem.decrease_concurrency();
- if (cnst->sharing_policy)
+ if (cnst->sharing_policy != s4u::Link::SharingPolicy::FATPIPE)
elem.consumption_weight += value;
else
elem.consumption_weight = std::max(elem.consumption_weight, value);
check_concurrency();
}
-Variable* Constraint::get_variable(const_lmm_element_t* elem) const
+Variable* Constraint::get_variable(const Element** elem) const
{
if (*elem == nullptr) {
// That is the first call, pick the first element among enabled_element_set (or disabled_element_set if
// if we modify the list between calls, normal version may loop forever
// this safe version ensures that we browse the list elements only once
-Variable* Constraint::get_variable_safe(const_lmm_element_t* elem, const_lmm_element_t* nextelem, int* numelem) const
+Variable* Constraint::get_variable_safe(const Element** elem, const Element** nextelem, int* numelem) const
{
if (*elem == nullptr) {
*numelem = enabled_element_set.size() + disabled_element_set.size() - 1;
}
template <class ElemList>
-static void format_element_list(const ElemList& elem_list, int sharing_policy, double& sum, std::string& buf)
+static void format_element_list(const ElemList& elem_list, s4u::Link::SharingPolicy sharing_policy, double& sum,
+ std::string& buf)
{
for (Element const& elem : elem_list) {
buf += std::to_string(elem.consumption_weight) + ".'" + std::to_string(elem.variable->id_int) + "'(" +
- std::to_string(elem.variable->value) + ")" + (sharing_policy ? " + " : " , ");
- if (sharing_policy)
+ std::to_string(elem.variable->value) + ")" +
+ (sharing_policy != s4u::Link::SharingPolicy::FATPIPE ? " + " : " , ");
+ if (sharing_policy != s4u::Link::SharingPolicy::FATPIPE)
sum += elem.consumption_weight * elem.variable->value;
else
sum = std::max(sum, elem.consumption_weight * elem.variable->value);
double sum = 0.0;
// Show the enabled variables
buf += "\t";
- buf += cnst.sharing_policy ? "(" : "max(";
+ buf += cnst.sharing_policy != s4u::Link::SharingPolicy::FATPIPE ? "(" : "max(";
format_element_list(cnst.enabled_element_set, cnst.sharing_policy, sum, buf);
// TODO: Adding disabled elements only for test compatibility, but do we really want them to be printed?
format_element_list(cnst.disabled_element_set, cnst.sharing_policy, sum, buf);
buf += "0) <= " + std::to_string(cnst.bound) + " ('" + std::to_string(cnst.id_int) + "')";
- if (not cnst.sharing_policy) {
+ if (cnst.sharing_policy == s4u::Link::SharingPolicy::FATPIPE) {
buf += " [MAX-Constraint]";
}
XBT_DEBUG("%s", buf.c_str());
for (Element& elem : cnst.enabled_element_set) {
xbt_assert(elem.variable->sharing_weight > 0);
if (elem.consumption_weight > 0) {
- if (cnst.sharing_policy)
+ if (cnst.sharing_policy != s4u::Link::SharingPolicy::FATPIPE)
cnst.usage += elem.consumption_weight / elem.variable->sharing_weight;
else if (cnst.usage < elem.consumption_weight / elem.variable->sharing_weight)
cnst.usage = elem.consumption_weight / elem.variable->sharing_weight;
elem.make_active();
- simgrid::kernel::resource::Action* action = static_cast<simgrid::kernel::resource::Action*>(elem.variable->id);
+ resource::Action* action = static_cast<resource::Action*>(elem.variable->id);
if (modified_set_ && not action->is_within_modified_set())
modified_set_->push_back(*action);
}
/* Update the usage of contraints where this variable is involved */
for (Element& elem : var.cnsts) {
Constraint* cnst = elem.constraint;
- if (cnst->sharing_policy) {
+ if (cnst->sharing_policy != s4u::Link::SharingPolicy::FATPIPE) {
// Remember: shared constraints require that sum(elem.value * var.value) < cnst->bound
double_update(&(cnst->remaining), elem.consumption_weight * var.value, cnst->bound * sg_maxmin_precision);
double_update(&(cnst->usage), elem.consumption_weight / var.sharing_weight, sg_maxmin_precision);
delete[] cnst_light_tab;
}
-/** \brief Attribute the value bound to var->bound.
+/** @brief Attribute the value bound to var->bound.
*
- * \param var the Variable*
- * \param bound the new bound to associate with var
+ * @param var the Variable*
+ * @param bound the new bound to associate with var
*
* Makes var->bound equal to bound. Whenever this function is called a change is signed in the system. To
* avoid false system changing detection it is a good idea to test (bound != 0) before calling it.
update_modified_set(var->cnsts[0].constraint);
}
-void Variable::initialize(simgrid::kernel::resource::Action* id_value, double sharing_weight_value, double bound_value,
+void Variable::initialize(resource::Action* id_value, double sharing_weight_value, double bound_value,
int number_of_constraints, unsigned visited_value)
{
id = id_value;
// Anyway, caller functions all call check_concurrency() in the end.
}
-/* \brief update the weight of a variable, and enable/disable it.
+/* @brief update the weight of a variable, and enable/disable it.
* @return Returns whether a change was made
*/
void System::update_variable_weight(Variable* var, double weight)
cnst->bound = bound;
}
-/** \brief Update the constraint set propagating recursively to other constraints so the system should not be entirely
+/** @brief Update the constraint set propagating recursively to other constraints so the system should not be entirely
* computed.
*
- * \param cnst the Constraint* affected by the change
+ * @param cnst the Constraint* affected by the change
*
* A recursive algorithm to optimize the system recalculation selecting only constraints that have changed. Each
* constraint change is propagated to the list of constraints for each variable.
/**
* Returns resource load (in flop per second, or byte per second, or similar)
*
- * If the resource is shared (the default case), the load is sum of resource usage made by every variables located on
- * this resource.
+ * If the resource is shared (the default case), the load is sum of resource usage made by
+ * every variables located on this resource.
*
- * If the resource is not shared (ie in FATPIPE mode), then the load is the max (not the sum) of all resource usages
- * located on this resource.
+ * If the resource is not shared (ie in FATPIPE mode), then the load is the max (not the sum)
+ * of all resource usages located on this resource.
*/
double Constraint::get_usage() const
{
double result = 0.0;
- if (sharing_policy) {
+ if (sharing_policy != s4u::Link::SharingPolicy::FATPIPE) {
for (Element const& elem : enabled_element_set)
if (elem.consumption_weight > 0)
result += elem.consumption_weight * elem.variable->value;
