X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a69abcc786d029bd2962537f767d12a0f808d11..f2907d4c4e2bfdd55ae8a7c41711b731d106f668:/teshsuite/s4u/storage_client_server/storage_client_server.cpp?ds=sidebyside

diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.cpp b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
index abb3536473..0dbda82536 100644
--- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
@@ -63,11 +63,8 @@ static void hsm_put(const char* remote_host, const char* src, const char* dest)
 static void display_storage_content(simgrid::s4u::Storage* storage)
 {
   XBT_INFO("Print the content of the storage element: %s", storage->name());
-  xbt_dict_cursor_t cursor = NULL;
-  char* file;
-  sg_size_t* psize;
   std::map<std::string, sg_size_t*>* content = storage->content();
-  if (!content->empty()) {
+  if (not content->empty()) {
     for (auto entry : *content)
       XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), *entry.second);
   } else {
@@ -87,29 +84,26 @@ static void get_set_storage_data(const char* storage_name)
   XBT_INFO("*** GET/SET DATA for storage element: %s ***", storage_name);
   simgrid::s4u::Storage& storage = simgrid::s4u::Storage::byName(storage_name);
 
-  char* data = (char*)storage.userdata();
+  char* data = static_cast<char*>(storage.userdata());
   XBT_INFO("Get data: '%s'", data);
   storage.setUserdata(xbt_strdup("Some data"));
-  data = (char*)storage.userdata();
+  data = static_cast<char*>(storage.userdata());
   XBT_INFO("\tSet and get data: '%s'", data);
   xbt_free(data);
 }
 
-// static void dump_platform_storages(void){
-//  unsigned int cursor;
-//  xbt_dynar_t storages = MSG_storages_as_dynar();
-//  msg_storage_t storage;
-//  xbt_dynar_foreach(storages, cursor, storage){
-//    XBT_INFO("Storage %s is attached to %s", MSG_storage_get_name(storage), MSG_storage_get_host(storage));
-//    MSG_storage_set_property_value(storage, "other usage", xbt_strdup("gpfs"));
-//  }
-//  xbt_dynar_free(&storages);
-// Expected output in tesh file
-//> [  1.207952] (server@alice) Storage Disk1 is attached to bob
-//> [  1.207952] (server@alice) Storage Disk2 is attached to alice
-//> [  1.207952] (server@alice) Storage Disk3 is attached to carl
-//> [  1.207952] (server@alice) Storage Disk4 is attached to denise
-//}
+static void dump_platform_storages()
+{
+  std::unordered_map<std::string, simgrid::s4u::Storage*>* storages = simgrid::s4u::Storage().allStorages();
+
+  for (auto storage : *storages) {
+    XBT_INFO("Storage %s is attached to %s", storage.first.c_str(), storage.second->host());
+    storage.second->setProperty("other usage", xbt_strdup("gpfs"));
+  }
+  // Expected output in tesh file that's missing for now
+  //> [  1.207952] (server@alice) Storage Disk3 is attached to carl
+  //> [  1.207952] (server@alice) Storage Disk4 is attached to denise
+}
 
 static void storage_info(simgrid::s4u::Host* host)
 {
@@ -155,7 +149,7 @@ static void server()
   XBT_INFO("Server waiting for transfers ...");
   while (1) {
     char* msg = static_cast<char*>(simgrid::s4u::this_actor::recv(mailbox));
-    if (!strcmp(msg, "finalize")) { // Shutdown ...
+    if (not strcmp(msg, "finalize")) { // Shutdown ...
       xbt_free(msg);
       break;
     } else { // Receive file to save
@@ -168,7 +162,7 @@ static void server()
   }
 
   storage_info(simgrid::s4u::this_actor::host());
-  //  dump_platform_storages();
+  dump_platform_storages();
 }
 
 int main(int argc, char* argv[])