[sonar] Remove custom destructors for examples/s4u/.

[simgrid.git] / examples / s4u / app-bittorrent / s4u-bittorrent.cpp

diff --git a/examples/s4u/app-bittorrent/s4u-bittorrent.cpp b/examples/s4u/app-bittorrent/s4u-bittorrent.cpp
index d205165..de5ca50 100644 (file)
--- 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-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,26 +12,24 @@ simgrid::xbt::Extension<simgrid::s4u::Host, HostBittorrent> HostBittorrent::EXTE
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv);
+  simgrid::s4u::Engine e(&argc, argv);
 
   /* Check the arguments */
   xbt_assert(argc > 2, "Usage: %s platform_file deployment_file", argv[0]);
 
-  e->loadPlatform(argv[1]);
+  e.load_platform(argv[1]);
 
+  /* Install our extension on all existing hosts */
   HostBittorrent::EXTENSION_ID = simgrid::s4u::Host::extension_create<HostBittorrent>();
-
-  std::vector<simgrid::s4u::Host*> list;
-  simgrid::s4u::Engine::getInstance()->getHostList(&list);
+  std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::get_instance()->get_all_hosts();
   for (auto const& host : list)
     host->extension_set(new HostBittorrent(host));
 
-  e->registerFunction<Tracker>("tracker");
-  e->registerFunction<Peer>("peer");
-  e->loadDeployment(argv[2]);
+  e.register_actor<Tracker>("tracker");
+  e.register_actor<Peer>("peer");
+  e.load_deployment(argv[2]);
 
-  e->run();
+  e.run();
 
-  delete e;
   return 0;
 }