/* 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(_sg_cfg_set, "network/latency_factor", 13.01);
- xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 0.97);
- xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 20537);
+ xbt_cfg_setdefault_double("network/latency-factor", 13.01);
+ xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
+ xbt_cfg_setdefault_double("network/weight-S", 20537);
}
/***************************************************************************/
/* 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(_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/weight_S", 0.0);
+ xbt_cfg_setdefault_double("network/latency-factor", 1.0);
+ xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0);
+ xbt_cfg_setdefault_double("network/weight-S", 0.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;
- 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("network/latency-factor", 10.4);
+ xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92);
+ xbt_cfg_setdefault_double("network/weight-S", 8775);
}
-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(_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("network/latency-factor", 10.4);
+ xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92);
+ 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;
- 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("network/latency-factor", 10.4);
+ xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92);
+ xbt_cfg_setdefault_double("network/weight-S", 8775);
}
namespace simgrid {
NetworkCm02Model::NetworkCm02Model()
:NetworkModel()
{
- char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
- int select = xbt_cfg_get_boolean(_sg_cfg_set, "network/maxmin_selective_update");
+ char *optim = xbt_cfg_get_string("network/optim");
+ int select = xbt_cfg_get_boolean("network/maxmin-selective-update");
if (!strcmp(optim, "Full")) {
updateMechanism_ = UM_FULL;
} else if (!strcmp(optim, "Lazy")) {
updateMechanism_ = UM_LAZY;
selectiveUpdate_ = 1;
- xbt_assert((select == 1) || (xbt_cfg_is_default_value(_sg_cfg_set, "network/maxmin_selective_update")),
+ xbt_assert((select == 1) || (xbt_cfg_is_default_value("network/maxmin-selective-update")),
"Disabling selective update while using the lazy update mechanism is dumb!");
} else {
xbt_die("Unsupported optimization (%s) for this model", optim);
if (!maxminSystem_)
maxminSystem_ = lmm_system_new(selectiveUpdate_);
- routing_model_create(createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, NULL));
+ routing_model_create(createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, nullptr));
if (updateMechanism_ == UM_LAZY) {
- actionHeap_ = xbt_heap_new(8, NULL);
+ 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_;
}
}
+NetworkCm02Model::~NetworkCm02Model() {}
+
Link* NetworkCm02Model::createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy,
xbt_dict_t properties)
{
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());
}
}
-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;
double latency = 0.0;
- std::vector<Link*> * back_route = NULL;
+ std::vector<Link*> * back_route = nullptr;
int constraints_per_variable = 0;
std::vector<Link*> *route = new std::vector<Link*>();
if (sg_network_crosstraffic == 1) {
back_route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency(dst, src, back_route, NULL);
+ routing_platf->getRouteAndLatency(dst, src, back_route, nullptr);
for (auto link: *back_route)
if (link->isOff())
failed = 1;
}
constraints_per_variable = route->size();
- if (back_route != NULL)
+ if (back_route != nullptr)
constraints_per_variable += back_route->size();
if (action->latency_ > 0) {
}
delete route;
+ delete back_route;
XBT_OUT();
Link::onCommunicate(action, src, dst);
return action;
}
+bool NetworkCm02Model::next_occuring_event_isIdempotent()
+{
+ return true;
+}
+
+void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action)
+{
+ // Nothing
+};
+
/************
* Resource *
************/
if (value > 0)
turnOn();
else {
- lmm_variable_t var = NULL;
- lmm_element_t elem = NULL;
+ lmm_variable_t var = nullptr;
+ lmm_element_t elem = nullptr;
double now = surf_get_clock();
turnOff();
double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (m_bandwidth.peak * m_bandwidth.scale);
lmm_variable_t var;
- lmm_element_t elem = NULL, nextelem = NULL;
+ lmm_element_t elem = nullptr, nextelem = nullptr;
int numelem = 0;
while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) {
NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var);
void NetworkCm02Link::updateLatency(double value){
double delta = value - m_latency.peak;
- lmm_variable_t var = NULL;
- lmm_element_t elem = NULL;
- lmm_element_t nextelem = NULL;
+ lmm_variable_t var = nullptr;
+ lmm_element_t elem = nullptr;
+ lmm_element_t nextelem = nullptr;
int numelem = 0;
m_latency.peak = value;
}
}
+NetworkCm02Link::~NetworkCm02Link() {}
+
/**********
* Action *
**********/
+
+NetworkCm02Action::~NetworkCm02Action() {}
+
void NetworkCm02Action::updateRemainingLazy(double now)
{
double delta = 0.0;
lastValue_ = lmm_variable_getvalue(getVariable());
}
+void NetworkCm02Link::gapAppend(double size, const Link* link, NetworkAction* action)
+{
+ // Nothing
+};
+
}
}
