improve example, should be enough for this release

[simgrid.git] / examples / msg / io / remote.c

diff --git a/examples/msg/io/remote.c b/examples/msg/io/remote.c
index 7cba8e5..c0e263d 100644 (file)
--- a/examples/msg/io/remote.c
+++ b/examples/msg/io/remote.c
@@ -20,6 +20,8 @@
 #include "msg/msg.h"
 #include "surf/surf_private.h"
 
+#define INMEGA (1024*1024)
+
 int host(int argc, char *argv[]);
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(remote_io,
@@ -46,22 +48,30 @@ int host(int argc, char *argv[]){
 
   MSG_file_close(file);
 
-  if (argc > 2){
+  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 100KiB to '%s'",filename);
-    write = MSG_file_write(file, 100*1024);
-    XBT_INFO("Have written %llu bytes to '%s'. Offset is now at: %llu",write,filename,
-        MSG_file_tell(file));
+    XBT_INFO("Try to write %llu MiB to '%s'",
+        MSG_file_get_size(file)/1024,
+        filename);
+    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_get_host_by_name(argv[3]);
-    XBT_INFO("Move '%s' (of size %llu) from '%s' to '%s'", filename,
+    if (atoi(argv[5])){
+      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 {
+      XBT_INFO("Copy '%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]);
+      MSG_file_rcopy(file, dest, argv[4]);
+    }
   }
 
   return 0;
@@ -72,14 +82,31 @@ int host(int argc, char *argv[]){
 int main(int argc, char **argv)
 {
   int res;
+  unsigned int cur;
+  xbt_dynar_t storages;
+  msg_storage_t st;
 
   MSG_init(&argc, argv);
   MSG_create_environment(argv[1]);
   MSG_function_register("host", host);
   MSG_launch_application(argv[2]);
 
+  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));
+  }
+
   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_dynar_free_container(&storages);
+
   XBT_INFO("Simulation time %g", MSG_get_clock());
   if (res == MSG_OK)
     return 0;