From 08e5e85e11083a3c354ce0ccb8e854c89af1dfe3 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Thu, 12 Mar 2015 11:07:26 +0100
Subject: [PATCH] [mc] Simplify nesting of MC_state_get_request

---
 src/mc/mc_state.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c
index 09b523906f..bb53fa512d 100644
--- a/src/mc/mc_state.c
+++ b/src/mc/mc_state.c
@@ -226,10 +226,13 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value)
   MC_EACH_SIMIX_PROCESS(process,
     procstate = &state->proc_status[process->pid];
 
-    if (procstate->state == MC_INTERLEAVE
-        || procstate->state == MC_MORE_INTERLEAVE) {
-      if (MC_process_is_enabled(process)) {
-        switch (process->simcall.call) {
+    if (procstate->state != MC_INTERLEAVE
+        && procstate->state != MC_MORE_INTERLEAVE)
+        continue;
+    if (!MC_process_is_enabled(process))
+      continue;
+
+    switch (process->simcall.call) {
         case SIMCALL_COMM_WAITANY:
           *value = -1;
           while (procstate->interleave_count <
@@ -307,8 +310,7 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value)
           *value = 0;
           return &process->simcall;
           break;
-        }
-      }
+
     }
   );
 
-- 
2.20.1