Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Huge commit for java with simgrid3_5
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Wed, 9 Feb 2011 17:45:05 +0000 (17:45 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Wed, 9 Feb 2011 17:45:05 +0000 (17:45 +0000)
Not working yet but compile, parse platform and deployment.
Break into runall. (swag_extract)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java@9598 48e7efb5-ca39-0410-a469-dd3cf9ba447f

33 files changed:
CMakeLists.txt
FindJavaSG.cmake [new file with mode: 0644]
FindSimGrid.cmake
examples/basic/basicDeployment.xml
examples/basic/deploy.xml
examples/pingPong/PingPongTest.java
examples/pingPong/pingPongDeployment.xml
examples/platform.xml
org/simgrid/msg/ApplicationHandler.java [moved from java/org/simgrid/msg/ApplicationHandler.java with 98% similarity]
org/simgrid/msg/Host.java [moved from java/org/simgrid/msg/Host.java with 100% similarity]
org/simgrid/msg/HostFailureException.java [moved from java/org/simgrid/msg/HostFailureException.java with 100% similarity]
org/simgrid/msg/HostNotFoundException.java [moved from java/org/simgrid/msg/HostNotFoundException.java with 100% similarity]
org/simgrid/msg/JniException.java [moved from java/org/simgrid/msg/JniException.java with 100% similarity]
org/simgrid/msg/Msg.java [moved from java/org/simgrid/msg/Msg.java with 97% similarity]
org/simgrid/msg/MsgException.java [moved from java/org/simgrid/msg/MsgException.java with 100% similarity]
org/simgrid/msg/MsgNative.java [moved from java/org/simgrid/msg/MsgNative.java with 100% similarity]
org/simgrid/msg/NativeException.java [moved from java/org/simgrid/msg/NativeException.java with 100% similarity]
org/simgrid/msg/Process.java [moved from java/org/simgrid/msg/Process.java with 100% similarity]
org/simgrid/msg/ProcessNotFoundException.java [moved from java/org/simgrid/msg/ProcessNotFoundException.java with 100% similarity]
org/simgrid/msg/Sem.java [moved from java/org/simgrid/msg/Sem.java with 100% similarity]
org/simgrid/msg/Task.java [moved from java/org/simgrid/msg/Task.java with 100% similarity]
org/simgrid/msg/TaskCancelledException.java [moved from java/org/simgrid/msg/TaskCancelledException.java with 100% similarity]
org/simgrid/msg/TimeoutException.java [moved from java/org/simgrid/msg/TimeoutException.java with 100% similarity]
org/simgrid/msg/TransferFailureException.java [moved from java/org/simgrid/msg/TransferFailureException.java with 100% similarity]
src/jmsg.c
src/jmsg.h
src/jmsg_application_handler.c
src/jmsg_host.c
src/jmsg_process.c
src/jmsg_task.c
src/jxbt_utilities.c
src/smx_context_java.c
test_java.sh [new file with mode: 0755]

index fc396f1..8b23be0 100644 (file)
@@ -1,38 +1,20 @@
 cmake_minimum_required(VERSION 2.6)
 project(simgrid-java C)
-include(FindSimGrid.cmake)
+set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
+set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib")
+
 
 set(soversion 1)
 ###############################
 # Test the build dependencies #
 ###############################
-SET(HAVE_JAVA 0)
-include(FindJava)
-include(FindJNI)
-if(JAVA_INCLUDE_PATH)
-       set(HAVE_JNI_H 1)
-endif(JAVA_INCLUDE_PATH)       
-if(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-       SET(HAVE_JAVA 1)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH} ")
-       if(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH2} ")                   
-       endif(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-else(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2) 
-       SET(HAVE_JAVA 0)
-endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-
-        message("")
-       message("JNI.H :                        ${JAVA_INCLUDE_PATH}")
-       message("JNI_MD.H :                     ${JAVA_INCLUDE_PATH2}")
-        message("JAVAC :                        ${JAVA_COMPILE}")
-        message("JAVA_ARCHIVE :                 ${JAVA_ARCHIVE}")
-       
+include(FindSimGrid.cmake)
+include(FindJavaSG.cmake)
 
 ###############################
 # Declare our package content #
 ###############################
-
 set(JMSG_C_SRC
        src/smx_context_java.h
        src/smx_context_java.c
@@ -69,21 +51,16 @@ set(JMSG_JAVA_SRC
        org/simgrid/msg/TransferFailureException.java   
 )
 
-file(GLOB_RECURSE examples_sources
-       "examples/*.java"
-       "examples/*.xml"
-       "examples/*.txt"
-       "examples/java/runtest"
-)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -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 -I$ENV{SIMGRID_ROOT}/src -I$ENV{SIMGRID_ROOT}/src/include")
+set(LIB_PATH "-L$ENV{SIMGRID_ROOT}/lib")
 
-###############
-# Build Stuff #
-###############
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${HAVE_GRAS_H} -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(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH} ${LIB_PATH}")
 
-add_library(simgrid-java SHARED ${JMSG_C_SRC})
-set_target_properties(simgrid-java PROPERTIES VERSION ${soversion})
-target_link_libraries(simgrid-java ${HAVE_SIMGRID_LIB})
+add_library(SG_java SHARED ${JMSG_C_SRC})
+target_link_libraries(SG_java -lsimgrid)
+set_target_properties(SG_java PROPERTIES VERSION ${soversion})
 
 set(JAVA_FILES ${JMSG_JAVA_SRC})
 set(JAVA_CLASSES ${JAVA_FILES})
@@ -94,127 +71,79 @@ string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/org/"
 string(REPLACE "org/simgrid/msg" "${CMAKE_BINARY_DIR}/classes/simgrid/msg"
                JAVA_CLASSES "${JAVA_CLASSES}")
 string(REPLACE ".java" ".class;" 
-               JAVA_CLASSES "${JAVA_CLASSES}")
-              
+               JAVA_CLASSES "${JAVA_CLASSES}")        
 
 add_custom_command(
-  OUTPUT  ${CMAKE_BINARY_DIR}/classes/
-  COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/classes/")
-
-
+  OUTPUT  ${CMAKE_HOME_DIRECTORY}/classes/
+  COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_HOME_DIRECTORY}/classes/"
+  )
+  
 # compile all .java files with javac to .class
 ADD_CUSTOM_COMMAND(
   OUTPUT ${JAVA_CLASSES}
-  DEPENDS ${JAVA_FILES} ${CMAKE_BINARY_DIR}/classes/
-  COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/classes/
-                          -cp ${CMAKE_BINARY_DIR}/classes/
+  DEPENDS ${JMSG_JAVA_SRC} ${CMAKE_HOME_DIRECTORY}/classes/
+  COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/classes/
+                          -cp ${CMAKE_HOME_DIRECTORY}/classes/
                          ${JAVA_FILES}
   COMMENT "Compiling java sources of core library..."
 )
 
-ADD_CUSTOM_TARGET(simgrid_jar ALL
-                  DEPENDS ${CMAKE_BINARY_DIR}/share/simgrid.jar)
-
-ADD_CUSTOM_COMMAND( 
-  OUTPUT ${CMAKE_BINARY_DIR}/share/simgrid.jar
-  DEPENDS ${JAVA_CLASSES} 
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/classes
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/share
-  COMMAND ${JAVA_ARCHIVE} -cvf ${CMAKE_BINARY_DIR}/share/simgrid.jar .
+ADD_CUSTOM_COMMAND(
+  OUTPUT ${CMAKE_HOME_DIRECTORY}/simgrid.jar
+  DEPENDS ${JAVA_CLASSES}
+  WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/classes  
+  COMMAND ${JAVA_ARCHIVE} -cvf ${CMAKE_HOME_DIRECTORY}/simgrid.jar .
   COMMENT "Building simgrid.jar..."
 )
 
 ADD_CUSTOM_COMMAND(
-       OUTPUT  ${CMAKE_BINARY_DIR}/examples/basic/BasicTest.class
-                       ${CMAKE_BINARY_DIR}/examples/basic/FinalizeTask.class
-                       ${CMAKE_BINARY_DIR}/examples/basic/Forwarder.class
-                       ${CMAKE_BINARY_DIR}/examples/basic/Slave.class
-                       ${CMAKE_BINARY_DIR}/examples/basic/Master.class
-                       ${CMAKE_BINARY_DIR}/examples/pingPong/PingPongTest.class
-                       ${CMAKE_BINARY_DIR}/examples/pingPong/Sender.class
-                       ${CMAKE_BINARY_DIR}/examples/pingPong/PingPongTask.class
-                       ${CMAKE_BINARY_DIR}/examples/pingPong/Receiver.class
-                       ${CMAKE_BINARY_DIR}/examples/commTime/FinalizeTask.class
-                       ${CMAKE_BINARY_DIR}/examples/commTime/CommTimeTest.class
-                       ${CMAKE_BINARY_DIR}/examples/commTime/Slave.class
-                       ${CMAKE_BINARY_DIR}/examples/commTime/Master.class
-                       ${CMAKE_BINARY_DIR}/examples/suspend/SuspendTest.class
-                       ${CMAKE_BINARY_DIR}/examples/suspend/LazyGuy.class
-                       ${CMAKE_BINARY_DIR}/examples/suspend/DreamMaster.class
+       OUTPUT  ${CMAKE_HOME_DIRECTORY}/examples/basic/BasicTest.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/basic/FinalizeTask.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/basic/Forwarder.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/basic/Slave.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/basic/Master.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/PingPongTest.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Sender.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/PingPongTask.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Receiver.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/FinalizeTask.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/CommTimeTest.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Slave.class
+                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Master.class
+                       ${CMAKE_HOME_DIRECTORY}/lib/libsimgrid.so
                        
-       DEPENDS 
-            ${CMAKE_BINARY_DIR}/share/simgrid.jar
-                       ${CMAKE_HOME_DIRECTORY}/examples/basic/*.java
-                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
-                       ${CMAKE_HOME_DIRECTORY}/examples/commTime/*.java
-                       ${CMAKE_HOME_DIRECTORY}/examples/suspend/*.java
+       DEPENDS SG_java
+            ${CMAKE_HOME_DIRECTORY}/simgrid.jar
                        
        COMMENT "Build examples for java"       
        
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/basic
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/ping_pong
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/comm_time
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/suspend
-       
-       COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/examples/basic -cp ${CMAKE_BINARY_DIR}/share/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/basic/*.java  
-       COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/examples/ping_pong -cp ${CMAKE_BINARY_DIR}/share/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
-       COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/examples/comm_time -cp ${CMAKE_BINARY_DIR}/share/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/commTime/*.java
-       COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/examples/suspend -cp ${CMAKE_BINARY_DIR}/share/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/suspend/*.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/pingPong/*.java
+       COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
 )
 
-ADD_CUSTOM_TARGET(examples ALL
-       DEPENDS ${CMAKE_BINARY_DIR}/examples/basic/BasicTest.class
-               ${CMAKE_BINARY_DIR}/examples/basic/FinalizeTask.class
-               ${CMAKE_BINARY_DIR}/examples/basic/Forwarder.class
-               ${CMAKE_BINARY_DIR}/examples/basic/Slave.class
-               ${CMAKE_BINARY_DIR}/examples/basic/Master.class
-               ${CMAKE_BINARY_DIR}/examples/ping_pong/PingPongTest.class
-               ${CMAKE_BINARY_DIR}/examples/ping_pong/Sender.class
-               ${CMAKE_BINARY_DIR}/examples/ping_pong/PingPongTask.class
-               ${CMAKE_BINARY_DIR}/examples/ping_pong/Receiver.class
-               ${CMAKE_BINARY_DIR}/examples/comm_time/FinalizeTask.class
-               ${CMAKE_BINARY_DIR}/examples/comm_time/CommTimeTest.class
-               ${CMAKE_BINARY_DIR}/examples/comm_time/Slave.class
-               ${CMAKE_BINARY_DIR}/examples/comm_time/Master.class
-               ${CMAKE_BINARY_DIR}/examples/suspend/SuspendTest.class
-               ${CMAKE_BINARY_DIR}/examples/suspend/LazyGuy.class
-               ${CMAKE_BINARY_DIR}/examples/suspend/DreamMaster.class
-       COMMENT Compiling the Java examples                                                     
+ADD_CUSTOM_TARGET(simgrid_java_examples ALL
+                  DEPENDS      ${CMAKE_HOME_DIRECTORY}/examples/basic/BasicTest.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/basic/FinalizeTask.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/basic/Forwarder.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/basic/Slave.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/basic/Master.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/PingPongTest.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Sender.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/PingPongTask.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Receiver.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/FinalizeTask.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/CommTimeTest.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Slave.class
+                                                       ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Master.class
+                                       
 )
 
 #####################
 # Declare our tests #
 #####################
+INCLUDE(CTest)
 ENABLE_TESTING()
 
-set(osname ${CMAKE_SYSTEM_NAME})
-set(cpu ${CMAKE_SYSTEM_PROCESSOR})
-set(DISTRIB2 ${CMAKE_SYSTEM_VERSION})
-
-SET(SITE "${osname}_${DISTRIB2}_${cpu}")
-SET(CTEST_SITE "${osname}_${DISTRIB2}_${cpu}")
-SET(CTEST_PROJECT_NAME "${PROJECT_NAME}")
-SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000")
-SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000")
-
-
-# java examples
-ADD_TEST(java-basic    java -cp ${CMAKE_BINARY_DIR}/examples/basic:${CMAKE_BINARY_DIR}/share/simgrid.jar BasicTest examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/basic/basic_deployment.xml)
-ADD_TEST(java-pingpong         java -cp ${CMAKE_BINARY_DIR}/examples/pingpong:${CMAKE_BINARY_DIR}/share/simgrid.jar PingpongTest examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingpong/pingpong_deployment.xml)
-ADD_TEST(java-pingpong         java -cp ${CMAKE_BINARY_DIR}/examples/pingpong:${CMAKE_BINARY_DIR}/share/simgrid.jar PingpongTest examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingpong/pingpong_deployment.xml)
-#ADD_TEST(java-comm_time ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples/java/comm_time CommTimeTest ${simgrid_BINARY_DIR})
-#ADD_TEST(java-suspend         ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples/java/suspend SuspendTest ${simgrid_BINARY_DIR})
-
-######################
-# Install some stuff #
-######################
-install(FILES ${CMAKE_BINARY_DIR}/share/simgrid.jar
-          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/)
-
-add_custom_target(uninstall
-       COMMAND ${CMAKE_COMMAND} -E     remove -f ${CMAKE_INSTALL_PREFIX}/share/simgrid.jar
-       COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding java ok"
-)      
-
-install(TARGETS simgrid-java
-        DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+ADD_TEST(java-basic    ${CMAKE_HOME_DIRECTORY}/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples basic/BasicTest ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/basic/)
+ADD_TEST(java-pingpong         ${CMAKE_HOME_DIRECTORY}/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples pingPong/PingPongTest ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/pingPong/)
\ No newline at end of file
diff --git a/FindJavaSG.cmake b/FindJavaSG.cmake
new file mode 100644 (file)
index 0000000..4de80c5
--- /dev/null
@@ -0,0 +1,30 @@
+include(FindJava)
+include(FindJNI)
+       
+if(JAVA_COMPILE AND JAVA_INCLUDE_PATH)
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH} ")
+else(JAVA_COMPILE AND JAVA_INCLUDE_PATH) 
+       message(FATAL_ERROR "Can't compile java!!!")
+endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH)
+
+message(STATUS "Looking for jni.h")
+if(JAVA_INCLUDE_PATH)
+message(STATUS "Looking for jni.h - found")
+else(JAVA_INCLUDE_PATH)
+message(STATUS "Looking for ljni.h - not found")
+endif(JAVA_INCLUDE_PATH)
+
+message(STATUS "Looking for jni_md.h")
+if(JAVA_INCLUDE_PATH2)
+message(STATUS "Looking for jni_md.h - found")
+else(JAVA_INCLUDE_PATH2)
+message(STATUS "Looking for jni_md.h - found")
+endif(JAVA_INCLUDE_PATH2)
+
+if(JAVA_COMPILE)
+message(STATUS "Found javac: ${JAVA_COMPILE}")
+endif(JAVA_COMPILE)
+
+if(JAVA_ARCHIVE)
+message(STATUS "Found jar: ${JAVA_ARCHIVE}")
+endif(JAVA_ARCHIVE)
\ No newline at end of file
index a5d247f..9a1cf4f 100644 (file)
@@ -1,5 +1,5 @@
-#IF YOU HAVE INSTALL SIMGRID LIBRARIES AND SIMGRID BINARIES IN A SPECIAL DIRECTORY
-#YOU CAN SPECIFY SIMGRID_LIBRARY_PAT AND SIMGRID_BIN_PATH OR SIMPLY LD_LIBRARY_PATH
+#IF YOU HAVE INSTALL SIMGRID IN A SPECIAL DIRECTORY
+#YOU CAN SPECIFY SIMGRID_ROOT OR GRAS_ROOT
 
 # TO CALL THIS FILE USE
        #set(CMAKE_MODULE_PATH 
@@ -7,17 +7,13 @@
        #${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
        #)
 
-message("SIMGRID_LIBRARY_PATH  = $ENV{SIMGRID_LIBRARY_PATH}")
-message("SIMGRID_BIN_PATH      = $ENV{SIMGRID_BIN_PATH}")
-message("LD_LIBRARY_PATH       = $ENV{LD_LIBRARY_PATH}")
-
 find_library(HAVE_SIMGRID_LIB
     NAME simgrid
     HINTS
-    $ENV{LIBRARIES}
     $ENV{LD_LIBRARY_PATH}
-    $ENV{SIMGRID_LIBRARY_PATH}
-    PATH_SUFFIXES lib64 lib simgrid/lib64 simgrid/lib
+    $ENV{GRAS_ROOT}
+       $ENV{SIMGRID_ROOT}
+    PATH_SUFFIXES lib64 lib
     PATHS
     /opt
     /opt/local
@@ -28,10 +24,9 @@ find_library(HAVE_SIMGRID_LIB
 
 find_path(HAVE_GRAS_H gras.h
     HINTS
-    $ENV{INCLUDES}
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{SIMGRID_LIBRARY_PATH}
-    PATH_SUFFIXES include simgrid/include
+    $ENV{GRAS_ROOT}
+       $ENV{SIMGRID_ROOT}
+    PATH_SUFFIXES include
     PATHS
     /opt
     /opt/local
@@ -40,38 +35,52 @@ find_path(HAVE_GRAS_H gras.h
     /usr
 )
 
-string(REPLACE "/include" "/bin" OPTIONAL_BIN_PATH "HAVE_GRAS_H")
-
 find_program(HAVE_TESH
-NAMES tesh
-HINTS
-$ENV{SIMGRID_BIN_PATH}
-$ENV{LD_LIBRARY_PATH}
-PATH_SUFFIXES bin simgrid/bin
-PATHS
-${OPTIONAL_BIN_PATH}
-/opt
-/opt/local
-/opt/csw
-/sw
-/usr
+       NAMES tesh
+       HINTS
+       $ENV{GRAS_ROOT}
+       $ENV{SIMGRID_ROOT}
+       PATH_SUFFIXES bin
+       PATHS
+       /opt
+       /opt/local
+       /opt/csw
+       /sw
+       /usr
 )
 
 find_program(HAVE_GRAS_STUB
-NAMES gras_stub_generator
-HINTS
-$ENV{SIMGRID_BIN_PATH}
-$ENV{LD_LIBRARY_PATH}
-PATH_SUFFIXES bin simgrid/bin
-PATHS
-/opt
-/opt/local
-/opt/csw
-/sw
-/usr
+       NAMES gras_stub_generator
+       HINTS
+       $ENV{GRAS_ROOT}
+       $ENV{SIMGRID_ROOT}
+       PATH_SUFFIXES bin
+       PATHS
+       /opt
+       /opt/local
+       /opt/csw
+       /sw
+       /usr
 )
 
-message("HAVE_SIMGRID_LIB      = ${HAVE_SIMGRID_LIB}")
-message("HAVE_GRAS_H           = ${HAVE_GRAS_H}")
-message("HAVE_TESH             = ${HAVE_TESH}")
-message("HAVE_GRAS_STUB                = ${HAVE_GRAS_STUB}")
\ No newline at end of file
+message(STATUS "Looking for lib SimGrid")
+if(HAVE_SIMGRID_LIB)
+message(STATUS "Looking for lib SimGrid - found")
+else(HAVE_SIMGRID_LIB)
+message(STATUS "Looking for lib SimGrid - not found")
+endif(HAVE_SIMGRID_LIB)
+
+message(STATUS "Looking for gras.h")
+if(HAVE_GRAS_H)
+message(STATUS "Looking for gras.h - found")
+else(HAVE_GRAS_H)
+message(STATUS "Looking for gras.h - not found")
+endif(HAVE_GRAS_H)
+
+if(HAVE_TESH)
+message(STATUS "Found Tesh: ${HAVE_TESH}")
+endif(HAVE_TESH)
+
+if(HAVE_GRAS_STUB)
+message(STATUS "Found gras_stub_generator: ${HAVE_GRAS_STUB}")
+endif(HAVE_GRAS_STUB)
\ No newline at end of file
index b6195d1..7edfa6d 100644 (file)
@@ -1,49 +1,49 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="Jacquelin" function="Master">
+  <process host="Jacquelin" function="basic.Master">
      <argument value="5"/>     <!-- Amount of tasks to dispatch -->
      <argument value="50000"/> <!-- Computation size of each task -->
      <argument value="10"/>    <!-- Communication size of each one -->
      <argument value="7"/>     <!-- Amount of slaves waiting for orders -->
   </process>
   
-  <process host="Jackson" function="Forwarder">
+  <process host="Jackson" function="basic.Forwarder">
      <argument value="0"/>  <!-- Input mailbox -->
      <argument value="7"/>  <!-- First output mailbox -->
      <argument value="8"/>  <!-- Last output mailbox -->
   </process>
-  <process host="Casavant" function="Forwarder">
+  <process host="Casavant" function="basic.Forwarder">
      <argument value="1"/>  <!-- Input mailbox -->
      <argument value="9"/>  <!-- First output mailbox -->
      <argument value="10"/> <!-- Last output mailbox -->
   </process>
   
-  <process host="iRMX" function="Slave">
+  <process host="iRMX" function="basic.Slave">
      <argument value="2"/>  <!-- Input mailbox -->
   </process>
-  <process host="Bousquet" function="Slave">
+  <process host="Bousquet" function="basic.Slave">
      <argument value="3"/>  <!-- Input mailbox -->
   </process>  
-  <process host="Soucy" function="Slave">
+  <process host="Soucy" function="basic.Slave">
      <argument value="4"/>  <!-- Input mailbox -->
   </process>  
-  <process host="Kuenning" function="Slave">
+  <process host="Kuenning" function="basic.Slave">
      <argument value="5"/>  <!-- Input mailbox -->
   </process>  
-  <process host="Browne" function="Slave">
+  <process host="Browne" function="basic.Slave">
      <argument value="6"/>  <!-- Input mailbox -->
   </process>  
-  <process host="Stephen" function="Slave">
+  <process host="Stephen" function="basic.Slave">
      <argument value="7"/>  <!-- Input mailbox -->
   </process>  
-  <process host="Robert" function="Slave">
+  <process host="Robert" function="basic.Slave">
      <argument value="8"/>  <!-- Input mailbox -->
   </process>  
-  <process host="Sirois" function="Slave">
+  <process host="Sirois" function="basic.Slave">
      <argument value="9"/>  <!-- Input mailbox -->
   </process>  
-  <process host="Monique" function="Slave">
+  <process host="Monique" function="basic.Slave">
      <argument value="10"/>  <!-- Input mailbox -->
   </process>  
 </platform>
index e2d3632..4f075e3 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="2">
   <!-- The master process (with some arguments) -->
 
index 2fa93c9..4103286 100644 (file)
@@ -20,6 +20,7 @@ public class PingPongTest  {
     
     public static void main(String[] args) throws NativeException {
        
+    
        /* initialize the MSG simulation. Must be done before anything else (even logging). */
        Msg.init(args);
 
index 321346b..7177bde 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="Jacquelin" function="Sender">
+  <process host="Jacquelin" function="pingPong.Sender">
       <argument value="Bellevue"/>
   </process>
-<process host="Boivin" function="Receiver"/>
+<process host="Boivin" function="pingPong.Receiver"/>
 </platform>
index 484de26..dd4de15 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "simgrid.dtd">
+ <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
  <platform version="3">
  <AS  id="AS0"  routing="Full">
    <host id="Jacquelin" power="137333000"/>
similarity index 98%
rename from java/org/simgrid/msg/ApplicationHandler.java
rename to org/simgrid/msg/ApplicationHandler.java
index 9b0e1f0..f983b9a 100644 (file)
@@ -83,7 +83,7 @@ public final class ApplicationHandler {
 
                                 Process process = cls.newInstance();
                                 process.name = function;
-                                process.id = simgrid.msg.Process.nextProcessId++;
+                                process.id = org.simgrid.msg.Process.nextProcessId++;
                                 Host host = Host.getByName(hostName);
 
                                 MsgNative.processCreate(process, host);
similarity index 97%
rename from java/org/simgrid/msg/Msg.java
rename to org/simgrid/msg/Msg.java
index 1cf2cc0..da8f553 100644 (file)
@@ -15,12 +15,12 @@ public final class Msg {
        /* Statically load the library which contains all native functions used in here */
        static {
                try {
-                       System.loadLibrary("simgrid-java");
+                       System.loadLibrary("SG_java");
                } catch(UnsatisfiedLinkError e) {
                        System.err.println("Cannot load the bindings to the simgrid library: ");
                        e.printStackTrace();
                        System.err.println(
-                                       "Please check your LD_LIBRARY_PATH, or copy the simgrid and simgrid-java libraries to the current directory");
+                                       "Please check your LD_LIBRARY_PATH, or copy the simgrid and SG_java libraries to the current directory");
                        System.exit(1);
                }
        }
index 5becc9e..4b69122 100644 (file)
@@ -50,7 +50,7 @@ static jobject native_to_java_process(m_process_t process)
  */
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
                                          jobject jprocess_arg,
                                          jobject jhost)
 {
@@ -62,7 +62,7 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
   m_process_t process;          /* the native process to create                         */
   m_host_t host;                /* Where that process lives */
    
-  DEBUG4("Java_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)",
+  DEBUG4("Java_org_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)",
         env, cls, jprocess_arg, jhost);
    
    
@@ -114,7 +114,7 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
                                           jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -133,7 +133,7 @@ Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
                                          jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -151,7 +151,7 @@ Java_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_processIsSuspended(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processIsSuspended(JNIEnv * env, jclass cls,
                                               jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -166,7 +166,7 @@ Java_simgrid_msg_MsgNative_processIsSuspended(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processKill(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processKill(JNIEnv * env, jclass cls,
                                        jobject jprocess)
 {
   /* get the native instances from the java ones */
@@ -187,7 +187,7 @@ Java_simgrid_msg_MsgNative_processKill(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
                                           jobject jprocess)
 {
   /* get the native instances from the java ones */
@@ -212,7 +212,7 @@ Java_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls,
                                           jint PID)
 {
   m_process_t process = MSG_process_from_PID(PID);
@@ -232,7 +232,7 @@ Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processGetPID(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processGetPID(JNIEnv * env, jclass cls,
                                          jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -247,7 +247,7 @@ Java_simgrid_msg_MsgNative_processGetPID(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processGetPPID(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processGetPPID(JNIEnv * env, jclass cls,
                                           jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -261,7 +261,7 @@ Java_simgrid_msg_MsgNative_processGetPPID(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
 {
   m_process_t process = MSG_process_self();
   jobject jprocess;
@@ -280,7 +280,7 @@ Java_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
                                              jobject jhost)
 {
   m_host_t host = jhost_get_native(env, jhost);
@@ -299,7 +299,7 @@ Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
                                           jdouble seconds)
 {
   MSG_error_t rv = MSG_process_sleep((double) seconds);
@@ -316,7 +316,7 @@ Java_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
  ***************************************************************************************/
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
                                          jstring jname)
 {
   m_host_t host;                /* native host                                          */
@@ -368,7 +368,7 @@ Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jstring JNICALL
-Java_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls,
                                        jobject jhost)
 {
   m_host_t host = jhost_get_native(env, jhost);
@@ -382,13 +382,13 @@ Java_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_hostGetNumber(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_MsgNative_hostGetNumber(JNIEnv * env, jclass cls)
 {
   return (jint) MSG_get_host_number();
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
 {
   jobject jhost;
 
@@ -424,7 +424,7 @@ Java_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
 }
 
 JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_hostGetSpeed(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetSpeed(JNIEnv * env, jclass cls,
                                         jobject jhost)
 {
   m_host_t host = jhost_get_native(env, jhost);
@@ -438,7 +438,7 @@ Java_simgrid_msg_MsgNative_hostGetSpeed(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
                                        jobject jhost)
 {
   m_host_t host = jhost_get_native(env, jhost);
@@ -453,7 +453,7 @@ Java_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls,
                                        jobject jhost)
 {
   m_host_t host = jhost_get_native(env, jhost);
@@ -472,7 +472,7 @@ Java_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls,
  ***************************************************************************************/
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls,
                                       jobject jtask, jstring jname,
                                       jdouble jcomputeDuration,
                                       jdouble jmessageSize)
@@ -515,7 +515,7 @@ Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls,
                                                jobject jtask,
                                                jstring jname,
                                                jobjectArray jhosts,
@@ -603,7 +603,7 @@ Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskGetSender(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetSender(JNIEnv * env, jclass cls,
                                          jobject jtask)
 {
   m_process_t process;
@@ -620,7 +620,7 @@ Java_simgrid_msg_MsgNative_taskGetSender(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
                                          jobject jtask)
 {
   m_host_t host;
@@ -643,7 +643,7 @@ Java_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jstring JNICALL
-Java_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls,
                                        jobject jtask)
 {
   m_task_t task = jtask_to_native_task(jtask, env);
@@ -657,7 +657,7 @@ Java_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls,
                                       jobject jtask)
 {
   m_task_t ptask = jtask_to_native_task(jtask, env);
@@ -674,7 +674,7 @@ Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls,
                                                   jobject jtask)
 {
   m_task_t ptask = jtask_to_native_task(jtask, env);
@@ -687,7 +687,7 @@ Java_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env,
+Java_org_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env,
                                                     jclass cls,
                                                     jobject jtask)
 {
@@ -701,7 +701,7 @@ Java_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSetPriority(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskSetPriority(JNIEnv * env, jclass cls,
                                            jobject jtask, jdouble priority)
 {
   m_task_t task = jtask_to_native_task(jtask, env);
@@ -714,7 +714,7 @@ Java_simgrid_msg_MsgNative_taskSetPriority(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
                                        jobject jtask_arg)
 {
 
@@ -735,7 +735,7 @@ Java_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
                                        jobject jtask)
 {
   m_task_t task = jtask_to_native_task(jtask, env);
@@ -759,20 +759,19 @@ Java_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_Msg_getErrCode(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_Msg_getErrCode(JNIEnv * env, jclass cls)
 {
   return (jint) MSG_get_errno();
 }
 
 JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls)
 {
   return (jdouble) MSG_get_clock();
 }
 
-
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
+Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 {
   char **argv = NULL;
   int index;
@@ -780,7 +779,7 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
   jstring jval;
   const char *tmp;
 
-  factory_initializer_to_use = SIMIX_ctx_java_factory_init;
+  smx_factory_initializer_to_use = SIMIX_ctx_java_factory_init;
 
   if (jargs)
     argc = (int) (*env)->GetArrayLength(env, jargs);
@@ -793,6 +792,7 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
     jval = (jstring) (*env)->GetObjectArrayElement(env, jargs, index);
     tmp = (*env)->GetStringUTFChars(env, jval, 0);
     argv[index + 1] = strdup(tmp);
+    //argv[index] = strdup(tmp);
     (*env)->ReleaseStringUTFChars(env, jval, tmp);
   }
 
@@ -807,7 +807,7 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 }
 
 JNIEXPORT void JNICALL
-    JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
+    JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
 {
   MSG_error_t rv;
   int index;                    //xbt_fifo_item_t item = NULL;
@@ -844,14 +844,14 @@ JNIEXPORT void JNICALL
 }
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processKillAll(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processKillAll(JNIEnv * env, jclass cls,
                                           jint jresetPID)
 {
   return (jint) MSG_process_killall((int) jresetPID);
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
                                        jstring jplatformFile)
 {
 
@@ -864,7 +864,7 @@ Java_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
                                        jobject jprocess)
 {
 
@@ -879,7 +879,7 @@ Java_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
+Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
 {
   const char *s = (*env)->GetStringUTFChars(env, js, 0);
   INFO1("%s", s);
@@ -887,7 +887,7 @@ Java_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
+Java_org_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
 {
   int index;
   jobjectArray jtable;
@@ -898,7 +898,7 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
   int count = MSG_get_host_number();
   m_host_t *table = MSG_get_host_table();
 
-  jclass cls = jxbt_get_class(env, "simgrid/msg/Host");
+  jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
 
   if (!cls) {
     return NULL;
@@ -919,7 +919,7 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
       jname = (*env)->NewStringUTF(env, MSG_host_get_name(host));
 
       jhost =
-          Java_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname);
+          Java_org_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname);
       /* FIXME: leak of jname ? */
     }
 
@@ -930,7 +930,7 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
                                     jstring jalias, jobject jtask,
                                     jdouble jtimeout)
 {
@@ -960,7 +960,7 @@ Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
                                            jstring jalias, jobject jtask,
                                            jdouble jmaxRate)
 {
@@ -990,7 +990,7 @@ Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
                                        jstring jalias, jdouble jtimeout,
                                        jobject jhost)
 {
@@ -1029,7 +1029,7 @@ Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls,
                                       jstring jalias)
 {
 
@@ -1046,7 +1046,7 @@ Java_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
                                               jstring jalias,
                                               jobject jhost)
 {
@@ -1069,7 +1069,7 @@ Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_taskListenFrom(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskListenFrom(JNIEnv * env, jclass cls,
                                           jstring jalias)
 {
 
@@ -1084,14 +1084,14 @@ Java_simgrid_msg_MsgNative_taskListenFrom(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
                                        jstring jdeploymentFile)
 {
 
   const char *deploymentFile =
       (*env)->GetStringUTFChars(env, jdeploymentFile, 0);
 
-  surf_parse_reset_parser();
+  surf_parse_reset_callbacks();
 
   surfxml_add_callback(STag_surfxml_process_cb_list,
                        japplication_handler_on_begin_process);
index dffe8b9..14e7650 100644 (file)
@@ -21,7 +21,7 @@ JNIEnv *get_current_thread_env(void);
  * Signature   (Lsimgrid/msg/Process;Lsimgrid/msg/Host;)V
  */
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
                                          jobject jprocess, jobject jhost);
 
 
@@ -32,7 +32,7 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
  * Signature   (Lsimgrid/msg/Process;)V
  */
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
                                           jobject jprocess);
 
 /*
@@ -40,7 +40,7 @@ Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
  * Method              processResume
  * Signature   (Lsimgrid/msg/Process;)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processResume
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_processResume
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -48,7 +48,7 @@ JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processResume
  * Method              processIsSuspended
  * Signature   (Lsimgrid/msg/Process;)Z
  */
-JNIEXPORT jboolean JNICALL Java_simgrid_msg_MsgNative_processIsSuspended
+JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_MsgNative_processIsSuspended
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -56,7 +56,7 @@ JNIEXPORT jboolean JNICALL Java_simgrid_msg_MsgNative_processIsSuspended
  * Method              processKill
  * Signature   (Lsimgrid/msg/Process;)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processKill
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_processKill
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -64,7 +64,7 @@ JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processKill
  * Method              processGetHost
  * Signature   (Lsimgrid/msg/Process;)Lsimgrid/msg/Host;
  */
-JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_processGetHost
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_MsgNative_processGetHost
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -72,7 +72,7 @@ JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_processGetHost
  * Method              processFromPID
  * Signature   (I)Lsimgrid/msg/Process;
  */
-JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_processFromPID
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_MsgNative_processFromPID
     (JNIEnv *, jclass, jint);
 
 /*
@@ -80,7 +80,7 @@ JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_processFromPID
  * Method              processGetPID
  * Signature   (Lsimgrid/msg/Process;)I
  */
-JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processGetPID
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_MsgNative_processGetPID
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -88,7 +88,7 @@ JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processGetPID
  * Method              processGetPPID
  * Signature   (Lsimgrid/msg/Process;)I
  */
-JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processGetPPID
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_MsgNative_processGetPPID
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -96,7 +96,7 @@ JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processGetPPID
  * Method              processSelf
  * Signature   ()Lsimgrid/msg/Process;
  */
-JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_processSelf
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_MsgNative_processSelf
     (JNIEnv *, jclass);
 
 /*
@@ -104,7 +104,7 @@ JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_processSelf
  * Method              processSelfPID
  * Signature   ()I
  */
-JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processSelfPID
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_MsgNative_processSelfPID
     (JNIEnv *, jclass);
 
 /*
@@ -112,7 +112,7 @@ JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processSelfPID
  * Method              processSelfPPID
  * Signature   ()I
  */
-JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processSelfPPID
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_MsgNative_processSelfPPID
     (JNIEnv *, jclass);
 
 /*
@@ -120,7 +120,7 @@ JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processSelfPPID
  * Method              processChangeHost
  * Signature   (Lsimgrid/msg/Process;Lsimgrid/msg/Host;)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processChangeHost
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_processChangeHost
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -128,7 +128,7 @@ JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processChangeHost
  * Method              processWaitFor
  * Signature   (D)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processWaitFor
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_processWaitFor
     (JNIEnv *, jclass, jdouble);
 
 /*
@@ -136,7 +136,7 @@ JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processWaitFor
  * Method              hostGetByName
  * Signature   (Ljava/lang/String;)Lsimgrid/msg/Host;
  */
-JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_hostGetByName
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_MsgNative_hostGetByName
     (JNIEnv *, jclass, jstring);
 
 /*
@@ -144,7 +144,7 @@ JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_hostGetByName
  * Method              hostGetName
  * Signature   (Lsimgrid/msg/Host;)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_simgrid_msg_MsgNative_hostGetName
+JNIEXPORT jstring JNICALL Java_org_simgrid_msg_MsgNative_hostGetName
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -152,7 +152,7 @@ JNIEXPORT jstring JNICALL Java_simgrid_msg_MsgNative_hostGetName
  * Method              hostGetNumber
  * Signature   ()I
  */
-JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_hostGetNumber
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_MsgNative_hostGetNumber
     (JNIEnv *, jclass);
 
 /*
@@ -160,7 +160,7 @@ JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_hostGetNumber
  * Method              hostSelf
  * Signature   ()Lsimgrid/msg/Host;
  */
-JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_hostSelf
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_MsgNative_hostSelf
     (JNIEnv *, jclass);
 
 /*
@@ -168,11 +168,11 @@ JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_hostSelf
  * Method              hostGetSpeed
  * Signature   (Lsimgrid/msg/Host;)D
  */
-JNIEXPORT jdouble JNICALL Java_simgrid_msg_MsgNative_hostGetSpeed
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_MsgNative_hostGetSpeed
     (JNIEnv *, jclass, jobject);
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
                                        jobject jhost);
 
 /*
@@ -180,7 +180,7 @@ Java_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
  * Method              hostIsAvail
  * Signature   (Lsimgrid/msg/Host;)Z
  */
-JNIEXPORT jboolean JNICALL Java_simgrid_msg_MsgNative_hostIsAvail
+JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_MsgNative_hostIsAvail
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -188,11 +188,11 @@ JNIEXPORT jboolean JNICALL Java_simgrid_msg_MsgNative_hostIsAvail
  * Method              taskCreate
  * Signature   (Lsimgrid/msg/Task;Ljava/lang/String;DD)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_taskCreate
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_taskCreate
     (JNIEnv *, jclass, jobject, jstring, jdouble, jdouble);
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv *, jclass, jobject,
+Java_org_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv *, jclass, jobject,
                                                jstring, jobjectArray,
                                                jdoubleArray, jdoubleArray);
 
@@ -201,7 +201,7 @@ Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv *, jclass, jobject,
  * Method              taskGetSender
  * Signature   (Lsimgrid/msg/Task;)Lsimgrid/msg/Process;
  */
-JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_taskGetSender
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_MsgNative_taskGetSender
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -209,7 +209,7 @@ JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_taskGetSender
  * Method              taskGetSource
  * Signature   (Lsimgrid/msg/Task;)Lsimgrid/msg/Host;
  */
-JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_taskGetSource
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_MsgNative_taskGetSource
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -217,7 +217,7 @@ JNIEXPORT jobject JNICALL Java_simgrid_msg_MsgNative_taskGetSource
  * Method              taskGetName
  * Signature   (Lsimgrid/msg/Task;)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_simgrid_msg_MsgNative_taskGetName
+JNIEXPORT jstring JNICALL Java_org_simgrid_msg_MsgNative_taskGetName
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -225,7 +225,7 @@ JNIEXPORT jstring JNICALL Java_simgrid_msg_MsgNative_taskGetName
  * Method              taskCancel
  * Signature   (Lsimgrid/msg/Task;)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_taskCancel
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_taskCancel
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -233,7 +233,7 @@ JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_taskCancel
  * Method              taskGetComputeDuration
  * Signature   (Lsimgrid/msg/Task;)D
  */
-JNIEXPORT jdouble JNICALL Java_simgrid_msg_MsgNative_taskGetComputeDuration
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_MsgNative_taskGetComputeDuration
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -242,7 +242,7 @@ JNIEXPORT jdouble JNICALL Java_simgrid_msg_MsgNative_taskGetComputeDuration
  * Signature   (Lsimgrid/msg/Task;)D
  */
 JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv *, jclass,
+Java_org_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv *, jclass,
                                                     jobject);
 
 /*
@@ -250,7 +250,7 @@ Java_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv *, jclass,
  * Method              taskSetPriority
  * Signature   (Lsimgrid/msg/Task;D)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_taskSetPriority
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_taskSetPriority
     (JNIEnv *, jclass, jobject, jdouble);
 
 /*
@@ -258,7 +258,7 @@ JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_taskSetPriority
  * Method              taskDestroy
  * Signature   (Lsimgrid/msg/Task;)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_taskDestroy
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_taskDestroy
     (JNIEnv *, jclass, jobject);
 
 /*
@@ -266,15 +266,15 @@ JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_taskDestroy
  * Method              taskExecute
  * Signature   (Lsimgrid/msg/Task;)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_taskExecute
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_taskExecute
     (JNIEnv *, jclass, jobject);
 
 JNIEXPORT jobject JNICALL
-    Java_simgrid_msg_MsgNative_taskReceive
+    Java_org_simgrid_msg_MsgNative_taskReceive
     (JNIEnv *, jclass, jstring, jdouble, jobject);
 
 JNIEXPORT void JNICALL
-    Java_simgrid_msg_MsgNative_taskSend
+    Java_org_simgrid_msg_MsgNative_taskSend
     (JNIEnv *, jclass, jstring, jobject, jdouble);
 
 /*
@@ -282,27 +282,27 @@ JNIEXPORT void JNICALL
  * Method              getErrCode
  * Signature   ()I
  */
-JNIEXPORT jint JNICALL Java_simgrid_msg_Msg_getErrCode(JNIEnv *, jclass);
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_Msg_getErrCode(JNIEnv *, jclass);
 
 /*
  * Class               simgrid_msg_Msg
  * Method              getClock
  * Signature   ()D
  */
-JNIEXPORT jdouble JNICALL Java_simgrid_msg_Msg_getClock(JNIEnv *, jclass);
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Msg_getClock(JNIEnv *, jclass);
 
 JNIEXPORT void JNICALL
-    JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls);
+    JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls);
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs);
+Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs);
 
 /*
  * Class               simgrid_msg_Msg
  * Method              processKillAll
  * Signature   (I)I
  */
-JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processKillAll
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_MsgNative_processKillAll
     (JNIEnv *, jclass, jint);
 
 /*
@@ -310,35 +310,35 @@ JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_processKillAll
  * Method              processExit
  * Signature   (Lsimgrid/msg/Process;)V
  */
-JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processExit
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_processExit
     (JNIEnv *, jclass, jobject);
 
-JNIEXPORT void JNICALL Java_simgrid_msg_Msg_info(JNIEnv *, jclass,
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv *, jclass,
                                                  jstring);
 
 JNIEXPORT jobjectArray JNICALL
-Java_simgrid_msg_MsgNative_allHosts(JNIEnv *, jclass);
+Java_org_simgrid_msg_MsgNative_allHosts(JNIEnv *, jclass);
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
                                        jstring jplatformFile);
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv *, jclass, jstring,
+Java_org_simgrid_msg_MsgNative_taskSendBounded(JNIEnv *, jclass, jstring,
                                            jobject, jdouble);
 
 JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_taskListen(JNIEnv *, jclass, jstring);
+Java_org_simgrid_msg_MsgNative_taskListen(JNIEnv *, jclass, jstring);
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv *, jclass, jstring,
+Java_org_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv *, jclass, jstring,
                                               jobject);
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_taskListenFrom(JNIEnv *, jclass, jstring);
+Java_org_simgrid_msg_MsgNative_taskListenFrom(JNIEnv *, jclass, jstring);
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
                                        jstring jdeploymentFile);
 
 #endif                          /* !MSG4JAVA_H */
index f227464..885c50d 100644 (file)
@@ -17,11 +17,11 @@ void japplication_handler_on_start_document(void)
   jclass cls;
   JNIEnv *env = get_current_thread_env();
   jmethodID id =
-      jxbt_get_static_smethod(env, "simgrid/msg/ApplicationHandler",
+      jxbt_get_static_smethod(env, "org/simgrid/msg/ApplicationHandler",
                               "onStartDocument", "()V");
 
   if (!id
-      || !(cls = jxbt_get_class(env, "simgrid/msg/ApplicationHandler")))
+      || !(cls = jxbt_get_class(env, "org/simgrid/msg/ApplicationHandler")))
     return;
 
   (*env)->CallStaticVoidMethod(env, cls, id);
@@ -32,11 +32,11 @@ void japplication_handler_on_end_document(void)
   jclass cls;
   JNIEnv *env = get_current_thread_env();
   jmethodID id =
-      jxbt_get_static_smethod(env, "simgrid/msg/ApplicationHandler",
+      jxbt_get_static_smethod(env, "org/simgrid/msg/ApplicationHandler",
                               "onEndDocument", "()V");
 
   if (!id
-      || !(cls = jxbt_get_class(env, "simgrid/msg/ApplicationHandler")))
+      || !(cls = jxbt_get_class(env, "org/simgrid/msg/ApplicationHandler")))
     return;
 
   (*env)->CallStaticVoidMethod(env, cls, id);
@@ -49,11 +49,11 @@ void japplication_handler_on_begin_process(void)
   jclass cls;
   JNIEnv *env = get_current_thread_env();
   jmethodID id =
-      jxbt_get_static_smethod(env, "simgrid/msg/ApplicationHandler",
+      jxbt_get_static_smethod(env, "org/simgrid/msg/ApplicationHandler",
                               "onBeginProcess",
                               "(Ljava/lang/String;Ljava/lang/String;)V");
   if (!id
-      || !(cls = jxbt_get_class(env, "simgrid/msg/ApplicationHandler")))
+      || !(cls = jxbt_get_class(env, "org/simgrid/msg/ApplicationHandler")))
     return;
   jhostName = (jstring) (*env)->NewStringUTF(env, A_surfxml_process_host);
   jfunction =
@@ -67,10 +67,10 @@ void japplication_handler_on_process_arg(void)
   jclass cls;
   JNIEnv *env = get_current_thread_env();
   jmethodID id =
-      jxbt_get_static_smethod(env, "simgrid/msg/ApplicationHandler",
+      jxbt_get_static_smethod(env, "org/simgrid/msg/ApplicationHandler",
                               "onProcessArg", "(Ljava/lang/String;)V");
   if (!id
-      || !(cls = jxbt_get_class(env, "simgrid/msg/ApplicationHandler")))
+      || !(cls = jxbt_get_class(env, "org/simgrid/msg/ApplicationHandler")))
     return;
   jarg = (jstring) (*env)->NewStringUTF(env, A_surfxml_argument_value);
 
@@ -84,11 +84,11 @@ void japplication_handler_on_property(void)
   jclass cls;
   JNIEnv *env = get_current_thread_env();
   jmethodID id =
-      jxbt_get_static_smethod(env, "simgrid/msg/ApplicationHandler",
+      jxbt_get_static_smethod(env, "org/simgrid/msg/ApplicationHandler",
                               "onProperty",
                               "(Ljava/lang/String;Ljava/lang/String;)V");
   if (!id
-      || !(cls = jxbt_get_class(env, "simgrid/msg/ApplicationHandler")))
+      || !(cls = jxbt_get_class(env, "org/simgrid/msg/ApplicationHandler")))
     return;
 
   jid = (jstring) (*env)->NewStringUTF(env, A_surfxml_prop_id);
@@ -101,10 +101,10 @@ void japplication_handler_on_end_process(void)
   JNIEnv *env = get_current_thread_env();
   jclass cls;
   jmethodID id =
-      jxbt_get_static_smethod(env, "simgrid/msg/ApplicationHandler",
+      jxbt_get_static_smethod(env, "org/simgrid/msg/ApplicationHandler",
                               "onEndProcess", "()V");
   if (!id
-      || !(cls = jxbt_get_class(env, "simgrid/msg/ApplicationHandler")))
+      || !(cls = jxbt_get_class(env, "org/simgrid/msg/ApplicationHandler")))
     return;
   (*env)->CallStaticVoidMethod(env, cls, id);
 }
index 26edfa2..04402bc 100644 (file)
@@ -14,7 +14,7 @@
 jobject jhost_new_instance(JNIEnv * env)
 {
 
-  jclass cls = jxbt_get_class(env, "simgrid/msg/Host");
+  jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
   jmethodID constructor = jxbt_get_jmethod(env, cls, "<init>", "()V");
 
   if (!constructor)
@@ -35,7 +35,7 @@ void jhost_unref(JNIEnv * env, jobject jhost)
 
 void jhost_bind(jobject jhost, m_host_t host, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Host", "bind", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Host", "bind", "J");
 
   if (!id)
     return;
@@ -45,7 +45,7 @@ void jhost_bind(jobject jhost, m_host_t host, JNIEnv * env)
 
 m_host_t jhost_get_native(JNIEnv * env, jobject jhost)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Host", "bind", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Host", "bind", "J");
 
   if (!id)
     return NULL;
@@ -75,7 +75,7 @@ void jhost_set_name(jobject jhost, jstring jname, JNIEnv * env)
 
 jboolean jhost_is_valid(jobject jhost, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Host", "bind", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Host", "bind", "J");
 
   if (!id)
     return 0;
index a9dda6b..639e818 100644 (file)
@@ -27,7 +27,7 @@ void jprocess_delete_global_ref(jobject jprocess, JNIEnv * env)
 jboolean jprocess_is_alive(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-      jxbt_get_smethod(env, "simgrid/msg/Process", "isAlive", "()Z");
+      jxbt_get_smethod(env, "org/simgrid/msg/Process", "isAlive", "()Z");
 
   if (!id)
     return 0;
@@ -38,7 +38,7 @@ jboolean jprocess_is_alive(jobject jprocess, JNIEnv * env)
 void jprocess_join(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-      jxbt_get_smethod(env, "simgrid/msg/Process", "join", "()V");
+      jxbt_get_smethod(env, "org/simgrid/msg/Process", "join", "()V");
 
   if (!id)
     return;
@@ -49,7 +49,7 @@ void jprocess_join(jobject jprocess, JNIEnv * env)
 void jprocess_exit(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-      jxbt_get_smethod(env, "simgrid/msg/Process", "interrupt", "()V");
+      jxbt_get_smethod(env, "org/simgrid/msg/Process", "interrupt", "()V");
 
   if (!id)
     return;
@@ -60,7 +60,7 @@ void jprocess_exit(jobject jprocess, JNIEnv * env)
 void jprocess_yield(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-      jxbt_get_smethod(env, "simgrid/msg/Process", "switchProcess", "()V");
+      jxbt_get_smethod(env, "org/simgrid/msg/Process", "switchProcess", "()V");
 
   if (!id)
     return;
@@ -71,7 +71,7 @@ void jprocess_yield(jobject jprocess, JNIEnv * env)
 void jprocess_lock_mutex(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-      jxbt_get_smethod(env, "simgrid/msg/Process", "lockMutex", "()V");
+      jxbt_get_smethod(env, "org/simgrid/msg/Process", "lockMutex", "()V");
 
   if (!id)
     return;
@@ -82,7 +82,7 @@ void jprocess_lock_mutex(jobject jprocess, JNIEnv * env)
 void jprocess_unlock_mutex(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-      jxbt_get_smethod(env, "simgrid/msg/Process", "unlockMutex", "()V");
+      jxbt_get_smethod(env, "org/simgrid/msg/Process", "unlockMutex", "()V");
 
   if (!id)
     return;
@@ -94,7 +94,7 @@ void jprocess_unlock_mutex(jobject jprocess, JNIEnv * env)
 void jprocess_signal_cond(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-      jxbt_get_smethod(env, "simgrid/msg/Process", "signalCond", "()V");
+      jxbt_get_smethod(env, "org/simgrid/msg/Process", "signalCond", "()V");
 
   if (!id)
     return;
@@ -105,7 +105,7 @@ void jprocess_signal_cond(jobject jprocess, JNIEnv * env)
 void jprocess_wait_cond(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-      jxbt_get_smethod(env, "simgrid/msg/Process", "waitCond", "()V");
+      jxbt_get_smethod(env, "org/simgrid/msg/Process", "waitCond", "()V");
 
   if (!id)
     return;
@@ -117,7 +117,7 @@ void jprocess_wait_cond(jobject jprocess, JNIEnv * env)
 void jprocess_start(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-      jxbt_get_smethod(env, "simgrid/msg/Process", "start", "()V");
+      jxbt_get_smethod(env, "org/simgrid/msg/Process", "start", "()V");
 
   if (!id)
     return;
@@ -129,7 +129,7 @@ void jprocess_start(jobject jprocess, JNIEnv * env)
 
 m_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Process", "bind", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "bind", "J");
 
   if (!id)
     return NULL;
@@ -139,7 +139,7 @@ m_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
 
 void jprocess_bind(jobject jprocess, m_process_t process, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Process", "bind", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "bind", "J");
 
   if (!id)
     return;
@@ -149,7 +149,7 @@ void jprocess_bind(jobject jprocess, m_process_t process, JNIEnv * env)
 
 jlong jprocess_get_id(jobject jprocess, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Process", "id", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "id", "J");
 
   if (!id)
     return 0;
@@ -159,7 +159,7 @@ jlong jprocess_get_id(jobject jprocess, JNIEnv * env)
 
 jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Process", "name",
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "name",
                                 "Ljava/lang/String;");
   jobject jname;
 
@@ -174,7 +174,7 @@ jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
 
 jboolean jprocess_is_valid(jobject jprocess, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Process", "bind", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Process", "bind", "J");
 
   if (!id)
     return JNI_FALSE;
@@ -189,10 +189,10 @@ void jprocess_schedule(smx_context_t context)
 
   env = get_current_thread_env();
 
-  id = jxbt_get_smethod(env, "org/simgrid/msg/Process", "schedule", "()V");
+  id = jxbt_get_smethod(env, "org/org/simgrid/msg/Process", "schedule", "()V");
 
   if (!id) {
-    CRITICAL0("Cannot find java method org/simgrid/msg/Process/schedule()V");
+    CRITICAL0("Cannot find java method org/org/simgrid/msg/Process/schedule()V");
     return;
   }
 
@@ -209,7 +209,7 @@ void jprocess_unschedule(smx_context_t context)
   env = get_current_thread_env();
 
 
-  id = jxbt_get_smethod(env, "simgrid/msg/Process", "unschedule", "()V");
+  id = jxbt_get_smethod(env, "org/simgrid/msg/Process", "unschedule", "()V");
 
   if (!id)
     return;
index 7214d21..2c149a5 100644 (file)
@@ -12,7 +12,7 @@
 
 void jtask_bind(jobject jtask, m_task_t task, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Task", "bind", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Task", "bind", "J");
 
   if (!id)
     return;
@@ -22,7 +22,7 @@ void jtask_bind(jobject jtask, m_task_t task, JNIEnv * env)
 
 m_task_t jtask_to_native_task(jobject jtask, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Task", "bind", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Task", "bind", "J");
 
   if (!id)
     return NULL;
@@ -32,7 +32,7 @@ m_task_t jtask_to_native_task(jobject jtask, JNIEnv * env)
 
 jboolean jtask_is_valid(jobject jtask, JNIEnv * env)
 {
-  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Task", "bind", "J");
+  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Task", "bind", "J");
 
   if (!id)
     return JNI_FALSE;
index 6b11b8b..6b66e6a 100644 (file)
@@ -218,21 +218,21 @@ static void jxbt_throw_by_name(JNIEnv * env, const char *name, char *msg)
 void jxbt_throw_jni(JNIEnv * env, const char *msg)
 {
   jxbt_throw_by_name(env,
-                     "simgrid/msg/JniException",
+                     "org/simgrid/msg/JniException",
                      bprintf("Internal or JNI error: %s", msg));
 }
 
 void jxbt_throw_notbound(JNIEnv * env, const char *kind, void *pointer)
 {
   jxbt_throw_by_name(env,
-                     "simgrid/msg/JniException",
+                     "org/simgrid/msg/JniException",
                      bprintf("Internal error: %s %p not bound", kind,
                              pointer));
 }
 
 void jxbt_throw_native(JNIEnv * env, char *msg)
 {
-  jxbt_throw_by_name(env, "simgrid/msg/NativeException", msg);
+  jxbt_throw_by_name(env, "org/simgrid/msg/NativeException", msg);
 }
 
 /* *** */
@@ -250,14 +250,14 @@ void jxbt_throw_illegal(JNIEnv * env, char *msg)
 void jxbt_throw_host_not_found(JNIEnv * env, const char *invalid_name)
 {
   jxbt_throw_by_name(env,
-                     "simgrid/msg/HostNotFoundException",
+                     "org/simgrid/msg/HostNotFoundException",
                      bprintf("No such host: %s", invalid_name));
 }
 
 void jxbt_throw_process_not_found(JNIEnv * env, const char *invalid_name)
 {
   jxbt_throw_by_name(env,
-                     "simgrid/msg/ProcessNotFoundException",
+                     "org/simgrid/msg/ProcessNotFoundException",
                      bprintf("No such process: %s", invalid_name));
 }
 
@@ -265,7 +265,7 @@ void jxbt_throw_process_not_found(JNIEnv * env, const char *invalid_name)
 void jxbt_throw_transfer_failure(JNIEnv * env, char *details)
 {
 
-  jxbt_throw_by_name(env, "simgrid/msg/TransferFailureException", details);
+  jxbt_throw_by_name(env, "org/simgrid/msg/TransferFailureException", details);
 
 }
 
@@ -274,7 +274,7 @@ void jxbt_throw_host_failure(JNIEnv * env, char *details)
 {
 
   jxbt_throw_by_name(env,
-                     "simgrid/msg/HostFailureException",
+                     "org/simgrid/msg/HostFailureException",
                      bprintf("Host Failure %s", details));
 
 }
@@ -283,7 +283,7 @@ void jxbt_throw_host_failure(JNIEnv * env, char *details)
 void jxbt_throw_time_out_failure(JNIEnv * env, char *details)
 {
 
-  jxbt_throw_by_name(env, "simgrid/msg/TimeoutException", details);
+  jxbt_throw_by_name(env, "org/simgrid/msg/TimeoutException", details);
 
 }
 
@@ -291,6 +291,6 @@ void jxbt_throw_time_out_failure(JNIEnv * env, char *details)
 void jxbt_throw_task_cancelled(JNIEnv * env, char *details)
 {
 
-  jxbt_throw_by_name(env, "simgrid/msg/TaskCancelledException", details);
+  jxbt_throw_by_name(env, "org/simgrid/msg/TaskCancelledException", details);
 
 }
index 0689627..9d654da 100644 (file)
@@ -36,7 +36,7 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
   (*factory)->free = smx_ctx_java_free;
   (*factory)->stop = smx_ctx_java_stop;
   (*factory)->suspend = smx_ctx_java_suspend;
-  (*factory)->runall = smx_ctx_java_runall;
+  (*factory)->runall = (smx_pfn_context_runall_t)smx_ctx_java_runall;
   (*factory)->name = "ctx_java_factory";
 }
 
diff --git a/test_java.sh b/test_java.sh
new file mode 100755 (executable)
index 0000000..03836e6
--- /dev/null
@@ -0,0 +1,9 @@
+#! /bin/bash
+export LD_LIBRARY_PATH=$3/lib:$LD_LIBRARY_PATH:${SIMGRID_ROOT}/lib
+export JAVA_LIBRARY_PATH=:$3/lib:$JAVA_LIBRARY_PATH:${SIMGRID_ROOT}/lib
+cd $1
+echo "LD_LIBRARY_PATH   = $LD_LIBRARY_PATH"
+echo "JAVA_LIBRARY_PATH = $JAVA_LIBRARY_PATH"
+pwd
+echo "java -cp .:$3/simgrid.jar $2 *platform.xml $4*Deployment.xml"
+java -cp .:$3/simgrid.jar $2 *platform.xml $4*Deployment.xml