-/* Copyright (c) 2013-2019. 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. */
XBT_LOG_NEW_DEFAULT_CATEGORY(storage, "Messages specific for this simulation");
-static void display_disk_properties(simgrid::s4u::Disk* disk)
+static void display_disk_properties(const simgrid::s4u::Disk* disk)
{
const std::unordered_map<std::string, std::string>* props = disk->get_properties();
if (not props->empty()) {
// Send file
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::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(remote_host);
+ 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_disk_content(simgrid::s4u::Disk* disk)
+static void display_disk_content(const simgrid::s4u::Disk* disk)
{
XBT_INFO("*** Dump a disk ***");
XBT_INFO("Print the content of the disk: %s", disk->get_cname());
- std::map<std::string, sg_size_t>* content = disk->extension<simgrid::s4u::FileSystemDiskExt>()->get_content();
+ const auto* content = disk->extension<simgrid::s4u::FileSystemDiskExt>()->get_content();
if (not content->empty()) {
for (auto const& entry : *content)
XBT_INFO(" %s size: %llu bytes", entry.first.c_str(), entry.second);
{
XBT_INFO("*** GET/SET DATA for disk: %s ***", disk->get_cname());
- std::string* data = static_cast<std::string*>(disk->get_data());
+ const std::string* data = static_cast<std::string*>(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<std::string*>(disk->get_data());
static void dump_platform_disks()
{
-
for (auto const& h : simgrid::s4u::Engine::get_instance()->get_all_hosts())
for (auto const& d : h->get_disks()) {
if (h == d->get_host())
}
}
-static void disk_info(simgrid::s4u::Host* host)
+static void disk_info(const simgrid::s4u::Host* host)
{
XBT_INFO("*** Disk info on %s ***", host->get_cname());
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<std::string*>(mailbox->get());
+ while (true) {
+ auto msg = mailbox->get_unique<std::string>();
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;
}
}
xbt_assert(argc == 2, "Usage: %s platform_file\n", argv[0]);
e.load_platform(argv[1]);
- simgrid::s4u::Actor::create("server", simgrid::s4u::Host::by_name("alice"), server);
- simgrid::s4u::Actor::create("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.get_clock());
+ XBT_INFO("Simulated time: %g", simgrid::s4u::Engine::get_clock());
return 0;
}