surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
}
-HostL07Model::~HostL07Model() = default;
+HostL07Model::~HostL07Model()
+{
+ lmm_system_free(maxminSystem_);
+ maxminSystem_ = nullptr;
+ delete surf_network_model;
+ delete surf_cpu_model_pm;
+}
CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
: CpuModel()
, hostModel_(hmodel)
- {
- maxminSystem_ = sys;
- }
-CpuL07Model::~CpuL07Model() {
- lmm_system_free(maxminSystem_);
+{
+ maxminSystem_ = sys;
+}
+
+CpuL07Model::~CpuL07Model()
+{
maxminSystem_ = nullptr;
}
+
NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
: NetworkModel()
, hostModel_(hmodel)
- {
- maxminSystem_ = sys;
- loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
- }
-NetworkL07Model::~NetworkL07Model()
{
- maxminSystem_ = nullptr; // Avoid multi-free
+ maxminSystem_ = sys;
+ loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
}
+NetworkL07Model::~NetworkL07Model()
+{
+ maxminSystem_ = nullptr;
+}
double HostL07Model::nextOccuringEvent(double now)
{
double min = HostModel::nextOccuringEventFull(now);
- for (auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; ++it) {
+ ActionList::iterator it(getRunningActionSet()->begin());
+ ActionList::iterator itend(getRunningActionSet()->end());
+ for (; it != itend; ++it) {
L07Action *action = static_cast<L07Action*>(&*it);
if (action->latency_ > 0 && (min < 0 || action->latency_ < min)) {
min = action->latency_;
L07Action *action;
ActionList *actionSet = getRunningActionSet();
+ ActionList::iterator it(actionSet->begin());
+ ActionList::iterator itNext = it;
+ ActionList::iterator itend(actionSet->end());
- for(ActionList::iterator it = actionSet->begin(), itNext = it
- ; it != actionSet->end()
- ; it = itNext) {
- ++itNext;
+ for (; it != itend; it = itNext) {
+ ++itNext;
action = static_cast<L07Action*>(&*it);
if (action->latency_ > 0) {
if (action->latency_ > delta) {
} else {
action->latency_ = 0.0;
}
- if ((action->latency_ == 0.0) && (action->isSuspended() == 0)) {
+ if ((action->latency_ <= 0.0) && (action->isSuspended() == 0)) {
action->updateBound();
lmm_update_variable_weight(maxminSystem_, action->getVariable(), 1.0);
}
action, action->getRemains(), lmm_variable_getvalue(action->getVariable()) * delta);
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
- if (action->getMaxDuration() != NO_MAX_DURATION)
+ if (action->getMaxDuration() > NO_MAX_DURATION)
action->updateMaxDuration(delta);
XBT_DEBUG("Action (%p) : remains (%g).", action, action->getRemains());
* If it's not done, it may have failed.
*/
- if ((action->getRemains() <= 0) &&
- (lmm_get_variable_weight(action->getVariable()) > 0)) {
- action->finish();
- action->setState(Action::State::done);
- } else if ((action->getMaxDuration() != NO_MAX_DURATION) &&
- (action->getMaxDuration() <= 0)) {
+ if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
+ ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
action->finish();
action->setState(Action::State::done);
} else {
/* Need to check that none of the model has failed */
- lmm_constraint_t cnst = nullptr;
int i = 0;
-
- while ((cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i++))) {
+ lmm_constraint_t cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i);
+ while (cnst != nullptr) {
+ i++;
void *constraint_id = lmm_constraint_id(cnst);
if (static_cast<simgrid::surf::Resource*>(constraint_id)->isOff()) {
XBT_DEBUG("Action (%p) Failed!!", action);
action->setState(Action::State::failed);
break;
}
+ cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i);
}
}
}
double latency = 0.0;
this->hostList_->reserve(host_nb);
- for (int i = 0; i<host_nb; i++)
+ for (int i = 0; i < host_nb; i++) {
this->hostList_->push_back(host_list[i]);
+ if (flops_amount[i] > 0)
+ nb_used_host++;
+ }
/* Compute the number of affected resources... */
if(bytes_amount != nullptr) {
nb_link = affected_links.size();
}
- for (int i = 0; i < host_nb; i++)
- if (flops_amount[i] > 0)
- nb_used_host++;
-
XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link);
this->latency_ = latency;
if(bytes_amount != nullptr) {
for (int i = 0; i < host_nb; i++) {
for (int j = 0; j < host_nb; j++) {
+ if (bytes_amount[i * host_nb + j] > 0.0) {
+ std::vector<LinkImpl*> route;
+ hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr);
- if (bytes_amount[i * host_nb + j] == 0.0)
- continue;
-
- std::vector<LinkImpl*> route;
- hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr);
-
- for (auto link : route)
- lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(),
- bytes_amount[i * host_nb + j]);
+ for (auto link : route)
+ lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(),
+ bytes_amount[i * host_nb + j]);
+ }
}
}
}
action->updateBound();
}
}
+LinkL07::~LinkL07() = default;
/**********
* Action *
}
double lat_bound = sg_tcp_gamma / (2.0 * lat_current);
XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
- if ((latency_ == 0.0) && (suspended_ == 0)) {
+ if ((latency_ <= 0.0) && (suspended_ == 0)) {
if (rate_ < 0)
lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound);
else