X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3249a61af03aef482d68997d15a1ef6e85503da..6865db1b80d2d06c80ff82e7246821958b56e2d2:/src/s4u/s4u_storage.cpp diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp index 952ec8dec1..d010801b6c 100644 --- a/src/s4u/s4u_storage.cpp +++ b/src/s4u/s4u_storage.cpp @@ -1,12 +1,11 @@ -/* 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 "../surf/StorageImpl.hpp" +#include "simgrid/s4u/Storage.hpp" #include "simgrid/simix.hpp" -#include "src/surf/storage_interface.hpp" #include "xbt/lib.h" #include @@ -59,12 +58,12 @@ const char* Storage::host() 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() {