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

diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index 69e45db4fa..9e07765119 100644
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -1,13 +1,30 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2010, 2012-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+/** @addtogroup MSG_examples
+ * 
+ * @subsection MSG_ex_resources Other resource kinds
+ * 
+ * This section contains some sparse examples of how to use the other
+ * kind of resources, such as disk or GPU. These resources are quite
+ * experimental for now, but here we go anyway.
+ * 
+ * - <b>io/file.c</b> Example with the disk resource
+ */
+
+#define FILENAME1 "./doc/simgrid/examples/platforms/g5k.xml"
+#define FILENAME2 ".\\Windows\\setupact.log"
+#define FILENAME3 "./doc/simgrid/examples/platforms/g5k_cabinets.xml"
+#define FILENAME4 "./doc/simgrid/examples/platforms/nancy.xml"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "msg/msg.h"
 #include "surf/surf_private.h"
+#include "inttypes.h"
 
 int host(int argc, char *argv[]);
 
@@ -16,23 +33,37 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(io_file,
 
 int host(int argc, char *argv[])
 {
-  m_file_t file;
-  char* mount = bprintf("C:");
+  msg_file_t file = NULL;
+  char* mount = xbt_strdup("/home");
+  sg_storage_size_t read,write;
 
-  file = MSG_file_open(mount,"test.txt","rw");
-  XBT_INFO("Host '%s' open %p",MSG_host_get_name(MSG_host_self()), file);
+  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")) {
+    free(mount);
+    mount = xbt_strdup("/windows");
+    file = MSG_file_open(mount,FILENAME2, NULL);
+  } 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"))
+    file = MSG_file_open(mount,FILENAME4, NULL);
+  else xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
 
-  size_t read = MSG_file_read(mount,NULL,0,0,file);
-  XBT_INFO("Host '%s' read %zu", MSG_host_get_name(MSG_host_self()), read);
+  XBT_INFO("\tOpen file '%s'",file->fullname);
 
-  size_t write = MSG_file_write(mount,NULL,0,0,file);
-  XBT_INFO("Host '%s' write %zu", MSG_host_get_name(MSG_host_self()), write);
+  read = MSG_file_read(file, 10000000);     // Read for 10MB
+  XBT_INFO("\tHave read    %" PRIu64 " on %s",read,file->fullname);
 
-  int res = MSG_file_stat(mount,0,NULL);
-  XBT_INFO("Host '%s' stat %d",MSG_host_get_name(MSG_host_self()), res);
+  write = MSG_file_write(file, 100000);  // Write for 100KB
+  XBT_INFO("\tHave written %" PRIu64 " on %s",write,file->fullname);
 
-  res = MSG_file_close(mount,file);
-  XBT_INFO("Host '%s' close %d",MSG_host_get_name(MSG_host_self()), res);
+  read = MSG_file_read(file, 110000);     // Read for 110KB
+  XBT_INFO("\tHave read    %" PRIu64 " on %s (of size %" PRIu64 ")",read,file->fullname,
+      MSG_file_get_size(file));
+
+  XBT_INFO("\tClose file '%s'",file->fullname);
+  MSG_file_close(file);
 
   free(mount);
   return 0;
@@ -40,24 +71,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