X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cb462a8ced7fd3a3fc92e6990fb23514d4591902..45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a:/teshsuite/msg/storage/storage_basic.c

diff --git a/teshsuite/msg/storage/storage_basic.c b/teshsuite/msg/storage/storage_basic.c
index 8b501979bf..c386966d46 100644
--- a/teshsuite/msg/storage/storage_basic.c
+++ b/teshsuite/msg/storage/storage_basic.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. 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. */
+
 #include "msg/msg.h"
 #include "xbt/log.h"
 
@@ -8,7 +14,6 @@ void display_storage_properties(msg_storage_t storage);
 int hsm_put(const char *remote_host, const char *src, const char *dest);
 sg_size_t write_local_file(char *dest, sg_size_t file_size);
 sg_size_t read_local_file(const char *src);
-void display_storage_info(msg_host_t host);
 void dump_storage_by_name(char *name);
 void display_storage_content(msg_storage_t storage);
 void get_set_storage_data(const char *storage_name);
@@ -18,7 +23,7 @@ int server(int argc, char *argv[]);
 void storage_info(msg_host_t host)
 {
   const char* host_name = MSG_host_get_name(host);
-  XBT_INFO("*** Storage info on %s ***:", host_name);
+  XBT_INFO("*** Storage info on %s ***", host_name);
 
   xbt_dict_cursor_t cursor = NULL;
   char* mount_name;
@@ -29,16 +34,17 @@ void storage_info(msg_host_t host)
 
   xbt_dict_foreach(storage_list,cursor,mount_name,storage_name)
   {
-    XBT_INFO("Storage name: %s, mount name: %s", storage_name, mount_name);
+    XBT_INFO("\tStorage name: %s, mount name: %s", storage_name, mount_name);
 
     sg_size_t free_size = MSG_storage_get_free_size(mount_name);
     sg_size_t used_size = MSG_storage_get_used_size(mount_name);
 
-    XBT_INFO("Free size: %llu bytes", free_size);
-    XBT_INFO("Used size: %llu bytes", used_size);
+    XBT_INFO("\t\tFree size: %llu bytes", free_size);
+    XBT_INFO("\t\tUsed size: %llu bytes", used_size);
 
     storage = MSG_storage_get_by_name(storage_name);
     display_storage_properties(storage);
+    dump_storage_by_name(storage_name);
   }
   xbt_dict_free(&storage_list);
 }
@@ -47,12 +53,12 @@ void display_storage_properties(msg_storage_t storage){
   xbt_dict_cursor_t cursor = NULL;
   char *key, *data;
   xbt_dict_t props = MSG_storage_get_properties(storage);
-  if (props){
-    XBT_INFO("Properties of mounted storage: %s", MSG_storage_get_name(storage));
+  if (xbt_dict_length(props) > 0){
+    XBT_INFO("\tProperties of mounted storage: %s", MSG_storage_get_name(storage));
     xbt_dict_foreach(props, cursor, key, data)
-	  XBT_INFO("'%s' -> '%s'", key, data);
+	  XBT_INFO("\t\t'%s' -> '%s'", key, data);
   }else{
-	XBT_INFO("No property attached.");
+	XBT_INFO("\tNo property attached.");
   }
 }
 
@@ -66,17 +72,18 @@ int hsm_put(const char *remote_host, const char *src, const char *dest){
   XBT_INFO("%s sends %llu to %s",MSG_host_get_name(MSG_host_self()),read_size,remote_host);
   msg_task_t to_execute = MSG_task_create((const char*)"hsm_put", 0, (double) read_size, (void*)dest);
   MSG_task_send(to_execute, remote_host);
-
+  MSG_process_sleep(.4);
   return 1;
 }
 
 sg_size_t write_local_file(char *dest, sg_size_t file_size)
 {
-  sg_size_t write;
+  sg_size_t written;
   msg_file_t file = MSG_file_open("/sd1",dest, NULL);
-  write = MSG_file_write(file, file_size);
+  written = MSG_file_write(file, file_size);
+  XBT_INFO("%llu bytes on %llu bytes have been written by %s on /sd1",written, file_size, MSG_host_get_name(MSG_host_self()));
   MSG_file_close(file);
-  return write;
+  return written;
 }
 
 sg_size_t read_local_file(const char *src)
@@ -92,24 +99,6 @@ sg_size_t read_local_file(const char *src)
   return read;
 }
 
-void display_storage_info(msg_host_t host)
-{
-  const char* host_name = MSG_host_get_name(host);
-  XBT_INFO("*** Storage info of: %s ***", host_name);
-
-  xbt_dict_cursor_t cursor = NULL;
-  char* mount_name;
-  char* storage_name;
-
-  xbt_dict_t storage_list = MSG_host_get_storage_list(host);
-
-  xbt_dict_foreach(storage_list,cursor,mount_name,storage_name)
-  {
-    dump_storage_by_name(storage_name);
-  }
-  xbt_dict_free(&storage_list);
-}
-
 void dump_storage_by_name(char *name){
   XBT_INFO("*** Dump a storage element ***");
   msg_storage_t storage = MSG_storage_get_by_name(name);
@@ -130,9 +119,9 @@ void display_storage_content(msg_storage_t storage){
   xbt_dict_t content = MSG_storage_get_content(storage);
   if (content){
     xbt_dict_foreach(content, cursor, file, psize)
-    XBT_INFO("%s size: %llu bytes", file, *psize);
+    XBT_INFO("\t%s size: %llu bytes", file, *psize);
   } else {
-    XBT_INFO("No content.");
+    XBT_INFO("\tNo content.");
   }
   xbt_dict_free(&content);
 }
@@ -145,20 +134,19 @@ void get_set_storage_data(const char *storage_name){
 
   MSG_storage_set_data(storage,strdup("Some data"));
   data = MSG_storage_get_data(storage);
-  XBT_INFO("Set and get data: '%s'", data);
+  XBT_INFO("\tSet and get data: '%s'", data);
 }
 
 int client(int argc, char *argv[])
 {
-  hsm_put("server","./doc/simgrid/examples/cxx/autoDestination/FinalizeTask.cxx","./scratch/toto.xml");
-  hsm_put("server","./doc/simgrid/examples/cxx/autoDestination/autoDestination_deployment.xml","./scratch/titi.cxx");
+  hsm_put("server","./doc/simgrid/examples/cxx/autoDestination/FinalizeTask.cxx","./scratch/toto.cxx");
+  hsm_put("server","./doc/simgrid/examples/cxx/autoDestination/autoDestination_deployment.xml","./scratch/titi.xml");
   hsm_put("server","./doc/simgrid/examples/cxx/autoDestination/Slave.cxx","./scratch/tata.cxx");
 
   msg_task_t finalize = MSG_task_create("finalize", 0, 0, NULL);
   MSG_task_send(finalize, "server");
 
   get_set_storage_data("cdisk");
-  display_storage_info(MSG_host_self());
 
   return 1;
 }
@@ -168,9 +156,9 @@ int server(int argc, char *argv[])
   msg_task_t to_execute = NULL;
   _XBT_GNUC_UNUSED int res;
 
-  display_storage_info(MSG_host_self());
+  storage_info(MSG_host_self());
 
-  XBT_INFO("Server waiting for transfers");
+  XBT_INFO("Server waiting for transfers ...");
   while(1){
     res = MSG_task_receive(&(to_execute), MSG_host_get_name(MSG_host_self()));
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
@@ -193,7 +181,7 @@ int server(int argc, char *argv[])
     to_execute = NULL;
   }
 
-  display_storage_info(MSG_host_self());
+  storage_info(MSG_host_self());
   return 1;
 }