Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
shrinking cmake in java examples
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Sat, 5 Mar 2016 22:33:06 +0000 (23:33 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Sat, 5 Mar 2016 22:33:06 +0000 (23:33 +0100)
and remove a useless deployment file

38 files changed:
examples/java/async/CMakeLists.txt
examples/java/bittorrent/CMakeLists.txt
examples/java/chord/CMakeLists.txt
examples/java/cloud/CMakeLists.txt
examples/java/cloud/energy/CMakeLists.txt
examples/java/cloud/energy/Main.java
examples/java/cloud/migration/CMakeLists.txt
examples/java/commTime/CMakeLists.txt
examples/java/energy/CMakeLists.txt
examples/java/io/CMakeLists.txt
examples/java/io/Storage.java
examples/java/kademlia/CMakeLists.txt
examples/java/master_slave_bypass/CMakeLists.txt
examples/java/master_slave_kill/CMakeLists.txt
examples/java/master_slave_kill/FinalizeTask.java
examples/java/master_slave_kill/Master.java
examples/java/master_slave_kill/MsKill.java
examples/java/master_slave_kill/Slave.java
examples/java/masterslave/CMakeLists.txt
examples/java/masterslave/FinalizeTask.java
examples/java/masterslave/Forwarder.java
examples/java/masterslave/Master.java
examples/java/masterslave/Masterslave.java
examples/java/masterslave/Slave.java
examples/java/migration/CMakeLists.txt
examples/java/mutualExclusion/CMakeLists.txt
examples/java/pingPong/CMakeLists.txt
examples/java/priority/CMakeLists.txt
examples/java/startKillTime/CMakeLists.txt
examples/java/startKillTime/Master.java
examples/java/startKillTime/StartKillTime.java
examples/java/suspend/CMakeLists.txt
examples/java/suspend/DreamMaster.java
examples/java/suspend/Suspend.java
examples/java/suspend/suspend.tesh
examples/java/suspend/suspendDeployment.xml [deleted file]
examples/java/tracing/CMakeLists.txt
examples/java/tracing/Receiver.java

index 1d03cef..aca0ef1 100644 (file)
@@ -1,36 +1,21 @@
 set(example java_async)
 set(example java_async)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/AsyncTest.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Forwarder.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/AsyncTest.java  ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Forwarder.java  ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/async.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/asyncDeployment.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/README
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/async.tesh           PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/asyncDeployment.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                       PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README               PARENT_SCOPE)
index 47c6b1c..96906da 100644 (file)
@@ -1,38 +1,22 @@
 set(example java_bittorrent)
 set(example java_bittorrent)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Bittorrent.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/Common.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Connection.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/MessageTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Peer.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Tracker.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/TrackerTask.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Bittorrent.java   ${CMAKE_CURRENT_SOURCE_DIR}/Common.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Connection.java   ${CMAKE_CURRENT_SOURCE_DIR}/MessageTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Peer.java         ${CMAKE_CURRENT_SOURCE_DIR}/Tracker.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/TrackerTask.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/generate.py
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.tesh  PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.xml   PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                   PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/generate.py      PARENT_SCOPE)
index 702b214..076b4b1 100644 (file)
@@ -1,36 +1,22 @@
 set(example java_chord)
 set(example java_chord)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Chord.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/ChordTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Common.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/FindSuccessorAnswerTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/FindSuccessorTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/GetPredecessorAnswerTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/GetPredecessorTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Node.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/NotifyTask.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Chord.java   ${CMAKE_CURRENT_SOURCE_DIR}/ChordTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Common.java  ${CMAKE_CURRENT_SOURCE_DIR}/FindSuccessorAnswerTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/FindSuccessorTask.java ${CMAKE_CURRENT_SOURCE_DIR}/GetPredecessorAnswerTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/GetPredecessorTask.java ${CMAKE_CURRENT_SOURCE_DIR}/Node.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/NotifyTask.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/chord.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/chord.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/chord.tesh  PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/chord.xml   PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                              PARENT_SCOPE)
index 00f8996..4fd806d 100644 (file)
@@ -1,30 +1,18 @@
 set(example java_cloud)
 set(example java_cloud)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Cloud.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Cloud.java  ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Master.java ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/cloud.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/cloud.tesh  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                              PARENT_SCOPE)
index 77d4d4a..c13e68f 100644 (file)
@@ -1,28 +1,17 @@
 set(example java_cloud_energy)
 set(example java_cloud_energy)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Main.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/EnergyVMRunner.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Main.java ${CMAKE_CURRENT_SOURCE_DIR}/EnergyVMRunner.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/../.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/../.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/energy.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/energy.tesh  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                               PARENT_SCOPE)
index 1913e4d..d450b20 100644 (file)
@@ -23,7 +23,7 @@ public class Main {
 
     /* construct the platform */
     Msg.createEnvironment(args[0]);
 
     /* construct the platform */
     Msg.createEnvironment(args[0]);
-    
+
     /* Create and start a runner for the experiment */
     new EnergyVMRunner(Host.all()[0],"energy VM runner",null).start();
 
     /* Create and start a runner for the experiment */
     new EnergyVMRunner(Host.all()[0],"energy VM runner",null).start();
 
index b826d27..04799a6 100644 (file)
@@ -1,36 +1,21 @@
 set(example java_cloud_migration)
 set(example java_cloud_migration)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Daemon.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/Main.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Test.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/TestHostOnOff.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/XVM.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Daemon.java ${CMAKE_CURRENT_SOURCE_DIR}/Main.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Test.java   ${CMAKE_CURRENT_SOURCE_DIR}/TestHostOnOff.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/XVM.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/../.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/../.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/migration.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_simple.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
-set(txt_files
-  ${CMAKE_CURRENT_SOURCE_DIR}/README
-  ${txt_files}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/migration.tesh     PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deploy_simple.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                     PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README             PARENT_SCOPE)
index 2281db9..ba6db1f 100644 (file)
@@ -1,31 +1,19 @@
 set(example java_commTime)
 set(example java_commTime)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/CommTimeTest.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/CommTimeTest.java  ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Master.java        ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/commtime.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/commTimeDeployment.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/commtime.tesh           PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/commTimeDeployment.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                          PARENT_SCOPE)
index 44612e5..f24d28a 100644 (file)
@@ -1,28 +1,17 @@
 set(example java_energy)
 set(example java_energy)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Energy.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/EnergyConsumer.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Energy.java  ${CMAKE_CURRENT_SOURCE_DIR}/EnergyConsumer.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/energy.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/energy.tesh  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                               PARENT_SCOPE)
index 12b1e2e..606bd31 100644 (file)
@@ -1,30 +1,18 @@
 set(example java_io)
 set(example java_io)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/IO.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/Node.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Storage.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Client.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/IO.java       ${CMAKE_CURRENT_SOURCE_DIR}/Node.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Storage.java  ${CMAKE_CURRENT_SOURCE_DIR}/Client.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/storage.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/storage.tesh  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                PARENT_SCOPE)
index ae2488d..6b789b7 100644 (file)
@@ -10,7 +10,7 @@ import org.simgrid.msg.Host;
 import org.simgrid.msg.MsgException;
 
 public class Storage {
 import org.simgrid.msg.MsgException;
 
 public class Storage {
-  public static void main(String[] args) throws MsgException {      
+  public static void main(String[] args) throws MsgException {
     Msg.init(args);
     if(args.length < 1) {
       Msg.info("Usage   : Storage platform_file ");
     Msg.init(args);
     if(args.length < 1) {
       Msg.info("Usage   : Storage platform_file ");
index f153b38..ec0270f 100644 (file)
@@ -1,39 +1,23 @@
 set(example java_kademlia)
 set(example java_kademlia)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Kademlia.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/Answer.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Bucket.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Common.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Contact.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/FindNodeAnswerTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/FindNodeTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/KademliaTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Node.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/PingAnswerTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/PingTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/RoutingTable.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Kademlia.java      ${CMAKE_CURRENT_SOURCE_DIR}/Answer.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Bucket.java        ${CMAKE_CURRENT_SOURCE_DIR}/Common.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Contact.java       ${CMAKE_CURRENT_SOURCE_DIR}/FindNodeAnswerTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/FindNodeTask.java  ${CMAKE_CURRENT_SOURCE_DIR}/KademliaTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Node.java          ${CMAKE_CURRENT_SOURCE_DIR}/PingAnswerTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/PingTask.java      ${CMAKE_CURRENT_SOURCE_DIR}/RoutingTable.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/kademlia.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/kademlia.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/kademlia.tesh  PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/kademlia.xml   PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                 PARENT_SCOPE)
index 715fffa..7b30e8e 100644 (file)
@@ -1,36 +1,18 @@
 set(example java_master_slave_bypass)
 set(example java_master_slave_bypass)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/MsBypass.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/MsBypass.java  ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Master.java    ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/bypass.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/bypass.tesh  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                               PARENT_SCOPE)
index 9f90f54..de8f0d4 100644 (file)
@@ -1,36 +1,19 @@
 set(example java_master_slave_kill)
 set(example java_master_slave_kill)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/MsKill.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/MsKill.java ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Master.java ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/kill.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/kill.tesh  PARENT_SCOPE)
+set(xml_files     ${xml_files}                                            PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                             PARENT_SCOPE)
index ec1a0e2..0af5a86 100644 (file)
@@ -7,9 +7,8 @@
 package master_slave_kill;
 import org.simgrid.msg.Task;
 
 package master_slave_kill;
 import org.simgrid.msg.Task;
 
-public class FinalizeTask extends Task {       
+public class FinalizeTask extends Task {
    public FinalizeTask() {
       super("finalize",0,0);
    }
 }
    public FinalizeTask() {
       super("finalize",0,0);
    }
 }
-    
\ No newline at end of file
index ab2044f..8cb481e 100644 (file)
@@ -16,32 +16,31 @@ import org.simgrid.msg.Task;
 import master_slave_kill.FinalizeTask;
 
 public class Master extends Process {
 import master_slave_kill.FinalizeTask;
 
 public class Master extends Process {
-       public Master(String hostname, String name) throws HostNotFoundException {
-               super(hostname, name);
-       }
-       public void main(String[] args) throws MsgException {
-               Msg.info("Master Hello!");
-               Process process2 = null;
-               //Create a slave on host "alice"
-               try {
-                       Msg.info("Create process on host 'Boivin'");
-                   process2 = new Slave("Boivin","slave");
-                   process2.start();
-               } catch (MsgException e){
-                   System.out.println("Process2!");
-               }
+  public Master(String hostname, String name) throws HostNotFoundException {
+    super(hostname, name);
+  }
+  public void main(String[] args) throws MsgException {
+    Msg.info("Master Hello!");
+    Process process2 = null;
+    //Create a slave on host "alice"
+    try {
+      Msg.info("Create process on host 'Boivin'");
+      process2 = new Slave("Boivin","slave");
+      process2.start();
+    } catch (MsgException e){
+      System.out.println("Process2!");
+    }
 
 
-               //Wait for slave "alice"
-               while(true)
-               {
-                               Task task = Task.receive("mail1");
-                               if (task instanceof FinalizeTask) {
-                                       Msg.info("Received mail1!");
-                                       break;
-                               }
-               }
-               process2.kill();
+    //Wait for slave "alice"
+    while(true) {
+      Task task = Task.receive("mail1");
+      if (task instanceof FinalizeTask) {
+        Msg.info("Received mail1!");
+        break;
+      }
+    }
+    process2.kill();
 
 
-               Msg.info("Process2 is now killed, should exit now");
-       }
+    Msg.info("Process2 is now killed, should exit now");
+  }
 }
 }
index 7191929..7a4a680 100644 (file)
@@ -11,28 +11,24 @@ import org.simgrid.msg.MsgException;
 import org.simgrid.msg.NativeException;
 
 public class MsKill {
 import org.simgrid.msg.NativeException;
 
 public class MsKill {
+  /* This only contains the launcher. If you do nothing more than than you can run  java simgrid.msg.Msg
+   * which also contains such a launcher
+   */
 
 
-   /* This only contains the launcher. If you do nothing more than than you can run
-    *   java simgrid.msg.Msg
-    * which also contains such a launcher
-    */
-
-    public static void main(String[] args) throws NativeException {
-
+  public static void main(String[] args) throws NativeException {
     /* initialize the MSG simulation. Must be done before anything else (even logging). */
     Msg.init(args);
     Msg.createEnvironment(args[0]);
 
     /* bypass deploymemt */
     try {
     /* initialize the MSG simulation. Must be done before anything else (even logging). */
     Msg.init(args);
     Msg.createEnvironment(args[0]);
 
     /* bypass deploymemt */
     try {
-           Master process1 = new Master("Jacquelin","master");
-           process1.start();
-    }
-    catch (MsgException e){
-       System.out.println("Create processes failed!");
+      Master process1 = new Master("Jacquelin","master");
+      process1.start();
+    } catch (MsgException e){
+      System.out.println("Create processes failed!");
     }
 
     }
 
-       /*  execute the simulation. */
+    /*  execute the simulation. */
     Msg.run();
     Msg.run();
-    }
+  }
 }
 }
index cd731e6..847b8fc 100644 (file)
@@ -18,22 +18,22 @@ import org.simgrid.msg.Process;
 import master_slave_kill.FinalizeTask;
 
 public class Slave extends Process {
 import master_slave_kill.FinalizeTask;
 
 public class Slave extends Process {
-       public Slave(String hostname, String name) throws HostNotFoundException {
-               super(hostname, name);
-       }
-       public void main(String[] args) throws TransferFailureException, HostFailureException, TimeoutException, NativeException {
-       Msg.info("Slave Hello!");
-       
-       FinalizeTask task = new FinalizeTask();
-       Msg.info("Send Mail1!");
-       task.send("mail1");
-       
-        try {
-                Task.receive("mail2");
-        } catch (MsgException e) {
-                Msg.debug("Received failed");
-                return;
-        }
-       Msg.info("Receive Mail2!");
+  public Slave(String hostname, String name) throws HostNotFoundException {
+    super(hostname, name);
+  }
+  public void main(String[] args) throws TransferFailureException, HostFailureException, TimeoutException, NativeException {
+    Msg.info("Slave Hello!");
+
+    FinalizeTask task = new FinalizeTask();
+    Msg.info("Send Mail1!");
+    task.send("mail1");
+
+    try {
+      Task.receive("mail2");
+    } catch (MsgException e) {
+      Msg.debug("Received failed");
+      return;
+    }
+    Msg.info("Receive Mail2!");
   }
 }
   }
 }
index 7d1751f..c79b99c 100644 (file)
@@ -1,37 +1,21 @@
 set(example java_masterslave)
 set(example java_masterslave)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Masterslave.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/Forwarder.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Masterslave.java  ${CMAKE_CURRENT_SOURCE_DIR}/Forwarder.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Master.java ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java  ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java) 
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/deploy.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslaveDeployment.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/README
-  PARENT_SCOPE)
+set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/masterslave.tesh           PARENT_SCOPE)
+set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deploy.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterslaveDeployment.xml  PARENT_SCOPE)
+set(examples_src ${examples_src}  ${sources}                                             PARENT_SCOPE)
+set(txt_files  ${txt_files}  ${CMAKE_CURRENT_SOURCE_DIR}/README                          PARENT_SCOPE)
index e250984..8c89aa6 100644 (file)
@@ -7,9 +7,9 @@
 package masterslave;
 import org.simgrid.msg.Task;
 
 package masterslave;
 import org.simgrid.msg.Task;
 
-public class FinalizeTask extends Task {       
+public class FinalizeTask extends Task {
    public FinalizeTask() {
       super("finalize",0,0);
    }
 }
    public FinalizeTask() {
       super("finalize",0,0);
    }
 }
-    
+
index f6b8f5b..3c4542c 100644 (file)
@@ -12,46 +12,43 @@ import org.simgrid.msg.MsgException;
 import org.simgrid.msg.Task;
 import org.simgrid.msg.Process;
 
 import org.simgrid.msg.Task;
 import org.simgrid.msg.Process;
 
-
 public class Forwarder extends Process {
 public class Forwarder extends Process {
-       public Forwarder(Host host, String name, String[]args) {
-               super(host,name,args);
-       }
-   public void main(String[] args) throws MsgException {
-      if (args.length < 3) {    
-        Msg.info("Forwarder needs 3 arguments (input mailbox, first output mailbox, last one)");
-        Msg.info("Got "+args.length+" instead");
-        System.exit(1);
-      }
-      int input = Integer.valueOf(args[0]).intValue();         
-      int firstOutput = Integer.valueOf(args[1]).intValue();           
-      int lastOutput = Integer.valueOf(args[2]).intValue();            
-      
-      int taskCount = 0;
-      int slavesCount = lastOutput - firstOutput + 1;
-      Msg.info("Receiving on 'slave_"+input+"'");
-      while(true) {
-        Task task = Task.receive("slave_"+input);      
-        
-        if (task instanceof FinalizeTask) {
-           Msg.info("Got a finalize task. Let's forward that we're done.");
-           
-           for (int cpt = firstOutput; cpt<=lastOutput; cpt++) {
-              Task tf = new FinalizeTask();
-              tf.send("slave_"+cpt);
-           }
-           break;
-        }
-        int dest = firstOutput + (taskCount % slavesCount);
-        
-        Msg.info("Sending \"" + task.getName() + "\" to \"slave_" + dest + "\"");
-        task.send("slave_"+dest);
-           
-        taskCount++;
+  public Forwarder(Host host, String name, String[]args) {
+    super(host,name,args);
+  }
+  public void main(String[] args) throws MsgException {
+    if (args.length < 3) {
+      Msg.info("Forwarder needs 3 arguments (input mailbox, first output mailbox, last one)");
+      Msg.info("Got "+args.length+" instead");
+      System.exit(1);
+    }
+    int input = Integer.valueOf(args[0]).intValue();    
+    int firstOutput = Integer.valueOf(args[1]).intValue();    
+    int lastOutput = Integer.valueOf(args[2]).intValue();    
+
+    int taskCount = 0;
+    int slavesCount = lastOutput - firstOutput + 1;
+    Msg.info("Receiving on 'slave_"+input+"'");
+    while(true) {
+      Task task = Task.receive("slave_"+input);  
+
+      if (task instanceof FinalizeTask) {
+        Msg.info("Got a finalize task. Let's forward that we're done.");
+
+      for (int cpt = firstOutput; cpt<=lastOutput; cpt++) {
+         Task tf = new FinalizeTask();
+         tf.send("slave_"+cpt);
       }
       }
-      
-        
-      Msg.info("I'm done. See you!");
-   }
-}
+      break;
+    }
+    int dest = firstOutput + (taskCount % slavesCount);
+
+    Msg.info("Sending \"" + task.getName() + "\" to \"slave_" + dest + "\"");
+    task.send("slave_"+dest);
 
 
+    taskCount++;
+    }
+
+    Msg.info("I'm done. See you!");
+  }
+}
index 8e9d9d1..b3ce6d1 100644 (file)
@@ -14,36 +14,36 @@ import org.simgrid.msg.Task;
 import org.simgrid.msg.Process;;
 
 public class Master extends Process {
 import org.simgrid.msg.Process;;
 
 public class Master extends Process {
-       public Master(Host host, String name, String[]args) {
-               super(host,name,args);
-       
-       public void main(String[] args) throws MsgException {
-               if (args.length < 4) {
-                       Msg.info("Master needs 4 arguments");
-                       System.exit(1);
-               }
-
-               int tasksCount = Integer.valueOf(args[0]).intValue();           
-               double taskComputeSize = Double.valueOf(args[1]).doubleValue();         
-               double taskCommunicateSize = Double.valueOf(args[2]).doubleValue();
-
-               int slavesCount = Integer.valueOf(args[3]).intValue();
-
-               Msg.info("Hello! Got "+  slavesCount + " slaves and "+tasksCount+" tasks to process");
-
-               for (int i = 0; i < tasksCount; i++) {
-                       Task task = new Task("Task_" + i, taskComputeSize, taskCommunicateSize); 
-                       //Msg.info("Sending \"" + task.getName()+ "\" to \"slave_" + i % slavesCount + "\"");
-                       task.send("slave_"+(i%slavesCount));
-               }
-
-               Msg.info("All tasks have been dispatched. Let's tell everybody the computation is over.");
-
-               for (int i = 0; i < slavesCount; i++) {
-                       FinalizeTask task = new FinalizeTask();
-                       task.send("slave_"+(i%slavesCount));
-               }
-
-               Msg.info("Goodbye now!");
-       }
+  public Master(Host host, String name, String[]args) {
+    super(host,name,args);
+  } 
+  public void main(String[] args) throws MsgException {
+    if (args.length < 4) {
+      Msg.info("Master needs 4 arguments");
+      System.exit(1);
+    }
+
+    int tasksCount = Integer.valueOf(args[0]).intValue();
+    double taskComputeSize = Double.valueOf(args[1]).doubleValue();
+    double taskCommunicateSize = Double.valueOf(args[2]).doubleValue();
+
+    int slavesCount = Integer.valueOf(args[3]).intValue();
+
+    Msg.info("Hello! Got "+  slavesCount + " slaves and "+tasksCount+" tasks to process");
+
+    for (int i = 0; i < tasksCount; i++) {
+      Task task = new Task("Task_" + i, taskComputeSize, taskCommunicateSize); 
+      //Msg.info("Sending \"" + task.getName()+ "\" to \"slave_" + i % slavesCount + "\"");
+      task.send("slave_"+(i%slavesCount));
+    }
+
+    Msg.info("All tasks have been dispatched. Let's tell everybody the computation is over.");
+
+    for (int i = 0; i < slavesCount; i++) {
+      FinalizeTask task = new FinalizeTask();
+      task.send("slave_"+(i%slavesCount));
+    }
+
+    Msg.info("Goodbye now!");
+  }
 }
 }
index f5518ab..236b97d 100644 (file)
@@ -12,26 +12,25 @@ import org.simgrid.msg.Msg;
 import org.simgrid.msg.NativeException;
 
 public class Masterslave {
 import org.simgrid.msg.NativeException;
 
 public class Masterslave {
-   public static final int TASK_COMP_SIZE = 10000000;
-   public static final int TASK_COMM_SIZE = 10000000;
-   /* This only contains the launcher. If you do nothing more than than you can run
-    *   java simgrid.msg.Msg
-    * which also contains such a launcher
-    */
-
-    public static void main(String[] args) throws NativeException {
-        /* initialize the MSG simulation. Must be done before anything else (even logging). */
-        Msg.init(args);
-
-        String platf  = args.length > 1 ? args[0] : "examples/java/platform.xml";
-        String deploy =  args.length > 1 ? args[1] : "examples/java/masterslave/masterslaveDeployment.xml";
-
-        Msg.verb("Platform: "+platf+"; Deployment:"+deploy+"; Current directory: "+new File(".").getAbsolutePath());
-
-        /* construct the platform and deploy the application */
-        Msg.createEnvironment(platf);
-        Msg.deployApplication(deploy);
-        /*  execute the simulation. */
-        Msg.run();
-    }
+  public static final int TASK_COMP_SIZE = 10000000;
+  public static final int TASK_COMM_SIZE = 10000000;
+  /* This only contains the launcher. If you do nothing more than than you can run java simgrid.msg.Msg
+   * which also contains such a launcher
+   */
+
+  public static void main(String[] args) throws NativeException {
+    /* initialize the MSG simulation. Must be done before anything else (even logging). */
+    Msg.init(args);
+
+    String platf  = args.length > 1 ? args[0] : "examples/java/platform.xml";
+    String deploy =  args.length > 1 ? args[1] : "examples/java/masterslave/masterslaveDeployment.xml";
+
+    Msg.verb("Platform: "+platf+"; Deployment:"+deploy+"; Current directory: "+new File(".").getAbsolutePath());
+
+    /* construct the platform and deploy the application */
+    Msg.createEnvironment(platf);
+    Msg.deployApplication(deploy);
+    /*  execute the simulation. */
+    Msg.run();
+  }
 }
 }
index 2820c92..c2ffe37 100644 (file)
@@ -16,33 +16,30 @@ import org.simgrid.msg.TransferFailureException;
 import org.simgrid.msg.Process;
 
 public class Slave extends Process {
 import org.simgrid.msg.Process;
 
 public class Slave extends Process {
-       public Slave(Host host, String name, String[]args) {
-               super(host,name,args);
-       }
-       public void main(String[] args) throws TransferFailureException, HostFailureException, TimeoutException {
-               if (args.length < 1) {
-                       Msg.info("Slave needs 1 argument (its number)");
-                       System.exit(1);
-               }
-
-               int num = Integer.valueOf(args[0]).intValue();
-               //Msg.info("Receiving on 'slave_"+num+"'");
-
-               while(true) {  
-                       Task task = Task.receive("slave_"+num); 
-
-                       if (task instanceof FinalizeTask) {
-                               break;
-                       }
-                       Msg.info("Received \"" + task.getName() +  "\". Processing it.");
-                       try {
-                               task.execute();
-                       } catch (TaskCancelledException e) {
-
-                       }
-               //      Msg.info("\"" + task.getName() + "\" done ");
-               }
-
-               Msg.info("Received Finalize. I'm done. See you!");
-       }
+  public Slave(Host host, String name, String[]args) {
+    super(host,name,args);
+  }
+  public void main(String[] args) throws TransferFailureException, HostFailureException, TimeoutException {
+    if (args.length < 1) {
+      Msg.info("Slave needs 1 argument (its number)");
+      System.exit(1);
+    }
+
+    int num = Integer.valueOf(args[0]).intValue();
+    //Msg.info("Receiving on 'slave_"+num+"'");
+
+    while(true) {  
+      Task task = Task.receive("slave_"+num);  
+
+      if (task instanceof FinalizeTask) {
+        break;
+      }
+      Msg.info("Received \"" + task.getName() +  "\". Processing it.");
+      try {
+        task.execute();
+      } catch (TaskCancelledException e) {}
+    }
+
+    Msg.info("Received Finalize. I'm done. See you!");
+  }
 }
 }
index 1e0810d..b7b100f 100644 (file)
@@ -1,30 +1,18 @@
 set(example java_migration)
 set(example java_migration)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Migration.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/Emigrant.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Policeman.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Migration.java ${CMAKE_CURRENT_SOURCE_DIR}/Emigrant.java ${CMAKE_CURRENT_SOURCE_DIR}/Policeman.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/migration.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/migrationDeployment.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/migration.tesh           PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/migrationDeployment.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                           PARENT_SCOPE)
index f15a42c..f664af1 100644 (file)
@@ -1,33 +1,20 @@
 set(example java_mutualExclusion)
 set(example java_mutualExclusion)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Coordinator.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/GrantTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/MutexCentral.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/Node.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/RequestTask.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Coordinator.java   ${CMAKE_CURRENT_SOURCE_DIR}/GrantTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/MutexCentral.java  ${CMAKE_CURRENT_SOURCE_DIR}/Node.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseTask.java   ${CMAKE_CURRENT_SOURCE_DIR}/RequestTask.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/mutualexclusion.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/mutex_centralized_deployment.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/mutualexclusion.tesh              PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/mutex_centralized_deployment.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                                    PARENT_SCOPE)
index dadb6c2..1943dfa 100644 (file)
@@ -1,31 +1,19 @@
 set(example java_pingPong)
 set(example java_pingPong)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/PingPongTest.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/PingPongTask.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Receiver.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/Sender.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/PingPongTest.java ${CMAKE_CURRENT_SOURCE_DIR}/PingPongTask.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Receiver.java     ${CMAKE_CURRENT_SOURCE_DIR}/Sender.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/pingpong.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/pingPongDeployment.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/pingpong.tesh           PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/pingPongDeployment.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                          PARENT_SCOPE)
index 8c9a66f..0141aff 100644 (file)
@@ -1,29 +1,18 @@
 set(example java_priority)
 set(example java_priority)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Priority.java 
-            ${CMAKE_CURRENT_SOURCE_DIR}/Test.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Priority.java ${CMAKE_CURRENT_SOURCE_DIR}/Test.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/priority.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/priorityDeployment.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/priority.tesh           PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/priorityDeployment.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                          PARENT_SCOPE)
index 8086745..71300cc 100644 (file)
@@ -1,30 +1,18 @@
 set(example java_startKillTime)
 set(example java_startKillTime)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Master.java 
-            ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java 
-           ${CMAKE_CURRENT_SOURCE_DIR}/StartKillTime.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Master.java ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java ${CMAKE_CURRENT_SOURCE_DIR}/StartKillTime.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/startKillTime.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_start_kill.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/startKillTime.tesh         PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment_start_kill.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                             PARENT_SCOPE)
index 593e39a..b162c5f 100644 (file)
@@ -12,7 +12,6 @@ import org.simgrid.msg.Process;
 import org.simgrid.msg.TimeoutException;
 import org.simgrid.msg.TransferFailureException;
 
 import org.simgrid.msg.TimeoutException;
 import org.simgrid.msg.TransferFailureException;
 
-
 public class Master extends Process {
   public Master(Host host, String name, String[]args) {
     super(host,name,args);
 public class Master extends Process {
   public Master(Host host, String name, String[]args) {
     super(host,name,args);
index b7240b3..abd28e1 100644 (file)
@@ -9,7 +9,7 @@ import org.simgrid.msg.Msg;
 import org.simgrid.msg.NativeException;
 
 public class StartKillTime {
 import org.simgrid.msg.NativeException;
 
 public class StartKillTime {
-  public static void main(String[] args) throws NativeException {      
+  public static void main(String[] args) throws NativeException {
     Msg.init(args);
     if(args.length < 2) {
       Msg.info("Usage   : StartKilltime platform_file deployment_file");
     Msg.init(args);
     if(args.length < 2) {
       Msg.info("Usage   : StartKilltime platform_file deployment_file");
index 5254666..086fcd4 100644 (file)
@@ -1,30 +1,17 @@
 set(example java_suspend)
 set(example java_suspend)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Suspend.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/DreamMaster.java
-           ${CMAKE_CURRENT_SOURCE_DIR}/LazyGuy.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Suspend.java ${CMAKE_CURRENT_SOURCE_DIR}/DreamMaster.java ${CMAKE_CURRENT_SOURCE_DIR}/LazyGuy.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/suspend.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/suspendDeployment.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/suspend.tesh           PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                         PARENT_SCOPE)
index 6469b5a..650a364 100644 (file)
@@ -5,14 +5,15 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 package suspend;
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 package suspend;
-import org.simgrid.msg.Host;
+import org.simgrid.msg .Host;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.Process;
 import org.simgrid.msg.MsgException;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.Process;
 import org.simgrid.msg.MsgException;
+import org.simgrid.msg.HostNotFoundException;
 
 public class DreamMaster extends Process {
 
 public class DreamMaster extends Process {
-  public DreamMaster(Host host, String name, String[]args) {
-    super(host,name,args);
+  public DreamMaster(String hostname, String name)  throws HostNotFoundException{
+    super(hostname,name);
   }
 
   public void main(String[] args) throws MsgException {
   }
 
   public void main(String[] args) throws MsgException {
index f6c19e0..c56e739 100644 (file)
@@ -6,18 +6,24 @@
 
 package suspend;
 import org.simgrid.msg.Msg;
 
 package suspend;
 import org.simgrid.msg.Msg;
+import org.simgrid.msg.MsgException;
 
 public class Suspend {
   public static void main(String[] args) {
     Msg.init(args);
 
 public class Suspend {
   public static void main(String[] args) {
     Msg.init(args);
-    if(args.length < 2) {
-      Msg.info("Usage   : Suspend platform_file deployment_file");
-      Msg.info("example : Suspend ../platforms/platform.xml suspendDeployment.xml");
+    if(args.length < 1) {
+      Msg.info("Usage   : Suspend platform_file");
+      Msg.info("example : Suspend ../platforms/platform.xml");
       System.exit(1);
     }
     /* construct the platform and deploy the application */
     Msg.createEnvironment(args[0]);
       System.exit(1);
     }
     /* construct the platform and deploy the application */
     Msg.createEnvironment(args[0]);
-    Msg.deployApplication(args[1]);
+    try {
+        DreamMaster process1 = new DreamMaster("Jacquelin","DreamMaster");
+        process1.start();
+      } catch (MsgException e){
+        System.out.println("Create processes failed!");
+      }
 
     /*  execute the simulation. */
     Msg.run();
 
     /*  execute the simulation. */
     Msg.run();
index 7803c78..b78bd64 100644 (file)
@@ -1,13 +1,13 @@
 #! tesh
 
 ! output sort 19
 #! tesh
 
 ! output sort 19
-$ java -classpath ${classpath:=.} suspend/Suspend ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/suspend/suspendDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ java -classpath ${classpath:=.} suspend/Suspend ${srcdir:=.}/../platforms/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (0:maestro@) Using regular java threads.
-> [  0.000000] (1:suspend.DreamMaster@Jacquelin) Let's create a lazy guy.
-> [  0.000000] (1:suspend.DreamMaster@Jacquelin) Let's wait a little bit...
+> [  0.000000] (1:DreamMaster@Jacquelin) Let's create a lazy guy.
+> [  0.000000] (1:DreamMaster@Jacquelin) Let's wait a little bit...
 > [  0.000000] (2:Lazy@Jacquelin) Nobody's watching me ? Let's go to sleep.
 > [ 10.000000] (0:maestro@) MSG_main finished; Cleaning up the simulation...
 > [  0.000000] (2:Lazy@Jacquelin) Nobody's watching me ? Let's go to sleep.
 > [ 10.000000] (0:maestro@) MSG_main finished; Cleaning up the simulation...
-> [ 10.000000] (1:suspend.DreamMaster@Jacquelin) Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!
-> [ 10.000000] (1:suspend.DreamMaster@Jacquelin) OK, goodbye now.
+> [ 10.000000] (1:DreamMaster@Jacquelin) Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!
+> [ 10.000000] (1:DreamMaster@Jacquelin) OK, goodbye now.
 > [ 10.000000] (2:Lazy@Jacquelin) Uuuh ? Did somebody call me ?
 > [ 10.000000] (2:Lazy@Jacquelin) Mmmh, goodbye now.
 > [ 10.000000] (2:Lazy@Jacquelin) Uuuh ? Did somebody call me ?
 > [ 10.000000] (2:Lazy@Jacquelin) Mmmh, goodbye now.
diff --git a/examples/java/suspend/suspendDeployment.xml b/examples/java/suspend/suspendDeployment.xml
deleted file mode 100644 (file)
index 448cec5..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Jacquelin" function="suspend.DreamMaster"/>
-</platform>
index aa5e59f..8a18864 100644 (file)
@@ -1,31 +1,19 @@
 set(example java_tracing)
 set(example java_tracing)
-set(sources ${CMAKE_CURRENT_SOURCE_DIR}/PingPongTask.java
-            ${CMAKE_CURRENT_SOURCE_DIR}/Receiver.java 
-            ${CMAKE_CURRENT_SOURCE_DIR}/Sender.java 
-           ${CMAKE_CURRENT_SOURCE_DIR}/TracingTest.java)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/PingPongTask.java ${CMAKE_CURRENT_SOURCE_DIR}/Receiver.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Sender.java       ${CMAKE_CURRENT_SOURCE_DIR}/TracingTest.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                            -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
     )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
     )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/tracingPingPong.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/tracingPingPongDeployment.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/tracingPingPong.tesh           PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/tracingPingPongDeployment.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                                 PARENT_SCOPE)
index d3d0a1a..725d9cf 100644 (file)
@@ -18,7 +18,7 @@ public class Receiver extends Process {
 
   public Receiver(Host host, String name, String[]args) {
     super(host,name,args);
 
   public Receiver(Host host, String name, String[]args) {
     super(host,name,args);
-  } 
+  }
 
   public void main(String[] args) throws MsgException {
     Msg.info("hello!");
 
   public void main(String[] args) throws MsgException {
     Msg.info("hello!");