Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index d1595cb..fc62fac 100644 (file)
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -16,7 +16,7 @@
  */
 
 #define FILENAME1 "./doc/simgrid/examples/platforms/g5k.xml"
-#define FILENAME2 "./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml"
+#define FILENAME2 ".\\Windows\\setupact.log"
 #define FILENAME3 "./doc/simgrid/examples/platforms/g5k_cabinets.xml"
 #define FILENAME4 "./doc/simgrid/examples/platforms/nancy.xml"
 
@@ -34,33 +34,36 @@ int host(int argc, char *argv[])
 {
   msg_file_t file = NULL;
   char* mount = xbt_strdup("/home");
-  size_t read,write;
+  sg_size_t read,write;
 
   if(!strcmp(MSG_process_get_name(MSG_process_self()),"0")){
     file = MSG_file_open(mount,FILENAME1, NULL);
     MSG_file_dump(file);
-  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1"))
+  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1")) {
+    free(mount);
+    mount = xbt_strdup("/windows");
     file = MSG_file_open(mount,FILENAME2, NULL);
-  else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2"))
+  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2")){
     file = MSG_file_open(mount,FILENAME3, NULL);
-  else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3"))
+  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3"))
     file = MSG_file_open(mount,FILENAME4, NULL);
   else xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
 
-  XBT_INFO("\tOpen file '%s'",file->fullname);
+  const char* filename = MSG_file_get_name(file);
+  XBT_INFO("\tOpen file '%s'",filename);
 
-  read = MSG_file_read(10000000,file);     // Read for 10MB
-  XBT_INFO("\tHave read    %zu on %s",read,file->fullname);
+  read = MSG_file_read(file, 10000000);     // Read for 10MB
+  XBT_INFO("\tHave read    %llu on %s",read,filename);
 
-  write = MSG_file_write(100000,file);  // Write for 100KB
-  XBT_INFO("\tHave written %zu on %s",write,file->fullname);
+  write = MSG_file_write(file, 100000);  // Write for 100KB
+  XBT_INFO("\tHave written %llu on %s",write,filename);
 
-  read = MSG_file_read(110000,file);     // Read for 110KB
-  XBT_INFO("\tHave read    %zu on %s (of size %zu)",read,file->fullname,
+  read = MSG_file_read(file, 110000);     // Read for 110KB
+  XBT_INFO("\tHave read    %llu on %s (of size %llu)",read,filename,
       MSG_file_get_size(file));
 
-  XBT_INFO("\tClose file '%s'",file->fullname);
   MSG_file_close(file);
+  XBT_INFO("\tClose file '%s'",filename);
 
   free(mount);
   return 0;