Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 5f52e8c..ecc9e63 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -8,9 +8,10 @@
 #include <utility>
 
 #include "network_ib.hpp"
+
+#include "src/surf/HostImpl.hpp"
 #include "simgrid/sg_config.h"
 #include "maxmin_private.hpp"
-#include "src/surf/host_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
@@ -94,8 +95,9 @@ void surf_network_model_init_IB(void)
 
   if (surf_network_model)
     return;
+
+  simgrid::surf::on_link.connect(netlink_parse_init);
   surf_network_model = new simgrid::surf::NetworkIBModel();
-  net_define_callbacks();
   xbt_dynar_push(all_existing_models, &surf_network_model);
   networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
   networkCommunicateCallbacks.connect(IB_action_init_callback);
@@ -104,7 +106,7 @@ void surf_network_model_init_IB(void)
   
 }
 
-#include <surf/surfxml_parse.h> // FIXME: move that back to the parsing area
+#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
 
 namespace simgrid {
 namespace surf {