X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4aabf1133bae287cd37f9b9829a724a1bef2be53..27915da6b357d043681f745c4574699ff0db0146:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 99aa45eaee..7963b087f0 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -68,28 +68,16 @@ xbt_dynar_t sg_hosts_as_dynar(void) const char* name = nullptr; simgrid::s4u::Host* host = nullptr; xbt_dict_foreach(host_list, cursor, name, host) - if (host && host->pimpl_netcard && host->pimpl_netcard->getRcType() == SURF_NETWORK_ELEMENT_HOST) + if (host && host->pimpl_netcard && host->pimpl_netcard->isHost()) xbt_dynar_push(res, &host); return res; } // ========= Layering madness ==============* -#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme by initializing that level in msg when used -#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme by initializing that level in simix when used #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_routing.hpp" -void sg_host_init() -{ - MSG_HOST_LEVEL = simgrid::s4u::Host::extension_create([](void *p) { - __MSG_host_priv_free((msg_host_priv_t) p); - }); - - SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy); - USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL); -} - // ========== User data Layer ========== void *sg_host_user(sg_host_t host) { return host->extension(USER_HOST_LEVEL);