Merge pull request #244 from Takishipp/actor-yield

[simgrid.git] / examples / msg / io-file / io-file.c

diff --git a/examples/msg/io-file/io-file.c b/examples/msg/io-file/io-file.c
index 0e91b06..ec15057 100644 (file)
--- a/examples/msg/io-file/io-file.c
+++ b/examples/msg/io-file/io-file.c
@@ -3,12 +3,8 @@
 /* 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. */
 
-#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 "simgrid/msg.h"
+#include "simgrid/plugins/file_system.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(io_file, "Messages specific for this io example");
 
@@ -22,21 +18,21 @@ static int host(int argc, char *argv[])
 
   switch(MSG_process_self_PID()){
   case 1:
-    file = MSG_file_open(FILENAME1, NULL);
-    MSG_file_dump(file);
-    st_name = "Disk4";
-    break;
-  case 2 :
-    file = MSG_file_open(FILENAME2, NULL);
+    file    = MSG_file_open("c:\\Windows\\setupact.log", NULL);
     st_name = "Disk2";
     break;
-  case 3 :
-    file = MSG_file_open(FILENAME3, NULL);
+  case 2:
+    file    = MSG_file_open("/home/doc/simgrid/examples/platforms/nancy.xml", NULL);
+    st_name = "Disk1";
+    break;
+  case 3:
+    file    = MSG_file_open("/home/doc/simgrid/examples/platforms/g5k_cabinets.xml", NULL);
     st_name = "Disk3";
     break;
   case 4:
-    file = MSG_file_open(FILENAME4, NULL);
-    st_name = "Disk1";
+    file = MSG_file_open("/home/doc/simgrid/examples/platforms/g5k.xml", NULL);
+    MSG_file_dump(file);
+    st_name = "Disk4";
     break;
   default:
     xbt_die("FILENAME NOT DEFINED %s",MSG_process_get_name(MSG_process_self()));
@@ -81,10 +77,10 @@ static int host(int argc, char *argv[])
             filename, MSG_storage_get_used_size(st), MSG_storage_get_size(st));
 
   if (MSG_process_self_PID() == 1){
-    XBT_INFO("\tUnlink file '%s'",MSG_file_get_name(file));
+    XBT_INFO("\tUnlink file '%s'", MSG_file_get_name(file));
     MSG_file_unlink(file);
   } else {
-    XBT_INFO("\tClose file '%s'",filename);
+    XBT_INFO("\tClose file '%s'", filename);
     MSG_file_close(file);
   }
   return 0;
@@ -93,6 +89,8 @@ static int host(int argc, char *argv[])
 int main(int argc, char **argv)
 {
   MSG_init(&argc, argv);
+  MSG_storage_file_system_init();
+
   MSG_create_environment(argv[1]);
   xbt_dynar_t hosts =  MSG_hosts_as_dynar();
   MSG_function_register("host", host);
@@ -104,6 +102,6 @@ int main(int argc, char **argv)
   xbt_dynar_free(&hosts);
 
   int res = MSG_main();
-  XBT_INFO("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %.6f", MSG_get_clock());
   return res != MSG_OK;
 }