From 03b24e261031cc8cfc835e0bb9f7c388f143da3e Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Sat, 5 Mar 2016 23:33:06 +0100 Subject: [PATCH] shrinking cmake in java examples and remove a useless deployment file --- examples/java/async/CMakeLists.txt | 31 ++------ examples/java/bittorrent/CMakeLists.txt | 34 +++----- examples/java/chord/CMakeLists.txt | 32 +++----- examples/java/cloud/CMakeLists.txt | 22 ++---- examples/java/cloud/energy/CMakeLists.txt | 19 +---- examples/java/cloud/energy/Main.java | 2 +- examples/java/cloud/migration/CMakeLists.txt | 31 ++------ examples/java/commTime/CMakeLists.txt | 24 ++---- examples/java/energy/CMakeLists.txt | 19 +---- examples/java/io/CMakeLists.txt | 22 ++---- examples/java/io/Storage.java | 2 +- examples/java/kademlia/CMakeLists.txt | 36 +++------ .../java/master_slave_bypass/CMakeLists.txt | 28 ++----- .../java/master_slave_kill/CMakeLists.txt | 29 ++----- .../java/master_slave_kill/FinalizeTask.java | 3 +- examples/java/master_slave_kill/Master.java | 51 ++++++------ examples/java/master_slave_kill/MsKill.java | 24 +++--- examples/java/master_slave_kill/Slave.java | 34 ++++---- examples/java/masterslave/CMakeLists.txt | 32 ++------ examples/java/masterslave/FinalizeTask.java | 4 +- examples/java/masterslave/Forwarder.java | 77 +++++++++---------- examples/java/masterslave/Master.java | 64 +++++++-------- examples/java/masterslave/Masterslave.java | 43 +++++------ examples/java/masterslave/Slave.java | 55 +++++++------ examples/java/migration/CMakeLists.txt | 22 ++---- examples/java/mutualExclusion/CMakeLists.txt | 27 ++----- examples/java/pingPong/CMakeLists.txt | 24 ++---- examples/java/priority/CMakeLists.txt | 21 ++--- examples/java/startKillTime/CMakeLists.txt | 22 ++---- examples/java/startKillTime/Master.java | 1 - .../java/startKillTime/StartKillTime.java | 2 +- examples/java/suspend/CMakeLists.txt | 21 +---- examples/java/suspend/DreamMaster.java | 7 +- examples/java/suspend/Suspend.java | 14 +++- examples/java/suspend/suspend.tesh | 10 +-- examples/java/suspend/suspendDeployment.xml | 5 -- examples/java/tracing/CMakeLists.txt | 24 ++---- examples/java/tracing/Receiver.java | 2 +- 38 files changed, 319 insertions(+), 601 deletions(-) delete mode 100644 examples/java/suspend/suspendDeployment.xml diff --git a/examples/java/async/CMakeLists.txt b/examples/java/async/CMakeLists.txt index 1d03cef1f6..aca0ef1b5f 100644 --- a/examples/java/async/CMakeLists.txt +++ b/examples/java/async/CMakeLists.txt @@ -1,36 +1,21 @@ 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} - 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() -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) diff --git a/examples/java/bittorrent/CMakeLists.txt b/examples/java/bittorrent/CMakeLists.txt index 47c6b1cd79..96906daa34 100644 --- a/examples/java/bittorrent/CMakeLists.txt +++ b/examples/java/bittorrent/CMakeLists.txt @@ -1,38 +1,22 @@ 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} - 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() -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) diff --git a/examples/java/chord/CMakeLists.txt b/examples/java/chord/CMakeLists.txt index 702b21425e..076b4b1b79 100644 --- a/examples/java/chord/CMakeLists.txt +++ b/examples/java/chord/CMakeLists.txt @@ -1,36 +1,22 @@ 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} - 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() -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) diff --git a/examples/java/cloud/CMakeLists.txt b/examples/java/cloud/CMakeLists.txt index 00f8996456..4fd806d43d 100644 --- a/examples/java/cloud/CMakeLists.txt +++ b/examples/java/cloud/CMakeLists.txt @@ -1,30 +1,18 @@ 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} - 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() -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) diff --git a/examples/java/cloud/energy/CMakeLists.txt b/examples/java/cloud/energy/CMakeLists.txt index 77d4d4acf6..c13e68fe2b 100644 --- a/examples/java/cloud/energy/CMakeLists.txt +++ b/examples/java/cloud/energy/CMakeLists.txt @@ -1,28 +1,17 @@ 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} - 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() -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) diff --git a/examples/java/cloud/energy/Main.java b/examples/java/cloud/energy/Main.java index 1913e4d9f4..d450b20dad 100644 --- a/examples/java/cloud/energy/Main.java +++ b/examples/java/cloud/energy/Main.java @@ -23,7 +23,7 @@ public class Main { /* 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(); diff --git a/examples/java/cloud/migration/CMakeLists.txt b/examples/java/cloud/migration/CMakeLists.txt index b826d27fd5..04799a6ecd 100644 --- a/examples/java/cloud/migration/CMakeLists.txt +++ b/examples/java/cloud/migration/CMakeLists.txt @@ -1,36 +1,21 @@ 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} - 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() -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) diff --git a/examples/java/commTime/CMakeLists.txt b/examples/java/commTime/CMakeLists.txt index 2281db9b4c..ba6db1fba3 100644 --- a/examples/java/commTime/CMakeLists.txt +++ b/examples/java/commTime/CMakeLists.txt @@ -1,31 +1,19 @@ 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} - 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() -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) diff --git a/examples/java/energy/CMakeLists.txt b/examples/java/energy/CMakeLists.txt index 44612e57b8..f24d28aff7 100644 --- a/examples/java/energy/CMakeLists.txt +++ b/examples/java/energy/CMakeLists.txt @@ -1,28 +1,17 @@ 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} - 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() -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) diff --git a/examples/java/io/CMakeLists.txt b/examples/java/io/CMakeLists.txt index 12b1e2ef04..606bd316c7 100644 --- a/examples/java/io/CMakeLists.txt +++ b/examples/java/io/CMakeLists.txt @@ -1,30 +1,18 @@ 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} - 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() -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) diff --git a/examples/java/io/Storage.java b/examples/java/io/Storage.java index ae2488d8cf..6b789b7695 100644 --- a/examples/java/io/Storage.java +++ b/examples/java/io/Storage.java @@ -10,7 +10,7 @@ import org.simgrid.msg.Host; 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 "); diff --git a/examples/java/kademlia/CMakeLists.txt b/examples/java/kademlia/CMakeLists.txt index f153b38654..ec0270fad2 100644 --- a/examples/java/kademlia/CMakeLists.txt +++ b/examples/java/kademlia/CMakeLists.txt @@ -1,39 +1,23 @@ 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} - 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() -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) diff --git a/examples/java/master_slave_bypass/CMakeLists.txt b/examples/java/master_slave_bypass/CMakeLists.txt index 715fffa755..7b30e8eeaa 100644 --- a/examples/java/master_slave_bypass/CMakeLists.txt +++ b/examples/java/master_slave_bypass/CMakeLists.txt @@ -1,36 +1,18 @@ 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} - 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() -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) diff --git a/examples/java/master_slave_kill/CMakeLists.txt b/examples/java/master_slave_kill/CMakeLists.txt index 9f90f54fa7..de8f0d40f4 100644 --- a/examples/java/master_slave_kill/CMakeLists.txt +++ b/examples/java/master_slave_kill/CMakeLists.txt @@ -1,36 +1,19 @@ 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} - 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() -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) diff --git a/examples/java/master_slave_kill/FinalizeTask.java b/examples/java/master_slave_kill/FinalizeTask.java index ec1a0e2872..0af5a8686c 100644 --- a/examples/java/master_slave_kill/FinalizeTask.java +++ b/examples/java/master_slave_kill/FinalizeTask.java @@ -7,9 +7,8 @@ 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); } } - \ No newline at end of file diff --git a/examples/java/master_slave_kill/Master.java b/examples/java/master_slave_kill/Master.java index ab2044f500..8cb481e0b5 100644 --- a/examples/java/master_slave_kill/Master.java +++ b/examples/java/master_slave_kill/Master.java @@ -16,32 +16,31 @@ import org.simgrid.msg.Task; 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"); + } } diff --git a/examples/java/master_slave_kill/MsKill.java b/examples/java/master_slave_kill/MsKill.java index 7191929858..7a4a680914 100644 --- a/examples/java/master_slave_kill/MsKill.java +++ b/examples/java/master_slave_kill/MsKill.java @@ -11,28 +11,24 @@ import org.simgrid.msg.MsgException; 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 { - 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(); - } + } } diff --git a/examples/java/master_slave_kill/Slave.java b/examples/java/master_slave_kill/Slave.java index cd731e6cf6..847b8fca21 100644 --- a/examples/java/master_slave_kill/Slave.java +++ b/examples/java/master_slave_kill/Slave.java @@ -18,22 +18,22 @@ import org.simgrid.msg.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!"); } } diff --git a/examples/java/masterslave/CMakeLists.txt b/examples/java/masterslave/CMakeLists.txt index 7d1751fb97..c79b99c061 100644 --- a/examples/java/masterslave/CMakeLists.txt +++ b/examples/java/masterslave/CMakeLists.txt @@ -1,37 +1,21 @@ 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} - 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() -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) diff --git a/examples/java/masterslave/FinalizeTask.java b/examples/java/masterslave/FinalizeTask.java index e250984baf..8c89aa60a3 100644 --- a/examples/java/masterslave/FinalizeTask.java +++ b/examples/java/masterslave/FinalizeTask.java @@ -7,9 +7,9 @@ package masterslave; import org.simgrid.msg.Task; -public class FinalizeTask extends Task { +public class FinalizeTask extends Task { public FinalizeTask() { super("finalize",0,0); } } - + diff --git a/examples/java/masterslave/Forwarder.java b/examples/java/masterslave/Forwarder.java index f6b8f5b1e2..3c4542cf19 100644 --- a/examples/java/masterslave/Forwarder.java +++ b/examples/java/masterslave/Forwarder.java @@ -12,46 +12,43 @@ import org.simgrid.msg.MsgException; import org.simgrid.msg.Task; import org.simgrid.msg.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!"); + } +} diff --git a/examples/java/masterslave/Master.java b/examples/java/masterslave/Master.java index 8e9d9d1e5d..b3ce6d1932 100644 --- a/examples/java/masterslave/Master.java +++ b/examples/java/masterslave/Master.java @@ -14,36 +14,36 @@ import org.simgrid.msg.Task; 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!"); + } } diff --git a/examples/java/masterslave/Masterslave.java b/examples/java/masterslave/Masterslave.java index f5518ab9ea..236b97d87a 100644 --- a/examples/java/masterslave/Masterslave.java +++ b/examples/java/masterslave/Masterslave.java @@ -12,26 +12,25 @@ import org.simgrid.msg.Msg; 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(); + } } diff --git a/examples/java/masterslave/Slave.java b/examples/java/masterslave/Slave.java index 2820c92954..c2ffe370c8 100644 --- a/examples/java/masterslave/Slave.java +++ b/examples/java/masterslave/Slave.java @@ -16,33 +16,30 @@ import org.simgrid.msg.TransferFailureException; 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!"); + } } diff --git a/examples/java/migration/CMakeLists.txt b/examples/java/migration/CMakeLists.txt index 1e0810d0ed..b7b100f466 100644 --- a/examples/java/migration/CMakeLists.txt +++ b/examples/java/migration/CMakeLists.txt @@ -1,30 +1,18 @@ 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} - 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() -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) diff --git a/examples/java/mutualExclusion/CMakeLists.txt b/examples/java/mutualExclusion/CMakeLists.txt index f15a42c985..f664af12b7 100644 --- a/examples/java/mutualExclusion/CMakeLists.txt +++ b/examples/java/mutualExclusion/CMakeLists.txt @@ -1,33 +1,20 @@ 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} - 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() -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) diff --git a/examples/java/pingPong/CMakeLists.txt b/examples/java/pingPong/CMakeLists.txt index dadb6c2f83..1943dfa2da 100644 --- a/examples/java/pingPong/CMakeLists.txt +++ b/examples/java/pingPong/CMakeLists.txt @@ -1,31 +1,19 @@ 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} - 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() -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) diff --git a/examples/java/priority/CMakeLists.txt b/examples/java/priority/CMakeLists.txt index 8c9a66fc01..0141affe23 100644 --- a/examples/java/priority/CMakeLists.txt +++ b/examples/java/priority/CMakeLists.txt @@ -1,29 +1,18 @@ 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} - 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() -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) diff --git a/examples/java/startKillTime/CMakeLists.txt b/examples/java/startKillTime/CMakeLists.txt index 808674570b..71300cc73c 100644 --- a/examples/java/startKillTime/CMakeLists.txt +++ b/examples/java/startKillTime/CMakeLists.txt @@ -1,30 +1,18 @@ 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} - 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() -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) diff --git a/examples/java/startKillTime/Master.java b/examples/java/startKillTime/Master.java index 593e39a12e..b162c5f168 100644 --- a/examples/java/startKillTime/Master.java +++ b/examples/java/startKillTime/Master.java @@ -12,7 +12,6 @@ import org.simgrid.msg.Process; 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); diff --git a/examples/java/startKillTime/StartKillTime.java b/examples/java/startKillTime/StartKillTime.java index b7240b36f4..abd28e1164 100644 --- a/examples/java/startKillTime/StartKillTime.java +++ b/examples/java/startKillTime/StartKillTime.java @@ -9,7 +9,7 @@ import org.simgrid.msg.Msg; 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"); diff --git a/examples/java/suspend/CMakeLists.txt b/examples/java/suspend/CMakeLists.txt index 5254666125..086fcd4559 100644 --- a/examples/java/suspend/CMakeLists.txt +++ b/examples/java/suspend/CMakeLists.txt @@ -1,30 +1,17 @@ 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} - 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() -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) diff --git a/examples/java/suspend/DreamMaster.java b/examples/java/suspend/DreamMaster.java index 6469b5a0f9..650a364730 100644 --- a/examples/java/suspend/DreamMaster.java +++ b/examples/java/suspend/DreamMaster.java @@ -5,14 +5,15 @@ * 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.HostNotFoundException; 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 { diff --git a/examples/java/suspend/Suspend.java b/examples/java/suspend/Suspend.java index f6c19e04ba..c56e739bfa 100644 --- a/examples/java/suspend/Suspend.java +++ b/examples/java/suspend/Suspend.java @@ -6,18 +6,24 @@ package suspend; import org.simgrid.msg.Msg; +import org.simgrid.msg.MsgException; 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]); - 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(); diff --git a/examples/java/suspend/suspend.tesh b/examples/java/suspend/suspend.tesh index 7803c786f3..b78bd64489 100644 --- a/examples/java/suspend/suspend.tesh +++ b/examples/java/suspend/suspend.tesh @@ -1,13 +1,13 @@ #! 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] (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... -> [ 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. diff --git a/examples/java/suspend/suspendDeployment.xml b/examples/java/suspend/suspendDeployment.xml deleted file mode 100644 index 448cec594a..0000000000 --- a/examples/java/suspend/suspendDeployment.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/examples/java/tracing/CMakeLists.txt b/examples/java/tracing/CMakeLists.txt index aa5e59f828..8a18864c51 100644 --- a/examples/java/tracing/CMakeLists.txt +++ b/examples/java/tracing/CMakeLists.txt @@ -1,31 +1,19 @@ 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} - 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() -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) diff --git a/examples/java/tracing/Receiver.java b/examples/java/tracing/Receiver.java index d3d0a1a466..725d9cfa14 100644 --- a/examples/java/tracing/Receiver.java +++ b/examples/java/tracing/Receiver.java @@ -18,7 +18,7 @@ public class Receiver extends Process { public Receiver(Host host, String name, String[]args) { super(host,name,args); - } + } public void main(String[] args) throws MsgException { Msg.info("hello!"); -- 2.20.1