X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6e59f1a8345f70bc3a44d7b2789d0ab9a8bdc9b..98ffb5e655112b4d638cc63a48d5fc4c08ee051d:/examples/msg/io-remote/io-remote.c diff --git a/examples/msg/io-remote/io-remote.c b/examples/msg/io-remote/io-remote.c index bbb3ca0475..010afdb4f6 100644 --- a/examples/msg/io-remote/io-remote.c +++ b/examples/msg/io-remote/io-remote.c @@ -1,15 +1,10 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 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. */ -/** @addtogroup MSG_examples - * - * - io/remote.c Example of delegated I/O operations - */ - #include "simgrid/msg.h" +#include "simgrid/plugins/file_system.h" #define INMEGA (1024*1024) @@ -38,9 +33,8 @@ static int host(int argc, char *argv[]){ 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, dest; - src= MSG_host_self(); - dest = MSG_host_by_name(argv[3]); + 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), argv[3]); @@ -62,21 +56,25 @@ int main(int argc, char **argv) msg_storage_t st; MSG_init(&argc, argv); + MSG_storage_file_system_init(); + MSG_create_environment(argv[1]); MSG_function_register("host", host); MSG_launch_application(argv[2]); xbt_dynar_t storages = MSG_storages_as_dynar(); xbt_dynar_foreach(storages, cur, st){ - XBT_INFO("Init: %llu MiB used on '%s'", MSG_storage_get_used_size(st)/INMEGA, MSG_storage_get_name(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_INFO("Init: %llu MiB used on '%s'", MSG_storage_get_used_size(st)/INMEGA, MSG_storage_get_name(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)); } - xbt_dynar_free_container(&storages); + xbt_dynar_free(&storages); XBT_INFO("Simulation time %g", MSG_get_clock()); return res != MSG_OK;