XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
static void IB_create_host_callback(simgrid::s4u::Host& host){
- using namespace simgrid::surf;
+ using simgrid::surf::NetworkIBModel;
+ using simgrid::surf::IBNode;
static int id=0;
// pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives
simgrid::surf::NetworkAction *action,
simgrid::surf::Action::State statein, simgrid::surf::Action::State stateout)
{
- using namespace simgrid::surf;
+ using simgrid::surf::NetworkIBModel;
+ using simgrid::surf::IBNode;
+
if(statein!=simgrid::surf::Action::State::running || stateout!=simgrid::surf::Action::State::done)
return;
std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
}
-
-static void IB_action_init_callback(
- simgrid::surf::NetworkAction *action, simgrid::routing::NetCard *src, simgrid::routing::NetCard *dst)
+static void IB_action_init_callback(simgrid::surf::NetworkAction* action, simgrid::s4u::Host* src,
+ simgrid::s4u::Host* dst)
{
simgrid::surf::NetworkIBModel* ibModel = (simgrid::surf::NetworkIBModel*)surf_network_model;
- simgrid::surf::IBNode* act_src= (simgrid::surf::IBNode*) xbt_dict_get_or_null(ibModel->active_nodes, src->name());
+ simgrid::surf::IBNode* act_src =
+ (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, src->name().c_str());
xbt_assert(act_src, "could not find src node active comms !");
- simgrid::surf::IBNode* act_dst= (simgrid::surf::IBNode*) xbt_dict_get_or_null(ibModel->active_nodes, dst->name());
+ simgrid::surf::IBNode* act_dst =
+ (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, dst->name().c_str());
xbt_assert(act_dst, "could not find dst node active comms !");
ibModel->active_comms[action]=std::make_pair(act_src, act_dst);
/* month=june, */
/* year={2010} */
/* } */
-void surf_network_model_init_IB(void)
+void surf_network_model_init_IB()
{
using simgrid::surf::networkActionStateChangedCallbacks;
return;
surf_network_model = new simgrid::surf::NetworkIBModel();
- xbt_dynar_push(all_existing_models, &surf_network_model);
+ all_existing_models->push_back(surf_network_model);
networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
Link::onCommunicate.connect(IB_action_init_callback);
simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);