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 21c1b83..fc79986 100644 (file)
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -35,7 +35,7 @@ int host(int argc, char *argv[])
   msg_file_t file = NULL;
   s_msg_stat_t stat;
   void *ptr = NULL;
-  char* mount = bprintf("/home");
+  char* mount = xbt_strdup("/home");
   double read,write;
 
   if(!strcmp(MSG_process_get_name(MSG_process_self()),"0"))
@@ -51,16 +51,17 @@ 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);
+  XBT_INFO("\tHave read    %8.1f 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);
+  XBT_INFO("\tHave written %8.1f 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);
+  XBT_INFO("\tHave read    %8.1f on %s",read,file->name);
 
   MSG_file_stat(file,&stat);
   XBT_INFO("\tFile stat %s Size %.1f",file->name,stat.size);
+  MSG_file_free_stat(&stat);
 
   XBT_INFO("\tClose file '%s'",file->name);
   MSG_file_close(file);
@@ -81,14 +82,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