Merge concerns - Adrien

diff --combined CMakeLists.txt
index c6e0b7c,f2d0163..7c442ce
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -88,8 -88,8 +88,10 @@@ set(JMSG_C_SR
        src/jmsg_task.h
        src/jmsg_synchro.c
        src/jmsg_synchro.h
 +      src/jtrace.c
 +      src/jtrace.h
+       src/jmsg_rngstream.c
+       src/jmsg_rngstream.h
  )
  
  set(JMSG_JAVA_SRC
@@@ -109,10 -109,17 +111,18 @@@
        org/simgrid/msg/TransferFailureException.java   
        org/simgrid/msg/Mutex.java
        org/simgrid/msg/Comm.java
 +      org/simgrid/trace/Trace.java
+       org/simgrid/msg/RngStream.java
  )
  
  set(JAVA_EXAMPLES
+   examples/bittorrent/Bittorrent.java
+   examples/bittorrent/Common.java
+   examples/bittorrent/Connection.java
+   examples/bittorrent/MessageTask.java
+   examples/bittorrent/Peer.java
+   examples/bittorrent/Tracker.java
+   examples/bittorrent/TrackerTask.java
    examples/chord/Chord.java
    examples/chord/Common.java
    examples/chord/Node.java
@@@ -156,10 -163,6 +166,10 @@@
        examples/startKillTime/Slave.java
        examples/startKillTime/Master.java
        examples/startKillTime/StartKillTime.java
 +      examples/tracing/PingPongTask.java
 +      examples/tracing/Sender.java
 +      examples/tracing/Receiver.java
 +      examples/tracing/TracingTest.java
  )
  
  set(CMAKE_SRC
@@@ -180,7 -183,7 +190,8 @@@ set(XML_FILE
      examples/master_slave_bypass/platform.xml
      examples/master_slave_kill/platform.xml
      examples/async/asyncDeployment.xml
 +    examples/tracing/tracingPingPongDeployment.xml
+     examples/bittorrent/bittorrent.xml
  )
  
  set(source_to_pack
@@@ -204,6 -207,7 +215,7 @@@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O
  set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I${SIMGRID_INCLUDES} ")
  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH}")
  
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast")
  if(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-but-set-variable")
  endif(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
@@@ -226,22 -230,6 +238,22 @@@ else(WIN32
      set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
  endif(WIN32)
  
 +# SG_java_tracing
 +add_library(SG_java_tracing SHARED ${JMSG_C_SRC})
 +if(WIN32)
 +    set_target_properties(SG_java_tracing PROPERTIES LINK_FLAGS "-Wl,--subsystem,windows,--kill-at ${SIMGRID_LIB}" PREFIX "")
 +    find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
 +    message(STATUS "pexports: ${PEXPORTS_PATH}")
 +    if(PEXPORTS_PATH)
 +    add_custom_command(TARGET SG_java_tracing POST_BUILD
 +    COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/SG_java_tracing.dll > ${CMAKE_BINARY_DIR}/SG_java_tracing.def)
 +    endif(PEXPORTS_PATH)
 +else(WIN32)
 +    target_link_libraries(SG_java_tracing pcre pthread simgrid)
 +    set_target_properties(SG_java_tracing PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
 +endif(WIN32)
 +
 +
  # java_classes
  add_custom_command(
        OUTPUT  ${JMSG_JAVA_SRC_CLASS}
@@@ -276,7 -264,8 +288,8 @@@ add_custom_command
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/*.java                                 
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/*.java
 -
 +      COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/tracing/*.java
+       COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/*.java
  )
  
  add_custom_target(simgrid_java_examples ALL
@@@ -287,7 -276,7 +300,7 @@@
  # Declare dependencies #
  ########################
  add_dependencies(simgrid_jar java_classes)
 -add_dependencies(simgrid_java_examples simgrid_jar SG_java)
 +add_dependencies(simgrid_java_examples simgrid_jar SG_java_tracing SG_java)
  
  SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
  ${CMAKE_HOME_DIRECTORY}/simgrid.jar
@@@ -299,17 -288,18 +312,19 @@@
  INCLUDE(CTest)
  ENABLE_TESTING()
  
- ADD_TEST(basic           ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/basic/basic.tesh)
  ADD_TEST(async           ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/async/async.tesh)
+ ADD_TEST(basic           ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/basic/basic.tesh)
+ ADD_TEST(bittorrent           ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/bittorrent.tesh)
+ ADD_TEST(chord                 ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/chord/chord.tesh)
  ADD_TEST(pingPong        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingpong.tesh)
  ADD_TEST(CommTime        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/commTime/commtime.tesh)
  ADD_TEST(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh)
  ADD_TEST(bypass          ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/bypass.tesh)
  ADD_TEST(kill            ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/kill.tesh)
 -ADD_TEST(startKillTime            ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh)
 +ADD_TEST(startKillTime   ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh)
 +ADD_TEST(tracing         ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/tracing/tracingPingPong.tesh)
  #Don't forget to put new test in this list!!!
- set(test_list basic async pingPong CommTime mutualExclusion bypass kill startKillTime tracing)
 -set(test_list basic bittorrent chord async pingPong CommTime mutualExclusion bypass kill startKillTime)
++set(test_list basic bittorrent chord async pingPong CommTime mutualExclusion bypass kill startKillTime tracing)
  
  ##########################################
  # Set the  DYLD_LIBRARY_PATH for mac     #
@@@ -340,7 -330,7 +355,7 @@@ endif(APPLE
  ###########
  # Install #
  ###########
 -install(TARGETS SG_java
 +install(TARGETS SG_java SG_java_tracing
        DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
  install(FILES ${CMAKE_HOME_DIRECTORY}/simgrid.jar
        DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)