X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c69e23793c9da81d75f1fa275a7131f299416147..4e8b07e1fee60c02b2f5627419d99ff7f76a8443:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 0fbc70e557..7f14976da9 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1,19 +1,12 @@
 ### define source packages
 
 set(EXTRA_DIST
+  src/3rd-party/catch.hpp
+  src/3rd-party/xxhash.hpp
   src/bindings/python/simgrid_python.cpp
   src/dag/dax.dtd
   src/dag/dax_dtd.c
   src/dag/dax_dtd.h
-  src/include/catch.hpp
-  src/include/mc/datatypes.h
-  src/include/mc/mc.h
-  src/include/simgrid/sg_config.hpp
-  src/include/xbt/coverage.h
-  src/include/xbt/mmalloc.h
-  src/include/xbt/parmap.hpp
-  src/include/xbt/xbt_modinter.h
-  src/include/xxhash.hpp
   src/kernel/actor/Simcall.hpp
   src/kernel/resource/HostImpl.hpp
   src/kernel/resource/LinkImpl.hpp
@@ -33,8 +26,14 @@ set(EXTRA_DIST
   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
   src/mc/mc_record.hpp
+
+  src/simgrid/sg_config.hpp
+  src/simgrid/math_utils.h
+
   src/smpi/colls/coll_tuned_topo.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
@@ -42,21 +41,23 @@ set(EXTRA_DIST
   src/smpi/include/smpi_utils.hpp
   src/smpi/smpi_main.c
   src/smpi/smpi_replay_main.cpp
-  src/surf/surf_interface.hpp
-  src/surf/xml/simgrid.dtd
-  src/surf/xml/simgrid_dtd.c
-  src/surf/xml/simgrid_dtd.h
-  src/surf/xml/surfxml_sax_cb.cpp
+  src/kernel/xml/simgrid.dtd
+  src/kernel/xml/simgrid_dtd.c
+  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
@@ -250,6 +251,7 @@ set(STHREAD_SRC
   src/sthread/sthread_impl.cpp
   src/sthread/sthread.c
   src/sthread/sthread.h
+  src/sthread/ObjectAccess.cpp
 )
 
 set(XBT_SRC
@@ -276,13 +278,18 @@ set(XBT_SRC
   src/xbt/xbt_log_appender_file.cpp
   src/xbt/xbt_log_layout_format.cpp
   src/xbt/xbt_log_layout_simple.cpp
-  src/xbt/xbt_main.cpp
+  src/xbt/xbt_misc.cpp
   src/xbt/xbt_os_file.cpp
   src/xbt/xbt_os_time.c
   src/xbt/xbt_parse_units.cpp
   src/xbt/xbt_replay.cpp
   src/xbt/xbt_str.cpp
-  src/xbt/xbt_virtu.cpp
+  src/xbt/utils/iter/iterator_wrapping.hpp
+  src/xbt/utils/iter/subsets.hpp
+  src/xbt/utils/iter/powerset.hpp
+  src/xbt/utils/iter/variable_for_loop.hpp
+  src/xbt/utils/iter/LazyKSubsets.hpp
+  src/xbt/utils/iter/LazyPowerset.hpp
   )
 
 if(HAVE_MMALLOC)
@@ -297,10 +304,54 @@ set(NS3_SRC
   src/kernel/resource/models/ns3/ns3_simulator.cpp
   )
 
-set(SURF_SRC
+set(KERNEL_SRC
+  src/deprecated.cpp
+
   src/kernel/EngineImpl.cpp
   src/kernel/EngineImpl.hpp
 
+  src/kernel/activity/ActivityImpl.cpp
+  src/kernel/activity/ActivityImpl.hpp
+  src/kernel/activity/BarrierImpl.cpp
+  src/kernel/activity/BarrierImpl.hpp
+  src/kernel/activity/CommImpl.cpp
+  src/kernel/activity/CommImpl.hpp
+  src/kernel/activity/ConditionVariableImpl.cpp
+  src/kernel/activity/ConditionVariableImpl.hpp
+  src/kernel/activity/ExecImpl.cpp
+  src/kernel/activity/ExecImpl.hpp
+  src/kernel/activity/IoImpl.cpp
+  src/kernel/activity/IoImpl.hpp
+  src/kernel/activity/MailboxImpl.cpp
+  src/kernel/activity/MailboxImpl.hpp
+  src/kernel/activity/MutexImpl.cpp
+  src/kernel/activity/MutexImpl.hpp
+  src/kernel/activity/SemaphoreImpl.cpp
+  src/kernel/activity/SemaphoreImpl.hpp
+  src/kernel/activity/SleepImpl.cpp
+  src/kernel/activity/SleepImpl.hpp
+  src/kernel/activity/Synchro.cpp
+  src/kernel/activity/Synchro.hpp
+
+  src/kernel/actor/ActorImpl.cpp
+  src/kernel/actor/ActorImpl.hpp
+  src/kernel/actor/CommObserver.cpp
+  src/kernel/actor/CommObserver.hpp
+  src/kernel/actor/Simcall.cpp
+  src/kernel/actor/SimcallObserver.cpp
+  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
+  src/kernel/context/ContextRaw.hpp
+  src/kernel/context/ContextSwapped.cpp
+  src/kernel/context/ContextSwapped.hpp
+  src/kernel/context/ContextThread.cpp
+  src/kernel/context/ContextThread.hpp
+
   src/kernel/lmm/System.cpp
   src/kernel/lmm/System.hpp
   src/kernel/lmm/fair_bottleneck.cpp
@@ -360,15 +411,14 @@ set(SURF_SRC
 
   src/kernel/timer/Timer.cpp
 
-  src/surf/sg_platf.cpp
-  src/surf/xml/platf.hpp
-  src/surf/xml/platf_private.hpp
-  src/surf/xml/surfxml_parseplatf.cpp
-  src/surf/xml/surfxml_sax_cb.cpp
+  src/kernel/xml/platf.hpp
+  src/kernel/xml/platf_private.hpp
+  src/kernel/xml/sg_platf.cpp
+  src/kernel/xml/platf_sax_cb.cpp
   )
 if (Eigen3_FOUND)
-  set(SURF_SRC
-    ${SURF_SRC}
+  set(KERNEL_SRC
+    ${KERNEL_SRC}
     src/kernel/lmm/bmf.cpp
     src/kernel/lmm/bmf.hpp)
 else()
@@ -377,6 +427,18 @@ else()
     src/kernel/lmm/bmf.cpp
     src/kernel/lmm/bmf.hpp)
 endif()
+# Boost context may not be available
+if (HAVE_BOOST_CONTEXTS)
+  set(KERNEL_SRC
+      ${KERNEL_SRC}
+      src/kernel/context/ContextBoost.cpp
+      src/kernel/context/ContextBoost.hpp)
+else()
+  set(EXTRA_DIST
+      ${EXTRA_DIST}
+      src/kernel/context/ContextBoost.cpp
+      src/kernel/context/ContextBoost.hpp)
+endif()
 
 set(PLUGINS_SRC
   src/plugins/ProducerConsumer.cpp
@@ -393,61 +455,6 @@ set(PLUGINS_SRC
   src/plugins/vm/dirty_page_tracking.cpp
   )
 
-set(SIMIX_SRC
-  src/kernel/activity/ActivityImpl.cpp
-  src/kernel/activity/ActivityImpl.hpp
-  src/kernel/activity/BarrierImpl.cpp
-  src/kernel/activity/BarrierImpl.hpp
-  src/kernel/activity/CommImpl.cpp
-  src/kernel/activity/CommImpl.hpp
-  src/kernel/activity/ConditionVariableImpl.cpp
-  src/kernel/activity/ConditionVariableImpl.hpp
-  src/kernel/activity/ExecImpl.cpp
-  src/kernel/activity/ExecImpl.hpp
-  src/kernel/activity/IoImpl.cpp
-  src/kernel/activity/IoImpl.hpp
-  src/kernel/activity/MailboxImpl.cpp
-  src/kernel/activity/MailboxImpl.hpp
-  src/kernel/activity/MutexImpl.cpp
-  src/kernel/activity/MutexImpl.hpp
-  src/kernel/activity/SemaphoreImpl.cpp
-  src/kernel/activity/SemaphoreImpl.hpp
-  src/kernel/activity/SleepImpl.cpp
-  src/kernel/activity/SleepImpl.hpp
-  src/kernel/activity/Synchro.cpp
-  src/kernel/activity/Synchro.hpp
-  src/kernel/actor/ActorImpl.cpp
-  src/kernel/actor/ActorImpl.hpp
-  src/kernel/actor/CommObserver.cpp
-  src/kernel/actor/CommObserver.hpp
-  src/kernel/actor/Simcall.cpp
-  src/kernel/actor/SimcallObserver.cpp
-  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
-  src/kernel/context/ContextRaw.hpp
-  src/kernel/context/ContextSwapped.cpp
-  src/kernel/context/ContextSwapped.hpp
-  src/kernel/context/ContextThread.cpp
-  src/kernel/context/ContextThread.hpp
-  src/simix/libsmx.cpp
-  )
-
-# Boost context may not be available
-if (HAVE_BOOST_CONTEXTS)
-  set(SIMIX_SRC
-      ${SIMIX_SRC}
-      src/kernel/context/ContextBoost.cpp
-      src/kernel/context/ContextBoost.hpp)
-else()
-  set(EXTRA_DIST
-      ${EXTRA_DIST}
-      src/kernel/context/ContextBoost.cpp
-      src/kernel/context/ContextBoost.hpp)
-endif()
 
 set(S4U_SRC
   src/s4u/s4u_Activity.cpp
@@ -523,6 +530,21 @@ set(MC_SRC
   src/mc/explo/UdporChecker.cpp
   src/mc/explo/UdporChecker.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/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
@@ -548,17 +570,17 @@ set(MC_SRC
   src/mc/remote/Channel.hpp
   src/mc/remote/CheckerSide.cpp
   src/mc/remote/CheckerSide.hpp
-  src/mc/remote/RemoteProcess.cpp
-  src/mc/remote/RemoteProcess.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
 
@@ -569,6 +591,8 @@ set(MC_SRC
   src/mc/transition/TransitionAny.hpp
   src/mc/transition/TransitionComm.cpp
   src/mc/transition/TransitionComm.hpp
+  src/mc/transition/TransitionObjectAccess.cpp
+  src/mc/transition/TransitionObjectAccess.hpp
   src/mc/transition/TransitionRandom.cpp
   src/mc/transition/TransitionRandom.hpp
   src/mc/transition/TransitionSynchro.cpp
@@ -589,8 +613,6 @@ set(MC_SRC
   src/mc/mc_forward.hpp
   src/mc/mc_private.hpp
   src/mc/mc_record.cpp
-  src/mc/udpor_global.cpp
-  src/mc/udpor_global.hpp
 
   src/xbt/mmalloc/mm_interface.c
   )
@@ -717,7 +739,7 @@ set(source_of_generated_headers
 
 ### depend of some variables set upper
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SIMIX_SRC    ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp
+  set(KERNEL_SRC  ${KERNEL_SRC} src/kernel/context/ContextUnix.hpp
                                 src/kernel/context/ContextUnix.cpp)
 else() # NOT ucontext
   set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp
@@ -729,8 +751,7 @@ set(simgrid_sources
   ${S4U_SRC}
   ${SIMGRID_SRC}
   ${MC_SRC_BASE}
-  ${SIMIX_SRC}
-  ${SURF_SRC}
+  ${KERNEL_SRC}
   ${TRACING_SRC}
   ${XBT_SRC}
   ${PLUGINS_SRC}
@@ -784,6 +805,9 @@ set(DOC_SOURCES
   docs/source/_static/css/custom.css
   docs/source/_templates/breadcrumbs.html
 
+  docs/source/img/design-scheduling-parallel.svg
+  docs/source/img/design-scheduling-simulatedtime.svg
+  docs/source/img/design-scheduling-wallclock.svg
   docs/source/img/eclipseScreenShot.png
   docs/source/img/extlink.png
   docs/source/img/extlink.svg
@@ -847,6 +871,19 @@ set(DOC_SOURCES
   docs/source/tuto_s4u/master-workers-lab3.cpp
   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/Tutorial_MPI_Applications.rst
   docs/source/tuto_smpi/3hosts.png
   docs/source/tuto_smpi/3hosts.xml