StorageModel();
~StorageModel();
- virtual StorageImpl* createStorage(const char* id, const char* type_id, const char* content_name,
- const char* attach) = 0;
+ virtual StorageImpl* createStorage(std::string id, std::string type_id, std::string content_name,
+ std::string attach) = 0;
std::vector<StorageImpl*> p_storageList;
};
class StorageImpl : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder {
public:
/** @brief Storage constructor */
- StorageImpl(Model* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite,
- const char* type_id, const char* content_name, sg_size_t size, const char* attach);
+ StorageImpl(Model* model, std::string name, lmm_system_t maxminSystem, double bread, double bwrite,
+ std::string type_id, std::string content_name, sg_size_t size, std::string attach);
~StorageImpl() override;
-public:
/** @brief Public interface */
s4u::Storage piface_;
static StorageImpl* byName(const char* name);
/**
* @brief Get the content of the current Storage
*
- * @return A xbt_dict_t with path as keys and size in bytes as values
+ * @return A map with path as keys and size in bytes as values
*/
virtual std::map<std::string, sg_size_t>* getContent();
virtual sg_size_t getSize() { return size_; }
virtual std::string getHost() { return attach_; }
- std::map<std::string, sg_size_t>* parseContent(const char* filename);
- static std::unordered_map<std::string, StorageImpl*>* storages;
+ std::map<std::string, sg_size_t>* parseContent(std::string filename);
static std::unordered_map<std::string, StorageImpl*>* storagesMap() { return StorageImpl::storages; }
lmm_constraint_t constraintWrite_; /* Constraint for maximum write bandwidth*/
private:
sg_size_t size_;
+ static std::unordered_map<std::string, StorageImpl*>* storages;
std::map<std::string, sg_size_t>* content_;
// Name of the host to which this storage is attached. Only used at platform parsing time, then the interface stores
// the Host directly.
StorageImpl* storage_;
FileImpl* file_ = nullptr;
};
-}
-}
-typedef struct s_storage_type {
- char* model;
- char* content;
- char* type_id;
- xbt_dict_t properties;
+class StorageType {
+public:
+ std::string id;
+ std::string model;
+ std::string content;
+ std::map<std::string, std::string>* properties;
std::map<std::string, std::string>* model_properties;
sg_size_t size;
-} s_storage_type_t;
-typedef s_storage_type_t* storage_type_t;
+ StorageType(std::string id, std::string model, std::string content, std::map<std::string, std::string>* properties,
+ std::map<std::string, std::string>* model_properties, sg_size_t size)
+ : id(id), model(model), content(content), properties(properties), model_properties(model_properties), size(size)
+ {
+ }
+};
+}
+}
#endif /* STORAGE_INTERFACE_HPP_ */