From: Frederic Suter Date: Thu, 11 May 2017 11:22:59 +0000 (+0200) Subject: these models want to please Sonar X-Git-Tag: v3.16~274^2~41^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4429a5bdc377b1e8e1e6b1eefc3c56a5f251a47d?ds=sidebyside these models want to please Sonar --- diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index f9835fabc7..1f5ebb5775 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -179,7 +179,7 @@ CpuAction *CpuCas01::sleep(double duration) // FIXME: sleep variables should not consume 1.0 in lmm_expand action->maxDuration_ = duration; action->suspended_ = 2; - if (duration == NO_MAX_DURATION) { + if (duration < 0) { // NO_MAX_DURATION /* Move to the *end* of the corresponding action set. This convention is used to speed up update_resource_state */ action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); action->stateSet_ = static_cast(model())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked; diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 22f0325d9d..ec1edd5027 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -88,7 +88,7 @@ void surf_network_model_init_Reno() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve); all_existing_models->push_back(surf_network_model); lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); @@ -104,7 +104,7 @@ void surf_network_model_init_Reno2() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve); all_existing_models->push_back(surf_network_model); lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); @@ -119,7 +119,7 @@ void surf_network_model_init_Vegas() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve); all_existing_models->push_back(surf_network_model); lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); @@ -234,7 +234,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) double_update(&(deltap), action->latency_, sg_surf_precision); action->latency_ = 0.0; } - if (action->latency_ == 0.0 && !(action->isSuspended())) + if (action->latency_ <= 0.0 && !(action->isSuspended())) lmm_update_variable_weight(maxminSystem_, action->getVariable(), action->weight_); } if (TRACE_is_enabled()) { @@ -250,17 +250,16 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) } } if (!lmm_get_number_of_cnst_from_var (maxminSystem_, action->getVariable())) { - /* There is actually no link used, hence an infinite bandwidth. - * This happens often when using models like vivaldi. - * In such case, just make sure that the action completes immediately. + /* There is actually no link used, hence an infinite bandwidth. This happens often when using models like + * vivaldi. In such case, just make sure that the action completes immediately. */ action->updateRemains(action->getRemains()); } action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - - if (action->getMaxDuration() != NO_MAX_DURATION) + + if (action->getMaxDuration() > NO_MAX_DURATION) action->updateMaxDuration(delta); - + if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { action->finish(); @@ -393,7 +392,6 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const char* name, doub void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) { - /* Find out which of my iterators was triggered, and react accordingly */ if (triggered == bandwidth_.event) { setBandwidth(value); @@ -487,14 +485,10 @@ void NetworkCm02Link::setLatency(double value) } } -NetworkCm02Link::~NetworkCm02Link() {} - /********** * Action * **********/ -NetworkCm02Action::~NetworkCm02Action() {} - void NetworkCm02Action::updateRemainingLazy(double now) { if (suspended_ != 0) @@ -509,11 +503,11 @@ void NetworkCm02Action::updateRemainingLazy(double now) XBT_DEBUG("Updating action(%p): remains is now %f", this, remains_); } - if (maxDuration_ != NO_MAX_DURATION) + if (maxDuration_ > NO_MAX_DURATION) double_update(&maxDuration_, delta, sg_surf_precision); if ((remains_ <= 0 && (lmm_get_variable_weight(getVariable()) > 0)) || - (((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0)))){ + ((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) { finish(); setState(Action::State::done); heapRemove(getModel()->getActionHeap()); diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 9f160e4722..5fb0290408 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -59,7 +59,7 @@ namespace simgrid { public: NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, lmm_system_t system); - ~NetworkCm02Link() override; + virtual ~NetworkCm02Link() = default; void apply_event(tmgr_trace_iterator_t event, double value) override; void setBandwidth(double value) override; void setLatency(double value) override; @@ -76,7 +76,7 @@ namespace simgrid { public: NetworkCm02Action(Model *model, double cost, bool failed) : NetworkAction(model, cost, failed) {}; - ~NetworkCm02Action() override; + virtual ~NetworkCm02Action() = default; void updateRemainingLazy(double now) override; protected: double senderGap_;