X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6945e8782f472829b038a9df3cfe65a503b75c89..f4fb259da7eb35a292005c2deea6b8f94ede5fc7:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fb0a00ce7..55a5fad96d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib") set(soversion 1) set(SIMGRID_JAVA_VERSION_MAJOR "1") -set(SIMGRID_JAVA_VERSION_MINOR "1") +set(SIMGRID_JAVA_VERSION_MINOR "2") set(SIMGRID_JAVA_VERSION_PATCH "0") set(DIST_NAME ${PROJECT_NAME}-${SIMGRID_JAVA_VERSION_MAJOR}.${SIMGRID_JAVA_VERSION_MINOR}) @@ -72,61 +72,80 @@ include(FindJavaSG.cmake) # Declare our package content # ############################### set(JMSG_C_SRC + src/smx_context_cojava.h + src/smx_context_cojava.c src/smx_context_java.h src/smx_context_java.c src/jxbt_utilities.c src/jxbt_utilities.h src/jmsg.c src/jmsg.h + src/jmsg_comm.c + src/jmsg_comm.h src/jmsg_host.c src/jmsg_host.h src/jmsg_process.c src/jmsg_process.h src/jmsg_task.c src/jmsg_task.h - src/jmsg_application_handler.c - src/jmsg_application_handler.h + src/jmsg_synchro.c + src/jmsg_synchro.h + src/jmsg_rngstream.c + src/jmsg_rngstream.h ) set(JMSG_JAVA_SRC - org/simgrid/msg/ApplicationHandler.java org/simgrid/msg/Host.java org/simgrid/msg/HostFailureException.java org/simgrid/msg/HostNotFoundException.java org/simgrid/msg/JniException.java org/simgrid/msg/Msg.java org/simgrid/msg/MsgException.java - org/simgrid/msg/MsgNative.java org/simgrid/msg/NativeException.java org/simgrid/msg/Process.java + org/simgrid/msg/ProcessKilledError.java org/simgrid/msg/ProcessNotFoundException.java - org/simgrid/msg/Sem.java org/simgrid/msg/Task.java org/simgrid/msg/TaskCancelledException.java org/simgrid/msg/TimeoutException.java org/simgrid/msg/TransferFailureException.java + org/simgrid/msg/Mutex.java + org/simgrid/msg/Comm.java + org/simgrid/msg/RngStream.java ) set(JAVA_EXAMPLES - examples/mutualExclusion/centralized/MutexCentral.java - examples/mutualExclusion/centralized/GrantTask.java - examples/mutualExclusion/centralized/Coordinator.java - examples/mutualExclusion/centralized/ReleaseTask.java - examples/mutualExclusion/centralized/Node.java - examples/mutualExclusion/centralized/RequestTask.java + examples/async/AsyncTest.java + examples/async/FinalizeTask.java + examples/async/Forwarder.java + examples/async/Master.java + examples/async/Slave.java + examples/startKillTime/Slave.java examples/basic/FinalizeTask.java examples/basic/Forwarder.java examples/basic/Master.java examples/basic/BasicTest.java examples/basic/Slave.java + + 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 + examples/chord/ChordTask.java + examples/chord/FindSuccessorAnswerTask.java + examples/chord/FindSuccessorTask.java + examples/chord/GetPredecessorAnswerTask.java + examples/chord/NotifyTask.java examples/commTime/FinalizeTask.java examples/commTime/Master.java examples/commTime/Slave.java examples/commTime/CommTimeTest.java - examples/pingPong/PingPongTask.java - examples/pingPong/Sender.java - examples/pingPong/Receiver.java - examples/pingPong/PingPongTest.java examples/master_slave_bypass/Master.java examples/master_slave_bypass/MsBypass.java examples/master_slave_bypass/Slave.java @@ -135,6 +154,21 @@ set(JAVA_EXAMPLES examples/master_slave_kill/MsKill.java examples/master_slave_kill/Slave.java examples/master_slave_kill/FinalizeTask.java + examples/mutualExclusion/centralized/MutexCentral.java + examples/mutualExclusion/centralized/GrantTask.java + examples/mutualExclusion/centralized/Coordinator.java + examples/mutualExclusion/centralized/ReleaseTask.java + examples/mutualExclusion/centralized/Node.java + examples/mutualExclusion/centralized/RequestTask.java + examples/pingPong/PingPongTask.java + examples/pingPong/Sender.java + examples/pingPong/Receiver.java + examples/pingPong/PingPongTest.java + examples/startKillTime/Master.java + examples/startKillTime/StartKillTime.java + examples/suspend/DreamMaster.java + examples/suspend/LazyGuy.java + examples/suspend/Suspend.java ) set(CMAKE_SRC @@ -154,6 +188,8 @@ set(XML_FILES examples/basic/deploy.xml examples/master_slave_bypass/platform.xml examples/master_slave_kill/platform.xml + examples/async/asyncDeployment.xml + examples/bittorrent/bittorrent.xml ) set(source_to_pack @@ -174,9 +210,10 @@ string(REPLACE ".java" ".class" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES_CLASS}") # FLAGS # ######### set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ") -set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I$ENV{SIMGRID_ROOT}/include") +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") @@ -186,15 +223,18 @@ endif(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") ########### # SG_java add_library(SG_java SHARED ${JMSG_C_SRC}) -target_link_libraries(SG_java pcre pthread) -set_target_properties(SG_java PROPERTIES LINK_FLAGS "-Wl,--subsystem,windows,--kill-at $ENV{SIMGRID_ROOT}/lib/libsimgrid.dll -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib") - -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 POST_BUILD -COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/libSG_java.dll > ${CMAKE_BINARY_DIR}/libSG_java.def) -endif(PEXPORTS_PATH) +if(WIN32) + set_target_properties(SG_java 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 POST_BUILD + COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/SG_java.dll > ${CMAKE_BINARY_DIR}/SG_java.def) + endif(PEXPORTS_PATH) +else(WIN32) + target_link_libraries(SG_java pcre pthread simgrid) + set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}") +endif(WIN32) # java_classes add_custom_command( @@ -206,7 +246,7 @@ add_custom_command( COMMENT "Compiling java sources of core library..." ) add_custom_target(java_classes ALL - DEPENDS ${JMSG_JAVA_SRC_CLASS} + DEPENDS ${JMSG_JAVA_SRC_CLASS} ) # simgrid_jar @@ -221,12 +261,19 @@ add_custom_command( COMMENT "Build examples for java" OUTPUT ${JAVA_EXAMPLES_CLASS} DEPENDS ${JAVA_EXAMPLES} - COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/basic/*.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/commTime/*.java - 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/async/*.java + COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/basic/*.java + COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/*.java + COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/chord/*.java + COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/commTime/*.java COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/*.java - COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/*.java + COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/*.java + 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/priority/*.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/suspend/*.java + ) add_custom_target(simgrid_java_examples ALL @@ -249,53 +296,47 @@ ${CMAKE_HOME_DIRECTORY}/simgrid.jar INCLUDE(CTest) ENABLE_TESTING() -ADD_TEST(basic -java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar basic/BasicTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/basic/basicDeployment.xml -) -ADD_TEST(pingPong -java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar pingPong/PingPongTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingPongDeployment.xml -) -ADD_TEST(CommTime -java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar commTime/CommTimeTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/commTime/commTimeDeployment.xml -) -ADD_TEST(mutualExclusion -java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar mutualExclusion/centralized/MutexCentral ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/ring3.xml ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml -) -ADD_TEST(bypass -java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar master_slave_bypass/MsBypass ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/platform.xml -) -ADD_TEST(kill -java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar master_slave_kill/MsKill ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/platform.xml -) +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(bypass ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/bypass.tesh) +ADD_TEST(commTime ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/commTime/commtime.tesh) +ADD_TEST(chord ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/chord/chord.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(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh) +ADD_TEST(pingPong ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingpong.tesh) +ADD_TEST(priority ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/priority/priority.tesh) +ADD_TEST(startKillTime ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh) +ADD_TEST(suspend ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/suspend/suspend.tesh) #Don't forget to put new test in this list!!! -set(test_list basic pingPong CommTime mutualExclusion bypass kill) +set(test_list async basic bittorrent bypass chord commTime kill mutualExclusion pingPong priority startKillTime) ########################################## # Set the DYLD_LIBRARY_PATH for mac # ########################################## if(APPLE) - if($ENV{DYLD_LIBRARY_PATH} STREQUAL "") + if($ENV{DYLD_LIBRARY_PATH}) set_tests_properties(${test_list} - PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}") - else($ENV{DYLD_LIBRARY_PATH} STREQUAL "") + PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") + else($ENV{DYLD_LIBRARY_PATH}) set_tests_properties(${test_list} - PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}") - endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "") + PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") + endif($ENV{DYLD_LIBRARY_PATH}) +else(APPLE) + ########################################## + # Set the LD_LIBRARY_PATH for our tests # + ########################################## + if(NOT WIN32) + if($ENV{LD_LIBRARY_PATH}) + set_tests_properties(${test_list} + PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") + else($ENV{LD_LIBRARY_PATH}) + set_tests_properties(${test_list} + PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") + endif($ENV{LD_LIBRARY_PATH}) + endif(NOT WIN32) endif(APPLE) -########################################## -# Set the LD_LIBRARY_PATH for our tests # -########################################## -if(NOT WIN32) -if($ENV{LD_LIBRARY_PATH} STREQUAL "") - set_tests_properties(${test_list} - PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}") -else($ENV{LD_LIBRARY_PATH} STREQUAL "") - set_tests_properties(${test_list} - PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}") -endif($ENV{LD_LIBRARY_PATH} STREQUAL "") -endif(NOT WIN32) - ########### # Install # ###########