X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/242fde5e8077f8193db4df5f262a9672085c8d8a..9deb0e2a4e935092d6a93beff6ad97e1f7970705:/src/surf/network_ib.cpp diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index cecdfc8d7e..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,10 +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); -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 +21,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); } @@ -82,11 +84,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); }