From 3189d7d6aafade3860d50252491bb52adbb7b262 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 30 Mar 2016 09:40:30 +0200 Subject: [PATCH] make an io package improve readibility and compactness of cmake file --- .gitignore | 6 +- examples/java/CMakeLists.txt | 71 +++++++++---------- examples/java/io/CMakeLists.txt | 19 ----- examples/java/io/{IO.java => file/Main.java} | 6 +- examples/java/io/{ => file}/Node.java | 2 +- .../io/{storage.tesh => file/io_file.tesh} | 26 +------ examples/java/io/{ => storage}/Client.java | 2 +- .../io/{Storage.java => storage/Main.java} | 6 +- examples/java/io/storage/io_storage.tesh | 25 +++++++ tools/cmake/DefinePackages.cmake | 26 ++++--- 10 files changed, 82 insertions(+), 107 deletions(-) delete mode 100644 examples/java/io/CMakeLists.txt rename examples/java/io/{IO.java => file/Main.java} (90%) rename examples/java/io/{ => file}/Node.java (99%) rename examples/java/io/{storage.tesh => file/io_file.tesh} (52%) rename examples/java/io/{ => storage}/Client.java (99%) rename examples/java/io/{Storage.java => storage/Main.java} (89%) create mode 100644 examples/java/io/storage/io_storage.tesh diff --git a/.gitignore b/.gitignore index 0ea4058466..84ec677355 100644 --- a/.gitignore +++ b/.gitignore @@ -979,7 +979,8 @@ examples/java/cloud/energy/java_cloud_energy_compiled examples/java/cloud/migration/java_cloud_migration_compiled examples/java/commTime/java_commTime_compiled examples/java/energy/consumption/java_energy_consumption_compiled -examples/java/io/java_io_compiled +examples/java/io/file/java_io_file_compiled +examples/java/io/storage/java_io_storage_compiled examples/java/process/kill/java_process_kill_compiled examples/java/process/migration/java_process_migration_compiled examples/java/process/suspend/java_process_suspend_compiled @@ -989,9 +990,6 @@ examples/java/pingPong/java_pingPong_compiled examples/java/priority/java_priority_compiled examples/java/startKillTime/java_startKillTime_compiled examples/java/tracing/java_tracing_compiled -examples/java/reservationSurfPlugin/java_reservation_surf_plugin_compiled -examples/java/surfCpuModel/java_surf_cpu_model_compiled -examples/java/surfPlugin/java_surf_plugin_compiled /CMakeCache.txt examples/smpi/mc/smpi_bugged1 examples/smpi/mc/smpi_bugged1_liveness diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt index bb2eade108..d5669f6051 100644 --- a/examples/java/CMakeLists.txt +++ b/examples/java/CMakeLists.txt @@ -1,40 +1,37 @@ -set(dht_chord_sources ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/Main.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/ChordTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/Common.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/FindSuccessorAnswerTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/FindSuccessorTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/GetPredecessorAnswerTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/GetPredecessorTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/Node.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/NotifyTask.java) -set(dht_kademlia_sources ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/Main.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/Answer.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/Bucket.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/Common.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/Contact.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/FindNodeAnswerTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/FindNodeTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/KademliaTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/Node.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/PingAnswerTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/PingTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/RoutingTable.java) -set(energy_consumption_sources ${CMAKE_CURRENT_SOURCE_DIR}/energy/consumption/Main.java - ${CMAKE_CURRENT_SOURCE_DIR}/energy/consumption/EnergyConsumer.java) -set(process_kill_sources ${CMAKE_CURRENT_SOURCE_DIR}/process/kill/Main.java - ${CMAKE_CURRENT_SOURCE_DIR}/process/kill/Killer.java - ${CMAKE_CURRENT_SOURCE_DIR}/process/kill/Victim.java) -set(process_migration_sources ${CMAKE_CURRENT_SOURCE_DIR}/process/migration/Main.java - ${CMAKE_CURRENT_SOURCE_DIR}/process/migration/Emigrant.java - ${CMAKE_CURRENT_SOURCE_DIR}/process/migration/Policeman.java) -set(process_suspend_sources ${CMAKE_CURRENT_SOURCE_DIR}/process/suspend/Main.java - ${CMAKE_CURRENT_SOURCE_DIR}/process/suspend/DreamMaster.java - ${CMAKE_CURRENT_SOURCE_DIR}/process/suspend/LazyGuy.java) - -foreach (example dht_chord dht_kademlia energy_consumption process_kill process_migration process_suspend) +set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord) +set(dht_chord_sources ${srcdir}/Main.java ${srcdir}/ChordTask.java ${srcdir}/Common.java + ${srcdir}/FindSuccessorAnswerTask.java ${srcdir}/FindSuccessorTask.java + ${srcdir}/GetPredecessorAnswerTask.java ${srcdir}/GetPredecessorTask.java + ${srcdir}/Node.java ${srcdir}/NotifyTask.java) + +set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia) +set(dht_kademlia_sources ${srcdir}/Main.java ${srcdir}/Answer.java ${srcdir}/Bucket.java ${srcdir}/Common.java + ${srcdir}/Contact.java ${srcdir}/FindNodeAnswerTask.java ${srcdir}/FindNodeTask.java + ${srcdir}/KademliaTask.java ${srcdir}/Node.java ${srcdir}/PingAnswerTask.java + ${srcdir}/PingTask.java ${srcdir}/RoutingTable.java) + +set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/energy/consumption) +set(energy_consumption_sources ${srcdir}/Main.java ${srcdir}/EnergyConsumer.java) + +set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/io/file) +set(io_file_sources ${srcdir}/Main.java ${srcdir}/Node.java) + +set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/io/storage) +set(io_storage_sources ${srcdir}/Main.java ${srcdir}/Client.java) + +set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/kill) +set(process_kill_sources ${srcdir}/Main.java ${srcdir}/Killer.java ${srcdir}/Victim.java) + +set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/migration) +set(process_migration_sources ${srcdir}/Main.java ${srcdir}/Emigrant.java ${srcdir}/Policeman.java) + +set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/process/suspend) +set(process_suspend_sources ${srcdir}/Main.java ${srcdir}/DreamMaster.java ${srcdir}/LazyGuy.java) + +foreach (example dht_chord dht_kademlia energy_consumption io_file io_storage + process_kill process_migration process_suspend) string (REPLACE "_" "/" example_dir ${example}) if(enable_java) - add_custom_command( COMMENT "Building java_${example}..." OUTPUT ${example_dir}/java_${example}_compiled @@ -55,9 +52,9 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/dht/chord/chord.x ${CMAKE_CURRENT_SOURCE_DIR}/dht/kademlia/kademlia.xml PARENT_SCOPE) if(enable_java) - foreach (example dht_chord dht_kademlia energy_consumption process_kill process_migration process_suspend) + foreach (example dht_chord dht_kademlia energy_consumption io_file io_storage + process_kill process_migration 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() endif() - diff --git a/examples/java/io/CMakeLists.txt b/examples/java/io/CMakeLists.txt deleted file mode 100644 index b59c2bb602..0000000000 --- a/examples/java/io/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -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) - -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-storage --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/io/storage.tesh) -endif() - -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/IO.java b/examples/java/io/file/Main.java similarity index 90% rename from examples/java/io/IO.java rename to examples/java/io/file/Main.java index f9de388706..998f911dad 100644 --- a/examples/java/io/IO.java +++ b/examples/java/io/file/Main.java @@ -4,13 +4,13 @@ /* 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 io; +package io.file; import org.simgrid.msg.Msg; import org.simgrid.msg.Host; import org.simgrid.msg.MsgException; -public class IO { +public class Main { public static void main(String[] args) throws MsgException { Msg.init(args); if(args.length < 1) { @@ -25,7 +25,7 @@ public class IO { Msg.info("Number of hosts:" + hosts.length); for (int i = 0; i < hosts.length && i < 4; i++) { - new io.Node(hosts[i],i).start(); + new io.file.Node(hosts[i],i).start(); } Msg.run(); diff --git a/examples/java/io/Node.java b/examples/java/io/file/Node.java similarity index 99% rename from examples/java/io/Node.java rename to examples/java/io/file/Node.java index 42e84b89b2..89e992b234 100644 --- a/examples/java/io/Node.java +++ b/examples/java/io/file/Node.java @@ -4,7 +4,7 @@ /* 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 io; +package io.file; import org.simgrid.msg.Msg; import org.simgrid.msg.File; diff --git a/examples/java/io/storage.tesh b/examples/java/io/file/io_file.tesh similarity index 52% rename from examples/java/io/storage.tesh rename to examples/java/io/file/io_file.tesh index f8d9db4c97..7167d37dcf 100644 --- a/examples/java/io/storage.tesh +++ b/examples/java/io/file/io_file.tesh @@ -1,30 +1,6 @@ #! tesh -$ java -classpath ${classpath:=.} io/Storage ${srcdir:=.}/../platforms/storage/storage.xml -> [0.000000] [jmsg/INFO] Using regular java threads. -> [denise:0:(1) 0.000000] [jmsg/INFO] ------------------------------------ -> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk2 -> [denise:0:(1) 0.000000] [jmsg/INFO] Size: 536870912000 bytes. -> [denise:0:(1) 0.000000] [jmsg/INFO] Free Size: 534479374867 bytes. -> [denise:0:(1) 0.000000] [jmsg/INFO] Used Size: 2391537133 bytes. -> [denise:0:(1) 0.000000] [jmsg/INFO] ------------------------------------ -> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk4 -> [denise:0:(1) 0.000000] [jmsg/INFO] Size: 536870912000 bytes. -> [denise:0:(1) 0.000000] [jmsg/INFO] Free Size: 536857690006 bytes. -> [denise:0:(1) 0.000000] [jmsg/INFO] Used Size: 13221994 bytes. -> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk2 -> [denise:0:(1) 0.000000] [jmsg/INFO] Attached to host:alice -> [denise:0:(1) 0.000000] [jmsg/INFO] Property key: Pierre -> [denise:0:(1) 0.000000] [jmsg/INFO] Property key2: Pierre -> [denise:0:(1) 0.000000] [jmsg/INFO] Disk attached: Disk4 -> [denise:0:(1) 0.000000] [jmsg/INFO] **************** ALL ************************* -> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk1 -> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk2 -> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk3 -> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk4 -> [0.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... - -$ java -classpath ${classpath:=.} io/IO ${srcdir:=.}/../platforms/storage/storage.xml +$ java -classpath ${classpath:=.} io/file/Main ${srcdir:=.}/../platforms/storage/storage.xml > [0.000000] [jmsg/INFO] Using regular java threads. > [0.000000] [jmsg/INFO] Number of hosts:4 > [denise:0:(1) 0.000000] [jmsg/INFO] Open file /home/doc/simgrid/examples/platforms/g5k.xml diff --git a/examples/java/io/Client.java b/examples/java/io/storage/Client.java similarity index 99% rename from examples/java/io/Client.java rename to examples/java/io/storage/Client.java index fdddde7320..509c32392b 100644 --- a/examples/java/io/Client.java +++ b/examples/java/io/storage/Client.java @@ -18,7 +18,7 @@ * ******************************************************************************/ -package io; +package io.storage; import org.simgrid.msg.Msg; import org.simgrid.msg.Host; diff --git a/examples/java/io/Storage.java b/examples/java/io/storage/Main.java similarity index 89% rename from examples/java/io/Storage.java rename to examples/java/io/storage/Main.java index 6b789b7695..9b77b8ddfe 100644 --- a/examples/java/io/Storage.java +++ b/examples/java/io/storage/Main.java @@ -4,12 +4,12 @@ /* 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 io; +package io.storage; import org.simgrid.msg.Msg; import org.simgrid.msg.Host; import org.simgrid.msg.MsgException; -public class Storage { +public class Main { public static void main(String[] args) throws MsgException { Msg.init(args); if(args.length < 1) { @@ -21,7 +21,7 @@ public class Storage { Msg.createEnvironment(args[0]); Host[] hosts = Host.all(); - new io.Client(hosts[0],0).start(); + new io.storage.Client(hosts[0],0).start(); Msg.run(); } diff --git a/examples/java/io/storage/io_storage.tesh b/examples/java/io/storage/io_storage.tesh new file mode 100644 index 0000000000..34d460462b --- /dev/null +++ b/examples/java/io/storage/io_storage.tesh @@ -0,0 +1,25 @@ +#! tesh + +$ java -classpath ${classpath:=.} io/storage/Main ${srcdir:=.}/../platforms/storage/storage.xml +> [0.000000] [jmsg/INFO] Using regular java threads. +> [denise:0:(1) 0.000000] [jmsg/INFO] ------------------------------------ +> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk2 +> [denise:0:(1) 0.000000] [jmsg/INFO] Size: 536870912000 bytes. +> [denise:0:(1) 0.000000] [jmsg/INFO] Free Size: 534479374867 bytes. +> [denise:0:(1) 0.000000] [jmsg/INFO] Used Size: 2391537133 bytes. +> [denise:0:(1) 0.000000] [jmsg/INFO] ------------------------------------ +> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk4 +> [denise:0:(1) 0.000000] [jmsg/INFO] Size: 536870912000 bytes. +> [denise:0:(1) 0.000000] [jmsg/INFO] Free Size: 536857690006 bytes. +> [denise:0:(1) 0.000000] [jmsg/INFO] Used Size: 13221994 bytes. +> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk2 +> [denise:0:(1) 0.000000] [jmsg/INFO] Attached to host:alice +> [denise:0:(1) 0.000000] [jmsg/INFO] Property key: Pierre +> [denise:0:(1) 0.000000] [jmsg/INFO] Property key2: Pierre +> [denise:0:(1) 0.000000] [jmsg/INFO] Disk attached: Disk4 +> [denise:0:(1) 0.000000] [jmsg/INFO] **************** ALL ************************* +> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk1 +> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk2 +> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk3 +> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk4 +> [0.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index f74d65dd80..3d5d7eb0df 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -924,20 +924,18 @@ set(txt_files # Add your CMakeLists file here to see your subdir built. set(CMAKEFILES_TXT examples/java/CMakeLists.txt - examples/java/async/CMakeLists.txt - examples/java/bittorrent/CMakeLists.txt - examples/java/cloud/CMakeLists.txt - examples/java/cloud/energy/CMakeLists.txt - examples/java/cloud/migration/CMakeLists.txt - examples/java/commTime/CMakeLists.txt - examples/java/io/CMakeLists.txt - examples/java/masterworker/CMakeLists.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/java/async/CMakeLists.txt + examples/java/bittorrent/CMakeLists.txt + examples/java/cloud/CMakeLists.txt + examples/java/cloud/energy/CMakeLists.txt + examples/java/cloud/migration/CMakeLists.txt + examples/java/commTime/CMakeLists.txt + examples/java/masterworker/CMakeLists.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 examples/msg/mc/CMakeLists.txt -- 2.20.1