From: Marion Guthmuller <marion.guthmuller@inria.fr>
Date: Thu, 3 Jul 2014 08:06:01 +0000 (+0200)
Subject: model-checker : remove useless condition
X-Git-Tag: v3_12~932
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a2b4d57f52081a0d45dc102c7bc987189e36c24c?hp=ef6f2ce6c7e898f90da6f5415d08a0e87c6853ba

model-checker : remove useless condition
---

diff --git a/src/mc/mc_comm_determinism.c b/src/mc/mc_comm_determinism.c
index 15cc8d1b74..31ea363fad 100644
--- a/src/mc/mc_comm_determinism.c
+++ b/src/mc/mc_comm_determinism.c
@@ -91,21 +91,21 @@ static void deterministic_pattern(xbt_dynar_t pattern, int partial)
     } else {
       while (cursor < nb_comms2) {
         comm1 = (mc_comm_pattern_t)xbt_dynar_get_as(process_comms_pattern1, cursor, mc_comm_pattern_t);
-        if (comm1->type == SIMIX_COMM_SEND && comm1->src_proc == current_process) {
+        if (comm1->type == SIMIX_COMM_SEND) {
           comm2 = get_comm_pattern_from_idx(process_comms_pattern2, &send_index, comm1->type, current_process);
           if (compare_comm_pattern(comm1, comm2)) {
-            XBT_INFO("The communications pattern of the process %u is different!", current_process);
+            XBT_INFO("The communications pattern of the process %u is different! (Different communication : %u)", current_process, cursor);
             initial_global_state->send_deterministic = 0;
             initial_global_state->comm_deterministic = 0;
             return;
           }
           send_index++;
-        } else if (comm1->type == SIMIX_COMM_RECEIVE && comm1->dst_proc == current_process) {
+        } else if (comm1->type == SIMIX_COMM_RECEIVE) {
           comm2 = get_comm_pattern_from_idx(process_comms_pattern2, &recv_index, comm1->type, current_process);
           if (compare_comm_pattern(comm1, comm2)) {
             initial_global_state->comm_deterministic = 0;
             if (!_sg_mc_send_determinism){
-              XBT_INFO("The communications pattern of the process %u is different!", current_process);
+              XBT_INFO("The communications pattern of the process %u is different! (Different communication : %u)", current_process, cursor);
               return;
             }
           }
@@ -183,8 +183,7 @@ void get_comm_pattern(xbt_dynar_t list, smx_simcall_t request, int call)
     pattern->data_size = pattern->comm->comm.src_buff_size;
     pattern->data = xbt_malloc0(pattern->data_size);
     addr_pointed = *(void **) pattern->comm->comm.src_buff;
-    if (addr_pointed > std_heap
-        && addr_pointed < ((xbt_mheap_t) std_heap)->breakval)
+    if (addr_pointed > std_heap && addr_pointed < ((xbt_mheap_t) std_heap)->breakval)
       memcpy(pattern->data, addr_pointed, pattern->data_size);
     else
       memcpy(pattern->data, pattern->comm->comm.src_buff, pattern->data_size);