/* month = Nov, */
/* pdf = {http://hal.inria.fr/hal-00646896/PDF/rr-validity.pdf}, */
/* } */
-void surf_network_model_init_LegrandVelho(void)
+void surf_network_model_init_LegrandVelho()
{
if (surf_network_model)
return;
surf_network_model = new simgrid::surf::NetworkCm02Model();
- xbt_dynar_push(all_existing_models, &surf_network_model);
+ all_existing_models->push_back(surf_network_model);
xbt_cfg_setdefault_double("network/latency-factor", 13.01);
xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
/* month = {oct}, */
/* year = {2002} */
/* } */
-void surf_network_model_init_CM02(void)
+void surf_network_model_init_CM02()
{
if (surf_network_model)
return;
surf_network_model = new simgrid::surf::NetworkCm02Model();
- xbt_dynar_push(all_existing_models, &surf_network_model);
+ all_existing_models->push_back(surf_network_model);
xbt_cfg_setdefault_double("network/latency-factor", 1.0);
xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0);
/* journal={{IEEE/ACM} Transactions on Networking}, */
/* volume={11}, number={4}, */
/* } */
-void surf_network_model_init_Reno(void)
+void surf_network_model_init_Reno()
{
if (surf_network_model)
return;
surf_network_model = new simgrid::surf::NetworkCm02Model();
- xbt_dynar_push(all_existing_models, &surf_network_model);
+ all_existing_models->push_back(surf_network_model);
lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
surf_network_model->f_networkSolve = lagrange_solve;
}
-void surf_network_model_init_Reno2(void)
+void surf_network_model_init_Reno2()
{
if (surf_network_model)
return;
surf_network_model = new simgrid::surf::NetworkCm02Model();
- xbt_dynar_push(all_existing_models, &surf_network_model);
+ all_existing_models->push_back(surf_network_model);
lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi);
surf_network_model->f_networkSolve = lagrange_solve;
xbt_cfg_setdefault_double("network/weight-S", 8775);
}
-void surf_network_model_init_Vegas(void)
+void surf_network_model_init_Vegas()
{
if (surf_network_model)
return;
surf_network_model = new simgrid::surf::NetworkCm02Model();
- xbt_dynar_push(all_existing_models, &surf_network_model);
+ all_existing_models->push_back(surf_network_model);
lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
surf_network_model->f_networkSolve = lagrange_solve;
updateMechanism_ = UM_LAZY;
selectiveUpdate_ = 1;
xbt_assert((select == 1) || (xbt_cfg_is_default_value("network/maxmin-selective-update")),
- "Disabling selective update while using the lazy update mechanism is dumb!");
+ "You cannot disable selective update while using the lazy update mechanism!");
} else {
- xbt_die("Unsupported optimization (%s) for this model", optim);
+ xbt_die("Unsupported optimization (%s) for this model. Accepted: Full, Lazy.", optim);
}
if (!maxminSystem_)
routing_model_create(createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, nullptr));
if (updateMechanism_ == UM_LAZY) {
- actionHeap_ = xbt_heap_new(8, nullptr);
- xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap);
- modifiedSet_ = new ActionLmmList();
- maxminSystem_->keep_track = modifiedSet_;
+ actionHeap_ = xbt_heap_new(8, nullptr);
+ xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap);
+ modifiedSet_ = new ActionLmmList();
+ maxminSystem_->keep_track = modifiedSet_;
}
}
void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/)
{
- NetworkCm02Action *action;
while ((xbt_heap_size(actionHeap_) > 0)
&& (double_equals(xbt_heap_maxkey(actionHeap_), now, sg_surf_precision))) {
- action = static_cast<NetworkCm02Action*> (xbt_heap_pop(actionHeap_));
+
+ NetworkCm02Action *action = static_cast<NetworkCm02Action*> (xbt_heap_pop(actionHeap_));
XBT_DEBUG("Something happened to action %p", action);
if (TRACE_is_enabled()) {
int n = lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable());
for (int i = 0; i < n; i++){
lmm_constraint_t constraint = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i);
NetworkCm02Link *link = static_cast<NetworkCm02Link*>(lmm_constraint_id(constraint));
- TRACE_surf_link_set_utilization(link->getName(),
- action->getCategory(),
- (lmm_variable_getvalue(action->getVariable())*
- lmm_get_cnst_weight_from_var(maxminSystem_,
- action->getVariable(),
- i)),
- action->getLastUpdate(),
- now - action->getLastUpdate());
+ double value = lmm_variable_getvalue(action->getVariable())*
+ lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i);
+ TRACE_surf_link_set_utilization(link->getName(), action->getCategory(), value,
+ action->getLastUpdate(), now - action->getLastUpdate());
}
}
action->refreshLastUpdate();
// if I am wearing a max_duration or normal hat
- } else if (action->getHat() == MAX_DURATION ||
- action->getHat() == NORMAL) {
+ } else if (action->getHat() == MAX_DURATION || action->getHat() == NORMAL) {
// no need to communicate anymore
// assume that flows that reached max_duration have remaining of 0
XBT_DEBUG("Action %p finished", action);
void NetworkCm02Model::updateActionsStateFull(double now, double delta)
{
- NetworkCm02Action *action;
ActionList *running_actions = getRunningActionSet();
for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end())
; it != itend ; it=itNext) {
- ++itNext;
+ ++itNext;
- action = static_cast<NetworkCm02Action*> (&*it);
+ NetworkCm02Action *action = static_cast<NetworkCm02Action*> (&*it);
XBT_DEBUG("Something happened to action %p", action);
double deltap = delta;
if (action->latency_ > 0) {
}
}
-Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate)
+Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst,
+ double size, double rate)
{
int failed = 0;
double bandwidth_bound;