Replace "switch" statement by "if" (Sonar).

[simgrid.git] / examples / s4u / platform-failures / s4u-platform-failures.cpp

diff --git a/examples/s4u/platform-failures/s4u-platform-failures.cpp b/examples/s4u/platform-failures/s4u-platform-failures.cpp
index 5f7d63f..77741db 100644 (file)
--- a/examples/s4u/platform-failures/s4u-platform-failures.cpp
+++ b/examples/s4u/platform-failures/s4u-platform-failures.cpp
@@ -30,17 +30,13 @@ static int master(int argc, char* argv[])
     } catch (simgrid::HostFailureException& e) {
       XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
       return -1;
+    } catch (simgrid::TimeoutError& e) {
+      delete payload;
+      XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
     } catch (xbt_ex& e) {
-      switch (e.category) {
-        case network_error:
-          XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
-          break;
-        case timeout_error:
-          XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
-          break;
-        default:
-          xbt_die("Unexpected behavior");
-      }
+      if (e.category != network_error)
+        xbt_die("Unexpected behavior");
+      XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
       delete payload;
     }
   }
@@ -56,18 +52,14 @@ static int master(int argc, char* argv[])
       delete payload;
       XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
       return -1;
+    } catch (simgrid::TimeoutError& e) {
+      delete payload;
+      XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
     } catch (xbt_ex& e) {
       delete payload;
-      switch (e.category) {
-        case network_error:
-          XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
-          break;
-        case timeout_error:
-          XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
-          break;
-        default:
-          xbt_die("Unexpected behavior");
-      }
+      if (e.category != network_error)
+        xbt_die("Unexpected behavior");
+      XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
     }
   }
 
@@ -86,8 +78,8 @@ static int worker(int argc, char* argv[])
     try {
       XBT_INFO("Waiting a message on %s", mailbox->get_cname());
       payload   = static_cast<double*>(mailbox->get());
-      comp_size = *payload;
       xbt_assert(payload != nullptr, "mailbox->get() failed");
+      comp_size = *payload;
       if (comp_size < 0) { /* - Exit when -1.0 is received */
         XBT_INFO("I'm done. See you!");
         delete payload;
@@ -104,18 +96,14 @@ static int worker(int argc, char* argv[])
         XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
         return -1;
       }
+    } catch (simgrid::HostFailureException& e) {
+      XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
+      delete payload;
+      return -1;
     } catch (xbt_ex& e) {
-      switch (e.category) {
-        case host_error:
-          XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
-          delete payload;
-          return -1;
-        case network_error:
-          XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!");
-          break;
-        default:
-          xbt_die("Unexpected behavior");
-      }
+      if (e.category != network_error)
+        xbt_die("Unexpected behavior. Category: %s", xbt_ex_catname(e.category));
+      XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!");
     }
   }
   return 0;