X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f743c0990a7d25e7fec3b225921bd4eee1b69dc1..9deb0e2a4e935092d6a93beff6ad97e1f7970705:/src/surf/network_ib.cpp

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index e85e54866e..98ee6c599a 100644
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -1,4 +1,4 @@
-/* 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
@@ -7,15 +7,11 @@
 #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);
 
-double Bs=0.925;
-double Be=0.965;
-double ys=1.35;
-
-
-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
@@ -25,11 +21,12 @@ 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);
  
 }
 
-static void IB_action_state_changed_callback(NetworkActionPtr action, e_surf_action_state_t statein, e_surf_action_state_t stateout){
+static void IB_action_state_changed_callback(NetworkAction *action, e_surf_action_state_t statein, e_surf_action_state_t stateout){
  if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE)
     return;
   std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
@@ -42,7 +39,7 @@ static void IB_action_state_changed_callback(NetworkActionPtr action, e_surf_act
 }
 
 
-static void IB_action_init_callback(NetworkActionPtr action,RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate){
+static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, RoutingEdge *dst, double size, double rate){
   if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL)
     xbt_die("IB comm added, without any node connected !");
   
@@ -56,7 +53,7 @@ static void IB_action_init_callback(NetworkActionPtr action,RoutingEdgePtr src,
     xbt_die("could not find dst node active comms !");  
  // act_dst->rate=rate;
   
-  ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair<IBNode*,IBNode*>(act_src, act_dst);
+  ((NetworkIBModel*)surf_network_model)->active_comms[action]=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);
 
@@ -87,18 +84,31 @@ 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);
+  
 }
 
 NetworkIBModel::NetworkIBModel()
  : NetworkSmpiModel() {
   m_haveGap=false;
   active_nodes=NULL;
+    
+  const char* IB_factors_string=sg_cfg_get_string("smpi/IB_penalty_factors");
+  xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";");
+  
+  if(xbt_dynar_length(radical_elements)!=3)
+    surf_parse_error("smpi/IB_penalty_factors should be provided and contain 3 elements, semi-colon separated : for example 0.965;0.925;1.35");
+  
+  Be = atof(xbt_dynar_get_as(radical_elements, 0, char *));
+  Bs = atof(xbt_dynar_get_as(radical_elements, 1, char *));
+  ys = atof(xbt_dynar_get_as(radical_elements, 2, char *));
+
+  xbt_dynar_free(&radical_elements);
 }
 
 NetworkIBModel::~NetworkIBModel()
@@ -176,7 +186,7 @@ void NetworkIBModel::updateIBfactors_rec(IBNode *root, bool* updatedlist) {
 }
 
 
-void NetworkIBModel::updateIBfactors(NetworkActionPtr action, IBNode *from, IBNode * to, int remove) {
+void NetworkIBModel::updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove) {
   if (from == to)//disregard local comms (should use loopback)
     return;