From: Gabriel Corona Date: Mon, 23 Nov 2015 16:00:24 +0000 (+0100) Subject: [surf] Move network_constant host callback from sg_platf_host_cb to hostCreatedCallbacks X-Git-Tag: v3_13~1562 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9239c9449e5c4f325bc26c207adcda8c139fd78a [surf] Move network_constant host callback from sg_platf_host_cb to hostCreatedCallbacks --- diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 609b2de12f..b9c0d76ebc 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -7,12 +7,11 @@ #include "network_constant.hpp" #include "surf/random_mgr.h" +#include "host_interface.hpp" + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); static int host_number_int = 0; -static void netcste_count_hosts(sg_platf_host_cbarg_t /*h*/) { - host_number_int++; -} static void netcste_parse_nolink(sg_platf_link_cbarg_t link){ xbt_die("There is no link in the Constant network model. " "Please remove any link from your platform (and switch to routing='None')"); @@ -28,7 +27,9 @@ void surf_network_model_init_Constant() routing_model_create(NULL); - sg_platf_host_add_cb(netcste_count_hosts); + hostCreatedCallbacks.connect([](Host*) { + host_number_int++; + }); sg_platf_link_add_cb(netcste_parse_nolink); Model *model = surf_network_model;