* under the terms of the license (GNU LGPL) which comes with this package. */
#include "ptask_L07.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
#include "surf/surf.hpp"
#include "xbt/config.hpp"
: NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel)
{
set_maxmin_system(sys);
- loopback_ = NetworkL07Model::create_link("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
+ loopback_ = NetworkL07Model::create_link("__loopback__", std::vector<double>{498000000}, 0.000015,
+ s4u::Link::SharingPolicy::FATPIPE);
}
NetworkL07Model::~NetworkL07Model()
}
if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) {
action.updateBound();
- get_maxmin_system()->update_variable_weight(action.get_variable(), 1.0);
+ get_maxmin_system()->update_variable_penalty(action.get_variable(), 1.0);
action.set_last_update();
}
}
* If it's not done, it may have failed.
*/
- if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) ||
+ if (((action.get_remains() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(kernel::resource::Action::State::FINISHED);
continue;
kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
while (cnst != nullptr) {
i++;
- void* constraint_id = cnst->get_id();
- if (not static_cast<simgrid::kernel::resource::Resource*>(constraint_id)->is_on()) {
+ kernel::resource::Resource* constraint_id = cnst->get_id();
+ if (not constraint_id->is_on()) {
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(kernel::resource::Action::State::FAILED);
break;
model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_list.size() + link_nb));
if (latency_ > 0)
- model->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
+ model->get_maxmin_system()->update_variable_penalty(get_variable(), 0.0);
/* Expand it for the CPUs even if there is nothing to compute, to make sure that it gets expended even if there is no
* communication either */
return new CpuL07(this, host, speed_per_pstate, core);
}
-kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, double bandwidth, double latency,
- s4u::Link::SharingPolicy policy)
+kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, const std::vector<double>& bandwidths,
+ double latency, s4u::Link::SharingPolicy policy)
{
- return new LinkL07(this, name, bandwidth, latency, policy);
+ xbt_assert(bandwidths.size() == 1, "Non WIFI link must have only 1 bandwidth.");
+ return new LinkL07(this, name, bandwidths[0], latency, policy);
}
/************
L07Action *action = static_cast<L07Action*>(execution_start(1.0));
action->set_max_duration(duration);
action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
- get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
+ get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0);
return action;
}