yet another cleaning pass

[simgrid.git] / examples / msg / io / storage.c

diff --git a/examples/msg/io/storage.c b/examples/msg/io/storage.c
index 66a1fd4..ce10c42 100644 (file)
--- a/examples/msg/io/storage.c
+++ b/examples/msg/io/storage.c
@@ -1,9 +1,14 @@
-/* Copyright (c) 2006-2014. The SimGrid Team.
+/* Copyright (c) 2006-2015. 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
+ * 
+ * - <b>io/storage.c</b> demo of all main storage and file functions
+ */
+
 /********************* Files and Storage handling ****************************
  * This example implements all main storage and file functions of the MSG API
  *
@@ -18,9 +23,7 @@
  *
 ******************************************************************************/
 
-#include "msg/msg.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
+#include "simgrid/msg.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(storage,"Messages specific for this simulation");
 
@@ -33,7 +36,7 @@ static int host(int argc, char *argv[]){
   xbt_dict_cursor_t cursor = NULL;
   char* mount_name;
   char* storage_name;
-  msg_storage_t storage;
+  msg_storage_t storage = NULL;
 
   // Retrieve all mount points of current host
   xbt_dict_t storage_list = MSG_host_get_mounted_storage_list(MSG_host_self());
@@ -44,8 +47,8 @@ static int host(int argc, char *argv[]){
     storage = MSG_storage_get_by_name(storage_name);
 
     // Retrieve disk's information
-    sg_size_t free_size = MSG_storage_get_free_size(mount_name);
-    sg_size_t used_size = MSG_storage_get_used_size(mount_name);
+    sg_size_t free_size = MSG_storage_get_free_size(storage);
+    sg_size_t used_size = MSG_storage_get_used_size(storage);
     sg_size_t size = MSG_storage_get_size(storage);
 
     XBT_INFO("Total size: %llu bytes", size);
@@ -54,7 +57,6 @@ static int host(int argc, char *argv[]){
   }
   xbt_dict_free(&storage_list);
 
-
   // Create a 200,000 bytes file named './tmp/data.txt' on /sd1
   char* file_name = xbt_strdup("/home/tmp/data.txt");
   msg_file_t file = NULL;
@@ -67,12 +69,12 @@ static int host(int argc, char *argv[]){
   MSG_file_dump(file);
 
   // check that sizes have changed
-  XBT_INFO("Free size: %llu bytes", MSG_storage_get_free_size("/home"));
-  XBT_INFO("Used size: %llu bytes", MSG_storage_get_used_size("/home"));
-
+  XBT_INFO("Free size: %llu bytes", MSG_storage_get_free_size(storage));
+  XBT_INFO("Used size: %llu bytes", MSG_storage_get_used_size(storage));
 
   // Now retrieve the size of created file and read it completely
   file_size = MSG_file_get_size(file);
+  MSG_file_seek(file, 0, SEEK_SET);
   read = MSG_file_read(file, file_size);
   XBT_INFO("Read %llu bytes on %s", read, file_name);
 
@@ -81,22 +83,28 @@ static int host(int argc, char *argv[]){
   XBT_INFO("Write %llu bytes on %s", write, file_name);
   MSG_file_dump(file);
 
-  MSG_file_close(file);
-  free(file_name);
-
   storage_name = xbt_strdup("Disk4");
   storage = MSG_storage_get_by_name(storage_name);
 
   // Now rename file from ./tmp/data.txt to ./tmp/simgrid.readme
-  XBT_INFO("*** Renaming '/tmp/data.txt' into '/tmp/simgrid.readme'");
-  MSG_storage_file_rename(storage, "/tmp/data.txt", "/tmp/simgrid.readme");
+  XBT_INFO("*** Move '/tmp/data.txt' into '/tmp/simgrid.readme'");
+  MSG_file_move(file, "/home/tmp/simgrid.readme");
+
+  // Attach some user data to the file
+  MSG_file_set_data(file, xbt_strdup("777"));
+  // Retrieve these data
+  char *data = MSG_file_get_data(file);
+  XBT_INFO("User data attached to the file: %s", data);
+
+  MSG_file_close(file);
+  free(file_name);
 
   // Now attach some user data to disk1
   XBT_INFO("*** Get/set data for storage element: %s ***",storage_name);
 
-  char *data = MSG_storage_get_data(storage);
+  data = MSG_storage_get_data(storage);
 
-  XBT_INFO("Get data: '%s'", data);
+  XBT_INFO("Get storage data: '%s'", data);
 
   MSG_storage_set_data(storage, xbt_strdup("Some user data"));
   data = MSG_storage_get_data(storage);
@@ -104,7 +112,6 @@ static int host(int argc, char *argv[]){
   xbt_free(data);
   xbt_free(storage_name);
 
-
   // Dump disks contents
   XBT_INFO("*** Dump content of %s ***",MSG_host_get_name(MSG_host_self()));
   xbt_dict_t contents = NULL;
@@ -125,10 +132,8 @@ static int host(int argc, char *argv[]){
   return 1;
 }
 
-
 int main(int argc, char *argv[])
 {
-
   MSG_init(&argc, argv);
   MSG_create_environment(argv[1]);
   MSG_function_register("host", host);
@@ -139,8 +144,5 @@ int main(int argc, char *argv[])
   msg_error_t res = MSG_main();
   XBT_INFO("Simulated time: %g", MSG_get_clock());
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  return res != MSG_OK;
 }