Use unsigned long long instead of uint64_t for sg_size_t.

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

diff --git a/examples/msg/io/storage.c b/examples/msg/io/storage.c
index f51add2..b422797 100644 (file)
--- a/examples/msg/io/storage.c
+++ b/examples/msg/io/storage.c
@@ -22,9 +22,6 @@
 #include "xbt/log.h"
 #include "xbt/dict.h"
 
- /* To use PRIu64 format specifier for printing uint64_t (sg_storage_size_t) */
-#include <inttypes.h>
-
 XBT_LOG_NEW_DEFAULT_CATEGORY(storage,"Messages specific for this simulation");
 
 static int host(int argc, char *argv[]){
@@ -43,59 +40,59 @@ static int host(int argc, char *argv[]){
 
   xbt_dict_foreach(storage_list,cursor,mount_name,storage_name)  {
     // For each disk mounted on host
+    XBT_INFO("Storage name: %s, mount name: %s", storage_name, mount_name);
+    storage = MSG_storage_get_by_name(storage_name);
 
-       XBT_INFO("Storage name: %s, mount name: %s", storage_name, mount_name);
-       storage = MSG_storage_get_by_name(storage_name);
-
-       // Retrieve disk's information
-       sg_storage_size_t free_size = MSG_storage_get_free_size(mount_name);
-       sg_storage_size_t used_size = MSG_storage_get_used_size(mount_name);
-       sg_storage_size_t size = MSG_storage_get_size(storage);
+    // 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 size = MSG_storage_get_size(storage);
 
-       XBT_INFO("Total size: %"PRIu64" bytes", size);
-       XBT_INFO("Free size: %"PRIu64" bytes", free_size);
-       XBT_INFO("Used size: %"PRIu64" bytes", used_size);
+    XBT_INFO("Total size: %llu bytes", size);
+    XBT_INFO("Free size: %llu bytes", free_size);
+    XBT_INFO("Used size: %llu bytes", used_size);
   }
   xbt_dict_free(&storage_list);
 
 
   // Create a 200,000 bytes file named './tmp/data.txt' on /sd1
 
-  char* mount = xbt_strdup("/sd1");
+  char* mount = xbt_strdup("/home");
   char* file_name = xbt_strdup("./tmp/data.txt");
   msg_file_t file = NULL;
-  sg_storage_size_t write, read, file_size;
+  sg_size_t write, read, file_size;
 
   // Open an non-existing file amounts to create it!
   file = MSG_file_open(mount, file_name, NULL);
   write = MSG_file_write(file, 200000);  // Write 200,000 bytes
-  XBT_INFO("Create a %"PRIu64" bytes file named '%s' on /sd1", write, file_name);
+  XBT_INFO("Create a %llu bytes file named '%s' on /sd1", write, file_name);
   MSG_file_dump(file);
 
   // check that sizes have changed
-  XBT_INFO("Total size: %"PRIu64" bytes", MSG_storage_get_free_size("/sd1"));
-  XBT_INFO("Free size: %"PRIu64" bytes", MSG_storage_get_used_size("/sd1"));
+  XBT_INFO("Free size: %llu bytes", MSG_storage_get_free_size("/home"));
+  XBT_INFO("Used size: %llu bytes", MSG_storage_get_used_size("/home"));
 
 
   // Now retrieve the size of created file and read it completely
   file_size = MSG_file_get_size(file);
   read = MSG_file_read(file, file_size);
-  XBT_INFO("Read %"PRIu64" bytes on %s", read, file_name);
+  XBT_INFO("Read %llu bytes on %s", read, file_name);
 
   // Now write 100,000 more bytes in tmp/data.txt
   write = MSG_file_write(file, 100000);  // Write 100,000 bytes
-  XBT_INFO("Write %"PRIu64" more bytes on %s", write, file_name);
+  XBT_INFO("Write %llu more bytes on %s", write, file_name);
   MSG_file_dump(file);
 
   MSG_file_close(file);
   free(mount);
   free(file_name);
 
-  storage_name = xbt_strdup("Disk1");
+  storage_name = xbt_strdup("Disk4");
   storage = MSG_storage_get_by_name(storage_name);
 
   // Now rename file from ./tmp/data.txt to ./tmp/simgrid.readme
-//  MSG_storage_file_rename(storage, "./tmp/data.txt", "./tmp/simgrid.readme");
+  XBT_INFO("*** Renaming './tmp/data.txt' into './tmp/simgrid.readme'");
+  MSG_storage_file_rename(storage, "./tmp/data.txt", "./tmp/simgrid.readme");
 
   // Now attach some user data to disk1
   XBT_INFO("*** Get/set data for storage element: %s ***",storage_name);
@@ -118,13 +115,13 @@ static int host(int argc, char *argv[]){
   char* mountname;
   xbt_dict_t content;
   char* path;
-  sg_storage_size_t *size;
+  sg_size_t *size;
   xbt_dict_foreach(contents, curs, mountname, content){
     XBT_INFO("Print the content of mount point: %s",mountname);
     xbt_dict_foreach(content,curs2,path,size){
-       XBT_INFO("%s size: %"PRIu64" bytes", path,*((sg_storage_size_t*)size));
+       XBT_INFO("%s size: %llu bytes", path,*((sg_size_t*)size));
     }
-    xbt_dict_free(&content);
+  xbt_dict_free(&content);
   }
   xbt_dict_free(&contents);
   return 1;