X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6e59f1a8345f70bc3a44d7b2789d0ab9a8bdc9b..da6b18121779fcbadaef944c4bafe2d9451fe5be:/examples/msg/io-file/io-file.c

diff --git a/examples/msg/io-file/io-file.c b/examples/msg/io-file/io-file.c
index c72e615c66..3e9d2728e9 100644
--- a/examples/msg/io-file/io-file.c
+++ b/examples/msg/io-file/io-file.c
@@ -1,25 +1,8 @@
-/* Copyright (c) 2008-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-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
- * 
- * @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/file.c</b> Example with the disk resource
- */
-
-#define FILENAME1 "/home/doc/simgrid/examples/platforms/g5k.xml"
-#define FILENAME2 "c:\\Windows\\setupact.log"
-#define FILENAME3 "/home/doc/simgrid/examples/platforms/g5k_cabinets.xml"
-#define FILENAME4 "/home/doc/simgrid/examples/platforms/nancy.xml"
-
 #include "simgrid/msg.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(io_file, "Messages specific for this io example");
@@ -27,25 +10,32 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(io_file, "Messages specific for this io example");
 static int host(int argc, char *argv[])
 {
   msg_file_t file = NULL;
-  sg_size_t read,write;
+  sg_size_t read;
+  sg_size_t 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);
+  switch(MSG_process_self_PID()){
+  case 1:
+    file    = MSG_file_open("c:\\Windows\\setupact.log", 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);
+    break;
+  case 2:
+    file    = MSG_file_open("/home/doc/simgrid/examples/platforms/nancy.xml", NULL);
     st_name = "Disk1";
+    break;
+  case 3:
+    file    = MSG_file_open("/home/doc/simgrid/examples/platforms/g5k_cabinets.xml", NULL);
+    st_name = "Disk3";
+    break;
+  case 4:
+    file = MSG_file_open("/home/doc/simgrid/examples/platforms/g5k.xml", NULL);
+    MSG_file_dump(file);
+    st_name = "Disk4";
+    break;
+  default:
+    xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
   }
-  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);
@@ -85,9 +75,13 @@ static int host(int argc, char *argv[])
   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);
-
+  if (MSG_process_self_PID() == 1){
+    XBT_INFO("\tUnlink file '%s'",MSG_file_get_name(file));
+    MSG_file_unlink(file);
+  } else {
+    XBT_INFO("\tClose file '%s'",filename);
+    MSG_file_close(file);
+  }
   return 0;
 }
 
@@ -99,10 +93,8 @@ int main(int argc, char **argv)
   MSG_function_register("host", host);
   unsigned long nb_hosts = xbt_dynar_length(hosts);
   XBT_INFO("Number of host '%lu'",nb_hosts);
-  for(int i = 0 ; i<nb_hosts; i++){
-    char* name_host = bprintf("%d",i);
-    MSG_process_create( name_host, host, NULL, xbt_dynar_get_as(hosts,i,msg_host_t) );
-    free(name_host);
+  for(int i = 0 ; i < nb_hosts; i++){
+    MSG_process_create("host", host, NULL, xbt_dynar_get_as(hosts,i,msg_host_t));
   }
   xbt_dynar_free(&hosts);