X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74c05dfe218c074e59069153299e731409a9e83a..629cb03f62f68abeaf28abc7080c0393e685b337:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 0c54171808..f17836c3b5 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -29,9 +29,14 @@ 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
@@ -49,10 +54,8 @@ set(EXTRA_DIST
   src/surf/network_ns3.hpp
   src/surf/network_smpi.hpp
   src/surf/network_ib.hpp
-  src/surf/ns3/my-point-to-point-helper.h
   src/surf/ns3/ns3_interface.h
   src/surf/ns3/ns3_simulator.h
-  src/surf/ns3/red-queue.h
   src/surf/plugins/energy.hpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.h
@@ -240,7 +243,7 @@ set(XBT_SRC
   src/xbt/RngStream.c
   src/xbt/automaton/automaton.c
   src/xbt/automaton/automatonparse_promela.c
-  src/xbt/config.c
+  src/xbt/config.cpp
   src/xbt/cunit.c
   src/xbt/dict.c
   src/xbt/dict_cursor.c
@@ -272,22 +275,14 @@ set(XBT_SRC
   src/xbt/xbt_strbuff.c
   src/xbt/xbt_virtu.c
   src/xbt_modinter.h
-
   )
 
 if(HAVE_MMALLOC)
-  set(XBT_SRC
-    ${XBT_SRC}
-    src/xbt/mmalloc/mm.c
-    )
+  set(XBT_SRC ${XBT_SRC}  src/xbt/mmalloc/mm.c )
 endif()
 
-set(NS3_SRC
-  src/surf/network_ns3.cpp
-  src/surf/ns3/my-point-to-point-helper.cc
-  src/surf/ns3/ns3_simulator.cc
-  src/surf/ns3/red-queue.cc
-  )
+set(NS3_SRC  src/surf/network_ns3.cpp
+             src/surf/ns3/ns3_simulator.cc )
 
 set(SURF_SRC
   src/surf/AsImpl.cpp
@@ -335,13 +330,12 @@ set(SURF_SRC
   src/surf/ptask_L07.cpp
   )
 
-set(SIMIX_GENERATED_SRC
-  src/simix/popping_generated.cpp
-  )
+set(SIMIX_GENERATED_SRC   src/simix/popping_generated.cpp  )
 set(SIMIX_SRC
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
   src/simix/Context.cpp
+  src/simix/ContextRaw.cpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
@@ -352,38 +346,33 @@ 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}
   )
 
-# 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_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  
@@ -393,7 +382,7 @@ set(S4U_SRC
 )
 
 set(SIMGRID_SRC
-  src/simgrid/sg_config.c
+  src/simgrid/sg_config.cpp
   src/simgrid/host.cpp
   src/simgrid/util.hpp
   )
@@ -495,9 +484,7 @@ set(JTRACE_C_SRC
   src/bindings/java/jtrace.h
 )
 
-set(JTRACE_JAVA_SRC
-  src/bindings/java/org/simgrid/trace/Trace.java
-)
+set(JTRACE_JAVA_SRC src/bindings/java/org/simgrid/trace/Trace.java)
 
 list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
 list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
@@ -587,8 +574,7 @@ set(MC_SRC
   src/mc/mc_page_snapshot.cpp
   src/mc/mc_comm_pattern.h
   src/mc/mc_comm_pattern.cpp
-  src/mc/mc_compare.cpp
-  src/mc/mc_diff.cpp
+  src/mc/compare.cpp
   src/mc/mc_dwarf.hpp
   src/mc/mc_dwarf.cpp
   src/mc/mc_dwarf_attrnames.cpp
@@ -601,7 +587,6 @@ set(MC_SRC
   src/mc/mc_mmalloc.h
   src/mc/LivenessChecker.hpp
   src/mc/LocationList.hpp
-  src/mc/malloc.hpp
   src/mc/LocationList.cpp
   src/mc/LivenessChecker.cpp
   src/mc/mc_record.cpp
@@ -613,7 +598,8 @@ set(MC_SRC
   src/mc/mc_safety.h
   src/mc/mc_state.h
   src/mc/mc_state.cpp
-  src/mc/mc_visited.cpp
+  src/mc/VisitedState.cpp
+  src/mc/VisitedState.hpp
   src/mc/mc_client_api.cpp
   src/mc/mc_protocol.h
   src/mc/mc_protocol.cpp
@@ -622,10 +608,10 @@ set(MC_SRC
   src/mc/mc_xbt.hpp
   src/mc/mc_xbt.cpp
   src/mc/mc_exit.h
+  src/mc/Transition.hpp
   )
 
-set(MC_SIMGRID_MC_SRC
-  src/mc/simgrid_mc.cpp)
+set(MC_SIMGRID_MC_SRC  src/mc/simgrid_mc.cpp)
 
 set(headers_to_install
   include/msg/msg.h
@@ -648,7 +634,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  
@@ -668,6 +654,7 @@ set(headers_to_install
   include/xbt/automaton.hpp
   include/xbt/base.h
   include/xbt/config.h
+  include/xbt/config.hpp
   include/xbt/cunit.h
   include/xbt/dict.h
   include/xbt/string.hpp
@@ -709,41 +696,24 @@ 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
-  set(SURF_SRC
-    ${SURF_SRC}
-    src/xbt/xbt_os_thread.c
-    )
+  set(SURF_SRC    ${SURF_SRC}   src/xbt/xbt_os_thread.c)
 else() # NOT pthread
-  set(EXTRA_DIST
-    ${EXTRA_DIST}
-    src/xbt/xbt_os_thread.c
+  set(EXTRA_DIST  ${EXTRA_DIST} src/xbt/xbt_os_thread.c
     )
 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
@@ -782,8 +752,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()
@@ -887,7 +857,6 @@ 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
@@ -927,39 +896,11 @@ set(txt_files
 # The list of cmake build directories is constructed from the following list. 
 # Add your CMakeLists file here to see your subdir built.
 set(CMAKEFILES_TXT
-  examples/java/async/CMakeLists.txt
-  examples/java/bittorrent/CMakeLists.txt
-  examples/java/chord/CMakeLists.txt
-  examples/java/cloud/CMakeLists.txt
-  examples/java/cloud/energy/CMakeLists.txt
-  examples/java/cloud/migration/CMakeLists.txt
-  examples/java/commTime/CMakeLists.txt
-  examples/java/energy/CMakeLists.txt
-  examples/java/io/CMakeLists.txt
-  examples/java/kademlia/CMakeLists.txt
-  examples/java/master_slave_bypass/CMakeLists.txt
-  examples/java/master_slave_kill/CMakeLists.txt
-  examples/java/masterslave/CMakeLists.txt
-  examples/java/migration/CMakeLists.txt
-  examples/java/mutualExclusion/CMakeLists.txt
-  examples/java/pingPong/CMakeLists.txt
-  examples/java/priority/CMakeLists.txt
-  examples/java/startKillTime/CMakeLists.txt
-  examples/java/suspend/CMakeLists.txt
-  examples/java/tracing/CMakeLists.txt
-  
+  examples/java/CMakeLists.txt
   examples/msg/CMakeLists.txt
-    examples/msg/bittorrent/CMakeLists.txt
-    examples/msg/chainsend/CMakeLists.txt
-    examples/msg/cloud/CMakeLists.txt
-    examples/msg/dht-kademlia/CMakeLists.txt
-    examples/msg/masterslave/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt
-    examples/msg/ns3/CMakeLists.txt
-    examples/msg/tracing/CMakeLists.txt
   examples/s4u/CMakeLists.txt
   examples/simdag/CMakeLists.txt
-    examples/simdag/dot/CMakeLists.txt
   examples/smpi/CMakeLists.txt
     examples/smpi/NAS/CMakeLists.txt
     examples/smpi/smpi_msg_masterslave/CMakeLists.txt
@@ -1028,7 +969,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/MakeLibWin.cmake
   tools/cmake/Modules/FindGFortran.cmake
   tools/cmake/Modules/FindGraphviz.cmake
-  tools/cmake/Modules/FindLibSigc++.cmake
   tools/cmake/Modules/FindLibdw.cmake
   tools/cmake/Modules/FindLibunwind.cmake
   tools/cmake/Modules/FindLuaSimgrid.cmake
@@ -1045,7 +985,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/scripts/IPC/Run/Win32IO.pm
   tools/cmake/scripts/IPC/Run/Win32Pump.pm
   tools/cmake/scripts/Diff.pm
-  tools/cmake/scripts/generate_memcheck_tests.pl
   tools/cmake/scripts/my_valgrind.pl
   tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake
@@ -1131,6 +1070,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/syscoord/median_harvard.syscoord
   examples/platforms/syscoord/median_meridian.syscoord
   examples/platforms/syscoord/median_p2psim.syscoord
+  examples/platforms/three_multicore_hosts.xml
   examples/platforms/torus_cluster.xml
   examples/platforms/two_hosts.xml
   examples/platforms/two_hosts_platform.xml