* @brief Callbacks handler which emit the callbacks after Storage creation *
* @details Callback functions have the following signature: `void(Storage*)`
*/
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(simgrid::surf::StorageImpl*)>) storageCreatedCallbacks;
+XBT_PUBLIC_DATA(simgrid::xbt::signal<void(StorageImpl*)>) storageCreatedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after Storage destruction *
* @details Callback functions have the following signature: `void(StoragePtr)`
*/
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(simgrid::surf::StorageImpl*)>) storageDestructedCallbacks;
+XBT_PUBLIC_DATA(simgrid::xbt::signal<void(StorageImpl*)>) storageDestructedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after Storage State changed *
* @details Callback functions have the following signature: `void(StorageAction *action, int previouslyOn, int
* currentlyOn)`
*/
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(simgrid::surf::StorageImpl*, int, int)>) storageStateChangedCallbacks;
+XBT_PUBLIC_DATA(simgrid::xbt::signal<void(StorageImpl*, int, int)>) storageStateChangedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after StorageAction State changed *
* @details Callback functions have the following signature: `void(StorageAction *action, simgrid::surf::Action::State
* old, simgrid::surf::Action::State current)`
*/
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(simgrid::surf::StorageAction*, simgrid::surf::Action::State,
- simgrid::surf::Action::State)>)
+XBT_PUBLIC_DATA(simgrid::xbt::signal<void(StorageAction*, Action::State, Action::State)>)
storageActionStateChangedCallbacks;
/*********
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;
};
* @brief SURF storage interface class
* @details A Storage represent a storage unit (e.g.: hard drive, usb key)
*/
-class StorageImpl : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder {
+class StorageImpl : public Resource, public 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);
+ static StorageImpl* byName(std::string name);
/** @brief Check if the Storage is used (if an action currently uses its resources) */
bool isUsed() override;
void turnOn() override;
void turnOff() override;
- std::map<std::string, sg_size_t*>* content_;
- sg_size_t size_;
- sg_size_t usedSize_;
- char* typeId_;
- char* attach_; // FIXME: this is the name of the host. Use the host directly
-
- /**
- * @brief Open a file
- *
- * @param mount The mount point
- * @param path The path to the file
- *
- * @return The StorageAction corresponding to the opening
- */
- virtual StorageAction* open(const char* mount, const char* path) = 0;
-
- /**
- * @brief Close a file
- *
- * @param fd The file descriptor to close
- * @return The StorageAction corresponding to the closing
- */
- virtual StorageAction* close(surf_file_t fd) = 0;
-
/**
* @brief Read a file
*
- * @param fd The file descriptor to read
* @param size The size in bytes to read
* @return The StorageAction corresponding to the reading
*/
- virtual StorageAction* read(surf_file_t fd, sg_size_t size) = 0;
+ virtual StorageAction* read(sg_size_t size) = 0;
/**
* @brief Write a file
*
- * @param fd The file descriptor to write
* @param size The size in bytes to write
* @return The StorageAction corresponding to the writing
*/
- virtual StorageAction* write(surf_file_t fd, sg_size_t size) = 0;
+ virtual StorageAction* write(sg_size_t size) = 0;
/**
* @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 std::map<std::string, sg_size_t>* getContent();
/**
* @brief Get the available size in bytes of the current Storage
* @return The used size in bytes of the current Storage
*/
virtual sg_size_t getUsedSize();
+ 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; }
- std::vector<StorageAction*> writeActions_;
lmm_constraint_t constraintWrite_; /* Constraint for maximum write bandwidth*/
lmm_constraint_t constraintRead_; /* Constraint for maximum write bandwidth*/
+
+ std::string typeId_;
+ sg_size_t usedSize_ = 0;
+
+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.
+ std::string attach_;
};
/**********
/** @ingroup SURF_storage_interface
* @brief The possible type of action for the storage component
*/
-typedef enum {
+enum e_surf_action_storage_type_t {
READ = 0, /**< Read a file */
- WRITE, /**< Write in a file */
- STAT, /**< Stat a file */
- OPEN, /**< Open a file */
- CLOSE /**< Close a file */
-} e_surf_action_storage_type_t;
+ WRITE /**< Write in a file */
+};
/** @ingroup SURF_storage_interface
* @brief SURF storage action interface class
* @param storage The Storage associated to this StorageAction
* @param type [description]
*/
- StorageAction(Model* model, double cost, bool failed, StorageImpl* storage, e_surf_action_storage_type_t type);
+ StorageAction(Model* model, double cost, bool failed, StorageImpl* storage, e_surf_action_storage_type_t type)
+ : Action(model, cost, failed), type_(type), storage_(storage){};
/**
* @brief StorageAction constructor
* @param type [description]
*/
StorageAction(Model* model, double cost, bool failed, lmm_variable_t var, StorageImpl* storage,
- e_surf_action_storage_type_t type);
+ e_surf_action_storage_type_t type)
+ : Action(model, cost, failed, var), type_(type), storage_(storage){};
void setState(simgrid::surf::Action::State state) override;
e_surf_action_storage_type_t type_;
StorageImpl* storage_;
- surf_file_t file_;
- double progress_;
};
-}
-}
-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;
-
-typedef struct surf_file {
- char* name;
- char* mount;
- sg_size_t size;
- sg_size_t current_position;
-} s_surf_file_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_ */
