if (surf_network_model)
return;
- surf_network_model = new NetworkCm02Model();
+ surf_network_model = new simgrid::surf::NetworkCm02Model();
net_define_callbacks();
- Model *model = surf_network_model;
+ simgrid::surf::Model *model = surf_network_model;
xbt_dynar_push(all_existing_models, &model);
xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor",
if (surf_network_model)
return;
- surf_network_model = new NetworkCm02Model();
+ surf_network_model = new simgrid::surf::NetworkCm02Model();
+ xbt_dynar_push(all_existing_models, &surf_network_model);
net_define_callbacks();
- Model *model = surf_network_model;
- xbt_dynar_push(all_existing_models, &model);
xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 1.0);
- xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",
- 1.0);
+ xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 1.0);
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 0.0);
}
if (surf_network_model)
return;
- surf_network_model = new NetworkCm02Model();
+ surf_network_model = new simgrid::surf::NetworkCm02Model();
+ xbt_dynar_push(all_existing_models, &surf_network_model);
net_define_callbacks();
- Model *model = surf_network_model;
- xbt_dynar_push(all_existing_models, &model);
- lmm_set_default_protocol_function(func_reno_f, func_reno_fp,
- func_reno_fpi);
+ lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
surf_network_model->f_networkSolve = lagrange_solve;
xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4);
- xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",
- 0.92);
+ xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 0.92);
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
}
if (surf_network_model)
return;
- surf_network_model = new NetworkCm02Model();
+ surf_network_model = new simgrid::surf::NetworkCm02Model();
+ xbt_dynar_push(all_existing_models, &surf_network_model);
net_define_callbacks();
- Model *model = surf_network_model;
- xbt_dynar_push(all_existing_models, &model);
- lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp,
- func_reno2_fpi);
+ 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(_sg_cfg_set, "network/latency_factor", 10.4);
- xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",
- 0.92);
- xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S",
- 8775);
+ xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 0.92);
+ xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
}
void surf_network_model_init_Vegas(void)
if (surf_network_model)
return;
- surf_network_model = new NetworkCm02Model();
+ surf_network_model = new simgrid::surf::NetworkCm02Model();
+ xbt_dynar_push(all_existing_models, &surf_network_model);
net_define_callbacks();
- Model *model = surf_network_model;
- xbt_dynar_push(all_existing_models, &model);
- lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,
- func_vegas_fpi);
+ lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
surf_network_model->f_networkSolve = lagrange_solve;
xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4);
- xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",
- 0.92);
+ xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 0.92);
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
}
+namespace simgrid {
+namespace surf {
+
NetworkCm02Model::NetworkCm02Model()
:NetworkModel()
{
p_modifiedSet = new ActionLmmList();
p_maxminSystem->keep_track = p_modifiedSet;
}
-
- m_haveGap = false;
}
Link* NetworkCm02Model::createLink(const char *name,
Link* link = new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial, history,
state_initial, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy);
- surf_callback_emit(networkLinkCreatedCallbacks, link);
+ Link::onCreation(link);
return link;
}
return;
}
-Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst,
+Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst,
double size, double rate)
{
unsigned int i;
xbt_dynar_t back_route = NULL;
int constraints_per_variable = 0;
- xbt_dynar_t route = xbt_dynar_new(sizeof(RoutingEdge*), NULL);
+ xbt_dynar_t route = xbt_dynar_new(sizeof(NetCard*), NULL);
XBT_IN("(%s,%s,%g,%g)", src->getName(), dst->getName(), size, rate);
routing_platf->getRouteAndLatency(src, dst, &route, &latency);
xbt_assert(!xbt_dynar_is_empty(route) || latency,
- "You're trying to send data from %s to %s but there is no connection at all between these two hosts.",
+ "You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
src->getName(), dst->getName());
xbt_dynar_foreach(route, i, _link) {
xbt_dynar_free(&route);
XBT_OUT();
- surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate);
+ networkCommunicateCallbacks(action, src, dst, size, rate);
return action;
}
m_lastValue = lmm_variable_getvalue(getVariable());
}
+}
+}