X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8db87bde70b28b9c6fcf5be4d924f6c3a141c715..53782855f0f3041e92f763891722e8a253479451:/teshsuite/s4u/storage_client_server/storage_client_server.cpp

diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.cpp b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
index 5d507fd050..85eabc7569 100644
--- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015, 2017. The    SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2017. 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. */
@@ -11,12 +10,13 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(storage, "Messages specific for this simulation");
 
 static void display_storage_properties(simgrid::s4u::Storage* storage)
 {
-  xbt_dict_cursor_t cursor = NULL;
-  char* key;
-  char* data;
   xbt_dict_t props = storage->properties();
   if (xbt_dict_length(props) > 0) {
     XBT_INFO("\tProperties of mounted storage: %s", storage->name());
+
+    xbt_dict_cursor_t cursor = NULL;
+    char* key;
+    char* data;
     xbt_dict_foreach (props, cursor, key, data)
       XBT_INFO("\t\t'%s' -> '%s'", key, data);
   } else {
@@ -56,84 +56,71 @@ static void hsm_put(const char* remote_host, const char* src, const char* dest)
   XBT_INFO("%s sends %llu to %s", simgrid::s4u::this_actor::name().c_str(), read_size, remote_host);
   char* payload                    = bprintf("%s %llu", dest, read_size);
   simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(remote_host);
-  simgrid::s4u::this_actor::send(mailbox, payload, static_cast<double>(read_size));
+  mailbox->send(payload, static_cast<double>(read_size));
   simgrid::s4u::this_actor::sleep_for(.4);
 }
 
 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;
-  xbt_dict_t content = storage->content();
-  if (content) {
-    xbt_dict_foreach (content, cursor, file, psize)
-      XBT_INFO("\t%s size: %llu bytes", file, *psize);
+  std::map<std::string, sg_size_t>* content = storage->content();
+  if (not content->empty()) {
+    for (auto entry : *content)
+      XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), entry.second);
   } else {
     XBT_INFO("\tNo content.");
   }
-  xbt_dict_free(&content);
 }
 
-static void dump_storage_by_name(char* name)
+static void dump_storage_by_name(const char* name)
 {
   XBT_INFO("*** Dump a storage element ***");
-  simgrid::s4u::Storage& storage = simgrid::s4u::Storage::byName(name);
-  display_storage_content(&storage);
+  simgrid::s4u::Storage* storage = simgrid::s4u::Storage::byName(name);
+  display_storage_content(storage);
 }
 
 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);
+  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();
+  storage->setUserdata(xbt_strdup("Some data"));
+  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::map<std::string, simgrid::s4u::Storage*>* storages = simgrid::s4u::allStorages();
+
+  for (auto storage : *storages) {
+    XBT_INFO("Storage %s is attached to %s", storage.first.c_str(), storage.second->host()->cname());
+    storage.second->setProperty("other usage", xbt_strdup("gpfs"));
+  }
+  delete storages;
+}
 
 static void storage_info(simgrid::s4u::Host* host)
 {
   XBT_INFO("*** Storage info on %s ***", host->cname());
-  xbt_dict_cursor_t cursor = NULL;
-  char* mount_name;
-  char* storage_name;
 
-  xbt_dict_t storage_list = host->mountedStoragesAsDict();
-  xbt_dict_foreach (storage_list, cursor, mount_name, storage_name) {
-    XBT_INFO("\tStorage name: %s, mount name: %s", storage_name, mount_name);
-    simgrid::s4u::Storage& storage = simgrid::s4u::Storage::byName(storage_name);
+  for (auto elm : host->mountedStorages()) {
+    const char* mount_name         = elm.first.c_str();
+    simgrid::s4u::Storage* storage = elm.second;
+    XBT_INFO("\tStorage name: %s, mount name: %s", storage->name(), mount_name);
 
-    sg_size_t free_size = storage.sizeFree();
-    sg_size_t used_size = storage.sizeUsed();
+    sg_size_t free_size = storage->sizeFree();
+    sg_size_t used_size = storage->sizeUsed();
 
     XBT_INFO("\t\tFree size: %llu bytes", free_size);
     XBT_INFO("\t\tUsed size: %llu bytes", used_size);
 
-    display_storage_properties(&storage);
-    dump_storage_by_name(storage_name);
+    display_storage_properties(storage);
+    dump_storage_by_name(storage->name());
   }
-  xbt_dict_free(&storage_list);
 }
 
 static void client()
@@ -143,7 +130,7 @@ static void client()
   hsm_put("alice", "/home/doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c", "c:\\Windows\\tata.c");
 
   simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName("alice");
-  simgrid::s4u::this_actor::send(mailbox, xbt_strdup("finalize"), 0);
+  mailbox->send(xbt_strdup("finalize"), 0);
 
   get_set_storage_data("Disk1");
 }
@@ -155,8 +142,8 @@ 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 ...
+    char* msg = static_cast<char*>(mailbox->recv());
+    if (not strcmp(msg, "finalize")) { // Shutdown ...
       xbt_free(msg);
       break;
     } else { // Receive file to save
@@ -164,11 +151,12 @@ static void server()
       char* dest              = strtok_r(msg, " ", &saveptr);
       sg_size_t size_to_write = std::stoull(strtok_r(nullptr, " ", &saveptr));
       write_local_file(dest, size_to_write);
+      xbt_free(dest);
     }
   }
 
   storage_info(simgrid::s4u::this_actor::host());
-  //  dump_platform_storages();
+  dump_platform_storages();
 }
 
 int main(int argc, char* argv[])
@@ -184,5 +172,6 @@ int main(int argc, char* argv[])
 
   XBT_INFO("Simulated time: %g", e->getClock());
 
+  delete e;
   return 0;
 }