X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dacf5b5e81474fb89d8234b907f6f61b623983e..32e70034e357fcad920962e4ed35fcbf8dd59283:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index b94ebb9830..4cf385b097 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -30,14 +30,15 @@ set(EXTRA_DIST
   src/simix/simcalls.in
   src/simix/simcalls.py
   src/simix/popping_private.h
-  src/simix/popping_bodies.c
-  src/simix/popping_generated.c
+  src/simix/popping_bodies.cpp
+  src/simix/popping_generated.cpp
   src/simix/popping_enum.h
   src/simix/popping_accessors.h
   src/simix/smx_host_private.h
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
   src/simix/smx_private.h
+  src/simix/smx_private.hpp
   src/simix/smx_process_private.h
   src/simix/smx_synchro_private.h
   src/smpi/README
@@ -83,11 +84,10 @@ set(EXTRA_DIST
   src/surf/surfxml_parse.c
   src/surf/trace_mgr_private.h
   src/surf/vm_hl13.hpp
-  src/surf/vm_interface.hpp
+  src/surf/virtual_machine.hpp
   src/surf/host_clm03.hpp
   src/surf/host_interface.hpp
   src/surf/host_ptask_L07.hpp
-  src/win32/config.h
   src/xbt/automaton/automaton_lexer.yy.c
   src/xbt/automaton/parserPromela.lex
   src/xbt/automaton/parserPromela.tab.cacc
@@ -106,6 +106,7 @@ set(EXTRA_DIST
   src/xbt/heap_private.h
   src/xbt/log_private.h
   src/xbt/mallocator_private.h
+
   src/xbt/mmalloc/mfree.c
   src/xbt/mmalloc/mm.c
   src/xbt/mmalloc/mm_legacy.c
@@ -118,7 +119,6 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mmtrace.awk
   src/xbt/mmalloc/mrealloc.c
   src/xbt/probes.h
-  src/xbt/setset_private.h
   src/xbt/win32_ucontext.c
   tools/tesh/generate_tesh
   examples/smpi/mc/only_send_deterministic.tesh
@@ -231,6 +231,7 @@ set(SMPI_SRC
   src/smpi/instr_smpi.c
   src/smpi/smpi_base.c
   src/smpi/smpi_bench.c
+  src/smpi/smpi_memory.cpp
   src/smpi/smpi_c99.c
   src/smpi/smpi_coll.c
   src/smpi/smpi_comm.c
@@ -266,9 +267,10 @@ set(XBT_SRC
   src/xbt/lib.c
   src/xbt/log.c
   src/xbt/mallocator.c
-  src/xbt/parmap.c
+  src/xbt/memory_map.cpp
+  src/xbt/memory_map.hpp
+  src/xbt/parmap.cpp
   src/xbt/set.c
-  src/xbt/setset.c
   src/xbt/snprintf.c
   src/xbt/swag.c
   src/xbt/xbt_log_appender_file.c
@@ -277,6 +279,7 @@ set(XBT_SRC
   src/xbt/xbt_main.c
   src/xbt/xbt_matrix.c
   src/xbt/xbt_os_time.c
+  src/xbt/xbt_os_file.c
   src/xbt/xbt_peer.c
   src/xbt/xbt_queue.c
   src/xbt/xbt_replay.c
@@ -286,6 +289,7 @@ set(XBT_SRC
   src/xbt/xbt_strbuff.c
   src/xbt/xbt_virtu.c
   src/xbt_modinter.h
+
   )
 
 if(HAVE_MMALLOC)
@@ -304,11 +308,13 @@ set(NS3_SRC
   )
 
 set(SURF_SRC
+  src/surf/callbacks.h
+  src/surf/callbacks.cpp
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
   src/surf/fair_bottleneck.cpp
-  src/surf/instr_routing.c
+  src/surf/instr_routing.cpp
   src/surf/instr_surf.c
   src/surf/lagrange.cpp
   src/surf/maxmin.cpp
@@ -320,7 +326,7 @@ set(SURF_SRC
   src/surf/platf_generator.c
   src/surf/plugins/energy.cpp
   src/surf/random_mgr.c
-  src/surf/sg_platf.c
+  src/surf/sg_platf.cpp
   src/surf/storage_interface.cpp
   src/surf/storage_n11.cpp
   src/surf/surf_c_bindings.cpp
@@ -339,7 +345,7 @@ set(SURF_SRC
   src/surf/surfxml_parseplatf.c
   src/surf/trace_mgr.c
   src/surf/vm_hl13.cpp
-  src/surf/vm_interface.cpp
+  src/surf/virtual_machine.cpp
   src/surf/host_clm03.cpp
   src/surf/host_interface.cpp
   src/surf/host_ptask_L07.cpp
@@ -347,35 +353,48 @@ set(SURF_SRC
   )
 
 set(SIMIX_GENERATED_SRC
-  src/simix/popping_generated.c
+  src/simix/popping_generated.cpp
   )
 set(SIMIX_SRC
-  src/simix/libsmx.c
-  src/simix/smx_context.c
-  src/simix/smx_context_base.c
-  src/simix/smx_context_raw.c
-  src/simix/smx_deployment.c
-  src/simix/smx_environment.c
-  src/simix/smx_global.c
-  src/simix/smx_host.c
-  src/simix/smx_io.c
-  src/simix/smx_network.c
-  src/simix/smx_process.c
-  src/simix/smx_synchro.c
-  src/simix/smx_vm.c
-  src/simix/popping.c
+  src/simix/libsmx.cpp
+  src/simix/smx_context.cpp
+  src/simix/Context.cpp
+  src/simix/smx_deployment.cpp
+  src/simix/smx_environment.cpp
+  src/simix/smx_global.cpp
+  src/simix/smx_host.cpp
+  src/simix/smx_io.cpp
+  src/simix/smx_network.cpp
+  src/simix/smx_process.cpp
+  src/simix/smx_synchro.cpp
+  src/simix/smx_vm.cpp
+  src/simix/popping.cpp
 
   ${SIMIX_GENERATED_SRC}
   )
 
+# Don't try to compile our inline assembly with MSVC
+if (MSVC)
+  set(EXTRA_DIST
+      ${EXTRA_DIST}
+      src/simix/RawContext.cpp)
+else()
+  set(SIMIX_SRC
+      ${SIMIX_SRC}
+      src/simix/RawContext.cpp)
+endif()
+
+# Boost context may not be available
 if (HAVE_BOOST_CONTEXT)
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/smx_context_boost.cpp)
+      src/simix/BoostContext.hpp
+      src/simix/BoostContext.cpp)
 else()
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/smx_context_boost.cpp)
+      src/simix/BoostContext.hpp
+      src/simix/BoostContext.cpp)
 endif()
 
 set(S4U_SRC
@@ -553,6 +572,7 @@ list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
 list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 
 set(LUA_SRC
+  src/bindings/lua/factories/host.lua
   src/bindings/lua/lua_comm.c
   src/bindings/lua/lua_host.c
   src/bindings/lua/lua_platf.c
@@ -602,12 +622,15 @@ set(MC_SRC
   src/mc/AddressSpace.hpp
   src/mc/AddressSpace.cpp
   src/mc/Frame.hpp
+  src/mc/Frame.cpp
   src/mc/ModelChecker.hpp
   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
@@ -616,8 +639,8 @@ set(MC_SRC
 
   src/mc/mc_forward.h
   src/mc/mc_forward.hpp
-  src/mc/mc_process.h
-  src/mc/mc_process.cpp
+  src/mc/Process.hpp
+  src/mc/Process.cpp
   src/mc/mc_unw.h
   src/mc/mc_unw.cpp
   src/mc/mc_unw_vmread.cpp
@@ -632,18 +655,19 @@ set(MC_SRC
   src/mc/mc_comm_determinism.cpp
   src/mc/mc_compare.cpp
   src/mc/mc_diff.cpp
+  src/mc/mc_dwarf.hpp
   src/mc/mc_dwarf.cpp
   src/mc/mc_dwarf_attrnames.cpp
-  src/mc/mc_dwarf_expression.cpp
+  src/mc/DwarfExpression.hpp
+  src/mc/DwarfExpression.cpp
   src/mc/mc_dwarf_tagnames.cpp
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.cpp
-  src/mc/mcer_ignore.cpp
-  src/mc/mcer_ignore.h
   src/mc/mc_ignore.h
   src/mc/mc_liveness.h
-  src/mc/mc_location.h
+  src/mc/LocationList.hpp
+  src/mc/LocationList.cpp
   src/mc/mc_liveness.cpp
   src/mc/mc_record.cpp
   src/mc/mc_member.cpp
@@ -657,15 +681,11 @@ set(MC_SRC
   src/mc/mc_state.h
   src/mc/mc_state.cpp
   src/mc/mc_visited.cpp
-  src/mc/mc_memory_map.h
-  src/mc/memory_map.cpp
   src/mc/mc_client.cpp
   src/mc/mc_client_api.cpp
   src/mc/mc_client.h
   src/mc/mc_protocol.h
   src/mc/mc_protocol.cpp
-  src/mc/mc_server.cpp
-  src/mc/mc_server.h
   src/mc/mc_smx.h
   src/mc/mc_smx.cpp
   src/mc/mc_xbt.hpp
@@ -692,6 +712,7 @@ set(headers_to_install
   include/simgrid/platf_generator.h
   include/simgrid/plugins.h
   include/simgrid/simix.h
+  include/simgrid/simix.hpp
   include/simgrid/host.h
   include/simgrid/link.h
   include/simgrid/s4u/actor.hpp
@@ -722,6 +743,7 @@ set(headers_to_install
   include/xbt/dynar.h
   include/xbt/ex.h
   include/xbt/fifo.h
+  include/xbt/file.h
   include/xbt/function_types.h
   include/xbt/graph.h
   include/xbt/graphxml.h
@@ -740,7 +762,6 @@ set(headers_to_install
   include/xbt/queue.h
   include/xbt/replay.h
   include/xbt/set.h
-  include/xbt/setset.h
   include/xbt/str.h
   include/xbt/strbuff.h
   include/xbt/swag.h
@@ -760,13 +781,25 @@ set(source_of_generated_headers
 if(${CONTEXT_THREADS}) #pthread
   set(SURF_SRC
     ${SURF_SRC}
-    src/simix/smx_context_thread.c
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
+    )
+else() # NOT pthread
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
+    )
+endif()
+
+if(${CONTEXT_THREADS}) #pthread
+  set(SURF_SRC
+    ${SURF_SRC}
     src/xbt/xbt_os_thread.c
     )
 else() # NOT pthread
   set(EXTRA_DIST
     ${EXTRA_DIST}
-    src/simix/smx_context_thread.c
     src/xbt/xbt_os_thread.c
     )
 endif()
@@ -774,12 +807,12 @@ endif()
 if(${CONTEXT_UCONTEXT}) #ucontext
   set(SURF_SRC
     ${SURF_SRC}
-    src/simix/smx_context_sysv.c
+    src/simix/UContext.cpp
     )
 else() # NOT ucontext
   set(EXTRA_DIST
     ${EXTRA_DIST}
-    src/simix/smx_context_sysv.c
+    src/simix/UContext.cpp
     )
 endif()
 
@@ -842,7 +875,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/smx_context_thread.c
+    src/simix/src/simix/ThreadContext.cpp
+    src/simix/src/simix/ThreadContext.hpp
     src/xbt/win32_ucontext.c
     src/xbt/xbt_os_thread.c
     )
@@ -888,6 +922,7 @@ set(DOC_SOURCES
   doc/doxygen/deployment.doc
   doc/doxygen/footer.html
   doc/doxygen/getting_started.doc
+  doc/doxygen/getting_started_index.doc
   doc/doxygen/header.html
   doc/doxygen/help.doc
   doc/doxygen/index.doc
@@ -912,7 +947,7 @@ set(DOC_SOURCES
   doc/doxygen/pls.doc
   doc/doxygen/stylesheet.css
   doc/doxygen/tracing.doc
-  doc/doxygen/use.doc
+  doc/doxygen/examples.doc
 
   doc/manpage/smpicc.1
   doc/manpage/smpicxx.1
@@ -948,6 +983,7 @@ set(DOC_TOOLS
   tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/index_create.pl
   tools/doxygen/xbt_log_extract_hierarchy.pl
+  tools/doxygen/list_routing_models_examples.sh
   )
 
 # these files get copied automatically to the html documentation
@@ -961,8 +997,10 @@ set(DOC_IMG
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/DiscoveringSimgrid.gif
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/storage_sample_scenario.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
@@ -994,6 +1032,7 @@ set(txt_files
   COPYING
   README
   README.java
+  README.lua
   ChangeLog
   ChangeLog.SimGrid-java
   INSTALL
@@ -1036,6 +1075,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/energy/consumption/CMakeLists.txt
   examples/msg/energy/onoff/CMakeLists.txt
   examples/msg/energy/pstate/CMakeLists.txt
+  examples/msg/energy/vm/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt
   examples/msg/gpu/CMakeLists.txt
   examples/msg/gtnets/CMakeLists.txt 
@@ -1058,7 +1098,8 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/token_ring/CMakeLists.txt
   examples/msg/tracing/CMakeLists.txt
   examples/s4u/CMakeLists.txt
-  examples/s4u/dumb/CMakeLists.txt
+  examples/s4u/basic/CMakeLists.txt
+  examples/s4u/io/CMakeLists.txt
   examples/scala/CMakeLists.txt
   examples/scala/master_slave_bypass/CMakeLists.txt
   examples/scala/master_slave_kill/CMakeLists.txt
@@ -1085,6 +1126,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/bug-17132/CMakeLists.txt
   teshsuite/java/CMakeLists.txt
   teshsuite/java/sleep_host_off/CMakeLists.txt
+  teshsuite/lua/lua_platforms.tesh
   teshsuite/mc/CMakeLists.txt
   teshsuite/mc/dwarf/CMakeLists.txt
   teshsuite/mc/dwarf_expression/CMakeLists.txt
@@ -1182,18 +1224,16 @@ set(TOOLS_CMAKEFILES_TXT
 
 set(CMAKE_SOURCE_FILES
   CMakeLists.txt
-  tools/cmake/AddTests.cmake
+  tools/cmake/Tests.cmake
   tools/cmake/CTestConfig.cmake
   tools/cmake/CTestCustom.cmake
-  tools/cmake/CompleteInFiles.cmake
   tools/cmake/DefinePackages.cmake
   tools/cmake/Distrib.cmake
-  tools/cmake/Flags.cmake
-  tools/cmake/GenerateDoc.cmake
-  tools/cmake/GenerateDocWin.cmake
+  tools/cmake/GCCFlags.cmake
+  tools/cmake/Documentation.cmake
   tools/cmake/MaintainerMode.cmake
   tools/cmake/MakeExe.cmake
-  tools/cmake/MakeJava.cmake
+  tools/cmake/Java.cmake
   tools/cmake/MakeLib.cmake
   tools/cmake/MakeLibWin.cmake
   tools/cmake/Modules/FindGFortran.cmake
@@ -1201,7 +1241,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindLibSigc++.cmake
   tools/cmake/Modules/FindLibdw.cmake
   tools/cmake/Modules/FindLibunwind.cmake
-  tools/cmake/Modules/FindLua51Simgrid.cmake
+  tools/cmake/Modules/FindLuaSimgrid.cmake
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindRngStream.cmake
   tools/cmake/Modules/FindRubySimgrid.cmake
@@ -1209,17 +1249,22 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindSimGrid.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
-  tools/cmake/Pipol.cmake
   tools/cmake/PrintArgs.cmake
-  tools/cmake/Scripts/Diff.pm
-  tools/cmake/Scripts/Makefile.default
-  tools/cmake/Scripts/SimGrid.packproj
-  tools/cmake/Scripts/generate_memcheck_tests.pl
-  tools/cmake/Scripts/java_bundle.sh
-  tools/cmake/Scripts/my_valgrind.pl
-  tools/cmake/Scripts/postinstall.sh
-  tools/cmake/Scripts/preinstall.sh
-  tools/cmake/Scripts/update_tesh.pl
+  tools/cmake/scripts/IPC/Run.pm
+  tools/cmake/scripts/IPC/Run/Debug.pm
+  tools/cmake/scripts/IPC/Run/IO.pm
+  tools/cmake/scripts/IPC/Run/Timer.pm
+  tools/cmake/scripts/IPC/Run/Win32Helper.pm
+  tools/cmake/scripts/IPC/Run/Win32IO.pm
+  tools/cmake/scripts/IPC/Run/Win32Pump.pm
+  tools/cmake/scripts/Diff.pm
+  tools/cmake/scripts/Makefile.default
+  tools/cmake/scripts/SimGrid.packproj
+  tools/cmake/scripts/generate_memcheck_tests.pl
+  tools/cmake/scripts/my_valgrind.pl
+  tools/cmake/scripts/postinstall.sh
+  tools/cmake/scripts/preinstall.sh
+  tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake
   tools/cmake/src/internal_config.h.in
   tools/cmake/src/simgrid.nsi.in
@@ -1234,7 +1279,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/test_prog/prog_stacksetup.c
   tools/cmake/test_prog/prog_thread_storage.c
   tools/cmake/test_prog/prog_vsnprintf.c
-  buildtools/Cross/Mingw.cmake
+  tools/cmake/cross-mingw.cmake
   tools/stack-cleaner/as
   tools/stack-cleaner/cc
   tools/stack-cleaner/c++
@@ -1250,6 +1295,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/cloud.xml
   examples/platforms/cluster.xml
   examples/platforms/cluster_and_one_host.xml
+  examples/platforms/cluster_prototype.lua
   examples/platforms/cluster_no_backbone.xml
   examples/platforms/clusters_routing_full.xml
   examples/platforms/crosstraffic.xml
@@ -1274,9 +1320,11 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/griffon.xml
   examples/platforms/meta_cluster.xml
   examples/platforms/multicore_machine.xml
+  examples/platforms/platform.lua
   examples/platforms/platform.xml
   examples/platforms/prop.xml
   examples/platforms/routing_cluster.xml
+  examples/platforms/routing_cluster.lua
   examples/platforms/routing_none.xml
   examples/platforms/storage/content/small_content.txt
   examples/platforms/storage/content/storage_content.txt
@@ -1285,6 +1333,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/storage/remote_io.xml
   examples/platforms/storage/storage.xml
   examples/platforms/small_platform.xml
+  examples/platforms/small_platform.lua
   examples/platforms/small_platform_fatpipe.xml
   examples/platforms/small_platform_one_link_routes.xml
   examples/platforms/small_platform_with_failures.xml