Remove 'using namespace foo;' in headers

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

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index cecdfc8..4e51c2b 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -1,16 +1,20 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <algorithm>
+#include <utility>
+
 #include "network_ib.hpp"
 #include "simgrid/sg_config.h"
 #include "maxmin_private.hpp"
+#include "src/surf/host_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
-static void IB_create_host_callback(sg_platf_host_cbarg_t t){
+static void IB_create_host_callback(Host* host){
   
   static int id=0;
 // pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives
@@ -20,7 +24,8 @@ static void IB_create_host_callback(sg_platf_host_cbarg_t t){
   IBNode* act = new IBNode(id);
 
   id++;
-  xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, t->id, act, NULL);
+  xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes,
+    host->getName(), act, NULL);
  
 }
 
@@ -51,7 +56,7 @@ static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, Rout
     xbt_die("could not find dst node active comms !");  
  // act_dst->rate=rate;
   
-  ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair(act_src, act_dst);
+  ((NetworkIBModel*)surf_network_model)->active_comms[action]=std::make_pair(act_src, act_dst);
   //post the action in the second dist, to retrieve in the other callback
   XBT_DEBUG("IB callback - action %p init", action);
 
@@ -82,11 +87,11 @@ void surf_network_model_init_IB(void)
     return;
   surf_network_model = new NetworkIBModel();
   net_define_callbacks();
-  xbt_dynar_push(model_list, &surf_network_model);
+  xbt_dynar_push(all_existing_models, &surf_network_model);
   surf_callback_connect(networkActionStateChangedCallbacks, IB_action_state_changed_callback);
   surf_callback_connect(networkCommunicateCallbacks, IB_action_init_callback);
 
-  sg_platf_host_add_cb(IB_create_host_callback);
+  hostCreatedCallbacks.connect(IB_create_host_callback);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
   
 }
@@ -134,7 +139,7 @@ void NetworkIBModel::computeIBfactors(IBNode *root) {
        my_penalty_out = num_comm_out * Bs;
     }
 
-    max_penalty_out = max(max_penalty_out,my_penalty_out);
+    max_penalty_out = std::max(max_penalty_out,my_penalty_out);
   }
 
   for (std::vector<ActiveComm*>::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
@@ -147,7 +152,7 @@ void NetworkIBModel::computeIBfactors(IBNode *root) {
                      * Be 
                      * (*it)->destination->ActiveCommsDown.size();//number of different nodes sending to dest
     
-    double penalty=max(my_penalty_in,max_penalty_out);
+    double penalty = std::max(my_penalty_in,max_penalty_out);
     
     double rate_before_update = (*it)->action->getBound();
     //save initial rate of the action