X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3368ca8f8b3fb922a94a217f0afc3243ae18c8f5..22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95:/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 1592629176..52d9ace4d2 100644 --- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp +++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp @@ -10,15 +10,13 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(storage, "Messages specific for this simulation"); static void display_storage_properties(simgrid::s4u::Storage* storage) { - 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); + std::map* props = storage->getProperties(); + if (not props->empty()) { + XBT_INFO("\tProperties of mounted storage: %s", storage->getCname()); + + for (auto const& elm : *props) { + XBT_INFO(" %s->%s", elm.first.c_str(), elm.second.c_str()); + } } else { XBT_INFO("\tNo property attached."); } @@ -29,7 +27,7 @@ static sg_size_t write_local_file(const char* dest, sg_size_t file_size) simgrid::s4u::File* file = new simgrid::s4u::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()->name().c_str()); + simgrid::s4u::Actor::self()->getCname()); delete file; return written; } @@ -40,7 +38,7 @@ static sg_size_t read_local_file(const char* src) 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()->name().c_str(), read, src); + XBT_INFO("%s has read %llu on %s", simgrid::s4u::Actor::self()->getCname(), read, src); delete file; return read; @@ -53,19 +51,19 @@ static void hsm_put(const char* remote_host, const char* src, const char* dest) sg_size_t read_size = read_local_file(src); // Send file - XBT_INFO("%s sends %llu to %s", simgrid::s4u::this_actor::name().c_str(), read_size, remote_host); + XBT_INFO("%s sends %llu to %s", simgrid::s4u::this_actor::getCname(), read_size, remote_host); char* payload = bprintf("%s %llu", dest, read_size); simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(remote_host); - mailbox->send(payload, static_cast(read_size)); + mailbox->put(payload, static_cast(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()); - std::map* content = storage->content(); + XBT_INFO("Print the content of the storage element: %s", storage->getCname()); + std::map* content = storage->getContent(); if (not content->empty()) { - for (auto entry : *content) + for (auto const& entry : *content) XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), entry.second); } else { XBT_INFO("\tNo content."); @@ -84,10 +82,10 @@ 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 = static_cast(storage->userdata()); + char* data = static_cast(storage->getUserdata()); XBT_INFO("Get data: '%s'", data); storage->setUserdata(xbt_strdup("Some data")); - data = static_cast(storage->userdata()); + data = static_cast(storage->getUserdata()); XBT_INFO("\tSet and get data: '%s'", data); xbt_free(data); } @@ -96,30 +94,30 @@ static void dump_platform_storages() { std::map* 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")); + 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; } static void storage_info(simgrid::s4u::Host* host) { - XBT_INFO("*** Storage info on %s ***", host->cname()); + XBT_INFO("*** Storage info on %s ***", host->getCname()); - for (auto elm : host->mountedStorages()) { + for (auto const& elm : host->getMountedStorages()) { 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); + XBT_INFO("\tStorage name: %s, mount name: %s", storage->getCname(), mount_name); - sg_size_t free_size = storage->sizeFree(); - sg_size_t used_size = storage->sizeUsed(); + sg_size_t free_size = storage->getSizeFree(); + sg_size_t used_size = storage->getSizeUsed(); 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()); + dump_storage_by_name(storage->getCname()); } } @@ -130,19 +128,19 @@ 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"); - mailbox->send(xbt_strdup("finalize"), 0); + mailbox->put(xbt_strdup("finalize"), 0); get_set_storage_data("Disk1"); } static void server() { - storage_info(simgrid::s4u::this_actor::host()); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(simgrid::s4u::this_actor::host()->cname()); + storage_info(simgrid::s4u::this_actor::getHost()); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(simgrid::s4u::this_actor::getHost()->getCname()); XBT_INFO("Server waiting for transfers ..."); while (1) { - char* msg = static_cast(simgrid::s4u::this_actor::recv(mailbox)); + char* msg = static_cast(mailbox->get()); if (not strcmp(msg, "finalize")) { // Shutdown ... xbt_free(msg); break; @@ -155,7 +153,7 @@ static void server() } } - storage_info(simgrid::s4u::this_actor::host()); + storage_info(simgrid::s4u::this_actor::getHost()); dump_platform_storages(); }