XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static void IB_create_host_callback(Host* host){
+static void IB_create_host_callback(simgrid::s4u::Host& host){
+ using namespace simgrid::surf;
static int id=0;
// pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives
id++;
xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes,
- host->getName(), act, NULL);
-
+ host.name().c_str(), act, NULL);
+
}
-static void IB_action_state_changed_callback(NetworkAction *action, e_surf_action_state_t statein, e_surf_action_state_t stateout){
+static void IB_action_state_changed_callback(
+ simgrid::surf::NetworkAction *action,
+ e_surf_action_state_t statein, e_surf_action_state_t stateout)
+{
+ using namespace simgrid::surf;
if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE)
return;
std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
}
-static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, RoutingEdge *dst, double size, double rate){
+static void IB_action_init_callback(
+ simgrid::surf::NetworkAction *action, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst,
+ double size, double rate)
+{
+ using namespace simgrid::surf;
if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL)
xbt_die("IB comm added, without any node connected !");
}
-
-
/*********
* Model *
*********/
/* } */
void surf_network_model_init_IB(void)
{
+ using simgrid::surf::networkActionStateChangedCallbacks;
+ using simgrid::surf::networkCommunicateCallbacks;
if (surf_network_model)
return;
- surf_network_model = new NetworkIBModel();
+ surf_network_model = new simgrid::surf::NetworkIBModel();
net_define_callbacks();
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);
-
- hostCreatedCallbacks.connect(IB_create_host_callback);
+ networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
+ networkCommunicateCallbacks.connect(IB_action_init_callback);
+ simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
}
+namespace simgrid {
+namespace surf {
+
NetworkIBModel::NetworkIBModel()
: NetworkSmpiModel() {
m_haveGap=false;
delete comm;
xbt_free(updated);
}
+
+}
+}