Change condition for infinite loops (make sonar believe that function can return).

diff --git a/examples/s4u/actor-daemon/s4u-actor-daemon.cpp b/examples/s4u/actor-daemon/s4u-actor-daemon.cpp
index 54037a6..4372bd4 100644 (file)
--- a/examples/s4u/actor-daemon/s4u-actor-daemon.cpp
+++ b/examples/s4u/actor-daemon/s4u-actor-daemon.cpp
@@ -21,7 +21,7 @@ static void my_daemon()
 {
   simgrid::s4u::Actor::self()->daemonize();
 
 {
   simgrid::s4u::Actor::self()->daemonize();
 

-  while (1) {
+  while (simgrid::s4u::this_actor::get_host()->is_on()) {

     XBT_INFO("Hello from the infinite loop");
     simgrid::s4u::this_actor::sleep_for(3.0);
   }
     XBT_INFO("Hello from the infinite loop");
     simgrid::s4u::this_actor::sleep_for(3.0);
   }

diff --git a/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp b/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
index cc86142..89189a9 100644 (file)
--- a/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
+++ b/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
@@ -17,7 +17,7 @@ static void dummy()
 static void dummy_daemon()
 {
   simgrid::s4u::Actor::self()->daemonize();
 static void dummy_daemon()
 {
   simgrid::s4u::Actor::self()->daemonize();

-  while (1) {
+  while (simgrid::s4u::this_actor::get_host()->is_on()) {

     XBT_INFO("Hello from the infinite loop");
     simgrid::s4u::this_actor::sleep_for(80.0);
   }
     XBT_INFO("Hello from the infinite loop");
     simgrid::s4u::this_actor::sleep_for(80.0);
   }

diff --git a/teshsuite/s4u/actor/actor.cpp b/teshsuite/s4u/actor/actor.cpp
index 6c70080..01558b2 100644 (file)
--- a/teshsuite/s4u/actor/actor.cpp
+++ b/teshsuite/s4u/actor/actor.cpp
@@ -12,7 +12,7 @@ static void worker()
   simgrid::s4u::this_actor::sleep_for(.5);
   XBT_INFO("Worker started (PID:%ld, PPID:%ld)", simgrid::s4u::this_actor::get_pid(),
            simgrid::s4u::this_actor::get_ppid());
   simgrid::s4u::this_actor::sleep_for(.5);
   XBT_INFO("Worker started (PID:%ld, PPID:%ld)", simgrid::s4u::this_actor::get_pid(),
            simgrid::s4u::this_actor::get_ppid());

-  while (1) {
+  while (simgrid::s4u::this_actor::get_host()->is_on()) {

     simgrid::s4u::this_actor::yield();
     XBT_INFO("Plop i am not suspended");
     simgrid::s4u::this_actor::sleep_for(1);
     simgrid::s4u::this_actor::yield();
     XBT_INFO("Plop i am not suspended");
     simgrid::s4u::this_actor::sleep_for(1);