Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt
index 7fa8d74..0c8162e 100644 (file)
--- a/examples/java/CMakeLists.txt
+++ b/examples/java/CMakeLists.txt
@@ -1,88 +1,39 @@
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/app/bittorrent)
-set(app_bittorrent_sources    ${srcdir}/Main.java  ${srcdir}/Common.java  ${srcdir}/Connection.java
-                              ${srcdir}/MessageTask.java ${srcdir}/Peer.java  ${srcdir}/Tracker.java
-                              ${srcdir}/TrackerTask.java)
+set(app_bittorrent_files        Main  Common  Connection MessageTask Peer  Tracker TrackerTask)
+set(app_centralizedmutex_files  Main  Coordinator  GrantTask Node ReleaseTask  RequestTask)
+set(app_masterworker_files      Main  Master Worker) 
+set(app_pingpong_files          Main  PingPongTask Receiver Sender) 
+set(app_tokenring_files         Main RelayRunner)
+set(async_waitall_files         Main  Receiver Sender)
+set(async_yield_files           Main  Yielder)
+set(async_dsend_files           Main  Receiver Sender)
+set(cloud_masterworker_files    Main  Master Worker)
+set(cloud_migration_files       Main  Daemon Test TestHostOnOff XVM)
+set(dht_chord_files             Main  ChordTask  Common FindSuccessorAnswerTask  FindSuccessorTask
+                                      GetPredecessorAnswerTask GetPredecessorTask Node  NotifyTask)
+set(dht_kademlia_files          Main  Answer  Bucket  Common Contact FindNodeAnswerTask  FindNodeTask
+                                      KademliaTask  Node  PingAnswerTask PingTask  RoutingTable)
+set(trace_pingpong_files        Main  PingPongTask Receiver Sender) 
+set(energy_consumption_files    Main  EnergyConsumer)
+set(energy_pstate_files         Main  PstateRunner)
+set(energy_vm_files             Main  EnergyVMRunner)
+set(io_file_files               Main  Node)
+set(io_storage_files            Main  Client)
+set(process_kill_files          Main  Killer  Victim)
+set(process_migration_files     Main  Emigrant  Policeman)
+set(process_startkilltime_files Main Sleeper)
+set(process_suspend_files       Main  DreamMaster  LazyGuy)
+set(task_priority_files         Main  Test)
 
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/app/centralizedmutex)
-set(app_centralizedmutex_sources  ${srcdir}/Main.java  ${srcdir}/Coordinator.java  ${srcdir}/GrantTask.java
-                              ${srcdir}/Node.java ${srcdir}/ReleaseTask.java  ${srcdir}/RequestTask.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/app/masterworker)
-set(app_masterworker_sources   ${srcdir}/Main.java  ${srcdir}/Master.java ${srcdir}/Worker.java) 
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/app/pingpong)
-set(app_pingpong_sources       ${srcdir}/Main.java  ${srcdir}/PingPongTask.java ${srcdir}/Receiver.java 
-                               ${srcdir}/Sender.java) 
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/app/tokenring)
-set(app_tokenring_sources      ${srcdir}/Main.java ${srcdir}/RelayRunner.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/async/waitall)
-set(async_waitall_sources      ${srcdir}/Main.java  ${srcdir}/Receiver.java ${srcdir}/Sender.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/async/yield)
-set(async_yield_sources      ${srcdir}/Main.java  ${srcdir}/Yielder.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/async/dsend)
-set(async_dsend_sources        ${srcdir}/Main.java  ${srcdir}/Receiver.java ${srcdir}/Sender.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/cloud/masterworker)
-set(cloud_masterworker_sources ${srcdir}/Main.java  ${srcdir}/Master.java ${srcdir}/Worker.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/cloud/migration)
-set(cloud_migration_sources    ${srcdir}/Main.java  ${srcdir}/Daemon.java ${srcdir}/Test.java
-                               ${srcdir}/TestHostOnOff.java ${srcdir}/XVM.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord)
-set(dht_chord_sources          ${srcdir}/Main.java  ${srcdir}/ChordTask.java  ${srcdir}/Common.java
-                               ${srcdir}/FindSuccessorAnswerTask.java  ${srcdir}/FindSuccessorTask.java
-                               ${srcdir}/GetPredecessorAnswerTask.java ${srcdir}/GetPredecessorTask.java
-                               ${srcdir}/Node.java  ${srcdir}/NotifyTask.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia)
-set(dht_kademlia_sources       ${srcdir}/Main.java  ${srcdir}/Answer.java  ${srcdir}/Bucket.java  ${srcdir}/Common.java
-                               ${srcdir}/Contact.java  ${srcdir}/FindNodeAnswerTask.java  ${srcdir}/FindNodeTask.java
-                               ${srcdir}/KademliaTask.java  ${srcdir}/Node.java  ${srcdir}/PingAnswerTask.java
-                               ${srcdir}/PingTask.java  ${srcdir}/RoutingTable.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/trace/pingpong)
-set(trace_pingpong_sources     ${srcdir}/Main.java  ${srcdir}/PingPongTask.java ${srcdir}/Receiver.java 
-                               ${srcdir}/Sender.java) 
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/energy/consumption)
-set(energy_consumption_sources ${srcdir}/Main.java  ${srcdir}/EnergyConsumer.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/energy/pstate)
-set(energy_pstate_sources      ${srcdir}/Main.java  ${srcdir}/PstateRunner.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/energy/vm)
-set(energy_vm_sources          ${srcdir}/Main.java  ${srcdir}/EnergyVMRunner.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/io/file)
-set(io_file_sources            ${srcdir}/Main.java  ${srcdir}/Node.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/io/storage)
-set(io_storage_sources         ${srcdir}/Main.java  ${srcdir}/Client.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/kill)
-set(process_kill_sources       ${srcdir}/Main.java  ${srcdir}/Killer.java  ${srcdir}/Victim.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/migration)
-set(process_migration_sources  ${srcdir}/Main.java  ${srcdir}/Emigrant.java  ${srcdir}/Policeman.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/startkilltime)
-set(process_startkilltime_sources ${srcdir}/Main.java ${srcdir}/Sleeper.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/suspend)
-set(process_suspend_sources    ${srcdir}/Main.java  ${srcdir}/DreamMaster.java  ${srcdir}/LazyGuy.java)
-
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/task/priority)
-set(task_priority_sources      ${srcdir}/Main.java  ${srcdir}/Test.java)
 
 foreach (example app_bittorrent app_centralizedmutex app_masterworker app_pingpong app_tokenring async_yield async_waitall async_dsend
          cloud_migration cloud_masterworker dht_chord dht_kademlia energy_consumption energy_pstate energy_vm io_file io_storage 
          process_kill process_migration process_startkilltime process_suspend task_priority trace_pingpong)
   string (REPLACE "_" "/" example_dir ${example})
+  set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/${example_dir})
+  foreach (filename ${${example}_files} )
+    set( ${example}_sources "${${example}_sources}" "${srcdir}/${filename}.java")
+  endforeach()
+
   if(enable_java)
     add_custom_command(
       COMMENT "Building java_${example}..."
@@ -117,6 +68,6 @@ if(enable_java)
            cloud_migration cloud_masterworker dht_chord dht_kademlia energy_consumption energy_pstate energy_vm io_file io_storage 
            process_kill process_migration process_startkilltime process_suspend task_priority trace_pingpong)
     string (REPLACE "_" "/" example_dir ${example})
-    ADD_TESH(java-${example}  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/${example_dir}/${example}.tesh)
+    ADD_TESH(java-${example}  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java/${example_dir} ${CMAKE_HOME_DIRECTORY}/examples/java/${example_dir}/${example}.tesh)
   endforeach()
 endif()

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 81feb43..4be1c2f 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1077,6 +1077,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/data_center.xml
   examples/platforms/dogbone.xml
   examples/platforms/energy_platform.xml
+  examples/platforms/energy_cluster.xml
   examples/platforms/faulty_host.xml
   examples/platforms/g5k.xml
   examples/platforms/griffon.xml

diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh
index 6310ddb..5055db7 100755 (executable)
--- a/tools/jenkins/Coverage.sh
+++ b/tools/jenkins/Coverage.sh
@@ -19,7 +19,7 @@ do_cleanup() {
 
 ### Check the node installation
 
-for pkg in xsltproc gcovr
+for pkg in xsltproc gcovr ant cover2cover.py
 do
    if command -v $pkg
    then 
@@ -43,6 +43,7 @@ done
 
 NUMPROC="$(nproc)" || NUMPROC=1
 
+
 cd $WORKSPACE/build
 
 ctest -D ExperimentalStart || true
@@ -54,10 +55,24 @@ cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON \
       -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=ON $WORKSPACE
 
 make -j$NUMPROC
+JACOCO_PATH="/usr/local/share/jacoco"
+export JAVA_TOOL_OPTIONS="-javaagent:${JACOCO_PATH}/lib/jacocoagent.jar"
+
 ctest -D ExperimentalTest -j$NUMPROC || true
 ctest -D ExperimentalCoverage || true
 
+unset JAVA_TOOL_OPTIONS
+i=0
 if [ -f Testing/TAG ] ; then
+  for example in app/bittorrent app/centralizedmutex app/masterworker app/pingpong app/tokenring async/yield async/waitall async/dsend cloud/migration cloud/masterworker dht/chord dht/kademlia energy/consumption energy/pstate energy/vm io/file io/storage process/kill process/migration process/startkilltime process/suspend task/priority trace/pingpong
+  do
+    #convert jacoco reports in xml ones
+    ant -f $WORKSPACE/tools/jenkins/jacoco.xml -Dsrcdir=$WORKSPACE/examples/java/${example} -Dbuilddir=$WORKSPACE/build/examples/java/${example} -Djacocodir=${JACOCO_PATH}/lib
+    #convert jacoco xml reports in cobertura xml reports
+    cover2cover.py $WORKSPACE/build/examples/java/${example}/report.xml $WORKSPACE/examples/java/ > $WORKSPACE/java_coverage_${i}.xml
+  i=$(($i + 1))
+  done
+   #convert all gcov reports to xml cobertura reports
    gcovr -r .. --xml-pretty -e teshsuite.* -u -o $WORKSPACE/xml_coverage.xml
    xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml
    mv CTestResults_memcheck.xml $WORKSPACE

diff --git a/tools/jenkins/jacoco.xml b/tools/jenkins/jacoco.xml
new file mode 100644 (file)
index 0000000..3106a1c
--- /dev/null
+++ b/tools/jenkins/jacoco.xml
@@ -0,0 +1,26 @@
+<project name="Example" xmlns:jacoco="antlib:org.jacoco.ant">
+
+    <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
+        <classpath path="${jacocodir}/jacocoant.jar"/>
+    </taskdef>
+
+<jacoco:report>
+                        
+    <executiondata>
+        <file file="${builddir}/jacoco.exec"/>
+    </executiondata>
+                        
+    <structure name="Example Project">
+        <classfiles>
+            <fileset dir="${builddir}"/>
+        </classfiles>
+        <sourcefiles encoding="UTF-8">
+            <fileset dir="${srcdir}"/>
+        </sourcefiles>
+    </structure>
+                        
+    <xml destfile="${builddir}/report.xml"/>
+                        
+</jacoco:report>
+
+</project>

diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index f452d68..d6a2966 100755 (executable)
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -428,7 +428,8 @@ if __name__ == '__main__':
            re.compile("^profiling:"),
            re.compile(".*WARNING: ASan doesn\'t fully support"),
            re.compile("Unable to clean temporary file C:.*"),
-           re.compile(".*Configuration change: Set \'contexts/")]
+           re.compile(".*Configuration change: Set \'contexts/"),
+           re.compile(".*Picked up JAVA_TOOL_OPTIONS.*")]
     
     if options.teshfile is None:
         f = FileReader(None)