X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07e23d67fa051a2507972338c09151e69c1ad2d4..666a812d1b3ee4568f2beb317dfcd08d99055697:/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 a524e29f4f..166d1341ec 100644
--- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
@@ -15,7 +15,7 @@ static void display_storage_properties(simgrid::s4u::Storage* storage)
 {
   std::map<std::string, std::string>* props = storage->getProperties();
   if (not props->empty()) {
-    XBT_INFO("\tProperties of mounted storage: %s", storage->getCname());
+    XBT_INFO("\tProperties of mounted storage: %s", storage->get_cname());
 
     for (auto const& elm : *props) {
       XBT_INFO("    %s->%s", elm.first.c_str(), elm.second.c_str());
@@ -30,7 +30,7 @@ static sg_size_t write_local_file(const std::string& dest, sg_size_t file_size)
   simgrid::s4u::File file(dest, nullptr);
   sg_size_t written = file.write(file_size);
   XBT_INFO("%llu bytes on %llu bytes have been written by %s on /sd1", written, file_size,
-           simgrid::s4u::Actor::self()->getCname());
+           simgrid::s4u::Actor::self()->get_cname());
   return written;
 }
 
@@ -39,7 +39,7 @@ static sg_size_t read_local_file(const std::string& src)
   simgrid::s4u::File file(src, nullptr);
   sg_size_t file_size = file.size();
   sg_size_t read      = file.read(file_size);
-  XBT_INFO("%s has read %llu on %s", simgrid::s4u::Actor::self()->getCname(), read, src.c_str());
+  XBT_INFO("%s has read %llu on %s", simgrid::s4u::Actor::self()->get_cname(), read, src.c_str());
   return read;
 }
 
@@ -50,7 +50,7 @@ static void hsm_put(const std::string& remote_host, const std::string& src, cons
   sg_size_t read_size = read_local_file(src);
 
   // Send file
-  XBT_INFO("%s sends %llu to %s", simgrid::s4u::this_actor::getCname(), read_size, remote_host.c_str());
+  XBT_INFO("%s sends %llu to %s", simgrid::s4u::this_actor::get_cname(), read_size, remote_host.c_str());
   std::string* payload             = new std::string(simgrid::xbt::string_printf("%s %llu", dest.c_str(), read_size));
   simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(remote_host);
   mailbox->put(payload, static_cast<double>(read_size));
@@ -59,7 +59,7 @@ static void hsm_put(const std::string& remote_host, const std::string& src, cons
 
 static void display_storage_content(simgrid::s4u::Storage* storage)
 {
-  XBT_INFO("Print the content of the storage element: %s", storage->getCname());
+  XBT_INFO("Print the content of the storage element: %s", storage->get_cname());
   std::map<std::string, sg_size_t>* content = storage->extension<simgrid::s4u::FileSystemStorageExt>()->getContent();
   if (not content->empty()) {
     for (auto const& entry : *content)
@@ -91,28 +91,28 @@ static void get_set_storage_data(const std::string& storage_name)
 
 static void dump_platform_storages()
 {
-  std::vector<simgrid::s4u::Storage*> storages = simgrid::s4u::Engine::getInstance()->getAllStorages();
+  std::vector<simgrid::s4u::Storage*> storages = simgrid::s4u::Engine::get_instance()->get_all_storages();
 
   for (auto const& s : storages) {
-    XBT_INFO("Storage %s is attached to %s", s->getCname(), s->getHost()->getCname());
+    XBT_INFO("Storage %s is attached to %s", s->get_cname(), s->getHost()->get_cname());
     s->setProperty("other usage", "gpfs");
   }
 }
 
 static void storage_info(simgrid::s4u::Host* host)
 {
-  XBT_INFO("*** Storage info on %s ***", host->getCname());
+  XBT_INFO("*** Storage info on %s ***", host->get_cname());
 
   for (auto const& elm : host->getMountedStorages()) {
     const std::string& mount_name  = elm.first;
     simgrid::s4u::Storage* storage = elm.second;
-    XBT_INFO("\tStorage name: %s, mount name: %s", storage->getCname(), mount_name.c_str());
+    XBT_INFO("\tStorage name: %s, mount name: %s", storage->get_cname(), mount_name.c_str());
 
     XBT_INFO("\t\tFree size: %llu bytes", sg_storage_get_size_free(storage));
     XBT_INFO("\t\tUsed size: %llu bytes", sg_storage_get_size_used(storage));
 
     display_storage_properties(storage);
-    dump_storage_by_name(storage->getCname());
+    dump_storage_by_name(storage->get_cname());
   }
 }
 
@@ -130,8 +130,8 @@ static void client()
 
 static void server()
 {
-  storage_info(simgrid::s4u::this_actor::getHost());
-  simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(simgrid::s4u::this_actor::getHost()->getCname());
+  storage_info(simgrid::s4u::this_actor::get_host());
+  simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(simgrid::s4u::this_actor::get_host()->get_cname());
 
   XBT_INFO("Server waiting for transfers ...");
   while (1) {
@@ -148,7 +148,7 @@ static void server()
     }
   }
 
-  storage_info(simgrid::s4u::this_actor::getHost());
+  storage_info(simgrid::s4u::this_actor::get_host());
   dump_platform_storages();
 }
 
@@ -157,13 +157,13 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
   sg_storage_file_system_init();
   xbt_assert(argc == 2, "Usage: %s platform_file\n", argv[0]);
-  e.loadPlatform(argv[1]);
+  e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::createActor("server", simgrid::s4u::Host::by_name("alice"), server);
-  simgrid::s4u::Actor::createActor("client", simgrid::s4u::Host::by_name("bob"), client);
+  simgrid::s4u::Actor::create("server", simgrid::s4u::Host::by_name("alice"), server);
+  simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("bob"), client);
 
   e.run();
 
-  XBT_INFO("Simulated time: %g", e.getClock());
+  XBT_INFO("Simulated time: %g", e.get_clock());
   return 0;
 }