From: Frederic Suter Date: Mon, 4 Dec 2017 20:25:39 +0000 (+0100) Subject: another example to teshsuite move X-Git-Tag: v3.18~168 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7b7e39e00786e5e3badf4302662c890290cd9d51 another example to teshsuite move --- diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index 9c6caf63ad..cff91d92aa 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -2,7 +2,7 @@ foreach(x app-masterworker app-pingpong app-token-ring cloud-capping cloud-masterworker cloud-migration cloud-simple cloud-two-tasks dht-pastry energy-consumption energy-onoff energy-vm platform-failures - io-file io-remote task-priority + io-file task-priority plugin-hostload process-create process-join platform-properties process-startkilltime synchro-semaphore trace-categories @@ -44,7 +44,7 @@ foreach (file answer dht-kademlia node routing_table task) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/${file}.c ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/${file}.h) endforeach() -foreach (file app-chainsend app-masterworker app-pingpong dht-kademlia dht-pastry io-remote platform-properties +foreach (file app-chainsend app-masterworker app-pingpong dht-kademlia dht-pastry platform-properties task-priority) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}/${file}_d.xml) endforeach() @@ -78,7 +78,7 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/a foreach(x app-chainsend app-masterworker app-pingpong app-token-ring cloud-capping cloud-masterworker cloud-migration cloud-simple - cloud-two-tasks dht-pastry dht-kademlia platform-failures io-file io-remote task-priority + cloud-two-tasks dht-pastry dht-kademlia platform-failures io-file task-priority energy-consumption energy-onoff energy-vm plugin-hostload process-create process-join process-startkilltime diff --git a/examples/msg/README.doc b/examples/msg/README.doc index 00970c1c18..9f9309ac98 100644 --- a/examples/msg/README.doc +++ b/examples/msg/README.doc @@ -147,10 +147,6 @@ simulated storages. This example illustrates the use of operations on file (@ref MSG_file_open, @ref MSG_file_read, @ref MSG_file_write, or @ref MSG_file_close). - - - Remote I/O. @ref examples/msg/io-remote/io-remote.c \n - I/O operations can also be done in a remote, i.e. when the - accessed disk is not mounted on the caller's host. @section msg_ex_misc Miscellaneous diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt index b9b2851b5a..40884fcc0a 100644 --- a/teshsuite/msg/CMakeLists.txt +++ b/teshsuite/msg/CMakeLists.txt @@ -4,7 +4,7 @@ foreach(x actions-comm actions-storage cloud-sharing get_sender host_on_off host_on_off_recv host_on_off_processes process-daemon process-kill process-migration process-suspend process-yield energy-ptask energy-pstate - io-raw-storage + io-raw-storage io-file-remote trace_integration) add_executable (${x} ${x}/${x}.c) target_link_libraries(${x} simgrid) @@ -49,6 +49,7 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/acti ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait4_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/async-waitall_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/async-waitany_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/io-file-remote/io-file-remote_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/process-yield/process-yield_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml @@ -73,7 +74,7 @@ foreach(x task_destroy_cancel task_listen_from task_progress process-daemon process-kill process-migration process-suspend process-yield energy-ptask - io-raw-storage + io-raw-storage io-file-remote trace_integration) ADD_TESH_FACTORIES(tesh-msg-${x} "thread;ucontext;raw;boost" --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms diff --git a/examples/msg/io-remote/io-remote.c b/teshsuite/msg/io-file-remote/io-file-remote.c similarity index 71% rename from examples/msg/io-remote/io-remote.c rename to teshsuite/msg/io-file-remote/io-file-remote.c index 626bd393c0..3f05e6aa90 100644 --- a/examples/msg/io-remote/io-remote.c +++ b/teshsuite/msg/io-file-remote/io-file-remote.c @@ -6,37 +6,38 @@ #include "simgrid/msg.h" #include -#define INMEGA (1024*1024) +#define INMEGA (1024 * 1024) XBT_LOG_NEW_DEFAULT_CATEGORY(remote_io, "Messages specific for this io example"); -static int host(int argc, char *argv[]){ - msg_file_t file = MSG_file_open(argv[1], NULL); - const char *filename = MSG_file_get_name(file); - XBT_INFO("Opened file '%s'",filename); +static int host(int argc, char* argv[]) +{ + msg_file_t file = MSG_file_open(argv[1], NULL); + const char* filename = MSG_file_get_name(file); + XBT_INFO("Opened file '%s'", filename); MSG_file_dump(file); - XBT_INFO("Try to read %llu from '%s'",MSG_file_get_size(file),filename); + XBT_INFO("Try to read %llu from '%s'", MSG_file_get_size(file), filename); sg_size_t read = MSG_file_read(file, MSG_file_get_size(file)); - XBT_INFO("Have read %llu from '%s'. Offset is now at: %llu",read,filename, MSG_file_tell(file)); + XBT_INFO("Have read %llu from '%s'. Offset is now at: %llu", read, filename, MSG_file_tell(file)); XBT_INFO("Seek back to the begining of the stream..."); MSG_file_seek(file, 0, SEEK_SET); XBT_INFO("Offset is now at: %llu", MSG_file_tell(file)); MSG_file_close(file); - if (argc > 5){ - file = MSG_file_open(argv[2], NULL); + if (argc > 5) { + file = MSG_file_open(argv[2], NULL); filename = MSG_file_get_name(file); - XBT_INFO("Opened file '%s'",filename); - XBT_INFO("Try to write %llu MiB to '%s'", MSG_file_get_size(file)/1024, filename); - sg_size_t write = MSG_file_write(file, MSG_file_get_size(file)*1024); - XBT_INFO("Have written %llu bytes to '%s'.",write,filename); + XBT_INFO("Opened file '%s'", filename); + XBT_INFO("Try to write %llu MiB to '%s'", MSG_file_get_size(file) / 1024, filename); + sg_size_t write = MSG_file_write(file, MSG_file_get_size(file) * 1024); + XBT_INFO("Have written %llu bytes to '%s'.", write, filename); - msg_host_t src= MSG_host_self(); + msg_host_t src = MSG_host_self(); msg_host_t dest = MSG_host_by_name(argv[3]); if (xbt_str_parse_int(argv[5], "Argument 5 (move or copy) must be an int, not '%s'")) { - XBT_INFO("Move '%s' (of size %llu) from '%s' to '%s'", filename,MSG_file_get_size(file), MSG_host_get_name(src), + XBT_INFO("Move '%s' (of size %llu) from '%s' to '%s'", filename, MSG_file_get_size(file), MSG_host_get_name(src), argv[3]); MSG_file_rmove(file, dest, argv[4]); } else { @@ -50,7 +51,7 @@ static int host(int argc, char *argv[]){ return 0; } -int main(int argc, char **argv) +int main(int argc, char** argv) { unsigned int cur; msg_storage_t st; @@ -63,14 +64,14 @@ int main(int argc, char **argv) MSG_launch_application(argv[2]); xbt_dynar_t storages = MSG_storages_as_dynar(); - xbt_dynar_foreach(storages, cur, st){ + xbt_dynar_foreach (storages, cur, st) { XBT_INFO("Init: %llu/%llu MiB used/free on '%s'", MSG_storage_get_used_size(st) / INMEGA, MSG_storage_get_free_size(st) / INMEGA, MSG_storage_get_name(st)); } int res = MSG_main(); - xbt_dynar_foreach(storages, cur, st){ + xbt_dynar_foreach (storages, cur, st) { XBT_INFO("End: %llu/%llu MiB used/free on '%s'", MSG_storage_get_used_size(st) / INMEGA, MSG_storage_get_free_size(st) / INMEGA, MSG_storage_get_name(st)); } diff --git a/examples/msg/io-remote/io-remote.tesh b/teshsuite/msg/io-file-remote/io-file-remote.tesh similarity index 95% rename from examples/msg/io-remote/io-remote.tesh rename to teshsuite/msg/io-file-remote/io-file-remote.tesh index 34c72adb88..c7377c9e9f 100644 --- a/examples/msg/io-remote/io-remote.tesh +++ b/teshsuite/msg/io-file-remote/io-file-remote.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ ${bindir:=.}/io-remote$EXEEXT ${platfdir}/storage/remote_io.xml ${srcdir}/io-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n" +$ ${bindir:=.}/io-file-remote$EXEEXT ${platfdir:=.}/storage/remote_io.xml ${srcdir:=.}/io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n" > [ 0.000000] (0@ ) Init: 12/476824 MiB used/free on 'Disk1' > [ 0.000000] (0@ ) Init: 2280/474556 MiB used/free on 'Disk2' > [ 0.000000] (1@alice) Opened file 'c:\Windows\setupact.log' diff --git a/examples/msg/io-remote/io-remote_d.xml b/teshsuite/msg/io-file-remote/io-file-remote_d.xml similarity index 100% rename from examples/msg/io-remote/io-remote_d.xml rename to teshsuite/msg/io-file-remote/io-file-remote_d.xml