From 125286ffc8a3858e0c62c3c4df0b7c0a1ea392ec Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 13 Mar 2017 09:02:16 +0100 Subject: [PATCH] minor bugs and smells --- .../msg/app-masterworker/app-masterworker.c | 1 - src/surf/cpu_interface.cpp | 10 +- src/surf/network_constant.cpp | 133 +++++++++--------- src/surf/ptask_L07.cpp | 44 +++--- 4 files changed, 89 insertions(+), 99 deletions(-) diff --git a/examples/msg/app-masterworker/app-masterworker.c b/examples/msg/app-masterworker/app-masterworker.c index 84a85a2633..ff457765b5 100644 --- a/examples/msg/app-masterworker/app-masterworker.c +++ b/examples/msg/app-masterworker/app-masterworker.c @@ -7,7 +7,6 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_app_masterworker, "Messages specific for this msg example"); - /* Main function of the master process */ static int master(int argc, char *argv[]) { diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index a22fd69253..6c724d2d29 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -79,17 +79,11 @@ void CpuModel::updateActionsStateFull(double now, double delta) action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - if (action->getMaxDuration() != NO_MAX_DURATION) action->updateMaxDuration(delta); - - if ((action->getRemainsNoUpdate() <= 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->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || + ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { action->finish(); action->setState(Action::State::done); } diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index e2675fcb5e..68a291a198 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -19,83 +19,82 @@ void surf_network_model_init_Constant() } namespace simgrid { - namespace surf { - LinkImpl* NetworkConstantModel::createLink(const char* name, double bw, double lat, - e_surf_link_sharing_policy_t policy) - { - - xbt_die("Refusing to create the link %s: there is no link in the Constant network model. " - "Please remove any link from your platform (and switch to routing='None')", - name); - return nullptr; - } +namespace surf { +LinkImpl* NetworkConstantModel::createLink(const char* name, double bw, double lat, e_surf_link_sharing_policy_t policy) +{ - double NetworkConstantModel::nextOccuringEvent(double /*now*/) - { - double min = -1.0; + xbt_die("Refusing to create the link %s: there is no link in the Constant network model. " + "Please remove any link from your platform (and switch to routing='None')", + name); + return nullptr; +} - ActionList *actionSet = getRunningActionSet(); - for(auto it(actionSet->begin()), itend(actionSet->end()) ; it != itend ; ++it) { - NetworkConstantAction *action = static_cast(&*it); - if (action->latency_ > 0 && (min < 0 || action->latency_ < min)) - min = action->latency_; - } +double NetworkConstantModel::nextOccuringEvent(double /*now*/) +{ + double min = -1.0; - return min; - } + ActionList* actionSet = getRunningActionSet(); + ActionList::iterator it(actionSet->begin()); + ActionList::iterator itend(actionSet->end()); + for (; it != itend; ++it) { + NetworkConstantAction* action = static_cast(&*it); + if (action->latency_ > 0 && (min < 0 || action->latency_ < min)) + min = action->latency_; + } - void NetworkConstantModel::updateActionsState(double /*now*/, double delta) - { - NetworkConstantAction *action = nullptr; - ActionList *actionSet = getRunningActionSet(); - for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) - ; it != itend ; it=itNext) { - ++itNext; - action = static_cast(&*it); - if (action->latency_ > 0) { - if (action->latency_ > delta) { - double_update(&(action->latency_), delta, sg_surf_precision); - } else { - action->latency_ = 0.0; - } - } - action->updateRemains(action->getCost() * delta / action->initialLatency_); - if (action->getMaxDuration() != NO_MAX_DURATION) - action->updateMaxDuration(delta); + return min; +} - if (action->getRemainsNoUpdate() <= 0) { - action->finish(); - action->setState(Action::State::done); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) - && (action->getMaxDuration() <= 0)) { - action->finish(); - action->setState(Action::State::done); - } +void NetworkConstantModel::updateActionsState(double /*now*/, double delta) +{ + NetworkConstantAction* action = nullptr; + ActionList* actionSet = getRunningActionSet(); + ActionList::iterator it(actionSet->begin()); + ActionList::iterator itNext = it; + ActionList::iterator itend(actionSet->end()); + for (; it != itend; it = itNext) { + ++itNext; + action = static_cast(&*it); + if (action->latency_ > 0) { + if (action->latency_ > delta) { + double_update(&(action->latency_), delta, sg_surf_precision); + } else { + action->latency_ = 0.0; } } + action->updateRemains(action->getCost() * delta / action->initialLatency_); + if (action->getMaxDuration() != NO_MAX_DURATION) + action->updateMaxDuration(delta); - Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) - { - NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor); - - simgrid::s4u::Link::onCommunicate(action, src, dst); - return action; + if (((action->getRemainsNoUpdate() <= 0) || + ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0)))) { + action->finish(); + action->setState(Action::State::done); } + } +} - /********** - * Action * - **********/ - NetworkConstantAction::NetworkConstantAction(NetworkConstantModel *model_, double size, double latency) - : NetworkAction(model_, size, false) - , initialLatency_(latency) - { - latency_ = latency; - if (latency_ <= 0.0) { - stateSet_ = model_->getDoneActionSet(); - stateSet_->push_back(*this); - } - }; +Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +{ + NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor); - NetworkConstantAction::~NetworkConstantAction() = default; + simgrid::s4u::Link::onCommunicate(action, src, dst); + return action; +} + +/********** + * Action * + **********/ +NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency) + : NetworkAction(model_, size, false), initialLatency_(latency) +{ + latency_ = latency; + if (latency_ <= 0.0) { + stateSet_ = model_->getDoneActionSet(); + stateSet_->push_back(*this); } +}; + +NetworkConstantAction::~NetworkConstantAction() = default; +} } diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 00718591d7..c72048b3e5 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -69,7 +69,9 @@ NetworkL07Model::~NetworkL07Model() 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(&*it); if (action->latency_ > 0 && (min < 0 || action->latency_ < min)) { min = action->latency_; @@ -85,11 +87,12 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { 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(&*it); if (action->latency_ > 0) { if (action->latency_ > delta) { @@ -117,20 +120,16 @@ void HostL07Model::updateActionsState(double /*now*/, double 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(constraint_id)->isOff()) { XBT_DEBUG("Action (%p) Failed!!", action); @@ -138,6 +137,7 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { action->setState(Action::State::failed); break; } + cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i); } } } @@ -206,16 +206,14 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, 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 route; + hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr); - if (bytes_amount[i * host_nb + j] == 0.0) - continue; - - std::vector 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]); + } } } } -- 2.20.1