Merge branch 'master' into S4U

diff --combined .gitignore
index a42d951,458db25..4b208aa
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -69,8 -69,8 +69,8 @@@ lib
  manpages/
  build_*/
  build/
- buildtools/Cmake/memcheck_tests.cmake
- buildtools/Cmake/test_prog/prog_va_copy.c
+ tools/cmake/memcheck_tests.cmake
+ tools/cmake/test_prog/prog_va_copy.c
  ### windows borland
  *.bpr
  *.bpf
@@@ -181,7 -181,6 +181,7 @@@ examples/msg/masterslave/masterslave_co
  examples/msg/irc_isend/peer
  examples/msg/irc_isend/toto.txt
  examples/msg/ns3/ns3
 +examples/s4u/dumb/s4u_test
  examples/simdag/sd_avail
  examples/simdag/ex_sd_seq_access
  examples/simdag/sd_seq_access

diff --combined tools/cmake/AddTests.cmake
index 8abfa55,e433f10..7ff5f3d
--- 1/buildtools/Cmake/AddTests.cmake
--- 2/tools/cmake/AddTests.cmake
+++ b/tools/cmake/AddTests.cmake
@@@ -279,8 -279,6 +279,8 @@@ IF(NOT enable_memcheck
    ADD_TEST(msg-icomms-waitany                      ${CMAKE_BINARY_DIR}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/platforms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)
    # END TESH TESTS
  
 +  ### S4U ###
 +  ADD_TESH_FACTORIES(s4u-dumb "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/dumb s4u_test.tesh)
  
    ### SIMDAG ###
    # BEGIN TESH TESTS
@@@ -594,5 -592,5 +594,5 @@@ IF(enable_auto_install
  ENDIF()
  
  IF(enable_memcheck)
-   INCLUDE(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)
+   INCLUDE(${CMAKE_HOME_DIRECTORY}/tools/cmake/memcheck_tests.cmake)
  ENDIF()

diff --combined tools/cmake/DefinePackages.cmake
index 1fe6e60,fa90c08..2930684
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -378,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
@@@ -690,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
@@@ -778,7 -766,6 +778,7 @@@ endif(
  ### Simgrid Lib sources
  set(simgrid_sources
    ${BINDINGS_SRC}
 +  ${S4U_SRC}
    ${MSG_SRC}
    ${SIMDAG_SRC}
    ${SIMGRID_SRC}
@@@ -1049,8 -1036,6 +1049,8 @@@ set(EXAMPLES_CMAKEFILES_TX
    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
@@@ -1174,58 -1159,58 +1174,58 @@@ set(TOOLS_CMAKEFILES_TX
  
  set(CMAKE_SOURCE_FILES
    CMakeLists.txt
-   buildtools/Cmake/AddTests.cmake
-   buildtools/Cmake/CTestConfig.cmake
-   buildtools/Cmake/CTestCustom.cmake
-   buildtools/Cmake/CompleteInFiles.cmake
-   buildtools/Cmake/DefinePackages.cmake
-   buildtools/Cmake/Distrib.cmake
-   buildtools/Cmake/Flags.cmake
-   buildtools/Cmake/GenerateDoc.cmake
-   buildtools/Cmake/GenerateDocWin.cmake
-   buildtools/Cmake/MaintainerMode.cmake
-   buildtools/Cmake/MakeExe.cmake
-   buildtools/Cmake/MakeJava.cmake
-   buildtools/Cmake/MakeLib.cmake
-   buildtools/Cmake/MakeLibWin.cmake
-   buildtools/Cmake/Modules/FindGFortran.cmake
-   buildtools/Cmake/Modules/FindGraphviz.cmake
-   buildtools/Cmake/Modules/FindLibSigc++.cmake
-   buildtools/Cmake/Modules/FindLibdw.cmake
-   buildtools/Cmake/Modules/FindLibunwind.cmake
-   buildtools/Cmake/Modules/FindLua51Simgrid.cmake
-   buildtools/Cmake/Modules/FindNS3.cmake
-   buildtools/Cmake/Modules/FindRngStream.cmake
-   buildtools/Cmake/Modules/FindRubySimgrid.cmake
-   buildtools/Cmake/Modules/FindScala.cmake
-   buildtools/Cmake/Modules/FindSimGrid.cmake
-   buildtools/Cmake/Modules/FindValgrind.cmake
-   buildtools/Cmake/Option.cmake
-   buildtools/Cmake/Pipol.cmake
-   buildtools/Cmake/PrintArgs.cmake
-   buildtools/Cmake/Scripts/Diff.pm
-   buildtools/Cmake/Scripts/Makefile.default
-   buildtools/Cmake/Scripts/SimGrid.packproj
-   buildtools/Cmake/Scripts/generate_memcheck_tests.pl
-   buildtools/Cmake/Scripts/java_bundle.sh
-   buildtools/Cmake/Scripts/my_valgrind.pl
-   buildtools/Cmake/Scripts/postinstall.sh
-   buildtools/Cmake/Scripts/preinstall.sh
-   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_mutex_timedlock.c
-   buildtools/Cmake/test_prog/prog_sem_init.c
-   buildtools/Cmake/test_prog/prog_sem_open.c
-   buildtools/Cmake/test_prog/prog_sem_timedwait.c
-   buildtools/Cmake/test_prog/prog_snprintf.c
-   buildtools/Cmake/test_prog/prog_stackgrowth.c
-   buildtools/Cmake/test_prog/prog_stacksetup.c
-   buildtools/Cmake/test_prog/prog_thread_storage.c
-   buildtools/Cmake/test_prog/prog_vsnprintf.c
+   tools/cmake/AddTests.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/MaintainerMode.cmake
+   tools/cmake/MakeExe.cmake
+   tools/cmake/MakeJava.cmake
+   tools/cmake/MakeLib.cmake
+   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/FindLua51Simgrid.cmake
+   tools/cmake/Modules/FindNS3.cmake
+   tools/cmake/Modules/FindRngStream.cmake
+   tools/cmake/Modules/FindRubySimgrid.cmake
+   tools/cmake/Modules/FindScala.cmake
+   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/UnitTesting.cmake
+   tools/cmake/src/internal_config.h.in
+   tools/cmake/src/simgrid.nsi.in
+   tools/cmake/test_prog/prog_AC_CHECK_MCSC.c
+   tools/cmake/test_prog/prog_gnu_dynlinker.c
+   tools/cmake/test_prog/prog_mutex_timedlock.c
+   tools/cmake/test_prog/prog_sem_init.c
+   tools/cmake/test_prog/prog_sem_open.c
+   tools/cmake/test_prog/prog_sem_timedwait.c
+   tools/cmake/test_prog/prog_snprintf.c
+   tools/cmake/test_prog/prog_stackgrowth.c
+   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/stack-cleaner/as
    tools/stack-cleaner/cc

diff --combined tools/cmake/Distrib.cmake
index 68e086b,29ab476..9e96457
--- 1/buildtools/Cmake/Distrib.cmake
--- 2/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@@ -206,7 -206,6 +206,7 @@@ set(source_to_pac
    ${MC_SRC}
    ${MC_SIMGRID_MC_SRC}
    ${MSG_SRC}
 +  ${S4U_SRC}
    ${NS3_SRC}
    ${RNGSTREAM_SRC}
    ${SIMDAG_SRC}
@@@ -278,7 -277,7 +278,7 @@@ endforeach(file ${source_to_pack}
  
  add_custom_command(
    TARGET dist-dir
-   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
    COMMAND ${CMAKE_COMMAND} -E echo "${GIT_VERSION}" > ${PROJECT_NAME}-${release_version}/.gitversion
    )
  

diff --combined tools/cmake/MakeExe.cmake
index b50ae4f,c04c5bc..b50ae4f
--- 1/buildtools/Cmake/MakeExe.cmake
--- 2/tools/cmake/MakeExe.cmake
+++ b/tools/cmake/MakeExe.cmake
@@@ -58,9 -58,6 +58,9 @@@ add_subdirectory(${CMAKE_HOME_DIRECTORY
  add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring)
  add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing)
  
 +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/s4u)
 +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/s4u/dumb)
 +
  add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala)
  add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_bypass)
  add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_kill)