Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into S4U
authorMartin Quinson <martin.quinson@loria.fr>
Sun, 2 Aug 2015 22:28:56 +0000 (00:28 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Sun, 2 Aug 2015 22:28:56 +0000 (00:28 +0200)
Conflicts:
buildtools/Cmake/DefinePackages.cmake

1  2 
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/Distrib.cmake

@@@ -50,13 -50,9 +50,9 @@@ set(EXTRA_DIS
    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
@@@ -299,13 -295,6 +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
@@@ -389,13 -378,6 +378,13 @@@ 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
@@@ -608,6 -590,19 +597,19 @@@ set(MC_SRC_BAS
  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_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
@@@ -695,11 -683,6 +690,11 @@@ set(headers_to_instal
    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
@@@ -780,24 -763,9 +775,10 @@@ else() # NOT ucontex
      )
  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}
@@@ -1049,7 -1017,7 +1030,7 @@@ set(EXAMPLES_CMAKEFILES_TX
    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
    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
@@@ -1208,7 -1174,6 +1189,6 @@@ set(CMAKE_SOURCE_FILE
    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
    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
@@@ -1265,6 -1229,7 +1244,7 @@@ set(PLATFORMS_EXAMPLE
    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
@@@ -195,7 -195,6 +195,6 @@@ set(source_to_pac
    ${headers_to_install}
    ${source_of_generated_headers}
    ${BINDINGS_SRC}
-   ${GTNETS_SRC}
    ${JEDULE_SRC}
    ${JMSG_C_SRC}
    ${JMSG_JAVA_SRC}
    ${MC_SRC}
    ${MC_SIMGRID_MC_SRC}
    ${MSG_SRC}
 +  ${S4U_SRC}
    ${NS3_SRC}
    ${RNGSTREAM_SRC}
    ${SIMDAG_SRC}