X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82230d737404aa70c3c2b5824d97109f1f129d58..86a1011750f50a04258aa9cf0eeb23e666cf6bf2:/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 9ef8840fa8..8c1f927bfc 100644 --- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp +++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp @@ -1,25 +1,27 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2021. 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 "simgrid/s4u.hpp" -#include +#include +#include #include +#include + XBT_LOG_NEW_DEFAULT_CATEGORY(storage, "Messages specific for this simulation"); -static void display_storage_properties(simgrid::s4u::Storage* storage) +static void display_disk_properties(const simgrid::s4u::Disk* disk) { - std::map* props = storage->getProperties(); + const std::unordered_map* props = disk->get_properties(); if (not props->empty()) { - XBT_INFO("\tProperties of mounted storage: %s", storage->getCname()); + XBT_INFO(" Properties of disk: %s", disk->get_cname()); for (auto const& elm : *props) { XBT_INFO(" %s->%s", elm.first.c_str(), elm.second.c_str()); } } else { - XBT_INFO("\tNo property attached."); + XBT_INFO(" No property attached."); } } @@ -28,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; } @@ -37,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; } @@ -48,123 +50,110 @@ 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()); - 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(read_size)); + XBT_INFO("%s sends %llu to %s", simgrid::s4u::this_actor::get_cname(), read_size, remote_host.c_str()); + auto* payload = new std::string(simgrid::xbt::string_printf("%s %llu", dest.c_str(), read_size)); + auto* mailbox = simgrid::s4u::Mailbox::by_name(remote_host); + mailbox->put(payload, read_size); simgrid::s4u::this_actor::sleep_for(.4); } -static void display_storage_content(simgrid::s4u::Storage* storage) +static void display_disk_content(const simgrid::s4u::Disk* disk) { - XBT_INFO("Print the content of the storage element: %s", storage->getCname()); - std::map* content = storage->getContent(); + XBT_INFO("*** Dump a disk ***"); + XBT_INFO("Print the content of the disk: %s", disk->get_cname()); + const auto* content = disk->extension()->get_content(); if (not content->empty()) { for (auto const& entry : *content) - XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), entry.second); + XBT_INFO(" %s size: %llu bytes", entry.first.c_str(), entry.second); } else { - XBT_INFO("\tNo content."); + XBT_INFO(" No content."); } } -static void dump_storage_by_name(const std::string& name) -{ - XBT_INFO("*** Dump a storage element ***"); - simgrid::s4u::Storage* storage = simgrid::s4u::Storage::byName(name); - display_storage_content(storage); -} - -static void get_set_storage_data(const std::string& storage_name) +static void get_set_disk_data(simgrid::s4u::Disk* disk) { - XBT_INFO("*** GET/SET DATA for storage element: %s ***", storage_name.c_str()); - simgrid::s4u::Storage* storage = simgrid::s4u::Storage::byName(storage_name); - - char* data = static_cast(storage->getUserdata()); - XBT_INFO("Get data: '%s'", data); - storage->setUserdata(xbt_strdup("Some data")); - data = static_cast(storage->getUserdata()); - XBT_INFO("\tSet and get data: '%s'", data); - xbt_free(data); + XBT_INFO("*** GET/SET DATA for disk: %s ***", disk->get_cname()); + + const std::string* data = static_cast(disk->get_data()); + XBT_INFO("Get data: '%s'", data ? data->c_str() : "No User Data"); + disk->set_data(new std::string("Some data")); + data = static_cast(disk->get_data()); + XBT_INFO(" Set and get data: '%s'", data->c_str()); + delete data; } -static void dump_platform_storages() +static void dump_platform_disks() { - std::map* storages = simgrid::s4u::allStorages(); - - for (auto const& storage : *storages) { - XBT_INFO("Storage %s is attached to %s", storage.first.c_str(), storage.second->getHost()->getCname()); - storage.second->setProperty("other usage", "gpfs"); - } - delete storages; + for (auto const& h : simgrid::s4u::Engine::get_instance()->get_all_hosts()) + for (auto const& d : h->get_disks()) { + if (h == d->get_host()) + XBT_INFO("%s is attached to %s", d->get_cname(), d->get_host()->get_cname()); + d->set_property("other usage", "gpfs"); + } } -static void storage_info(simgrid::s4u::Host* host) +static void disk_info(const simgrid::s4u::Host* host) { - XBT_INFO("*** Storage info on %s ***", host->getCname()); - - 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("*** Disk info on %s ***", host->get_cname()); - sg_size_t free_size = storage->getSizeFree(); - sg_size_t used_size = storage->getSizeUsed(); + for (auto const& disk : host->get_disks()) { + const char* mount_name = sg_disk_get_mount_point(disk); + XBT_INFO(" Disk name: %s, mount name: %s", disk->get_cname(), mount_name); - XBT_INFO("\t\tFree size: %llu bytes", free_size); - XBT_INFO("\t\tUsed size: %llu bytes", used_size); + XBT_INFO(" Free size: %llu bytes", sg_disk_get_size_free(disk)); + XBT_INFO(" Used size: %llu bytes", sg_disk_get_size_used(disk)); - display_storage_properties(storage); - dump_storage_by_name(storage->getCname()); + display_disk_properties(disk); + display_disk_content(disk); } } static void client() { - hsm_put("alice", "/home/doc/simgrid/examples/msg/icomms/small_platform.xml", "c:\\Windows\\toto.cxx"); - hsm_put("alice", "/home/doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml", "c:\\Windows\\titi.xml"); - hsm_put("alice", "/home/doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c", "c:\\Windows\\tata.c"); + hsm_put("alice", "/scratch/doc/simgrid/examples/msg/icomms/small_platform.xml", "/tmp/toto.xml"); + hsm_put("alice", "/scratch/doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml", "/tmp/titi.xml"); + hsm_put("alice", "/scratch/doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c", "/tmp/tata.c"); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName("alice"); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name("alice"); mailbox->put(new std::string("finalize"), 0); - get_set_storage_data("Disk1"); + get_set_disk_data(simgrid::s4u::Host::current()->get_disks().front()); // Disk1 } static void server() { - storage_info(simgrid::s4u::this_actor::getHost()); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(simgrid::s4u::this_actor::getHost()->getCname()); + disk_info(simgrid::s4u::this_actor::get_host()); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(simgrid::s4u::this_actor::get_host()->get_cname()); XBT_INFO("Server waiting for transfers ..."); - while (1) { - std::string* msg = static_cast(mailbox->get()); + while (true) { + auto msg = mailbox->get_unique(); if (*msg == "finalize") { // Shutdown ... - delete msg; break; } else { // Receive file to save size_t pos = msg->find(' '); std::string dest = msg->substr(0, pos); sg_size_t size_to_write = std::stoull(msg->substr(pos + 1)); write_local_file(dest, size_to_write); - delete msg; } } - storage_info(simgrid::s4u::this_actor::getHost()); - dump_platform_storages(); + disk_info(simgrid::s4u::this_actor::get_host()); + dump_platform_disks(); } 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", e.host_by_name("alice"), server); + simgrid::s4u::Actor::create("client", e.host_by_name("bob"), client); e.run(); - XBT_INFO("Simulated time: %g", e.getClock()); + XBT_INFO("Simulated time: %g", e.get_clock()); return 0; }