track all the useless void

[simgrid.git] / src / surf / network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 4c1cf08..77f3801 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -35,7 +35,7 @@ int sg_network_crosstraffic = 0;
 /*      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;
@@ -59,7 +59,7 @@ void surf_network_model_init_LegrandVelho(void)
 /*   month         = {oct}, */
 /*   year          = {2002} */
 /* } */
-void surf_network_model_init_CM02(void)
+void surf_network_model_init_CM02()
 {
 
   if (surf_network_model)
@@ -83,7 +83,7 @@ void surf_network_model_init_CM02(void)
 /*   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;
@@ -100,7 +100,7 @@ void surf_network_model_init_Reno(void)
 }
 
 
-void surf_network_model_init_Reno2(void)
+void surf_network_model_init_Reno2()
 {
   if (surf_network_model)
     return;
@@ -116,7 +116,7 @@ void surf_network_model_init_Reno2(void)
   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;
@@ -156,16 +156,18 @@ NetworkCm02Model::NetworkCm02Model()
   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)
 {
@@ -287,12 +289,13 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta)
   }
 }
 
-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*>();
@@ -310,7 +313,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d
 
   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;
@@ -347,7 +350,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d
   }
 
   constraints_per_variable = route->size();
-  if (back_route != NULL)
+  if (back_route != nullptr)
     constraints_per_variable += back_route->size();
 
   if (action->latency_ > 0) {
@@ -387,6 +390,16 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d
   return action;
 }
 
+bool NetworkCm02Model::next_occuring_event_isIdempotent()
+{
+  return true;
+}
+
+void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action)
+{
+  // Nothing
+};
+
 /************
  * Resource *
  ************/
@@ -425,8 +438,8 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value)
     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();
@@ -461,7 +474,7 @@ void NetworkCm02Link::updateBandwidth(double value) {
     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);
@@ -474,9 +487,9 @@ void NetworkCm02Link::updateBandwidth(double value) {
 
 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;
@@ -502,9 +515,14 @@ void NetworkCm02Link::updateLatency(double value){
   }
 }
 
+NetworkCm02Link::~NetworkCm02Link() {}
+
 /**********
  * Action *
  **********/
+
+NetworkCm02Action::~NetworkCm02Action() {}
+
 void NetworkCm02Action::updateRemainingLazy(double now)
 {
   double delta = 0.0;
@@ -541,5 +559,10 @@ void NetworkCm02Action::updateRemainingLazy(double now)
   lastValue_ = lmm_variable_getvalue(getVariable());
 }
 
+void NetworkCm02Link::gapAppend(double size, const Link* link, NetworkAction* action)
+{
+  // Nothing
+};
+
 }
 }