X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c43701ee8c55961a18ea2b8e75aa18a8654ebf71..7e625e5e848a284b522d69ec28cb111f1f88515b:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 8215478aec..c28b7aa134 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -46,29 +46,11 @@ set(EXTRA_DIST
   src/kernel/xml/simgrid_dtd.h
   src/kernel/xml/platf_sax_cb.cpp
 
-  src/xbt/automaton/automaton_lexer.yy.c
-  src/xbt/automaton/parserPromela.lex
-  src/xbt/automaton/parserPromela.tab.cacc
-  src/xbt/automaton/parserPromela.tab.hacc
-  src/xbt/automaton/parserPromela.yacc
   src/xbt/coverage.h
   src/xbt/dict_private.h
   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
@@ -257,8 +239,6 @@ set(STHREAD_SRC
 set(XBT_SRC
   src/xbt/OsSemaphore.hpp
   src/xbt/PropertyHolder.cpp
-  src/xbt/automaton/automaton.c
-  src/xbt/automaton/automatonparse_promela.c
   src/xbt/backtrace.cpp
   src/xbt/config.cpp
   src/xbt/dict.cpp
@@ -292,13 +272,6 @@ 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
@@ -322,6 +295,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
@@ -453,7 +430,8 @@ set(PLUGINS_SRC
   src/plugins/vm/VmLiveMigration.hpp
   src/plugins/vm/dirty_page_tracking.cpp
   src/plugins/battery.cpp
-  src/plugins/photovoltaic.cpp
+  src/plugins/chiller.cpp
+  src/plugins/solar_panel.cpp
   )
 
 
@@ -471,6 +449,8 @@ 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
@@ -535,11 +515,31 @@ set(MC_SRC_STATELESS
   src/mc/explo/DFSExplorer.hpp
   src/mc/explo/Exploration.cpp
   src/mc/explo/Exploration.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
+  src/mc/explo/udpor/maximal_subsets_iterator.hpp
+  src/mc/explo/udpor/UnfoldingEvent.cpp
+  src/mc/explo/udpor/UnfoldingEvent.hpp
+  src/mc/explo/udpor/Unfolding.cpp
+  src/mc/explo/udpor/Unfolding.hpp
+  src/mc/explo/udpor/udpor_forward.hpp
+  src/mc/explo/udpor/udpor_tests_private.hpp
 
   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
@@ -557,8 +557,8 @@ set(MC_SRC_STATELESS
   src/mc/remote/mc_protocol.h
 
   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
@@ -569,67 +569,7 @@ set(MC_SRC_STATELESS
   src/mc/transition/TransitionRandom.hpp
   src/mc/transition/TransitionSynchro.cpp
   src/mc/transition/TransitionSynchro.hpp
-  )
 
-set(MC_SRC_STATEFUL
-  src/mc/explo/CommunicationDeterminismChecker.cpp
-  src/mc/explo/LivenessChecker.cpp
-  src/mc/explo/LivenessChecker.hpp
-  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
-  src/mc/explo/udpor/maximal_subsets_iterator.hpp
-  src/mc/explo/udpor/UnfoldingEvent.cpp
-  src/mc/explo/udpor/UnfoldingEvent.hpp
-  src/mc/explo/udpor/Unfolding.cpp
-  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/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/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
@@ -641,8 +581,6 @@ set(MC_SRC_STATEFUL
   src/mc/api/strategy/MinMatchComm.hpp
   src/mc/api/strategy/Strategy.hpp
   src/mc/api/strategy/UniformStrategy.hpp
-
-  src/xbt/mmalloc/mm_interface.c
   )
 
 set(MC_SIMGRID_MC_SRC  src/mc/explo/simgrid_mc.cpp)
@@ -657,13 +595,14 @@ set(headers_to_install
   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/photovoltaic.hpp
+  include/simgrid/plugins/solar_panel.hpp
   include/simgrid/plugins/ProducerConsumer.hpp
   include/simgrid/instr.h
   include/simgrid/mailbox.h
@@ -693,6 +632,8 @@ 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
@@ -729,8 +670,6 @@ set(headers_to_install
   include/xbt.h
   include/xbt/asserts.h
   include/xbt/asserts.hpp
-  include/xbt/automaton.h
-  include/xbt/automaton.hpp
   include/xbt/backtrace.hpp
   include/xbt/base.h
   include/xbt/config.h
@@ -798,10 +737,7 @@ endif()
 if(SIMGRID_HAVE_MC)
   set(simgrid_sources  ${simgrid_sources}  ${MC_SRC_STATELESS})
 endif()
-if(SIMGRID_HAVE_STATEFUL_MC)
-  set(simgrid_sources  ${simgrid_sources}  ${MC_SRC_STATEFUL})
-endif()
-set(EXTRA_DIST ${EXTRA_DIST} ${MC_SRC_STATELESS} ${MC_SRC_STATEFUL})
+set(EXTRA_DIST ${EXTRA_DIST} ${MC_SRC_STATELESS})
 
 if(SIMGRID_HAVE_NS3)
   set(headers_to_install ${headers_to_install} include/simgrid/plugins/ns3.hpp)
@@ -1073,10 +1009,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
@@ -1141,7 +1074,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/optorsim/gridpp_grid_2004.conf
   examples/platforms/optorsim/lcg_sept2004_grid.conf
   examples/platforms/optorsim/transform_optorsim_platform.pl
-  examples/platforms/photovoltaic_platform.xml
   examples/platforms/profiles/fafard_state.profile
   examples/platforms/profiles/faulty_host.profile
   examples/platforms/profiles/ginette_state.profile
@@ -1187,13 +1119,3 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/wifi_large_cell.xml
   examples/platforms/wifi_ns3.xml
   )
-
-set(generated_src_files
-  src/xbt/automaton/automaton_lexer.yy.c
-  src/xbt/automaton/parserPromela.tab.cacc
-  src/xbt/automaton/parserPromela.tab.hacc
-  )
-
-foreach(file ${generated_src_files})
-  set_source_files_properties(${file} PROPERTIES GENERATED true)
-endforeach(file ${generated_src_files})