X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a001b13d7aa269a90f035f58c71778c6812b07f6..afc75f7692eff7f345826abe82d1e23ac1c18763:/examples/s4u/app-bittorrent/s4u-bittorrent.cpp?ds=sidebyside diff --git a/examples/s4u/app-bittorrent/s4u-bittorrent.cpp b/examples/s4u/app-bittorrent/s4u-bittorrent.cpp index 38709b0be3..22757ec988 100644 --- a/examples/s4u/app-bittorrent/s4u-bittorrent.cpp +++ b/examples/s4u/app-bittorrent/s4u-bittorrent.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2017. The SimGrid Team. +/* Copyright (c) 2012-2020. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,8 +8,6 @@ #include "s4u-peer.hpp" #include "s4u-tracker.hpp" -simgrid::xbt::Extension HostBittorrent::EXTENSION_ID; - int main(int argc, char* argv[]) { simgrid::s4u::Engine e(&argc, argv); @@ -17,18 +15,11 @@ int main(int argc, char* argv[]) /* Check the arguments */ xbt_assert(argc > 2, "Usage: %s platform_file deployment_file", argv[0]); - e.loadPlatform(argv[1]); - - HostBittorrent::EXTENSION_ID = simgrid::s4u::Host::extension_create(); - - std::vector list; - simgrid::s4u::Engine::getInstance()->getHostList(&list); - for (auto const& host : list) - host->extension_set(new HostBittorrent(host)); + e.load_platform(argv[1]); - e.registerFunction("tracker"); - e.registerFunction("peer"); - e.loadDeployment(argv[2]); + e.register_actor("tracker"); + e.register_actor("peer"); + e.load_deployment(argv[2]); e.run();