/* 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 "../surf/StorageImpl.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
-#include "xbt/lib.h"
+#include "src/plugins/file_system/FileSystem.hpp"
+#include "src/surf/StorageImpl.hpp"
#include <unordered_map>
namespace simgrid {
+namespace xbt {
+template class Extendable<simgrid::s4u::Storage>;
+}
+
namespace s4u {
-std::unordered_map<std::string, Storage*>* allStorages()
+
+std::map<std::string, Storage*>* allStorages()
{
std::unordered_map<std::string, surf::StorageImpl*>* map = surf::StorageImpl::storagesMap();
- std::unordered_map<std::string, Storage*>* res = new std::unordered_map<std::string, Storage*>;
- for (auto s : *map)
+ std::map<std::string, Storage*>* res = new std::map<std::string, Storage*>;
+ for (auto const& s : *map)
res->insert({s.first, &(s.second->piface_)}); // Convert each entry into its interface
return res;
}
-Storage* Storage::byName(const char* name)
+Storage* Storage::byName(std::string name)
{
surf::StorageImpl* res = surf::StorageImpl::byName(name);
if (res == nullptr)
return &res->piface_;
}
-const char* Storage::name()
+const std::string& Storage::getName() const
{
- return pimpl_->cname();
+ return pimpl_->getName();
}
-const char* Storage::host()
+const char* Storage::getCname() const
{
- return pimpl_->attach_;
+ return pimpl_->getCname();
}
-sg_size_t Storage::sizeFree()
+const char* Storage::getType()
{
- return simgrid::simix::kernelImmediate([this] { return pimpl_->getFreeSize(); });
+ return pimpl_->typeId_.c_str();
}
-sg_size_t Storage::sizeUsed()
+Host* Storage::getHost()
{
- return simgrid::simix::kernelImmediate([this] { return pimpl_->getUsedSize(); });
+ return attached_to_;
}
-sg_size_t Storage::size() {
- return pimpl_->size_;
-}
-xbt_dict_t Storage::properties()
+std::map<std::string, std::string>* Storage::getProperties()
{
return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); });
}
-const char* Storage::property(const char* key)
+const char* Storage::getProperty(std::string key)
+{
+ return this->pimpl_->getProperty(key);
+}
+
+void Storage::setProperty(std::string key, std::string value)
{
- return static_cast<const char*>(xbt_dict_get_or_null(this->properties(), key));
+ simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); });
}
-void Storage::setProperty(const char* key, char* value)
+sg_size_t Storage::read(sg_size_t size)
{
- xbt_dict_set(this->properties(), key, value, nullptr);
+ return simcall_storage_read(pimpl_, size);
}
-std::map<std::string, sg_size_t*>* Storage::content()
+sg_size_t Storage::write(sg_size_t size)
{
- return simgrid::simix::kernelImmediate([this] { return pimpl_->getContent(); });
+ return simcall_storage_write(pimpl_, size);
}
/*************