X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5fa23d0d0ca68403115c1a460e3d7715217523c..844c9baa41ffb9963bbbe8146b36b9323cc4ca6f:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 73202b4c49..c14bf259e9 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -29,15 +29,21 @@ set(EXTRA_DIST
   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/simix/Synchro.h
+  src/simix/SynchroComm.hpp
+  src/simix/SynchroExec.hpp
+  src/simix/SynchroIo.hpp
+  src/simix/SynchroSleep.hpp
+  src/simix/SynchroRaw.hpp
   src/smpi/README
   src/smpi/colls/coll_tuned_topo.h
   src/smpi/colls/colls.h
   src/smpi/colls/colls_private.h
   src/smpi/colls/smpi_mvapich2_selector_stampede.h
   src/smpi/private.h
+  src/smpi/private.hpp
   src/smpi/smpi_mpi_dt_private.h
   src/surf/cpu_cas01.hpp
   src/surf/cpu_interface.hpp
@@ -330,7 +336,7 @@ set(SIMIX_SRC
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
   src/simix/Context.cpp
-  src/simix/RawContext.cpp
+  src/simix/ContextRaw.cpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
@@ -341,7 +347,13 @@ set(SIMIX_SRC
   src/simix/smx_synchro.cpp
   src/simix/smx_vm.cpp
   src/simix/popping.cpp
-
+  src/simix/Synchro.cpp
+  src/simix/SynchroComm.cpp
+  src/simix/SynchroExec.cpp
+  src/simix/SynchroSleep.cpp
+  src/simix/SynchroRaw.cpp
+  src/simix/SynchroIo.cpp
+  
   ${SIMIX_GENERATED_SRC}
   )
 
@@ -349,19 +361,19 @@ set(SIMIX_SRC
 if (HAVE_BOOST_CONTEXTS)
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/BoostContext.hpp
-      src/simix/BoostContext.cpp)
+      src/simix/ContextBoost.hpp
+      src/simix/ContextBoost.cpp)
 else()
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/BoostContext.hpp
-      src/simix/BoostContext.cpp)
+      src/simix/ContextBoost.hpp
+      src/simix/ContextBoost.cpp)
 endif()
 
 set(S4U_SRC
   src/s4u/s4u_actor.cpp
   src/s4u/s4u_as.cpp
-  src/s4u/s4u_async.cpp
+  src/s4u/s4u_activity.cpp
   src/s4u/s4u_comm.cpp
   src/s4u/s4u_engine.cpp  
   src/s4u/s4u_file.cpp  
@@ -495,6 +507,7 @@ set(TRACING_SRC
   src/instr/instr_paje_types.cpp
   src/instr/instr_paje_values.cpp
   src/instr/instr_private.h
+  src/instr/instr_smpi.h
   src/instr/instr_resource_utilization.cpp
   src/instr/instr_trace.cpp
   )
@@ -623,7 +636,7 @@ set(headers_to_install
   include/simgrid/s4u/forward.hpp
   include/simgrid/s4u/actor.hpp
   include/simgrid/s4u/As.hpp
-  include/simgrid/s4u/async.hpp
+  include/simgrid/s4u/Activity.hpp
   include/simgrid/s4u/comm.hpp
   include/simgrid/s4u/engine.hpp  
   include/simgrid/s4u/file.hpp  
@@ -635,6 +648,8 @@ set(headers_to_install
   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_main.h
+  include/smpi/smpi_extended_traces.h
+  include/smpi/smpi_extended_traces_fortran.h
   include/surf/surf_routing.h
   include/xbt.h
   include/xbt/RngStream.h
@@ -685,17 +700,11 @@ set(source_of_generated_headers
 ### depend of some variables setted upper
 # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
 if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC
-    ${SURF_SRC}
-    src/simix/ThreadContext.cpp
-    src/simix/ThreadContext.hpp
-    )
+  set(SURF_SRC   ${SURF_SRC}   src/simix/ContextThread.cpp
+                               src/simix/ContextThread.hpp )
 else() # NOT pthread
-  set(EXTRA_DIST
-    ${EXTRA_DIST}
-    src/simix/ThreadContext.cpp
-    src/simix/ThreadContext.hpp
-    )
+  set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp
+                               src/simix/ContextThread.hpp )
 endif()
 
 if(${HAVE_THREAD_CONTEXTS}) #pthread
@@ -706,9 +715,9 @@ else() # NOT pthread
 endif()
 
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/simix/UContext.cpp)
+  set(SURF_SRC    ${SURF_SRC}   src/simix/ContextUnix.cpp)
 else() # NOT ucontext
-  set(EXTRA_DIST  ${EXTRA_DIST} src/simix/UContext.cpp)
+  set(EXTRA_DIST  ${EXTRA_DIST} src/simix/ContextUnix.cpp)
 endif()
 
 ### Simgrid Lib sources
@@ -747,8 +756,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/ThreadContext.cpp
-    src/simix/ThreadContext.hpp
+    src/simix/ContextThread.cpp
+    src/simix/ContextThread.hpp
     src/xbt/xbt_os_thread.c
     )
 endif()
@@ -777,15 +786,17 @@ set(DOC_SOURCES
   doc/triva-time_interval.svg
 
   doc/doxygen/FAQ.doc
-  doc/doxygen/advanced.doc
+  doc/doxygen/application.doc
   doc/doxygen/bindings.doc
-  doc/doxygen/contributing.doc
+  doc/doxygen/community.doc
+  doc/doxygen/community_contact.doc
+  doc/doxygen/community_extend.doc
+  doc/doxygen/community_giveback.doc
   doc/doxygen/deployment.doc
+  doc/doxygen/examples.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
   doc/doxygen/inside.doc
   doc/doxygen/inside_tests.doc
@@ -795,6 +806,7 @@ set(DOC_SOURCES
   doc/doxygen/inside_release.doc
   doc/doxygen/install.doc
   doc/doxygen/tutorial.doc
+  doc/doxygen/models.doc
   doc/doxygen/module-msg.doc
   doc/doxygen/module-sd.doc
   doc/doxygen/module-simix.doc
@@ -802,13 +814,18 @@ set(DOC_SOURCES
   doc/doxygen/module-surf.doc
   doc/doxygen/module-trace.doc
   doc/doxygen/module-xbt.doc
-  doc/doxygen/modules.doc
+  doc/doxygen/module-index.doc
+  doc/doxygen/ns3.doc
   doc/doxygen/options.doc
+  doc/doxygen/outcomes.doc  
+  doc/doxygen/outcomes_logs.doc  
+  doc/doxygen/outcomes_MC.doc  
+  doc/doxygen/outcomes_vizu.doc  
   doc/doxygen/platform.doc
-  doc/doxygen/pls.doc
+  doc/doxygen/platform_lua.doc
+  doc/doxygen/scenario.doc
   doc/doxygen/stylesheet.css
-  doc/doxygen/tracing.doc
-  doc/doxygen/examples.doc
+  doc/doxygen/uhood.doc
 
   doc/manpage/smpicc.1
   doc/manpage/smpicxx.1
@@ -837,7 +854,6 @@ set(DOC_FIGS
 
 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
   )
@@ -968,6 +984,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindLibunwind.cmake
   tools/cmake/Modules/FindLuaSimgrid.cmake
   tools/cmake/Modules/FindNS3.cmake
+  tools/cmake/Modules/FindPAPI.cmake
   tools/cmake/Modules/FindRngStream.cmake
   tools/cmake/Modules/FindSimGrid.cmake
   tools/cmake/Modules/FindValgrind.cmake
@@ -996,6 +1013,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/test_prog/prog_thread_storage.c
   tools/cmake/test_prog/prog_vsnprintf.c
   tools/cmake/cross-mingw.cmake
+  tools/smpi/generate_smpi_defines.pl
   tools/stack-cleaner/as
   tools/stack-cleaner/cc
   tools/stack-cleaner/c++