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

diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index 4b13333ad0..fdc8a30ad2 100644
--- 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
@@ -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 "/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 <stdio.h>
 #include <stdlib.h>
@@ -33,61 +33,58 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(io_file,
 int host(int argc, char *argv[])
 {
   msg_file_t file = NULL;
-  s_msg_stat_t stat;
-
-  char* mount = bprintf("C:");
-  size_t read,write;
-  if(!strcmp(MSG_process_get_name(MSG_process_self()),"0"))
-    file = MSG_file_open(mount,FILENAME1,"rw");
-  else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1"))
-    file = MSG_file_open(mount,FILENAME2,"rw");
-  else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2"))
-    file = MSG_file_open(mount,FILENAME3,"rw");
-  else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3"))
-    file = MSG_file_open(mount,FILENAME4,"rw");
+  sg_size_t read,write;
+
+  if(!strcmp(MSG_process_get_name(MSG_process_self()),"0")){
+    file = MSG_file_open(FILENAME1, NULL);
+    MSG_file_dump(file);
+  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1")) {
+    file = MSG_file_open(FILENAME2, NULL);
+  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"2")){
+    file = MSG_file_open(FILENAME3, NULL);
+  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3"))
+    file = MSG_file_open(FILENAME4, NULL);
   else xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
 
-  XBT_INFO("\tOpen file '%s'",file->name);
+  const char* filename = MSG_file_get_name(file);
+  XBT_INFO("\tOpen file '%s'",filename);
 
-  read = MSG_file_read(mount,NULL,10000000,sizeof(char*),file);     // Read for 10Mo
-  XBT_INFO("\tHaving read  %Zu \ton %s",read,file->name);
+  read = MSG_file_read(file, 10000000);     // Read for 10MB
+  XBT_INFO("\tHave read    %llu on %s",read,filename);
 
-  write = MSG_file_write(mount,NULL,100000,sizeof(char*),file);  // Write for 100Ko
-  XBT_INFO("\tHaving write %Zu \ton %s",write,file->name);
+  write = MSG_file_write(file, 100000);  // Write for 100KB
+  XBT_INFO("\tHave written %llu on %s",write,filename);
 
-  read = MSG_file_read(mount,NULL,10000000,sizeof(char*),file);     // Read for 10Mo
-  XBT_INFO("\tHaving read  %Zu \ton %s",read,file->name);
+  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));
 
-  MSG_file_stat(mount,file,&stat);
-  XBT_INFO("\tFile %s Size %d",file->name,(int)stat.size);
+  XBT_INFO("\tClose file '%s'",filename);
+  MSG_file_close(file);
 
-  XBT_INFO("\tClose file '%s'",file->name);
-  MSG_file_close(mount,file);
 
-  free(mount);
   return 0;
 }
 
 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