From 1255c296d82aec7379226de610668e2ff027ad2a Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 5 Dec 2017 18:59:48 +0100 Subject: [PATCH 1/1] please sonar and do the same in teshsuite --- examples/s4u/energy-vm/s4u-energy-vm.cpp | 6 +++--- teshsuite/s4u/actor/actor.cpp | 9 ++++----- teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp | 9 ++++----- teshsuite/s4u/concurrent_rw/concurrent_rw.cpp | 9 ++++----- teshsuite/s4u/host_on_off_wait/host_on_off_wait.cpp | 9 ++++----- teshsuite/s4u/listen_async/listen_async.cpp | 7 +++---- teshsuite/s4u/pid/pid.cpp | 7 +++---- 7 files changed, 25 insertions(+), 31 deletions(-) diff --git a/examples/s4u/energy-vm/s4u-energy-vm.cpp b/examples/s4u/energy-vm/s4u-energy-vm.cpp index 8855473d97..54d5c97e22 100644 --- a/examples/s4u/energy-vm/s4u-energy-vm.cpp +++ b/examples/s4u/energy-vm/s4u-energy-vm.cpp @@ -54,15 +54,15 @@ static void dvfs() int main(int argc, char* argv[]) { sg_host_energy_plugin_init(); - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); + simgrid::s4u::Engine e(&argc, argv); xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]); - e->loadPlatform(argv[1]); + e.loadPlatform(argv[1]); simgrid::s4u::Actor::createActor("dvfs", simgrid::s4u::Host::by_name("MyHost1"), dvfs); - e->run(); + e.run(); XBT_INFO("Total simulation time: %.2f; Host2 and Host3 must have the exact same energy consumption; Host1 is " "multi-core and will differ.", diff --git a/teshsuite/s4u/actor/actor.cpp b/teshsuite/s4u/actor/actor.cpp index 46b464fd88..be1e9de6af 100644 --- a/teshsuite/s4u/actor/actor.cpp +++ b/teshsuite/s4u/actor/actor.cpp @@ -54,15 +54,14 @@ static void master() int main(int argc, char* argv[]) { - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); - e->loadPlatform(argv[1]); + simgrid::s4u::Engine e(&argc, argv); + e.loadPlatform(argv[1]); simgrid::s4u::Actor::createActor("master", simgrid::s4u::Host::by_name("Tremblay"), master); simgrid::s4u::Actor::createActor("worker", simgrid::s4u::Host::by_name("Tremblay"), worker); - e->run(); - XBT_INFO("Simulation time %g", e->getClock()); + e.run(); + XBT_INFO("Simulation time %g", e.getClock()); - delete e; return 0; } diff --git a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp index 6b70db209d..41be1f3aff 100644 --- a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp +++ b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp @@ -166,11 +166,11 @@ int main(int argc, char* argv[]) std::vector argSend{specSend.c_str()}; std::vector argRecv{specRecv.c_str()}; - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); + simgrid::s4u::Engine e(&argc, argv); if (argc < 2) usage(argv[0], specSend.c_str(), specRecv.c_str()); - e->loadPlatform(argv[1]); + e.loadPlatform(argv[1]); if (argc >= 3) { argSend.clear(); @@ -187,9 +187,8 @@ int main(int argc, char* argv[]) simgrid::s4u::Actor::createActor("recver", hosts[1], receiver, argRecv); xbt_free(hosts); - e->run(); - XBT_INFO("Simulation time %g", e->getClock()); + e.run(); + XBT_INFO("Simulation time %g", e.getClock()); - delete e; return 0; } diff --git a/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp b/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp index 0c1db3c605..6872b3f726 100644 --- a/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp +++ b/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp @@ -29,15 +29,14 @@ static void host() int main(int argc, char** argv) { - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); - e->loadPlatform(argv[1]); + simgrid::s4u::Engine e(&argc, argv); + e.loadPlatform(argv[1]); for (int i = 0; i < 5; i++) simgrid::s4u::Actor::createActor("host", simgrid::s4u::Host::by_name("bob"), host); - e->run(); - XBT_INFO("Simulation time %g", e->getClock()); + e.run(); + XBT_INFO("Simulation time %g", e.getClock()); - delete e; return 0; } diff --git a/teshsuite/s4u/host_on_off_wait/host_on_off_wait.cpp b/teshsuite/s4u/host_on_off_wait/host_on_off_wait.cpp index 17f378df6b..90dfdeeb26 100644 --- a/teshsuite/s4u/host_on_off_wait/host_on_off_wait.cpp +++ b/teshsuite/s4u/host_on_off_wait/host_on_off_wait.cpp @@ -28,15 +28,14 @@ static void worker() int main(int argc, char* argv[]) { - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); - e->loadPlatform(argv[1]); + simgrid::s4u::Engine e(&argc, argv); + e.loadPlatform(argv[1]); simgrid::s4u::Actor::createActor("master", simgrid::s4u::Host::by_name("Tremblay"), master); simgrid::s4u::Actor::createActor("worker", simgrid::s4u::Host::by_name("Jupiter"), worker); - e->run(); - XBT_INFO("Simulation time %g", e->getClock()); + e.run(); + XBT_INFO("Simulation time %g", e.getClock()); - delete e; return 0; } diff --git a/teshsuite/s4u/listen_async/listen_async.cpp b/teshsuite/s4u/listen_async/listen_async.cpp index 7e07dc9d46..19a31c9167 100644 --- a/teshsuite/s4u/listen_async/listen_async.cpp +++ b/teshsuite/s4u/listen_async/listen_async.cpp @@ -45,13 +45,12 @@ static void server() int main(int argc, char* argv[]) { - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); - e->loadPlatform(argv[1]); + simgrid::s4u::Engine e(&argc, argv); + e.loadPlatform(argv[1]); simgrid::s4u::Actor::createActor("test", simgrid::s4u::Host::by_name("Tremblay"), server); - e->run(); + e.run(); - delete e; return 0; } diff --git a/teshsuite/s4u/pid/pid.cpp b/teshsuite/s4u/pid/pid.cpp index de948f3c56..552f17c4df 100644 --- a/teshsuite/s4u/pid/pid.cpp +++ b/teshsuite/s4u/pid/pid.cpp @@ -39,8 +39,8 @@ static void killall() int main(int argc, char* argv[]) { - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); - e->loadPlatform(argv[1]); + simgrid::s4u::Engine e(&argc, argv); + e.loadPlatform(argv[1]); if (argc > 2) simgrid::s4u::Actor::killAll(atoi(argv[2])); @@ -52,8 +52,7 @@ int main(int argc, char* argv[]) simgrid::s4u::Actor::createActor("sendpid", simgrid::s4u::Host::by_name("Tremblay"), sendpid); simgrid::s4u::Actor::createActor("killall", simgrid::s4u::Host::by_name("Tremblay"), killall); - e->run(); + e.run(); - delete e; return 0; } -- 2.20.1