From ef452e5b6bb45995982b6190d3455903eb0dc719 Mon Sep 17 00:00:00 2001
From: Augustin Degomme <augustin.degomme@imag.fr>
Date: Thu, 11 Sep 2014 14:31:10 +0200
Subject: [PATCH] resolve conflict

---
 src/smpi/smpi_bench.c  | 3 ++-
 src/smpi/smpi_global.c | 2 +-
 src/smpi/smpi_mpi_dt.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index 7207e64837..972795beb7 100644
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -627,8 +627,9 @@ void smpi_switch_data_segment(int dest){
       memcpy(smpi_privatisation_regions[i].address,TOPAGE(start_data_exe),size_data_exe);
     }
   }
+
   int current = smpi_privatisation_regions[dest].file_descriptor;
-  XBT_VERB("Switching data frame to the one of process %d", dest);
+  XBT_DEBUG("Switching data frame to the one of process %d", dest);
   void* tmp = mmap (TOPAGE(start_data_exe), size_data_exe, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, current, 0);
   if (tmp != TOPAGE(start_data_exe))
     xbt_die("Couldn't map the new region");
diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 246772cf74..9423d136c9 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -310,7 +310,7 @@ int smpi_process_get_sampling(void)
 
 void print_request(const char *message, MPI_Request request)
 {
-  XBT_DEBUG
+  XBT_VERB
       ("%s  request %p  [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]",
        message, request, request->buf, request->size, request->src,
        request->dst, request->tag, request->flags);
diff --git a/src/smpi/smpi_mpi_dt.c b/src/smpi/smpi_mpi_dt.c
index cd0f5868df..29843af1a1 100644
--- a/src/smpi/smpi_mpi_dt.c
+++ b/src/smpi/smpi_mpi_dt.c
@@ -1616,7 +1616,7 @@ void smpi_op_apply(MPI_Op op, void *invec, void *inoutvec, int *len,
                    MPI_Datatype * datatype)
 {
   if(smpi_privatize_global_variables){ //we need to switch here, as the called function may silently touch global variables
-    XBT_VERB("Applying operation, switch to the right data frame ");
+    XBT_DEBUG("Applying operation, switch to the right data frame ");
     smpi_switch_data_segment(smpi_process_index());
   }
 
-- 
2.20.1