X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a0c104c8ef077732f68619071eafd1072dc246d..939476f1fc7630eb237535b07ed0deef77ce1b24:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index f54d5c1f60..f05744b917 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -10,7 +10,6 @@ set(EXTRA_DIST
   src/include/xbt/mmalloc.h
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp
-  src/mc/PageStore.hpp
   src/msg/msg_private.hpp
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
@@ -44,6 +43,8 @@ set(EXTRA_DIST
   src/surf/network_ib.hpp
   src/surf/ns3/ns3_simulator.hpp
   src/surf/trace_mgr_test.cpp
+  src/mc/sosp/mc_snapshot_test.cpp
+  src/mc/sosp/PageStore_test.cpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.h
   src/surf/xml/simgrid_dtd.c
@@ -223,7 +224,7 @@ set(SMPI_SRC
   src/smpi/internals/smpi_global.cpp
   src/smpi/internals/smpi_host.cpp
   src/smpi/internals/smpi_replay.cpp
-  src/smpi/internals/smpi_process.cpp
+  src/smpi/internals/smpi_actor.cpp
   src/smpi/internals/smpi_utils.cpp
   src/smpi/mpi/smpi_comm.cpp
   src/smpi/mpi/smpi_datatype.cpp
@@ -247,7 +248,7 @@ set(SMPI_SRC
   src/smpi/include/smpi_keyvals.hpp
   src/smpi/include/smpi_datatype_derived.hpp
   src/smpi/include/smpi_op.hpp
-  src/smpi/include/smpi_process.hpp
+  src/smpi/include/smpi_actor.hpp
   src/smpi/include/smpi_request.hpp
   src/smpi/include/smpi_status.hpp
   src/smpi/include/smpi_win.hpp
@@ -422,11 +423,13 @@ endif()
 set(S4U_SRC
   src/s4u/s4u_Actor.cpp
   src/s4u/s4u_Activity.cpp
+  src/s4u/s4u_Barrier.cpp
   src/s4u/s4u_ConditionVariable.cpp
   src/s4u/s4u_Comm.cpp
   src/s4u/s4u_Engine.cpp
   src/s4u/s4u_Exec.cpp
   src/s4u/s4u_Host.cpp
+  src/s4u/s4u_Io.cpp
   src/s4u/s4u_Link.cpp
   src/s4u/s4u_Mailbox.cpp
   src/s4u/s4u_Mutex.cpp
@@ -594,6 +597,17 @@ set(MC_SRC
   src/mc/remote/mc_protocol.h
   src/mc/remote/mc_protocol.cpp
 
+  src/mc/sosp/PageStore.hpp
+  src/mc/sosp/PageStore.cpp
+  src/mc/sosp/ChunkedData.hpp
+  src/mc/sosp/ChunkedData.cpp
+  src/mc/sosp/RegionSnapshot.cpp
+  src/mc/sosp/RegionSnapshot.hpp
+  src/mc/sosp/mc_checkpoint.cpp
+  src/mc/sosp/mc_snapshot.hpp
+  src/mc/sosp/mc_snapshot.cpp
+  src/mc/sosp/mc_page_snapshot.cpp
+  
   src/mc/AddressSpace.hpp
   src/mc/Frame.hpp
   src/mc/Frame.cpp
@@ -601,12 +615,6 @@ set(MC_SRC
   src/mc/ModelChecker.cpp
   src/mc/ObjectInformation.hpp
   src/mc/ObjectInformation.cpp
-  src/mc/PageStore.hpp
-  src/mc/PageStore.cpp
-  src/mc/ChunkedData.hpp
-  src/mc/ChunkedData.cpp
-  src/mc/RegionSnapshot.cpp
-  src/mc/RegionSnapshot.hpp
   src/mc/Type.hpp
   src/mc/Variable.hpp
   src/mc/mc_forward.hpp
@@ -615,10 +623,6 @@ set(MC_SRC
   src/mc/mc_unw.hpp
   src/mc/mc_unw.cpp
   src/mc/mc_unw_vmread.cpp
-  src/mc/mc_checkpoint.cpp
-  src/mc/mc_snapshot.hpp
-  src/mc/mc_snapshot.cpp
-  src/mc/mc_page_snapshot.cpp
   src/mc/mc_comm_pattern.cpp
   src/mc/mc_comm_pattern.hpp
   src/mc/compare.cpp
@@ -659,6 +663,7 @@ set(headers_to_install
 
   include/simgrid_config.h
   include/simgrid/actor.h
+  include/simgrid/barrier.h
   include/simgrid/engine.h
   include/simgrid/chrono.hpp
   include/simgrid/plugins/dvfs.h
@@ -685,11 +690,13 @@ set(headers_to_install
   include/simgrid/zone.h
   include/simgrid/s4u/Activity.hpp
   include/simgrid/s4u/Actor.hpp
+  include/simgrid/s4u/Barrier.hpp
   include/simgrid/s4u/Comm.hpp
   include/simgrid/s4u/ConditionVariable.hpp
   include/simgrid/s4u/Engine.hpp
   include/simgrid/s4u/Exec.hpp
   include/simgrid/s4u/Host.hpp
+  include/simgrid/s4u/Io.hpp
   include/simgrid/s4u/Link.hpp
   include/simgrid/s4u/Mailbox.hpp
   include/simgrid/s4u/Mutex.hpp
@@ -795,17 +802,17 @@ endif()
 
 ### Simgrid Lib sources
 set(simgrid_sources
-  ${MSG_SRC}
   ${S4U_SRC}
-  ${SIMDAG_SRC}
   ${SIMGRID_SRC}
+  ${MC_SRC_BASE}
   ${SIMIX_SRC}
   ${SURF_SRC}
   ${TRACING_SRC}
   ${XBT_SRC}
   ${PLUGINS_SRC}
   ${BINDINGS_SRC}
-  ${MC_SRC_BASE}
+  ${MSG_SRC}
+  ${SIMDAG_SRC}
   )
 
 if(${SIMGRID_HAVE_JEDULE})
@@ -996,6 +1003,7 @@ set(CMAKEFILES_TXT
     examples/smpi/NAS/CMakeLists.txt
     examples/smpi/smpi_msg_masterslave/CMakeLists.txt
     examples/smpi/replay_multiple/CMakeLists.txt
+    examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
     examples/smpi/energy/f77/CMakeLists.txt
     examples/smpi/energy/f90/CMakeLists.txt
 
@@ -1085,7 +1093,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/test_prog/prog_snprintf.c
   tools/cmake/test_prog/prog_stackgrowth.c
   tools/cmake/test_prog/prog_stacksetup.c
-  tools/cmake/test_prog/prog_thread_storage.c
   tools/cmake/test_prog/prog_vsnprintf.c
   tools/cmake/cross-mingw.cmake
   tools/smpi/generate_smpi_defines.pl