From 5a2381818ef1eec814d276bbe5d9452e3e092661 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 30 Jan 2014 13:56:41 +0100 Subject: [PATCH] Make example java/cloud/migration build, and add dummy tesh file. --- buildtools/Cmake/AddTests.cmake | 5 +- buildtools/Cmake/DefinePackages.cmake | 1 + buildtools/Cmake/MakeExe.cmake | 1 + .../CONFIG/cluster_platform.xml | 9 ---- examples/java/cloud/migration/CMakeLists.txt | 47 +++++++++++++++++++ .../src => migration}/Daemon.java | 7 +++ .../src => migration}/Main.java | 16 ++++++- .../src => migration}/Test.java | 7 +++ .../src => migration}/XVM.java | 7 +++ .../CONFIG => migration}/deploy_simple.xml | 2 +- examples/java/cloud/migration/migration.tesh | 6 +++ .../CONFIG => migration}/platform_simple.xml | 0 12 files changed, 94 insertions(+), 14 deletions(-) delete mode 100644 examples/java/cloud/migration-test/CONFIG/cluster_platform.xml create mode 100644 examples/java/cloud/migration/CMakeLists.txt rename examples/java/cloud/{migration-test/src => migration}/Daemon.java (77%) rename examples/java/cloud/{migration-test/src => migration}/Main.java (52%) rename examples/java/cloud/{migration-test/src => migration}/Test.java (92%) rename examples/java/cloud/{migration-test/src => migration}/XVM.java (87%) rename examples/java/cloud/{migration-test/CONFIG => migration}/deploy_simple.xml (70%) create mode 100644 examples/java/cloud/migration/migration.tesh rename examples/java/cloud/{migration-test/CONFIG => migration}/platform_simple.xml (100%) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 5f18e9acb1..8036e0b382 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -561,15 +561,16 @@ if(NOT enable_memcheck) # Java examples if(enable_java) if(WIN32) - set(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/\;${SIMGRID_JAR}") + set(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/\;${SIMGRID_JAR}") else() - set(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/:${SIMGRID_JAR}") + set(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/:${SIMGRID_JAR}") endif() ADD_TEST(java-async ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/async/async.tesh) ADD_TEST(java-bittorrent ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/bittorrent/bittorrent.tesh) ADD_TEST(java-bypass ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/master_slave_bypass/bypass.tesh) ADD_TEST(java-chord ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/chord/chord.tesh) ADD_TEST(java-cloud ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/cloud/cloud.tesh) + ADD_TEST(java-cloud-migration ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/cloud/migration/migration.tesh) ADD_TEST(java-commTime ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/commTime/commtime.tesh) ADD_TEST(java-kademlia ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/kademlia/kademlia.tesh) ADD_TEST(java-kill ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/master_slave_kill/kill.tesh) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 63ed844df1..b4b6295c9b 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -873,6 +873,7 @@ set(EXAMPLES_CMAKEFILES_TXT examples/java/bittorrent/CMakeLists.txt examples/java/chord/CMakeLists.txt examples/java/cloud/CMakeLists.txt + examples/java/cloud/migration/CMakeLists.txt examples/java/commTime/CMakeLists.txt examples/java/io/CMakeLists.txt examples/java/kademlia/CMakeLists.txt diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake index 59794d0359..c854fb5580 100644 --- a/buildtools/Cmake/MakeExe.cmake +++ b/buildtools/Cmake/MakeExe.cmake @@ -7,6 +7,7 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/async) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/bittorrent) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/chord) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/cloud) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/cloud/migration) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/commTime) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/io) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/kademlia) diff --git a/examples/java/cloud/migration-test/CONFIG/cluster_platform.xml b/examples/java/cloud/migration-test/CONFIG/cluster_platform.xml deleted file mode 100644 index e0811a018d..0000000000 --- a/examples/java/cloud/migration-test/CONFIG/cluster_platform.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/examples/java/cloud/migration/CMakeLists.txt b/examples/java/cloud/migration/CMakeLists.txt new file mode 100644 index 0000000000..210dc002b0 --- /dev/null +++ b/examples/java/cloud/migration/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 2.6) + +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}/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 ${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 + ${CMAKE_CURRENT_SOURCE_DIR}/platform_simple.xml + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${sources} + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + PARENT_SCOPE + ) diff --git a/examples/java/cloud/migration-test/src/Daemon.java b/examples/java/cloud/migration/Daemon.java similarity index 77% rename from examples/java/cloud/migration-test/src/Daemon.java rename to examples/java/cloud/migration/Daemon.java index 91141c8412..d3ac758b2c 100644 --- a/examples/java/cloud/migration-test/src/Daemon.java +++ b/examples/java/cloud/migration/Daemon.java @@ -1,3 +1,10 @@ +/* Copyright (c) 2014. 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 cloud.migration; + import org.simgrid.msg.*; import org.simgrid.msg.Process; diff --git a/examples/java/cloud/migration-test/src/Main.java b/examples/java/cloud/migration/Main.java similarity index 52% rename from examples/java/cloud/migration-test/src/Main.java rename to examples/java/cloud/migration/Main.java index d088468598..68b19aca9e 100644 --- a/examples/java/cloud/migration-test/src/Main.java +++ b/examples/java/cloud/migration/Main.java @@ -1,3 +1,10 @@ +/* Copyright (c) 2014. 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 cloud.migration; + import org.simgrid.msg.Host; import org.simgrid.msg.HostNotFoundException; import org.simgrid.msg.Msg; @@ -18,9 +25,14 @@ public class Main { /* Init. internal values */ Msg.init(args); + if (args.length < 2) { + Msg.info("Usage : Main platform_file.xml dployment_file.xml"); + System.exit(1); + } + /* construct the platform and deploy the application */ - Msg.createEnvironment("./CONFIG/platform_simple.xml"); - Msg.deployApplication("./CONFIG/deploy_simple.xml"); + Msg.createEnvironment(args[0]); + Msg.deployApplication(args[1]); Msg.run(); diff --git a/examples/java/cloud/migration-test/src/Test.java b/examples/java/cloud/migration/Test.java similarity index 92% rename from examples/java/cloud/migration-test/src/Test.java rename to examples/java/cloud/migration/Test.java index d1e28b8782..50e9271170 100644 --- a/examples/java/cloud/migration-test/src/Test.java +++ b/examples/java/cloud/migration/Test.java @@ -1,3 +1,10 @@ +/* Copyright (c) 2014. 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 cloud.migration; + import org.simgrid.msg.*; import org.simgrid.msg.Process; diff --git a/examples/java/cloud/migration-test/src/XVM.java b/examples/java/cloud/migration/XVM.java similarity index 87% rename from examples/java/cloud/migration-test/src/XVM.java rename to examples/java/cloud/migration/XVM.java index 5cc70f5e7e..03dd601009 100644 --- a/examples/java/cloud/migration-test/src/XVM.java +++ b/examples/java/cloud/migration/XVM.java @@ -1,3 +1,10 @@ +/* Copyright (c) 2014. 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 cloud.migration; + import org.simgrid.msg.Host; import org.simgrid.msg.HostNotFoundException; import org.simgrid.msg.Msg; diff --git a/examples/java/cloud/migration-test/CONFIG/deploy_simple.xml b/examples/java/cloud/migration/deploy_simple.xml similarity index 70% rename from examples/java/cloud/migration-test/CONFIG/deploy_simple.xml rename to examples/java/cloud/migration/deploy_simple.xml index 405b195216..707963d190 100644 --- a/examples/java/cloud/migration-test/CONFIG/deploy_simple.xml +++ b/examples/java/cloud/migration/deploy_simple.xml @@ -1,6 +1,6 @@ - + diff --git a/examples/java/cloud/migration/migration.tesh b/examples/java/cloud/migration/migration.tesh new file mode 100644 index 0000000000..4c53f8d7e9 --- /dev/null +++ b/examples/java/cloud/migration/migration.tesh @@ -0,0 +1,6 @@ +#! tesh + +$ java -classpath ${classpath:=.} cloud/migration/Main ${srcdir:=.}/cloud/migration/platform_simple.xml ${srcdir:=.}/cloud/migration/deploy_simple.xml +> +> FIXME: add expected output here! +> diff --git a/examples/java/cloud/migration-test/CONFIG/platform_simple.xml b/examples/java/cloud/migration/platform_simple.xml similarity index 100% rename from examples/java/cloud/migration-test/CONFIG/platform_simple.xml rename to examples/java/cloud/migration/platform_simple.xml -- 2.20.1