~StorageImpl() override;
-public:
/** @brief Public interface */
s4u::Storage piface_;
static StorageImpl* byName(const char* name);
void turnOn() override;
void turnOff() override;
- std::map<std::string, sg_size_t>* content_;
- sg_size_t size_;
- sg_size_t usedSize_;
- char* typeId_;
- std::string attach_; // Name of the host to which this storage is attached.
- // Only used until the platform is fully parsed only.
- // Then the interface stores 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 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;
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_;
};
/**********
*/
typedef enum {
READ = 0, /**< Read a file */
- WRITE, /**< Write in a file */
- STAT, /**< Stat a file */
- OPEN, /**< Open a file */
- CLOSE /**< Close a file */
+ WRITE /**< Write in a file */
} e_surf_action_storage_type_t;
/** @ingroup SURF_storage_interface
* @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_;
+ FileImpl* file_ = nullptr;
};
}
}
} 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;
-
#endif /* STORAGE_INTERFACE_HPP_ */