-/* 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 "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
#include "src/surf/storage_interface.hpp"
-
#include "xbt/lib.h"
+#include <unordered_map>
+
extern xbt_lib_t storage_lib;
namespace simgrid {
namespace s4u {
-boost::unordered_map <std::string, Storage *> *Storage::storages_ = new boost::unordered_map<std::string, Storage*> ();
+std::unordered_map<std::string, Storage*>* Storage::storages_ = new std::unordered_map<std::string, Storage*>();
+
Storage::Storage(std::string name, smx_storage_t inferior) :
name_(name), pimpl_(inferior)
{
- size_ = SIMIX_storage_get_size(pimpl_);
+ hostname_ = surf_storage_get_host(pimpl_);
+ size_ = surf_storage_get_size(pimpl_);
storages_->insert({name, this});
}
Storage::~Storage() = default;
-smx_storage_t Storage::inferior() {
+smx_storage_t Storage::inferior()
+{
return pimpl_;
}
-Storage &Storage::byName(const char*name) {
- s4u::Storage *res = nullptr;
+
+Storage& Storage::byName(const char* name)
+{
+ s4u::Storage* res = nullptr;
try {
res = storages_->at(name);
} catch (std::out_of_range& e) {
return name_.c_str();
}
+const char* Storage::host()
+{
+ return hostname_.c_str();
+}
+
sg_size_t Storage::sizeFree()
{
- return simcall_storage_get_free_size(pimpl_);
+ return simgrid::simix::kernelImmediate([this] { return surf_storage_resource_priv(pimpl_)->getFreeSize(); });
}
sg_size_t Storage::sizeUsed()
{
- return simcall_storage_get_used_size(pimpl_);
+ return simgrid::simix::kernelImmediate([this] { return surf_storage_resource_priv(pimpl_)->getUsedSize(); });
}
sg_size_t Storage::size() {
return simcall_storage_get_properties(pimpl_);
}
+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 surf_storage_resource_priv(this->pimpl_)->getContent(); });
+}
+
+std::unordered_map<std::string, Storage*>* Storage::allStorages()
+{
+ return storages_;
}
} /* namespace s4u */