A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for huge pages in shared malloc.
[simgrid.git]
/
src
/
s4u
/
s4u_storage.cpp
diff --git
a/src/s4u/s4u_storage.cpp
b/src/s4u/s4u_storage.cpp
index
e816d0d
..
ba1820b
100644
(file)
--- a/
src/s4u/s4u_storage.cpp
+++ b/
src/s4u/s4u_storage.cpp
@@
-1,10
+1,9
@@
-/* 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. */
/* 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/
s
torage.hpp"
+#include "simgrid/s4u/
S
torage.hpp"
#include "simgrid/simix.hpp"
#include "src/surf/storage_interface.hpp"
#include "xbt/lib.h"
#include "simgrid/simix.hpp"
#include "src/surf/storage_interface.hpp"
#include "xbt/lib.h"
@@
-59,12
+58,12
@@
const char* Storage::host()
sg_size_t Storage::sizeFree()
{
sg_size_t Storage::sizeFree()
{
- return sim
call_storage_get_free_size(pimpl_
);
+ return sim
grid::simix::kernelImmediate([this] { return surf_storage_resource_priv(pimpl_)->getFreeSize(); }
);
}
sg_size_t Storage::sizeUsed()
{
}
sg_size_t Storage::sizeUsed()
{
- return sim
call_storage_get_used_size(pimpl_
);
+ return sim
grid::simix::kernelImmediate([this] { return surf_storage_resource_priv(pimpl_)->getUsedSize(); }
);
}
sg_size_t Storage::size() {
}
sg_size_t Storage::size() {
@@
-88,8
+87,7
@@
void Storage::setProperty(const char* key, char* value)
std::map<std::string, sg_size_t*>* Storage::content()
{
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()
}
std::unordered_map<std::string, Storage*>* Storage::allStorages()