Comment unused parameters.

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

diff --git a/src/surf/network.cpp b/src/surf/network.cpp
index 5b1896c..eb77f12 100644 (file)
--- a/src/surf/network.cpp
+++ b/src/surf/network.cpp
@@ -109,7 +109,7 @@ static void net_add_traces(void){
   }
 }
 
-static void net_define_callbacks(void)
+void net_define_callbacks(void)
 {
   /* Figuring out the network links */
   sg_platf_link_add_cb(net_parse_link_init);
@@ -248,11 +248,9 @@ void surf_network_model_init_Vegas(void)
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
-NetworkCm02Model::NetworkCm02Model() : NetworkCm02Model("network"){
-}
-
-NetworkCm02Model::NetworkCm02Model(string name) : Model(name){
-  ActionLmmPtr comm;
+void NetworkCm02Model::initialize()
+{
+  ActionLmmPtr comm = NULL;
 
   char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
   int select =
@@ -314,7 +312,7 @@ NetworkCm02LinkLmmPtr NetworkCm02Model::createResource(const char *name,
   return nw_link;
 }
 
-void NetworkCm02Model::updateActionsStateLazy(double now, double delta)
+void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/)
 {
   NetworkCm02ActionLmmPtr action;
   while ((xbt_heap_size(p_actionHeap) > 0)
@@ -324,7 +322,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double delta)
 #ifdef HAVE_TRACING
     if (TRACE_is_enabled()) {
       int n = lmm_get_number_of_cnst_from_var(p_maxminSystem, action->p_variable);
-      unsigned int i;
+      int i;
       for (i = 0; i < n; i++){
         lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem,
                                                             action->p_variable,
@@ -500,15 +498,15 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
   return action;
 }
 
-double NetworkCm02Model::latencyFactor(double size) {
+double NetworkCm02Model::latencyFactor(double /*size*/) {
   return sg_latency_factor;
 }
 
-double NetworkCm02Model::bandwidthFactor(double size) {
+double NetworkCm02Model::bandwidthFactor(double /*size*/) {
   return sg_bandwidth_factor;
 }
 
-double NetworkCm02Model::bandwidthConstraint(double rate, double bound, double size) {
+double NetworkCm02Model::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) {
   return rate;
 }
 
@@ -561,8 +559,8 @@ bool NetworkCm02LinkLmm::isShared()
 void NetworkCm02LinkLmm::updateState(tmgr_trace_event_t event_type,
                                       double value, double date)
 {
-  /*   printf("[" "%lg" "] Asking to update network card \"%s\" with value " */
-  /*     "%lg" " for event %p\n", surf_get_clock(), nw_link->name, */
+  /*   printf("[" "%g" "] Asking to update network card \"%s\" with value " */
+  /*     "%g" " for event %p\n", surf_get_clock(), nw_link->name, */
   /*     value, event_type); */
 
   if (event_type == p_power.event) {