-/* Copyright (c) 2013-2015, 2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2018. 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 <simgrid/plugins/file_system.h>
+#include <simgrid/s4u.hpp>
+#include <xbt/string.hpp>
+
#include <string>
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<std::string, std::string>* props = storage->getProperties();
+ if (not props->empty()) {
+ 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());
+ }
} else {
XBT_INFO("\tNo property attached.");
}
}
-static sg_size_t write_local_file(const char* dest, sg_size_t file_size)
+static sg_size_t write_local_file(const std::string& dest, sg_size_t file_size)
{
- simgrid::s4u::File* file = new simgrid::s4u::File(dest, nullptr);
- sg_size_t written = file->write(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()->name().c_str());
- delete file;
+ simgrid::s4u::Actor::self()->get_cname());
return written;
}
-static sg_size_t read_local_file(const char* src)
+static sg_size_t read_local_file(const std::string& src)
{
- simgrid::s4u::File* file = new simgrid::s4u::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()->name().c_str(), read, src);
- delete file;
-
+ 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()->get_cname(), read, src.c_str());
return read;
}
// Read src file on local disk and send a put message to remote host (size of message = size of src file)
-static void hsm_put(const char* remote_host, const char* src, const char* dest)
+static void hsm_put(const std::string& remote_host, const std::string& src, const std::string& dest)
{
// Read local src file, and return the size that was actually read
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);
- char* payload = bprintf("%s %llu", dest, read_size);
+ 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);
- simgrid::s4u::this_actor::send(mailbox, payload, static_cast<double>(read_size));
+ mailbox->put(payload, static_cast<double>(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<std::string, sg_size_t*>* content = storage->content();
+ 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>()->get_content();
if (not content->empty()) {
- for (auto entry : *content)
- XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), *entry.second);
+ for (auto const& entry : *content)
+ XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), entry.second);
} else {
XBT_INFO("\tNo content.");
}
}
-static void dump_storage_by_name(char* name)
+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 char* storage_name)
+static void get_set_storage_data(const std::string& storage_name)
{
- XBT_INFO("*** GET/SET DATA for storage element: %s ***", 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<char*>(storage->userdata());
- XBT_INFO("Get data: '%s'", data);
- storage->setUserdata(xbt_strdup("Some data"));
- data = static_cast<char*>(storage->userdata());
- XBT_INFO("\tSet and get data: '%s'", data);
- xbt_free(data);
+ std::string* data = static_cast<std::string*>(storage->getUserdata());
+ XBT_INFO("Get data: '%s'", data ? data->c_str() : "No User Data");
+ storage->setUserdata(new std::string("Some data"));
+ data = static_cast<std::string*>(storage->getUserdata());
+ XBT_INFO("\tSet and get data: '%s'", data->c_str());
+ delete data;
}
static void dump_platform_storages()
{
- std::map<std::string, simgrid::s4u::Storage*>* storages = simgrid::s4u::allStorages();
+ std::vector<simgrid::s4u::Storage*> storages = simgrid::s4u::Engine::get_instance()->get_all_storages();
- for (auto storage : *storages) {
- XBT_INFO("Storage %s is attached to %s", storage.first.c_str(), storage.second->host());
- storage.second->setProperty("other usage", xbt_strdup("gpfs"));
+ for (auto const& s : storages) {
+ XBT_INFO("Storage %s is attached to %s", s->get_cname(), s->getHost()->get_cname());
+ s->setProperty("other usage", "gpfs");
}
- delete storages;
}
static void storage_info(simgrid::s4u::Host* host)
{
- XBT_INFO("*** Storage info on %s ***", host->cname());
- xbt_dict_cursor_t cursor = NULL;
- char* mount_name;
- char* storage_name;
-
- xbt_dict_t storage_list = host->mountedStoragesAsDict();
- xbt_dict_foreach (storage_list, cursor, mount_name, storage_name) {
- XBT_INFO("\tStorage name: %s, mount name: %s", storage_name, mount_name);
- simgrid::s4u::Storage* storage = simgrid::s4u::Storage::byName(storage_name);
+ XBT_INFO("*** Storage info on %s ***", host->get_cname());
- sg_size_t free_size = storage->sizeFree();
- sg_size_t used_size = storage->sizeUsed();
+ 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->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("\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_name);
+ dump_storage_by_name(storage->get_cname());
}
- xbt_dict_free(&storage_list);
}
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");
- simgrid::s4u::this_actor::send(mailbox, xbt_strdup("finalize"), 0);
+ mailbox->put(new std::string("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::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) {
- char* msg = static_cast<char*>(simgrid::s4u::this_actor::recv(mailbox));
- if (not strcmp(msg, "finalize")) { // Shutdown ...
- xbt_free(msg);
+ std::string* msg = static_cast<std::string*>(mailbox->get());
+ if (*msg == "finalize") { // Shutdown ...
+ delete msg;
break;
} else { // Receive file to save
- char* saveptr;
- char* dest = strtok_r(msg, " ", &saveptr);
- sg_size_t size_to_write = std::stoull(strtok_r(nullptr, " ", &saveptr));
+ 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);
- xbt_free(dest);
+ delete msg;
}
}
- storage_info(simgrid::s4u::this_actor::host());
+ storage_info(simgrid::s4u::this_actor::get_host());
dump_platform_storages();
}
int main(int argc, char* argv[])
{
- simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, 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]);
-
- simgrid::s4u::Actor::createActor("server", simgrid::s4u::Host::by_name("alice"), server);
- simgrid::s4u::Actor::createActor("client", simgrid::s4u::Host::by_name("bob"), client);
+ e.load_platform(argv[1]);
- e->run();
+ simgrid::s4u::Actor::create("server", simgrid::s4u::Host::by_name("alice"), server);
+ simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("bob"), client);
- XBT_INFO("Simulated time: %g", e->getClock());
+ e.run();
+ XBT_INFO("Simulated time: %g", e.get_clock());
return 0;
}
