various cleanups in the CMakeLists.txt files

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

diff --git a/examples/msg/io/remote.c b/examples/msg/io/remote.c
index c0e263d..cc84983 100644 (file)
--- a/examples/msg/io/remote.c
+++ b/examples/msg/io/remote.c
@@ -1,24 +1,17 @@
-/* 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)
 
@@ -60,8 +53,8 @@ int host(int argc, char *argv[]){
 
     msg_host_t src, dest;
     src= MSG_host_self();
-    dest = MSG_get_host_by_name(argv[3]);
-    if (atoi(argv[5])){
+    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]);
@@ -71,6 +64,7 @@ int host(int argc, char *argv[]){
            MSG_file_get_size(file), MSG_host_get_name(src),
            argv[3]);
       MSG_file_rcopy(file, dest, argv[4]);
+      MSG_file_close(file);
     }
   }
 
@@ -108,8 +102,5 @@ int main(int argc, char **argv)
   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;
 }