X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e91f26820b30a2d87b4c723e92eaebbd2dc5ce15..3f8e81f0358efeb439da57c1e5516d26868b32b5:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 66fd9c8c6a..f8003c9d8a 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -18,6 +18,7 @@ set(EXTRA_DIST
   src/kernel/actor/Simcall.hpp
   src/kernel/resource/LinkImpl.hpp
   src/kernel/resource/NetworkModel.hpp
+  src/kernel/resource/NetworkModelFactors.hpp
   src/kernel/resource/SplitDuplexLinkImpl.hpp
   src/kernel/resource/StandardLinkImpl.hpp
   src/kernel/resource/WifiLinkImpl.hpp
@@ -40,7 +41,6 @@ set(EXTRA_DIST
   src/surf/network_constant.hpp
   src/surf/network_ib.hpp
   src/surf/network_ns3.hpp
-  src/surf/network_smpi.hpp
   src/surf/ns3/ns3_simulator.hpp
   src/surf/ptask_L07.hpp
   src/surf/surf_interface.hpp
@@ -246,7 +246,6 @@ set(SMPI_SRC
   src/smpi/plugins/ampi/instr_ampi.cpp
   src/smpi/plugins/ampi/instr_ampi.hpp
   src/surf/network_ib.cpp
-  src/surf/network_smpi.cpp
   )
 set(STHREAD_SRC
   src/sthread/sthread_impl.cpp
@@ -288,7 +287,8 @@ set(XBT_SRC
   )
 
 if(HAVE_MMALLOC)
-  set(XBT_SRC ${XBT_SRC}  src/xbt/mmalloc/mm.c )
+  set(SGMALLOC_SRC src/xbt/mmalloc/mm.c)
+  set(XBT_SRC      ${XBT_SRC} src/xbt/mmalloc/mm.c)
 else()
   set(EXTRA_DIST ${EXTRA_DIST} src/xbt/mmalloc/mm.c)
 endif()
@@ -314,8 +314,11 @@ set(SURF_SRC
   src/kernel/resource/CpuImpl.hpp
   src/kernel/resource/DiskImpl.cpp
   src/kernel/resource/DiskImpl.hpp
+  src/kernel/resource/FactorSet.cpp
+  src/kernel/resource/FactorSet.hpp
   src/kernel/resource/Model.cpp
   src/kernel/resource/NetworkModel.cpp
+  src/kernel/resource/NetworkModelFactors.cpp
   src/kernel/resource/Resource.hpp
   src/kernel/resource/SplitDuplexLinkImpl.cpp
   src/kernel/resource/StandardLinkImpl.cpp
@@ -432,7 +435,6 @@ set(SIMIX_SRC
   src/kernel/context/ContextThread.cpp
   src/kernel/context/ContextThread.hpp
   src/simix/libsmx.cpp
-  src/simix/smx_context.cpp
   )
 
 # Boost context may not be available
@@ -562,6 +564,7 @@ set(TRACING_SRC
 set(MC_SRC_BASE
   src/mc/mc_base.cpp
   src/mc/mc_base.hpp
+  src/mc/mc_client_api.cpp
   src/mc/mc_config.cpp
   src/mc/mc_config.hpp
   src/mc/mc_global.cpp
@@ -575,6 +578,7 @@ set(MC_SRC
   src/mc/explo/CommunicationDeterminismChecker.cpp
   src/mc/explo/DFSExplorer.cpp
   src/mc/explo/DFSExplorer.hpp
+  src/mc/explo/Exploration.cpp
   src/mc/explo/Exploration.hpp
   src/mc/explo/LivenessChecker.cpp
   src/mc/explo/LivenessChecker.hpp
@@ -621,6 +625,8 @@ set(MC_SRC
   src/mc/sosp/Snapshot.hpp
 
   src/mc/transition/Transition.hpp
+  src/mc/transition/TransitionActorJoin.cpp
+  src/mc/transition/TransitionActorJoin.hpp
   src/mc/transition/TransitionAny.cpp
   src/mc/transition/TransitionAny.hpp
   src/mc/transition/TransitionComm.cpp
@@ -633,28 +639,22 @@ set(MC_SRC
   src/mc/AddressSpace.hpp
   src/mc/ModelChecker.cpp
   src/mc/ModelChecker.hpp
-  src/mc/Session.cpp
-  src/mc/Session.hpp
   src/mc/VisitedState.cpp
   src/mc/VisitedState.hpp
-  src/mc/api.cpp
-  src/mc/api.hpp
+  src/mc/api/ActorState.hpp
   src/mc/api/State.cpp
   src/mc/api/State.hpp
+  src/mc/api/RemoteApp.cpp
+  src/mc/api/RemoteApp.hpp
   src/mc/compare.cpp
-  src/mc/mc_client_api.cpp
   src/mc/mc_exit.hpp
   src/mc/mc_forward.hpp
-  src/mc/mc_hash.cpp
-  src/mc/mc_hash.hpp
-  src/mc/mc_ignore.hpp
-  src/mc/mc_pattern.hpp
   src/mc/mc_private.hpp
   src/mc/mc_record.cpp
-  src/mc/mc_safety.hpp
-  src/mc/mc_smx.cpp
   src/mc/udpor_global.cpp
   src/mc/udpor_global.hpp
+
+  src/xbt/mmalloc/mm_interface.c
   )
 
 set(MC_SIMGRID_MC_SRC  src/mc/explo/simgrid_mc.cpp)
@@ -708,7 +708,6 @@ set(headers_to_install
   include/simgrid/s4u.hpp
 
   include/simgrid/kernel/resource/Action.hpp
-  include/simgrid/kernel/resource/NetworkModelIntf.hpp
   include/simgrid/kernel/resource/Model.hpp
 
   include/simgrid/kernel/routing/ClusterZone.hpp
@@ -737,6 +736,7 @@ set(headers_to_install
   include/smpi/forward.hpp
   include/xbt.h
   include/xbt/asserts.h
+  include/xbt/asserts.hpp
   include/xbt/automaton.h
   include/xbt/automaton.hpp
   include/xbt/backtrace.hpp
@@ -1214,6 +1214,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/vivaldi.xml
   examples/platforms/wifi.xml
   examples/platforms/wifi_energy.xml
+  examples/platforms/wifi_large_cell.xml
   examples/platforms/wifi_ns3.xml
   )