-/* Copyright (c) 2006-2015, 2017. 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"
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() {
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()