X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb5b6b0c3c4d9a38bb205b2c8bc9aeeba8674a25..ba9a4cfeba4eb00e84cd17603fc9654e81445655:/examples/msg/io/remote.c

diff --git a/examples/msg/io/remote.c b/examples/msg/io/remote.c
index 3a3efbcbed..cc84983669 100644
--- a/examples/msg/io/remote.c
+++ b/examples/msg/io/remote.c
@@ -1,24 +1,19 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. 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
- * 
- * @subsection MSG_ex_resources Other resource kinds
- * 
- * This section contains some sparse examples of how to use the other
- * kind of resources, such as disk or GPU. These resources are quite
- * experimental for now, but here we go anyway.
  * 
  * - <b>io/remote.c</b> Example of delegated I/O operations
  */
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "msg/msg.h"
-#include "surf/surf_private.h"
+#include "simgrid/msg.h"
+
+#define INMEGA (1024*1024)
 
 int host(int argc, char *argv[]);
 
@@ -29,111 +24,83 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(remote_io,
 int host(int argc, char *argv[]){
   msg_file_t file = NULL;
   const char* filename;
-//  msg_storage_t st;
-  sg_size_t read;//,write;
+  sg_size_t read, write;
 
   file = MSG_file_open(argv[1], NULL);
   filename = MSG_file_get_name(file);
   XBT_INFO("Opened file '%s'",filename);
   MSG_file_dump(file);
 
- // st = MSG_storage_get_by_name(st_name);
-
   XBT_INFO("Try to read %llu from '%s'",MSG_file_get_size(file),filename);
   read = MSG_file_read(file, MSG_file_get_size(file));
-  XBT_INFO("Have read %llu from '%s'",read,filename);
+  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);
+    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);
+    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]);
+    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]);
+      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_rcopy(file, dest, argv[4]);
+      MSG_file_close(file);
+    }
+  }
+
   return 0;
 }
 
-//int host(int argc, char *argv[])
-//{
-//  msg_file_t file = NULL;
-//  sg_size_t read,write;
-//  msg_storage_t st;
-//  const char* st_name;
-//
-//  if(!strcmp(MSG_process_get_name(MSG_process_self()),"0")){
-//    file = MSG_file_open(FILENAME1, NULL);
-//    MSG_file_dump(file);
-//    st_name = "Disk4";
-//  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1")) {
-//    file = MSG_file_open(FILENAME2, NULL);
-//    st_name = "Disk2";
-//  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2")){
-//    file = MSG_file_open(FILENAME3, NULL);
-//    st_name = "Disk3";
-//  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3")){
-//    file = MSG_file_open(FILENAME4, NULL);
-//    st_name = "Disk1";
-//  }
-//  else xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
-//
-//  const char* filename = MSG_file_get_name(file);
-//  XBT_INFO("\tOpen file '%s'",filename);
-//  st = MSG_storage_get_by_name(st_name);
-//
-//  XBT_INFO("\tCapacity of the storage element '%s' is stored on: %llu / %llu",
-//            filename, MSG_storage_get_used_size(st), MSG_storage_get_size(st));
-//
-//  /* Try to read for 10MB */
-//  read = MSG_file_read(file, 10000000);
-//  XBT_INFO("\tHave read %llu from '%s'",read,filename);
-//
-//  /* Write 100KB in file from the current position, i.e, end of file or 10MB */
-//  write = MSG_file_write(file, 100000);
-//  XBT_INFO("\tHave written %llu in '%s'. Size now is: %llu",write,filename,
-//           MSG_file_get_size(file));
-//
-//
-//  XBT_INFO("\tCapacity of the storage element '%s' is stored on: %llu / %llu",
-//            filename, MSG_storage_get_used_size(st), MSG_storage_get_size(st));
-//
-//  /* rewind to the beginning of the file */
-//  XBT_INFO("\tComing back to the beginning of the stream for file '%s'",
-//           filename);
-//  MSG_file_seek(file, 0, SEEK_SET);
-//
-//  /* Try to read 110KB */
-//  read = MSG_file_read(file, 110000);
-//  XBT_INFO("\tHave read %llu from '%s' (of size %llu)",read,filename,
-//      MSG_file_get_size(file));
-//
-//  /* rewind once again to the beginning of the file */
-//  XBT_INFO("\tComing back to the beginning of the stream for file '%s'",
-//           filename);
-//  MSG_file_seek(file, 0, SEEK_SET);
-//
-//  /* Write 110KB in file from the current position, i.e, end of file or 10MB */
-//  write = MSG_file_write(file, 110000);
-//  XBT_INFO("\tHave written %llu in '%s'. Size now is: %llu", write,filename,
-//      MSG_file_get_size(file));
-//
-//  XBT_INFO("\tCapacity of the storage element '%s' is stored on: %llu / %llu",
-//            filename, MSG_storage_get_used_size(st), MSG_storage_get_size(st));
-//
-//  XBT_INFO("\tClose file '%s'",filename);
-//  MSG_file_close(file);
-//
-//
-//  return 0;
-//}
+
 
 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;
-  else
-    return 1;
+  return res != MSG_OK;
 }