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
mv VM shutdown to the plugin
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Storage.hpp
diff --git
a/include/simgrid/s4u/Storage.hpp
b/include/simgrid/s4u/Storage.hpp
index
f28f936
..
571c3b1
100644
(file)
--- a/
include/simgrid/s4u/Storage.hpp
+++ b/
include/simgrid/s4u/Storage.hpp
@@
-7,6
+7,7
@@
#ifndef INCLUDE_SIMGRID_S4U_STORAGE_HPP_
#define INCLUDE_SIMGRID_S4U_STORAGE_HPP_
#ifndef INCLUDE_SIMGRID_S4U_STORAGE_HPP_
#define INCLUDE_SIMGRID_S4U_STORAGE_HPP_
+#include "xbt/Extendable.hpp"
#include <map>
#include <simgrid/s4u/forward.hpp>
#include <simgrid/simix.h>
#include <map>
#include <simgrid/s4u/forward.hpp>
#include <simgrid/simix.h>
@@
-15,11
+16,14
@@
#include <xbt/base.h>
namespace simgrid {
#include <xbt/base.h>
namespace simgrid {
+namespace xbt {
+extern template class XBT_PUBLIC() Extendable<simgrid::s4u::Storage>;
+}
namespace s4u {
namespace s4u {
-XBT_ATTRIB_PUBLIC
std::map<std::string, Storage*>* allStorages(
);
+XBT_ATTRIB_PUBLIC
void getStorageList(std::map<std::string, Storage*>* whereTo
);
-XBT_PUBLIC_CLASS Storage
+XBT_PUBLIC_CLASS Storage
: public simgrid::xbt::Extendable<Storage>
{
friend s4u::Engine;
friend simgrid::surf::StorageImpl;
{
friend s4u::Engine;
friend simgrid::surf::StorageImpl;
@@
-35,18
+39,16
@@
public:
const char* getCname() const;
const char* getType();
Host* getHost();
const char* getCname() const;
const char* getType();
Host* getHost();
- sg_size_t getSize(); /** Retrieve the total amount of space of this storage element */
- sg_size_t getSizeFree();
- sg_size_t getSizeUsed();
std::map<std::string, std::string>* getProperties();
std::map<std::string, std::string>* getProperties();
- const char* getProperty(const char* key);
- void setProperty(const char* key, const char* value);
- std::map<std::string, sg_size_t>* getContent();
+ const char* getProperty(std::string key);
+ void setProperty(std::string, std::string value);
void setUserdata(void* data) { userdata_ = data; }
void* getUserdata() { return userdata_; }
void setUserdata(void* data) { userdata_ = data; }
void* getUserdata() { return userdata_; }
+ sg_size_t read(sg_size_t size);
+ sg_size_t write(sg_size_t size);
surf::StorageImpl* getImpl() { return pimpl_; }
/* The signals */
surf::StorageImpl* getImpl() { return pimpl_; }
/* The signals */