-/* Copyright (c) 2006-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. 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/storage.hpp"
+#include "../surf/StorageImpl.hpp"
+#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
-#include "src/surf/storage_interface.hpp"
-
#include "xbt/lib.h"
-extern xbt_lib_t storage_lib;
+#include <unordered_map>
namespace simgrid {
namespace s4u {
-
-boost::unordered_map <std::string, Storage *> *Storage::storages_ = new boost::unordered_map<std::string, Storage*> ();
-Storage::Storage(std::string name, smx_storage_t inferior) :
- name_(name), pimpl_(inferior)
+std::unordered_map<std::string, Storage*>* allStorages()
{
- size_ = SIMIX_storage_get_size(pimpl_);
- storages_->insert({name, this});
-}
-
-Storage::~Storage() = default;
+ 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)
+ res->insert({s.first, &(s.second->piface_)}); // Convert each entry into its interface
-smx_storage_t Storage::inferior() {
- return pimpl_;
+ return res;
}
-Storage &Storage::byName(const char*name) {
- s4u::Storage *res = nullptr;
- try {
- res = storages_->at(name);
- } catch (std::out_of_range& e) {
- smx_storage_t inferior = xbt_lib_get_elm_or_null(storage_lib,name);
- if (inferior == nullptr)
- xbt_die("Storage %s does not exist. Please only use the storages that are defined in your platform.", name);
-
- res = new Storage(name,inferior);
- }
- return *res;
+
+Storage* Storage::byName(const char* name)
+{
+ surf::StorageImpl* res = surf::StorageImpl::byName(name);
+ if (res == nullptr)
+ return nullptr;
+ return &res->piface_;
}
const char* Storage::name()
{
- return name_.c_str();
+ return pimpl_->cname();
+}
+
+const char* Storage::host()
+{
+ return pimpl_->attach_;
}
sg_size_t Storage::sizeFree()
{
- return simcall_storage_get_free_size(pimpl_);
+ return simgrid::simix::kernelImmediate([this] { return pimpl_->getFreeSize(); });
}
sg_size_t Storage::sizeUsed()
{
- return simcall_storage_get_used_size(pimpl_);
+ return simgrid::simix::kernelImmediate([this] { return pimpl_->getUsedSize(); });
}
sg_size_t Storage::size() {
- return size_;
+ return pimpl_->size_;
}
xbt_dict_t Storage::properties()
{
- return simcall_storage_get_properties(pimpl_);
+ return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); });
+}
+
+const char* Storage::property(const char* key)
+{
+ return static_cast<const char*>(xbt_dict_get_or_null(this->properties(), key));
+}
+
+void Storage::setProperty(const char* key, char* value)
+{
+ xbt_dict_set(this->properties(), key, value, nullptr);
}
std::map<std::string, sg_size_t*>* Storage::content()
{
- return simgrid::simix::kernelImmediate(
- [this] { return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(this->pimpl_))->getContent(); });
+ return simgrid::simix::kernelImmediate([this] { return pimpl_->getContent(); });
}
+/*************
+ * Callbacks *
+ *************/
+simgrid::xbt::signal<void(s4u::Storage&)> Storage::onCreation;
+simgrid::xbt::signal<void(s4u::Storage&)> Storage::onDestruction;
+
} /* namespace s4u */
} /* namespace simgrid */