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);
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);
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);
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()) {
}
}
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();
simgrid::s4u::Link::onCreation(this->piface_);
}
-void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value)
+void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)
{
-
/* Find out which of my iterators was triggered, and react accordingly */
if (triggered == bandwidth_.event) {
setBandwidth(value);
}
}
-NetworkCm02Link::~NetworkCm02Link() {}
-
/**********
* Action *
**********/
-NetworkCm02Action::~NetworkCm02Action() {}
-
void NetworkCm02Action::updateRemainingLazy(double now)
{
if (suspended_ != 0)
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());