X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/30382b06d3320a281f1556546e3b0a8112bd055a..5f5a10db6fc4552782638abb4817041223e17775:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 1703fe08f2..abe9634303 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -25,7 +25,7 @@ set(EXTRA_DIST
   src/kernel/resource/models/network_ns3.hpp
   src/kernel/resource/models/ns3/ns3_simulator.hpp
   src/kernel/resource/models/ptask_L07.hpp
-  
+
   src/mc/datatypes.h
   src/mc/mc.h
   src/mc/mc_mmu.hpp
@@ -56,19 +56,6 @@ set(EXTRA_DIST
   src/xbt/log_private.hpp
   src/xbt/mallocator_private.h
   src/xbt/parmap.hpp
-  
-  src/xbt/mmalloc/mmalloc.h
-  src/xbt/mmalloc/mfree.c
-  src/xbt/mmalloc/mm_legacy.c
-  src/xbt/mmalloc/mm_module.c
-  src/xbt/mmalloc/mmalloc.c
-  src/xbt/mmalloc/mmalloc.info
-  src/xbt/mmalloc/mmalloc.texi
-  src/xbt/mmalloc/mmorecore.c
-  src/xbt/mmalloc/mmprivate.h
-  src/xbt/mmalloc/mrealloc.c
-  src/xbt/mmalloc/swag.c
-  src/xbt/mmalloc/swag.h
   )
 
 set(SMPI_SRC
@@ -292,21 +279,12 @@ set(XBT_SRC
   src/xbt/utils/iter/LazyPowerset.hpp
   )
 
-if(HAVE_MMALLOC)
-  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()
-
 set(NS3_SRC
   src/kernel/resource/models/network_ns3.cpp
   src/kernel/resource/models/ns3/ns3_simulator.cpp
   )
 
 set(KERNEL_SRC
-  src/deprecated.cpp
-
   src/kernel/EngineImpl.cpp
   src/kernel/EngineImpl.hpp
 
@@ -324,6 +302,10 @@ set(KERNEL_SRC
   src/kernel/activity/IoImpl.hpp
   src/kernel/activity/MailboxImpl.cpp
   src/kernel/activity/MailboxImpl.hpp
+  src/kernel/activity/MessImpl.cpp
+  src/kernel/activity/MessImpl.hpp
+  src/kernel/activity/MessageQueueImpl.cpp
+  src/kernel/activity/MessageQueueImpl.hpp
   src/kernel/activity/MutexImpl.cpp
   src/kernel/activity/MutexImpl.hpp
   src/kernel/activity/SemaphoreImpl.cpp
@@ -342,7 +324,7 @@ set(KERNEL_SRC
   src/kernel/actor/SimcallObserver.hpp
   src/kernel/actor/SynchroObserver.cpp
   src/kernel/actor/SynchroObserver.hpp
-  
+
   src/kernel/context/Context.cpp
   src/kernel/context/Context.hpp
   src/kernel/context/ContextRaw.cpp
@@ -447,17 +429,22 @@ set(PLUGINS_SRC
   src/plugins/host_dvfs.cpp
   src/plugins/host_energy.cpp
   src/plugins/host_load.cpp
+  src/plugins/jbod.cpp
   src/plugins/link_energy.cpp
   src/plugins/link_energy_wifi.cpp
   src/plugins/link_load.cpp
   src/plugins/vm/VmLiveMigration.cpp
   src/plugins/vm/VmLiveMigration.hpp
   src/plugins/vm/dirty_page_tracking.cpp
+  src/plugins/battery.cpp
+  src/plugins/chiller.cpp
+  src/plugins/solar_panel.cpp
   )
 
 
 set(S4U_SRC
   src/s4u/s4u_Activity.cpp
+  src/s4u/s4u_ActivitySet.cpp
   src/s4u/s4u_Actor.cpp
   src/s4u/s4u_Barrier.cpp
   src/s4u/s4u_Comm.cpp
@@ -469,9 +456,12 @@ set(S4U_SRC
   src/s4u/s4u_Io.cpp
   src/s4u/s4u_Link.cpp
   src/s4u/s4u_Mailbox.cpp
+  src/s4u/s4u_Mess.cpp
+  src/s4u/s4u_MessageQueue.cpp
   src/s4u/s4u_Mutex.cpp
   src/s4u/s4u_Netzone.cpp
   src/s4u/s4u_Semaphore.cpp
+  src/s4u/s4u_Task.cpp
   src/s4u/s4u_VirtualMachine.cpp
 )
 
@@ -519,22 +509,31 @@ set(MC_SRC_BASE
   src/mc/transition/Transition.cpp
   )
 
-set(MC_SRC
-  src/mc/explo/CommunicationDeterminismChecker.cpp
+set(MC_SRC_STATELESS
+  src/mc/api/ActorState.hpp
+  src/mc/api/ClockVector.cpp
+  src/mc/api/ClockVector.hpp
+  src/mc/api/State.cpp
+  src/mc/api/State.hpp
+  src/mc/api/RemoteApp.cpp
+  src/mc/api/RemoteApp.hpp
+
   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
+  src/mc/explo/CommunicationDeterminismChecker.cpp
+
   src/mc/explo/UdporChecker.cpp
   src/mc/explo/UdporChecker.hpp
-  
+
   src/mc/explo/udpor/Comb.hpp
   src/mc/explo/udpor/Configuration.hpp
   src/mc/explo/udpor/Configuration.cpp
   src/mc/explo/udpor/EventSet.cpp
   src/mc/explo/udpor/EventSet.hpp
+  src/mc/explo/udpor/ExtensionSetCalculator.cpp
+  src/mc/explo/udpor/ExtensionSetCalculator.hpp
   src/mc/explo/udpor/History.cpp
   src/mc/explo/udpor/History.hpp
   src/mc/explo/udpor/maximal_subsets_iterator.cpp
@@ -545,25 +544,17 @@ set(MC_SRC
   src/mc/explo/udpor/Unfolding.hpp
   src/mc/explo/udpor/udpor_forward.hpp
   src/mc/explo/udpor/udpor_tests_private.hpp
-  
-  src/mc/inspect/DwarfExpression.cpp
-  src/mc/inspect/DwarfExpression.hpp
-  src/mc/inspect/Frame.cpp
-  src/mc/inspect/Frame.hpp
-  src/mc/inspect/LocationList.cpp
-  src/mc/inspect/LocationList.hpp
-  src/mc/inspect/ObjectInformation.cpp
-  src/mc/inspect/ObjectInformation.hpp
-  src/mc/inspect/Type.hpp
-  src/mc/inspect/Variable.hpp
-  src/mc/inspect/mc_dwarf.cpp
-  src/mc/inspect/mc_dwarf.hpp
-  src/mc/inspect/mc_dwarf_attrnames.cpp
-  src/mc/inspect/mc_dwarf_tagnames.cpp
-  src/mc/inspect/mc_member.cpp
-  src/mc/inspect/mc_unw.cpp
-  src/mc/inspect/mc_unw.hpp
-  src/mc/inspect/mc_unw_vmread.cpp
+
+  src/mc/explo/odpor/Execution.cpp
+  src/mc/explo/odpor/Execution.hpp
+  src/mc/explo/odpor/ReversibleRaceCalculator.cpp
+  src/mc/explo/odpor/ReversibleRaceCalculator.hpp
+  src/mc/explo/odpor/WakeupTree.cpp
+  src/mc/explo/odpor/WakeupTree.hpp
+  src/mc/explo/odpor/WakeupTreeIterator.cpp
+  src/mc/explo/odpor/WakeupTreeIterator.hpp
+  src/mc/explo/odpor/odpor_forward.hpp
+  src/mc/explo/odpor/odpor_tests_private.hpp
 
   src/mc/remote/AppSide.cpp
   src/mc/remote/AppSide.hpp
@@ -573,21 +564,10 @@ set(MC_SRC
   src/mc/remote/CheckerSide.hpp
   src/mc/remote/RemotePtr.hpp
   src/mc/remote/mc_protocol.h
-  
-  src/mc/sosp/ChunkedData.cpp
-  src/mc/sosp/ChunkedData.hpp
-  src/mc/sosp/PageStore.cpp
-  src/mc/sosp/PageStore.hpp
-  src/mc/sosp/Region.cpp
-  src/mc/sosp/Region.hpp
-  src/mc/sosp/RemoteProcessMemory.cpp
-  src/mc/sosp/RemoteProcessMemory.hpp
-  src/mc/sosp/Snapshot.cpp
-  src/mc/sosp/Snapshot.hpp
 
   src/mc/transition/Transition.hpp
-  src/mc/transition/TransitionActorJoin.cpp
-  src/mc/transition/TransitionActorJoin.hpp
+  src/mc/transition/TransitionActor.cpp
+  src/mc/transition/TransitionActor.hpp
   src/mc/transition/TransitionAny.cpp
   src/mc/transition/TransitionAny.hpp
   src/mc/transition/TransitionComm.cpp
@@ -599,51 +579,44 @@ set(MC_SRC
   src/mc/transition/TransitionSynchro.cpp
   src/mc/transition/TransitionSynchro.hpp
 
-  src/mc/api/guide/BasicGuide.hpp
-  src/mc/api/guide/GuidedState.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/AddressSpace.hpp
-  src/mc/VisitedState.cpp
-  src/mc/VisitedState.hpp
-  src/mc/compare.cpp
+  src/mc/mc_environ.h
   src/mc/mc_exit.hpp
   src/mc/mc_forward.hpp
   src/mc/mc_private.hpp
   src/mc/mc_record.cpp
 
-  src/mc/api/guide/BasicGuide.hpp
-  src/mc/api/guide/GuidedState.hpp
-  src/mc/api/guide/WaitGuide.hpp
-  
-  src/xbt/mmalloc/mm_interface.c
+  src/mc/api/strategy/BasicStrategy.hpp
+  src/mc/api/strategy/MaxMatchComm.hpp
+  src/mc/api/strategy/MinMatchComm.hpp
+  src/mc/api/strategy/Strategy.hpp
+  src/mc/api/strategy/UniformStrategy.hpp
   )
 
 set(MC_SIMGRID_MC_SRC  src/mc/explo/simgrid_mc.cpp)
 
 set(headers_to_install
   include/simgrid/actor.h
+  include/simgrid/activity_set.h
   include/simgrid/barrier.h
   include/simgrid/comm.h
   include/simgrid/engine.h
   include/simgrid/exec.h
   include/simgrid/Exception.hpp
   include/simgrid/chrono.hpp
+  include/simgrid/plugins/battery.hpp
+  include/simgrid/plugins/chiller.hpp
   include/simgrid/plugins/dvfs.h
   include/simgrid/plugins/energy.h
   include/simgrid/plugins/file_system.h
+  include/simgrid/plugins/jbod.hpp
   include/simgrid/plugins/live_migration.h
   include/simgrid/plugins/load.h
+  include/simgrid/plugins/solar_panel.hpp
   include/simgrid/plugins/ProducerConsumer.hpp
   include/simgrid/instr.h
   include/simgrid/mailbox.h
   include/simgrid/modelchecker.h
   include/simgrid/forward.h
-  include/simgrid/simix.h
   include/simgrid/simix.hpp
   include/simgrid/kernel/ProfileBuilder.hpp
   include/simgrid/kernel/Timer.hpp
@@ -656,6 +629,7 @@ set(headers_to_install
   include/simgrid/vm.h
   include/simgrid/zone.h
   include/simgrid/s4u/Activity.hpp
+  include/simgrid/s4u/ActivitySet.hpp
   include/simgrid/s4u/Actor.hpp
   include/simgrid/s4u/Barrier.hpp
   include/simgrid/s4u/Comm.hpp
@@ -667,9 +641,12 @@ set(headers_to_install
   include/simgrid/s4u/Io.hpp
   include/simgrid/s4u/Link.hpp
   include/simgrid/s4u/Mailbox.hpp
+  include/simgrid/s4u/MessageQueue.hpp
+  include/simgrid/s4u/Mess.hpp
   include/simgrid/s4u/Mutex.hpp
   include/simgrid/s4u/NetZone.hpp
   include/simgrid/s4u/Semaphore.hpp
+  include/simgrid/s4u/Task.hpp
   include/simgrid/s4u/VirtualMachine.hpp
   include/simgrid/s4u.hpp
 
@@ -752,7 +729,7 @@ else() # NOT ucontext
                                 src/kernel/context/ContextUnix.cpp)
 endif()
 
-### Simgrid Lib sources
+### SimGrid Lib sources
 set(simgrid_sources
   ${S4U_SRC}
   ${SIMGRID_SRC}
@@ -769,8 +746,9 @@ if(enable_smpi)
 endif()
 
 if(SIMGRID_HAVE_MC)
-  set(simgrid_sources  ${simgrid_sources}  ${MC_SRC})
+  set(simgrid_sources  ${simgrid_sources}  ${MC_SRC_STATELESS})
 endif()
+set(EXTRA_DIST ${EXTRA_DIST} ${MC_SRC_STATELESS})
 
 if(SIMGRID_HAVE_NS3)
   set(headers_to_install ${headers_to_install} include/simgrid/plugins/ns3.hpp)
@@ -878,17 +856,10 @@ set(DOC_SOURCES
   docs/source/tuto_s4u/master-workers-lab4.cpp
 
   docs/source/Tutorial_DAG.rst
-  docs/source/tuto_dag/dag_lab1.cpp
-  docs/source/tuto_dag/dag_lab2-1.cpp
-  docs/source/tuto_dag/dag_lab2-2.cpp
-  docs/source/tuto_dag/dag_lab2-3.cpp
-  docs/source/tuto_dag/img/dag1.svg
-  docs/source/tuto_dag/img/dag2.svg
-  docs/source/tuto_dag/img/dag.svg
-  docs/source/tuto_dag/simple_dax.xml
-  docs/source/tuto_dag/simple_dot.dot
-  docs/source/tuto_dag/simple_json.json
-  docs/source/tuto_dag/small_platform.xml
+  docs/source/img/battery_degradation.svg
+  docs/source/img/dag1.svg
+  docs/source/img/dag2.svg
+  docs/source/img/dag.svg
 
   docs/source/Tutorial_MPI_Applications.rst
   docs/source/tuto_smpi/3hosts.png
@@ -1049,10 +1020,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/MaintainerMode.cmake
   tools/cmake/MakeLib.cmake
   tools/cmake/Modules/FindGraphviz.cmake
-  tools/cmake/Modules/FindLibdw.cmake
-  tools/cmake/Modules/FindLibelf.cmake
   tools/cmake/Modules/FindLibevent.cmake
-  tools/cmake/Modules/FindLibunwind.cmake
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindPAPI.cmake
   tools/cmake/Modules/FindValgrind.cmake
@@ -1065,6 +1033,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/scripts/update_tesh.pl
   tools/cmake/test_prog/prog_asan.cpp
   tools/cmake/test_prog/prog_makecontext.c
+  tools/cmake/test_prog/prog_ns3.cpp
   tools/cmake/test_prog/prog_stackgrowth.c
   tools/cmake/test_prog/prog_stacksetup.c
   tools/cmake/test_prog/prog_tsan.cpp