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
Merge branch 'master' into master
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Storage.hpp
diff --git
a/include/simgrid/s4u/Storage.hpp
b/include/simgrid/s4u/Storage.hpp
index
b807c7f
..
2f5f89d
100644
(file)
--- a/
include/simgrid/s4u/Storage.hpp
+++ b/
include/simgrid/s4u/Storage.hpp
@@
-17,17
+17,22
@@
#include <unordered_map>
namespace simgrid {
#include <unordered_map>
namespace simgrid {
-namespace xbt {
-extern template class XBT_PUBLIC Extendable<simgrid::s4u::Storage>;
-}
namespace s4u {
namespace s4u {
+#ifndef DOXYGEN
/** @deprecated Engine::get_all_storages() */
XBT_ATTRIB_DEPRECATED_v322("Please use Engine::get_all_storages()") XBT_PUBLIC void getStorageList(std::map<std::string, Storage*>* whereTo);
/** @deprecated Engine::get_all_storages() */
XBT_ATTRIB_DEPRECATED_v322("Please use Engine::get_all_storages()") XBT_PUBLIC void getStorageList(std::map<std::string, Storage*>* whereTo);
+#endif
+
+/** Storage represent the disk resources, usually associated to a given host
+ *
+ * By default, SimGrid does not keep track of the actual data being written but
+ * only computes the time taken by the corresponding data movement.
+ */
class XBT_PUBLIC Storage : public simgrid::xbt::Extendable<Storage> {
class XBT_PUBLIC Storage : public simgrid::xbt::Extendable<Storage> {
- friend s4u::Engine;
- friend s4u::Io;
+ friend s
imgrid::s
4u::Engine;
+ friend s
imgrid::s
4u::Io;
friend simgrid::surf::StorageImpl;
public:
friend simgrid::surf::StorageImpl;
public: