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

diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index fc62facad3..c72e615c66 100644
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2008-2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -15,82 +15,98 @@
  * - <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"
+#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>
-#include "msg/msg.h"
-#include "surf/surf_private.h"
+#include "simgrid/msg.h"
 
-int host(int argc, char *argv[]);
+XBT_LOG_NEW_DEFAULT_CATEGORY(io_file, "Messages specific for this io example");
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(io_file,
-                             "Messages specific for this io example");
-
-int host(int argc, char *argv[])
+static int host(int argc, char *argv[])
 {
   msg_file_t file = NULL;
-  char* mount = xbt_strdup("/home");
   sg_size_t read,write;
+  msg_storage_t st;
+  const char* st_name;
 
   if(!strcmp(MSG_process_get_name(MSG_process_self()),"0")){
-    file = MSG_file_open(mount,FILENAME1, NULL);
+    file = MSG_file_open(FILENAME1, NULL);
     MSG_file_dump(file);
+    st_name = "Disk4";
   } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"1")) {
-    free(mount);
-    mount = xbt_strdup("/windows");
-    file = MSG_file_open(mount,FILENAME2, NULL);
+    file = MSG_file_open(FILENAME2, NULL);
+    st_name = "Disk2";
   } 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);
+    file = MSG_file_open(FILENAME3, NULL);
+    st_name = "Disk3";
+  } else if(!strcmp(MSG_process_get_name(MSG_process_self()),"3")){
+    file = MSG_file_open(FILENAME4, NULL);
+    st_name = "Disk1";
+  }
   else xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
 
   const char* filename = MSG_file_get_name(file);
   XBT_INFO("\tOpen file '%s'",filename);
+  st = MSG_storage_get_by_name(st_name);
 
-  read = MSG_file_read(file, 10000000);     // Read for 10MB
-  XBT_INFO("\tHave read    %llu on %s",read,filename);
+  XBT_INFO("\tCapacity of the storage element '%s' is stored on: %llu / %llu",
+            filename, MSG_storage_get_used_size(st), MSG_storage_get_size(st));
 
-  write = MSG_file_write(file, 100000);  // Write for 100KB
-  XBT_INFO("\tHave written %llu on %s",write,filename);
+  /* Try to read for 10MB */
+  read = MSG_file_read(file, 10000000);
+  XBT_INFO("\tHave read %llu from '%s'",read,filename);
 
-  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));
+  /* Write 100KB in file from the current position, i.e, end of file or 10MB */
+  write = MSG_file_write(file, 100000);
+  XBT_INFO("\tHave written %llu in '%s'. Size now is: %llu",write,filename, MSG_file_get_size(file));
+
+
+  XBT_INFO("\tCapacity of the storage element '%s' is stored on: %llu / %llu",
+            filename, MSG_storage_get_used_size(st), MSG_storage_get_size(st));
+
+  /* rewind to the beginning of the file */
+  XBT_INFO("\tComing back to the beginning of the stream for file '%s'", filename);
+  MSG_file_seek(file, 0, SEEK_SET);
+
+  /* Try to read 110KB */
+  read = MSG_file_read(file, 110000);
+  XBT_INFO("\tHave read %llu from '%s' (of size %llu)",read,filename, MSG_file_get_size(file));
+
+  /* rewind once again to the beginning of the file */
+  XBT_INFO("\tComing back to the beginning of the stream for file '%s'", filename);
+  MSG_file_seek(file, 0, SEEK_SET);
+
+  /* Write 110KB in file from the current position, i.e, end of file or 10MB */
+  write = MSG_file_write(file, 110000);
+  XBT_INFO("\tHave written %llu in '%s'. Size now is: %llu", write,filename, MSG_file_get_size(file));
+
+  XBT_INFO("\tCapacity of the storage element '%s' is stored on: %llu / %llu",
+            filename, MSG_storage_get_used_size(st), MSG_storage_get_size(st));
 
-  MSG_file_close(file);
   XBT_INFO("\tClose file '%s'",filename);
+  MSG_file_close(file);
 
-  free(mount);
   return 0;
 }
 
 int main(int argc, char **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);
   unsigned long nb_hosts = xbt_dynar_length(hosts);
   XBT_INFO("Number of host '%lu'",nb_hosts);
-  for(i = 0 ; i<nb_hosts; i++)
-  {
+  for(int 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,msg_host_t) );
     free(name_host);
   }
   xbt_dynar_free(&hosts);
 
-  res = MSG_main();
+  int res = MSG_main();
   XBT_INFO("Simulation time %g", MSG_get_clock());
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-
+  return res != MSG_OK;
 }