From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 24 Mar 2016 10:32:03 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_13~311
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2ab3abe53dde0026da7545fb7a80f29caf22a39b?hp=-c

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

2ab3abe53dde0026da7545fb7a80f29caf22a39b
diff --combined tools/cmake/DefinePackages.cmake
index adb99d6741,9b9dc68f93..74b738d76e
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -554,6 -554,8 +554,8 @@@ set(MC_SR
    src/mc/Checker.hpp
    src/mc/Client.cpp
    src/mc/Client.hpp
+   src/mc/CommunicationDeterminismChecker.cpp
+   src/mc/CommunicationDeterminismChecker.hpp
    src/mc/Frame.hpp
    src/mc/Frame.cpp
    src/mc/ModelChecker.hpp
@@@ -585,7 -587,6 +587,6 @@@
    src/mc/mc_page_snapshot.cpp
    src/mc/mc_comm_pattern.h
    src/mc/mc_comm_pattern.cpp
-   src/mc/mc_comm_determinism.cpp
    src/mc/mc_compare.cpp
    src/mc/mc_diff.cpp
    src/mc/mc_dwarf.hpp
@@@ -598,11 -599,11 +599,11 @@@
    src/mc/mc_hash.cpp
    src/mc/mc_ignore.h
    src/mc/mc_mmalloc.h
-   src/mc/mc_liveness.h
+   src/mc/LivenessChecker.hpp
    src/mc/LocationList.hpp
    src/mc/malloc.hpp
    src/mc/LocationList.cpp
-   src/mc/mc_liveness.cpp
+   src/mc/LivenessChecker.cpp
    src/mc/mc_record.cpp
    src/mc/mc_member.cpp
    src/mc/mc_memory.cpp
@@@ -948,10 -949,13 +949,10 @@@ set(CMAKEFILES_TX
    examples/java/tracing/CMakeLists.txt
    
    examples/msg/CMakeLists.txt
 -    examples/msg/actions/CMakeLists.txt
      examples/msg/bittorrent/CMakeLists.txt
      examples/msg/chainsend/CMakeLists.txt
      examples/msg/cloud/CMakeLists.txt
      examples/msg/dht-kademlia/CMakeLists.txt
 -    examples/msg/dht-pastry/CMakeLists.txt
 -    examples/msg/energy/CMakeLists.txt
      examples/msg/gtnets/CMakeLists.txt 
      examples/msg/icomms/CMakeLists.txt
      examples/msg/io/CMakeLists.txt