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

diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index 21c1b836ce..3fca676679 100644
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -33,10 +33,9 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(io_file,
 int host(int argc, char *argv[])
 {
   msg_file_t file = NULL;
-  s_msg_stat_t stat;
   void *ptr = NULL;
-  char* mount = bprintf("/home");
-  double read,write;
+  char* mount = xbt_strdup("/home");
+  size_t read,write;
 
   if(!strcmp(MSG_process_get_name(MSG_process_self()),"0"))
     file = MSG_file_open(mount,FILENAME1,"rw");
@@ -50,17 +49,15 @@ int host(int argc, char *argv[])
 
   XBT_INFO("\tOpen file '%s'",file->name);
 
-  read = MSG_file_read(ptr,10000000,sizeof(char*),file);     // Read for 10Mo
-  XBT_INFO("\tHaving read  %.1f \ton %s",read,file->name);
+  read = MSG_file_read(ptr,10000000,sizeof(char*),file);     // Read for 10MB
+  XBT_INFO("\tHave read    %zu on %s",read,file->name);
 
-  write = MSG_file_write(ptr,100000,sizeof(char*),file);  // Write for 100Ko
-  XBT_INFO("\tHaving write %.1f \ton %s",write,file->name);
+  write = MSG_file_write(ptr,100000,sizeof(char*),file);  // Write for 100KB
+  XBT_INFO("\tHave written %zu on %s",write,file->name);
 
-  read = MSG_file_read(ptr,10000000,sizeof(char*),file);     // Read for 10Mo
-  XBT_INFO("\tHaving read  %.1f \ton %s",read,file->name);
-
-  MSG_file_stat(file,&stat);
-  XBT_INFO("\tFile stat %s Size %.1f",file->name,stat.size);
+  read = MSG_file_read(ptr,110000,sizeof(char*),file);     // Read for 110KB
+  XBT_INFO("\tHave read    %zu on %s (of size %zu)",read,file->name,
+      MSG_file_get_size(file));
 
   XBT_INFO("\tClose file '%s'",file->name);
   MSG_file_close(file);
@@ -81,14 +78,13 @@ int main(int argc, char **argv)
   for(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,m_host_t) );
+    MSG_process_create( name_host, host, NULL, xbt_dynar_get_as(hosts,i,msg_host_t) );
     free(name_host);
   }
   xbt_dynar_free(&hosts);
 
   res = MSG_main();
   XBT_INFO("Simulation time %g", MSG_get_clock());
-  MSG_clean();
   if (res == MSG_OK)
     return 0;
   else