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

diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index ed8e91ad8a..4e0ee91b81 100644
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -15,10 +15,10 @@
  * - <b>io/file.c</b> Example with the disk resource
  */
 
-#define FILENAME1 "/home/user/Install/simgrid/doc/simgrid/examples/platforms/g5k.xml"
-#define FILENAME2 "/home/user/Install/simgrid/doc/simgrid/examples/platforms/One_cluster_no_backbone.xml"
-#define FILENAME3 "/home/user/Install/simgrid/doc/simgrid/examples/platforms/g5k_cabinets.xml"
-#define FILENAME4 "/home/user/Install/simgrid/doc/simgrid/examples/platforms/nancy.xml"
+#define FILENAME1 "./doc/simgrid/examples/platforms/g5k.xml"
+#define FILENAME2 "./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml"
+#define FILENAME3 "./doc/simgrid/examples/platforms/g5k_cabinets.xml"
+#define FILENAME4 "./doc/simgrid/examples/platforms/nancy.xml"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,34 +33,30 @@ 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");
+  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");
+    file = MSG_file_open(mount,FILENAME1);
   else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1"))
-    file = MSG_file_open(mount,FILENAME2,"rw");
+    file = MSG_file_open(mount,FILENAME2);
   else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2"))
-    file = MSG_file_open(mount,FILENAME3,"rw");
+    file = MSG_file_open(mount,FILENAME3);
   else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3"))
-    file = MSG_file_open(mount,FILENAME4,"rw");
+    file = MSG_file_open(mount,FILENAME4);
   else xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
 
   XBT_INFO("\tOpen file '%s'",file->name);
 
-  read = MSG_file_read(ptr,10000000,sizeof(char*),file);     // Read for 10Mo
-  XBT_INFO("\tHaving read  %zu \ton %s",read,file->name);
+  read = MSG_file_read(10000000,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 %zu \ton %s",write,file->name);
+  write = MSG_file_write(100000,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  %zu \ton %s",read,file->name);
-
-  MSG_file_stat(file,&stat);
-  XBT_INFO("\tFile %s Size %d",file->name,(int)stat.size);
+  read = MSG_file_read(110000,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);
@@ -71,24 +67,23 @@ int host(int argc, char *argv[])
 
 int main(int argc, char **argv)
 {
-    int i,res;
-  MSG_global_init(&argc, argv);
+  int i,res;
+  MSG_init(&argc, argv);
   MSG_create_environment(argv[1]);
   xbt_dynar_t hosts =  MSG_hosts_as_dynar();
   MSG_function_register("host", host);
-
-  XBT_INFO("Number of host '%lu'",xbt_dynar_length(hosts));
-  for(i = 0 ; i<xbt_dynar_length(hosts); i++)
+  unsigned long nb_hosts = xbt_dynar_length(hosts);
+  XBT_INFO("Number of host '%lu'",nb_hosts);
+  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