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) {
* 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);
}
}
}
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]);
+ }
}
}
}
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(constraint());
- LinkImpl::onCreation(this);
+ s4u::Link::onCreation(this->piface_);
}
Action *CpuL07::execution_start(double size)
void L07Action::updateBound()
{
double lat_current = 0.0;
- double lat_bound = -1.0;
- int i, j;
int hostNb = hostList_->size();
if (communicationAmount_ != nullptr) {
- for (i = 0; i < hostNb; i++) {
- for (j = 0; j < hostNb; j++) {
+ for (int i = 0; i < hostNb; i++) {
+ for (int j = 0; j < hostNb; j++) {
if (communicationAmount_[i * hostNb + j] > 0) {
double lat = 0.0;
}
}
}
- lat_bound = sg_tcp_gamma / (2.0 * lat_current);
+ 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 (rate_ < 0)