X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19e4a01d6e38e856dafa1a08942143a8ec7f5e34..abf1df51ff436edb891e99e30daa01324c8efca2:/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 78598bcd5f..78fe0efb7f 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-2019. 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) { - std::map* props = storage->getProperties(); + const std::unordered_map* props = storage->get_properties(); if (not props->empty()) { - XBT_INFO("\tProperties of mounted storage: %s", storage->getCname()); + XBT_INFO(" Properties of mounted storage: %s", storage->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,83 +50,79 @@ 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(read_size)); + simgrid::s4u::Mailbox* 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) { - XBT_INFO("Print the content of the storage element: %s", storage->getCname()); - std::map* content = storage->getContent(); + XBT_INFO("Print the content of the storage element: %s", storage->get_cname()); + std::map* content = storage->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); + simgrid::s4u::Storage* storage = simgrid::s4u::Storage::by_name(name); display_storage_content(storage); } static void get_set_storage_data(const std::string& storage_name) { 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); + simgrid::s4u::Storage* storage = simgrid::s4u::Storage::by_name(storage_name); + + std::string* data = static_cast(storage->get_data()); + XBT_INFO("Get data: '%s'", data ? data->c_str() : "No User Data"); + storage->set_data(new std::string("Some data")); + data = static_cast(storage->get_data()); + XBT_INFO(" Set and get data: '%s'", data->c_str()); + delete data; } static void dump_platform_storages() { - std::map* storages = simgrid::s4u::allStorages(); + std::vector storages = simgrid::s4u::Engine::get_instance()->get_all_storages(); - 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"); + for (auto const& s : storages) { + XBT_INFO("Storage %s is attached to %s", s->get_cname(), s->get_host()->get_cname()); + s->set_property("other usage", "gpfs"); } - delete storages; } 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()) { + for (auto const& elm : host->get_mounted_storages()) { 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()); - - sg_size_t free_size = storage->getSizeFree(); - sg_size_t used_size = storage->getSizeUsed(); + XBT_INFO(" Storage name: %s, mount name: %s", storage->get_cname(), mount_name.c_str()); - 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_storage_get_size_free(storage)); + XBT_INFO(" Used 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()); } } 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", "/home/doc/simgrid/examples/msg/icomms/small_platform.xml", "/tmp/toto.xml"); + hsm_put("alice", "/home/doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml", "/tmp/titi.xml"); + hsm_put("alice", "/home/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"); @@ -132,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::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(simgrid::s4u::this_actor::get_host()->get_cname()); XBT_INFO("Server waiting for transfers ..."); while (1) { @@ -150,7 +148,7 @@ static void server() } } - storage_info(simgrid::s4u::this_actor::getHost()); + storage_info(simgrid::s4u::this_actor::get_host()); dump_platform_storages(); } @@ -159,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; }