X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28fd1a297a34554ab67781f5fb413bb9a97d521f..50c886de0c60029fb70b0441f3f021ceb4528424:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e11fb3b6f..7c442cee16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,10 @@ set(JMSG_C_SRC 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 @@ -107,9 +111,18 @@ set(JMSG_JAVA_SRC 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 @@ -153,6 +166,10 @@ set(JAVA_EXAMPLES 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 @@ -173,6 +190,8 @@ set(XML_FILES 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 @@ -196,6 +215,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -Wunused -Wmissing-prototypes - 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") @@ -215,13 +235,25 @@ if(WIN32) endif(PEXPORTS_PATH) else(WIN32) target_link_libraries(SG_java pcre pthread simgrid) - if($ENV{SIMGRID_PCRE_LIBRARY_PATH}) - set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}") - else($ENV{SIMGRID_PCRE_LIBRARY_PATH}) - set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib") - endif($ENV{SIMGRID_PCRE_LIBRARY_PATH}) + 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} @@ -256,6 +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 @@ -266,7 +300,7 @@ add_custom_target(simgrid_java_examples ALL # 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 @@ -278,16 +312,19 @@ ${CMAKE_HOME_DIRECTORY}/simgrid.jar 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) +set(test_list basic bittorrent chord async pingPong CommTime mutualExclusion bypass kill startKillTime tracing) ########################################## # Set the DYLD_LIBRARY_PATH for mac # @@ -318,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/)