From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Mon, 27 Apr 2015 08:33:01 +0000 (+0200)
Subject: Merge branch 'master' into mc
X-Git-Tag: v3_12~732^2~50
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d13b1659a0c2551ee41b287a269e391bb2d7bc8a

Merge branch 'master' into mc

Conflicts:
	buildtools/Cmake/DefinePackages.cmake
	src/mc/mc_request.cpp
---

d13b1659a0c2551ee41b287a269e391bb2d7bc8a
diff --cc buildtools/Cmake/DefinePackages.cmake
index b08922fe1f,79652e1ad5..d62ea0c557
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -590,57 -589,60 +590,58 @@@ set(MC_SRC_BAS
  
  set(MC_SRC
    src/mc/mc_address_space.h
 -  src/mc/mc_address_space.c
 +  src/mc/mc_address_space.cpp
    src/mc/mc_forward.h
    src/mc/mc_process.h
 -  src/mc/mc_process.c
 +  src/mc/mc_process.cpp
    src/mc/mc_unw.h
 -  src/mc/mc_unw.c
 -  src/mc/mc_unw_vmread.c
 +  src/mc/mc_unw.cpp
 +  src/mc/mc_unw_vmread.cpp
    src/mc/mc_mmalloc.h
 -  src/mc/mc_model_checker.h
 -  src/mc/mc_model_checker.c
 +  src/mc/ModelChecker.hpp
 +  src/mc/ModelChecker.cpp
    src/mc/mc_object_info.h
 -  src/mc/mc_object_info.c
 -  src/mc/mc_checkpoint.c
 +  src/mc/mc_object_info.cpp
 +  src/mc/mc_checkpoint.cpp
    src/mc/mc_snapshot.h
 -  src/mc/mc_snapshot.c
 -  src/mc/mc_page_store.h
 -  src/mc/mc_page_store.cpp
 +  src/mc/mc_snapshot.cpp
 +  src/mc/PageStore.hpp
 +  src/mc/PageStore.cpp
    src/mc/mc_page_snapshot.cpp
    src/mc/mc_comm_pattern.h
 -  src/mc/mc_comm_pattern.c
 -  src/mc/mc_comm_determinism.c
 +  src/mc/mc_comm_pattern.cpp
 +  src/mc/mc_comm_determinism.cpp
    src/mc/mc_compare.cpp
 -  src/mc/mc_diff.c
 -  src/mc/mc_dwarf.c
 +  src/mc/mc_diff.cpp
 +  src/mc/mc_dwarf.cpp
    src/mc/mc_dwarf_attrnames.h
 -  src/mc/mc_dwarf_expression.c
 +  src/mc/mc_dwarf_expression.cpp
    src/mc/mc_dwarf_tagnames.h
 -  src/mc/mc_hash.c
 -  src/mc/mc_ignore.c
 +  src/mc/mc_hash.cpp
 +  src/mc/mc_ignore.cpp
+   src/mc/mc_ignore.h
 -  src/mc/mc_interface.h
    src/mc/mc_liveness.h
    src/mc/mc_location.h
 -  src/mc/mc_liveness.c
 -  src/mc/mc_record.c
 -  src/mc/mc_member.c
 -  src/mc/mc_memory.c
 -  src/mc/mc_pair.c
 +  src/mc/mc_liveness.cpp
 +  src/mc/mc_record.cpp
 +  src/mc/mc_member.cpp
 +  src/mc/mc_memory.cpp
 +  src/mc/mc_pair.cpp
    src/mc/mc_private.h
    src/mc/mc_request.h
 -  src/mc/mc_request.c
 +  src/mc/mc_request.cpp
    src/mc/mc_safety.h
 -  src/mc/mc_safety.c
 -  src/mc/mc_set.cpp
 +  src/mc/mc_safety.cpp
    src/mc/mc_state.h
 -  src/mc/mc_state.c
 -  src/mc/mc_visited.c
 +  src/mc/mc_state.cpp
 +  src/mc/mc_visited.cpp
    src/mc/mc_memory_map.h
 -  src/mc/memory_map.c
 -  src/mc/mc_client.c
 -  src/mc/mc_client_api.c
 +  src/mc/memory_map.cpp
 +  src/mc/mc_client.cpp
 +  src/mc/mc_client_api.cpp
    src/mc/mc_client.h
    src/mc/mc_protocol.h
 -  src/mc/mc_protocol.c
 +  src/mc/mc_protocol.cpp
    src/mc/mc_server.cpp
    src/mc/mc_server.h
    src/mc/mc_smx.h
diff --cc src/mc/mc_request.cpp
index c3de6850aa,2af0bdbf38..4d0ebf46c1
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@@ -473,8 -471,8 +473,8 @@@ unsigned int MC_request_testany_fail(sm
    for (cursor=0; cursor != comms.used; ++cursor) {
  
      // Get the element:
-     smx_synchro_t remote_action;
+     smx_synchro_t remote_action = NULL;
 -    memcpy(buffer + comms.elmsize * cursor, &remote_action, sizeof(remote_action));
 +    memcpy(&remote_action, buffer + comms.elmsize * cursor, sizeof(remote_action));
  
      // Dereference the pointer:
      s_smx_synchro_t action;
diff --cc src/mc/mc_unw_vmread.cpp
index 55e348155b,2d7cb1e243..a4e567771c
--- a/src/mc/mc_unw_vmread.cpp
+++ b/src/mc/mc_unw_vmread.cpp
@@@ -58,9 -51,9 +57,9 @@@ static int access_mem(const unw_addr_sp
  
    struct iovec local = { valp, size };
    struct iovec remote = { (void*) addr, size };
-   s = process_vm_readv(pid, &local, 1, &remote, 1, 0);
+   ssize_t s = process_vm_readv(pid, &local, 1, &remote, 1, 0);
    if (s >= 0) {
 -    if (s != size)
 +    if ((size_t) s != size)
        return - UNW_EINVAL;
      else
        return 0;