Merge branch 'master' into S4U

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 8f95a15..1dc9ef3 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -15,8 +15,6 @@ set(EXTRA_DIST
   src/include/surf/maxmin.h
   src/include/surf/random_mgr.h
   src/include/surf/surf.h
-  src/include/surf/surf_resource.h
-  src/include/surf/surf_resource_lmm.h
   src/include/surf/surfxml_parse_values.h
   src/include/surf/trace_mgr.h
   src/include/xbt/win32_ucontext.h
@@ -52,13 +50,9 @@ set(EXTRA_DIST
   src/surf/cpu_cas01.hpp
   src/surf/cpu_interface.hpp
   src/surf/cpu_ti.hpp
-  src/surf/gtnets/gtnets_interface.h
-  src/surf/gtnets/gtnets_simulator.h
-  src/surf/gtnets/gtnets_topology.h
   src/surf/maxmin_private.hpp
   src/surf/network_cm02.hpp
   src/surf/network_constant.hpp
-  src/surf/network_gtnets.hpp
   src/surf/network_interface.hpp
   src/surf/network_ns3.hpp
   src/surf/network_smpi.hpp
@@ -126,8 +120,6 @@ set(EXTRA_DIST
   src/xbt/probes.h
   src/xbt/setset_private.h
   src/xbt/win32_ucontext.c
-  tools/tesh/run_context.h
-  tools/tesh/tesh.h
   tools/tesh/generate_tesh
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
@@ -303,13 +295,6 @@ if(HAVE_MMALLOC)
     )
 endif()
 
-set(GTNETS_SRC
-  src/surf/gtnets/gtnets_interface.cc
-  src/surf/gtnets/gtnets_simulator.cc
-  src/surf/gtnets/gtnets_topology.cc
-  src/surf/network_gtnets.cpp
-  )
-
 set(NS3_SRC
   src/surf/network_ns3.cpp
   src/surf/ns3/my-point-to-point-helper.cc
@@ -393,8 +378,17 @@ else()
       src/simix/smx_context_boost.cpp)
 endif()
 
+set(S4U_SRC
+  src/s4u/s4u_channel.cpp
+  src/s4u/s4u_engine.cpp  
+  src/s4u/s4u_host.cpp  
+  src/s4u/s4u_process.cpp
+)
+
 set(SIMGRID_SRC
   src/simgrid/sg_config.c
+  src/simgrid/host.cpp
+  src/simgrid/util.hpp
   )
 
 set(MSG_SRC
@@ -465,7 +459,7 @@ set(JSURF_JAVA_GENERATED_SRC
   src/bindings/java/org/simgrid/surf/LmmVariable.java
   src/bindings/java/org/simgrid/surf/Model.java
   src/bindings/java/org/simgrid/surf/NetworkAction.java
-  src/bindings/java/org/simgrid/surf/NetworkLink.java
+  src/bindings/java/org/simgrid/surf/Link.java
   src/bindings/java/org/simgrid/surf/Plugin.java
   src/bindings/java/org/simgrid/surf/Resource.java
   src/bindings/java/org/simgrid/surf/ResourceState.java
@@ -603,24 +597,31 @@ set(MC_SRC_BASE
 set(MC_SRC
   src/mc/AddressSpace.hpp
   src/mc/AddressSpace.cpp
+  src/mc/Frame.hpp
+  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/RegionSnapshot.cpp
+  src/mc/RegionSnapshot.hpp
+  src/mc/Type.hpp
+  src/mc/Variable.cpp
+  src/mc/Variable.hpp
+
   src/mc/mc_forward.h
+  src/mc/mc_forward.hpp
   src/mc/mc_process.h
   src/mc/mc_process.cpp
   src/mc/mc_unw.h
   src/mc/mc_unw.cpp
   src/mc/mc_unw_vmread.cpp
   src/mc/mc_mmalloc.h
-  src/mc/ModelChecker.hpp
-  src/mc/ModelChecker.cpp
   src/mc/mc_object_info.h
-  src/mc/mc_object_info.cpp
   src/mc/mc_checkpoint.cpp
   src/mc/mc_snapshot.h
   src/mc/mc_snapshot.cpp
-  src/mc/RegionSnapshot.cpp
-  src/mc/RegionSnapshot.hpp
-  src/mc/PageStore.hpp
-  src/mc/PageStore.cpp
   src/mc/mc_page_snapshot.cpp
   src/mc/mc_comm_pattern.h
   src/mc/mc_comm_pattern.cpp
@@ -687,6 +688,13 @@ set(headers_to_install
   include/simgrid/platf_generator.h
   include/simgrid/plugins.h
   include/simgrid/simix.h
+  include/simgrid/host.h
+  include/simgrid/link.h
+  include/simgrid/s4u/channel.hpp  
+  include/simgrid/s4u/engine.hpp  
+  include/simgrid/s4u/host.hpp  
+  include/simgrid/s4u/process.hpp
+  include/simgrid/s4u.h
   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_cocci.h
@@ -698,6 +706,7 @@ set(headers_to_install
   include/xbt/RngStream.h
   include/xbt/asserts.h
   include/xbt/automaton.h
+  include/xbt/automaton.hpp
   include/xbt/base.h
   include/xbt/config.h
   include/xbt/cunit.h
@@ -766,23 +775,10 @@ else() # NOT ucontext
     )
 endif()
 
-# -->HAVE_GTNETS
-if(HAVE_GTNETS)
-  set(GTNETS_USED
-    ${GTNETS_SRC}
-    )
-else()
-  set(GTNETS_USED "")
-  set(EXTRA_DIST
-    ${EXTRA_DIST}
-    ${GTNETS_SRC}
-    )
-endif()
-
 ### Simgrid Lib sources
 set(simgrid_sources
   ${BINDINGS_SRC}
-  ${GTNETS_USED}
+  ${S4U_SRC}
   ${MSG_SRC}
   ${SIMDAG_SRC}
   ${SIMGRID_SRC}
@@ -1034,7 +1030,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/energy/pstate/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt
   examples/msg/gpu/CMakeLists.txt
-  examples/msg/gtnets/CMakeLists.txt
+  examples/msg/gtnets/CMakeLists.txt 
   examples/msg/icomms/CMakeLists.txt
   examples/msg/io/CMakeLists.txt
   examples/msg/kademlia/CMakeLists.txt
@@ -1053,6 +1049,8 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/suspend/CMakeLists.txt
   examples/msg/token_ring/CMakeLists.txt
   examples/msg/tracing/CMakeLists.txt
+  examples/s4u/CMakeLists.txt
+  examples/s4u/dumb/CMakeLists.txt
   examples/scala/CMakeLists.txt
   examples/scala/master_slave_bypass/CMakeLists.txt
   examples/scala/master_slave_kill/CMakeLists.txt
@@ -1191,7 +1189,6 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/MakeLib.cmake
   buildtools/Cmake/MakeLibWin.cmake
   buildtools/Cmake/Modules/FindGFortran.cmake
-  buildtools/Cmake/Modules/FindGTnets.cmake
   buildtools/Cmake/Modules/FindGraphviz.cmake
   buildtools/Cmake/Modules/FindLibSigc++.cmake
   buildtools/Cmake/Modules/FindLibdw.cmake
@@ -1214,14 +1211,12 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/Scripts/my_valgrind.pl
   buildtools/Cmake/Scripts/postinstall.sh
   buildtools/Cmake/Scripts/preinstall.sh
-  buildtools/Cmake/Scripts/tesh.pl
   buildtools/Cmake/Scripts/update_tesh.pl
   buildtools/Cmake/UnitTesting.cmake
   buildtools/Cmake/src/internal_config.h.in
   buildtools/Cmake/src/simgrid.nsi.in
   buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
   buildtools/Cmake/test_prog/prog_gnu_dynlinker.c
-  buildtools/Cmake/test_prog/prog_gtnets.cpp
   buildtools/Cmake/test_prog/prog_mutex_timedlock.c
   buildtools/Cmake/test_prog/prog_sem_init.c
   buildtools/Cmake/test_prog/prog_sem_open.c
@@ -1249,6 +1244,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_no_backbone.xml
   examples/platforms/clusters_routing_full.xml
+  examples/platforms/crosstraffic.xml
   examples/platforms/conf/gridpp_grid_2004.conf
   examples/platforms/conf/gridpp_grid_2004.xml
   examples/platforms/conf/lcg_sept2004_grid.conf
@@ -1256,14 +1252,10 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/conf/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
-  examples/platforms/content/small_content.txt
-  examples/platforms/content/storage_content.txt
-  examples/platforms/content/win_storage_content.txt
   examples/platforms/trace/trace_A_failure.txt
   examples/platforms/trace/trace_A.txt
   examples/platforms/trace/trace_B.txt
   examples/platforms/data_center.xml
-  examples/platforms/deployment_remote_io.xml
   examples/platforms/energy_platform.xml
   examples/platforms/fat_tree_cluster.xml
   examples/platforms/g5k.xml
@@ -1276,9 +1268,13 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/multicore_machine.xml
   examples/platforms/platform.xml
   examples/platforms/prop.xml
-  examples/platforms/remote_io.xml
   examples/platforms/routing_cluster.xml
-  examples/platforms/storage.xml
+  examples/platforms/storage/content/small_content.txt
+  examples/platforms/storage/content/storage_content.txt
+  examples/platforms/storage/content/win_storage_content.txt
+  examples/platforms/storage/remote_io.deployment.xml
+  examples/platforms/storage/remote_io.xml
+  examples/platforms/storage/storage.xml
   examples/platforms/small_platform.xml
   examples/platforms/small_platform_fatpipe.xml
   examples/platforms/small_platform_one_link_routes.xml