#include <xbt/base.h>
#include <xbt/signal.hpp>
+#include "simgrid/s4u/Storage.hpp"
#include "src/surf/PropertyHolder.hpp"
#include "surf_interface.hpp"
#include <map>
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();
+ ~StorageImpl() override;
+
+public:
+ /** @brief Public interface */
+ s4u::Storage piface_;
+ static StorageImpl* byName(const char* 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_;
+ 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
- */
+ std::string 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;
/**
*
* @return A xbt_dict_t 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
*/
virtual sg_size_t getUsedSize();
- std::map<std::string, sg_size_t*>* parseContent(const char* filename);
-
- std::vector<StorageAction*> writeActions_;
+ 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; }
lmm_constraint_t constraintWrite_; /* Constraint for maximum write bandwidth*/
lmm_constraint_t constraintRead_; /* Constraint for maximum write bandwidth*/
e_surf_action_storage_type_t type_;
StorageImpl* storage_;
- surf_file_t file_;
+ FileImpl* file_;
double progress_;
};
}
} 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_ */