From d33aed39822fd01eb92af242ea062507d440479c Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 30 Mar 2016 12:20:00 +0200 Subject: [PATCH] redesign this test to match the C version move it into the process package --- .gitignore | 2 +- examples/java/CMakeLists.txt | 10 +++++--- .../startkilltime/Main.java} | 4 +-- .../startkilltime/Sleeper.java} | 13 +++++----- .../startkilltime/process_startkilltime.tesh | 12 +++++++++ .../process/startkilltime/startkilltime.xml | 10 ++++++++ examples/java/startKillTime/CMakeLists.txt | 19 -------------- examples/java/startKillTime/Master.java | 25 ------------------- .../startKillTime/deployment_start_kill.xml | 10 -------- .../java/startKillTime/startKillTime.tesh | 11 -------- tools/cmake/DefinePackages.cmake | 1 - 11 files changed, 38 insertions(+), 79 deletions(-) rename examples/java/{startKillTime/StartKillTime.java => process/startkilltime/Main.java} (94%) rename examples/java/{startKillTime/Slave.java => process/startkilltime/Sleeper.java} (70%) create mode 100644 examples/java/process/startkilltime/process_startkilltime.tesh create mode 100644 examples/java/process/startkilltime/startkilltime.xml delete mode 100644 examples/java/startKillTime/CMakeLists.txt delete mode 100644 examples/java/startKillTime/Master.java delete mode 100644 examples/java/startKillTime/deployment_start_kill.xml delete mode 100644 examples/java/startKillTime/startKillTime.tesh diff --git a/.gitignore b/.gitignore index 5e095ed5b5..e901bbe97c 100644 --- a/.gitignore +++ b/.gitignore @@ -987,7 +987,7 @@ examples/java/process/suspend/java_process_suspend_compiled examples/java/mutualExclusion/java_mutualExclusion_compiled examples/java/pingPong/java_pingPong_compiled examples/java/priority/java_priority_compiled -examples/java/startKillTime/java_startKillTime_compiled +examples/java/process/startkilltime/java_process_startkilltime_compiled examples/java/tracing/java_tracing_compiled /CMakeCache.txt examples/smpi/mc/smpi_bugged1 diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt index 6df55e9b06..31ebb6d79f 100644 --- a/examples/java/CMakeLists.txt +++ b/examples/java/CMakeLists.txt @@ -33,11 +33,14 @@ set(process_kill_sources ${srcdir}/Main.java ${srcdir}/Killer.java ${src set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/migration) set(process_migration_sources ${srcdir}/Main.java ${srcdir}/Emigrant.java ${srcdir}/Policeman.java) +set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/startkilltime) +set(process_startkilltime_sources ${srcdir}/Main.java ${srcdir}/Sleeper.java) + set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/suspend) set(process_suspend_sources ${srcdir}/Main.java ${srcdir}/DreamMaster.java ${srcdir}/LazyGuy.java) foreach (example app_bittorrent app_masterworker dht_chord dht_kademlia energy_consumption io_file io_storage - process_kill process_migration process_suspend) + process_kill process_migration process_startkilltime process_suspend) string (REPLACE "_" "/" example_dir ${example}) if(enable_java) add_custom_command( @@ -61,11 +64,12 @@ set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/app/masterworker/ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/app/bittorrent/bittorrent.xml ${CMAKE_CURRENT_SOURCE_DIR}/app/masterworker/masterworker.xml ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/chord.xml - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/kademlia.xml PARENT_SCOPE) + ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/kademlia.xml + ${CMAKE_CURRENT_SOURCE_DIR}/process/startkilltime/startkilltime.xml PARENT_SCOPE) if(enable_java) foreach (example app_bittorrent app_masterworker dht_chord dht_kademlia energy_consumption io_file io_storage - process_kill process_migration process_suspend) + process_kill process_migration process_startkilltime process_suspend) string (REPLACE "_" "/" example_dir ${example}) ADD_TESH(java-${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/${example_dir}/${example}.tesh) endforeach() diff --git a/examples/java/startKillTime/StartKillTime.java b/examples/java/process/startkilltime/Main.java similarity index 94% rename from examples/java/startKillTime/StartKillTime.java rename to examples/java/process/startkilltime/Main.java index abd28e1164..e24ecd1fb1 100644 --- a/examples/java/startKillTime/StartKillTime.java +++ b/examples/java/process/startkilltime/Main.java @@ -4,11 +4,11 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -package startKillTime; +package process.startkilltime; import org.simgrid.msg.Msg; import org.simgrid.msg.NativeException; -public class StartKillTime { +public class Main { public static void main(String[] args) throws NativeException { Msg.init(args); if(args.length < 2) { diff --git a/examples/java/startKillTime/Slave.java b/examples/java/process/startkilltime/Sleeper.java similarity index 70% rename from examples/java/startKillTime/Slave.java rename to examples/java/process/startkilltime/Sleeper.java index d8feef4806..fe1310e5f5 100644 --- a/examples/java/startKillTime/Slave.java +++ b/examples/java/process/startkilltime/Sleeper.java @@ -4,23 +4,22 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -package startKillTime; +package process.startkilltime; import org.simgrid.msg.Msg; import org.simgrid.msg.Host; import org.simgrid.msg.Process; import org.simgrid.msg.MsgException; -/* Lazy Guy Slave, suspends itself ASAP */ -public class Slave extends Process { - public Slave(Host host, String name, String[]args) { +public class Sleeper extends Process { + public Sleeper(Host host, String name, String[]args) { super(host,name,args); } public void main(String[] args) throws MsgException { - Msg.info("Hello!"); + Msg.info("Hello! I go to sleep."); try { - waitFor(10.0); - Msg.info("OK, goodbye now."); + waitFor(Integer.valueOf(args[0]).intValue()); + Msg.info("Done sleeping"); } catch (MsgException e) { Msg.debug("Wait cancelled."); } diff --git a/examples/java/process/startkilltime/process_startkilltime.tesh b/examples/java/process/startkilltime/process_startkilltime.tesh new file mode 100644 index 0000000000..fd2c1d52e3 --- /dev/null +++ b/examples/java/process/startkilltime/process_startkilltime.tesh @@ -0,0 +1,12 @@ +#! tesh +$ java -classpath ${classpath:=.} process/startkilltime/Main ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/process/startkilltime/startkilltime.xml +> [0.000000] [jmsg/INFO] Using regular java threads. +> [node-0.acme.org:process.startkilltime.Sleeper:(1) 0.000000] [jmsg/INFO] Hello! I go to sleep. +> [node-1.acme.org:process.startkilltime.Sleeper:(2) 1.000000] [jmsg/INFO] Hello! I go to sleep. +> [node-2.acme.org:process.startkilltime.Sleeper:(3) 2.000000] [jmsg/INFO] Hello! I go to sleep. +> [node-3.acme.org:process.startkilltime.Sleeper:(4) 3.000000] [jmsg/INFO] Hello! I go to sleep. +> [node-4.acme.org:process.startkilltime.Sleeper:(5) 4.000000] [jmsg/INFO] Hello! I go to sleep. +> [node-5.acme.org:process.startkilltime.Sleeper:(6) 5.000000] [jmsg/INFO] Hello! I go to sleep. +> [node-2.acme.org:process.startkilltime.Sleeper:(3) 6.000000] [jmsg/INFO] Done sleeping +> [node-3.acme.org:process.startkilltime.Sleeper:(4) 7.000000] [jmsg/INFO] Done sleeping +> [10.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... diff --git a/examples/java/process/startkilltime/startkilltime.xml b/examples/java/process/startkilltime/startkilltime.xml new file mode 100644 index 0000000000..dd3e3c73e6 --- /dev/null +++ b/examples/java/process/startkilltime/startkilltime.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/examples/java/startKillTime/CMakeLists.txt b/examples/java/startKillTime/CMakeLists.txt deleted file mode 100644 index 1191d0676f..0000000000 --- a/examples/java/startKillTime/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -set(example java_startKillTime) -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 ${CMAKE_COMMAND} -E remove ${example}_compiled - COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled - ) - add_custom_target(${example} ALL DEPENDS ${example}_compiled) - ADD_TESH(java-startKillTime --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/startKillTime/startKillTime.tesh) -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) diff --git a/examples/java/startKillTime/Master.java b/examples/java/startKillTime/Master.java deleted file mode 100644 index b162c5f168..0000000000 --- a/examples/java/startKillTime/Master.java +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (c) 2006-2014, 2016. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -package startKillTime; -import org.simgrid.msg.Host; -import org.simgrid.msg.HostFailureException; -import org.simgrid.msg.Msg; -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); - } - - public void main(String[] args) throws TransferFailureException, HostFailureException, TimeoutException { - Msg.info("Hello!"); - waitFor(10.0); - Msg.info("OK, goodbye now."); - } -} diff --git a/examples/java/startKillTime/deployment_start_kill.xml b/examples/java/startKillTime/deployment_start_kill.xml deleted file mode 100644 index d449286f08..0000000000 --- a/examples/java/startKillTime/deployment_start_kill.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/examples/java/startKillTime/startKillTime.tesh b/examples/java/startKillTime/startKillTime.tesh deleted file mode 100644 index eadb5f6d2d..0000000000 --- a/examples/java/startKillTime/startKillTime.tesh +++ /dev/null @@ -1,11 +0,0 @@ -#! tesh -$ java -classpath ${classpath:=.} startKillTime/StartKillTime ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/startKillTime/deployment_start_kill.xml -> [0.000000] [jmsg/INFO] Using regular java threads. -> [Jacquelin:startKillTime.Master:(1) 0.000000] [jmsg/INFO] Hello! -> [Boivin:startKillTime.Slave:(2) 1.000000] [jmsg/INFO] Hello! -> [Jean_Yves:startKillTime.Slave:(3) 2.000000] [jmsg/INFO] Hello! -> [TeX:startKillTime.Slave:(4) 3.000000] [jmsg/INFO] Hello! -> [Geoff:startKillTime.Slave:(5) 4.000000] [jmsg/INFO] Hello! -> [Disney:startKillTime.Slave:(6) 5.000000] [jmsg/INFO] Hello! -> [Jacquelin:startKillTime.Master:(1) 10.000000] [jmsg/INFO] OK, goodbye now. -> [10.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 904e0f835c..b11a9df611 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -931,7 +931,6 @@ set(CMAKEFILES_TXT examples/java/mutualExclusion/CMakeLists.txt examples/java/pingPong/CMakeLists.txt examples/java/priority/CMakeLists.txt - examples/java/startKillTime/CMakeLists.txt examples/java/tracing/CMakeLists.txt examples/msg/CMakeLists.txt examples/msg/cloud/CMakeLists.txt -- 2.20.1