-/* Copyright (c) 2013-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 <string>
+#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)
static void display_storage_content(simgrid::s4u::Storage* storage)
{
XBT_INFO("Print the content of the storage element: %s", storage->getCname());
- std::map<std::string, sg_size_t>* content = storage->getContent();
+ std::map<std::string, sg_size_t>* content = storage->extension<simgrid::s4u::FileSystemStorageExt>()->getContent();
if (not content->empty()) {
for (auto const& entry : *content)
XBT_INFO("\t%s size: %llu bytes", entry.first.c_str(), entry.second);
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->getUserdata());
- XBT_INFO("Get data: '%s'", data);
- storage->setUserdata(xbt_strdup("Some data"));
- data = static_cast<char*>(storage->getUserdata());
- 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::getInstance()->getAllStorages();
- 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->getCname(), s->getHost()->getCname());
+ s->setProperty("other usage", "gpfs");
}
- delete storages;
}
static void storage_info(simgrid::s4u::Host* host)
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("\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->getCname());