-/* Copyright (c) 2004-2015. The SimGrid Team.
+/* Copyright (c) 2004-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <xbt/base.h>
#include <xbt/signal.hpp>
-#include "surf_interface.hpp"
#include "src/surf/PropertyHolder.hpp"
+#include "surf_interface.hpp"
+#include <map>
#ifndef STORAGE_INTERFACE_HPP_
#define STORAGE_INTERFACE_HPP_
* Classes *
***********/
-class StorageModel;
-class Storage;
class StorageAction;
/*************
StorageModel();
~StorageModel();
- virtual Storage *createStorage(const char* id, const char* type_id,
- const char* content_name, const char* content_type,
- xbt_dict_t properties, const char *attach) = 0;
+ virtual Storage* createStorage(const char* id, const char* type_id, const char* content_name, const char* attach) = 0;
std::vector<Storage*> p_storageList;
};
class Storage : public simgrid::surf::Resource,
public simgrid::surf::PropertyHolder {
public:
- /**
- * @brief Storage constructor
- *
- * @param model StorageModel associated to this Storage
- * @param name The name of the Storage
- * @param props Dictionary of properties associated to this Storage
- * @param type_id [description]
- * @param content_name [description]
- * @param content_type [description]
- * @param size [description]
- */
- Storage(Model *model, const char *name, xbt_dict_t props,
- const char* type_id, const char *content_name, const char *content_type,
- sg_size_t size);
- /**
- * @brief Storage constructor
- *
- * @param model StorageModel associated to this Storage
- * @param name The name of the Storage
- * @param props Dictionary of properties associated to this Storage
- */
- Storage(Model *model, const char *name, xbt_dict_t props,
- lmm_system_t maxminSystem, double bread, double bwrite,
- double bconnection,
- const char* type_id, const char *content_name, const char *content_type,
- sg_size_t size, const char *attach);
+ /** @brief Storage constructor */
+ Storage(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);
~Storage();
/** @brief Check if the Storage is used (if an action currently uses its resources) */
bool isUsed() override;
- void apply_event(tmgr_trace_iterator_t event, double value) override;
+ void apply_event(tmgr_trace_event_t event, double value) override;
void turnOn() override;
void turnOff() override;
- xbt_dict_t content_;
- char* contentType_;
+ std::map<std::string, sg_size_t*>* content_;
sg_size_t size_;
sg_size_t usedSize_;
char * typeId_;
*
* @return A xbt_dict_t with path as keys and size in bytes as values
*/
- virtual xbt_dict_t getContent();
-
- /**
- * @brief Get the size in bytes of the current Storage
- *
- * @return The size in bytes of the current Storage
- */
- virtual sg_size_t getSize();
+ 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();
-
- xbt_dict_t parseContent(const char *filename);
+ std::map<std::string, sg_size_t*>* parseContent(const char* filename);
std::vector<StorageAction*> writeActions_;
void setState(simgrid::surf::Action::State state) override;
- e_surf_action_storage_type_t m_type;
- Storage *p_storage;
- surf_file_t p_file;
- double progress;
+ e_surf_action_storage_type_t type_;
+ Storage* storage_;
+ surf_file_t file_;
+ double progress_;
};
}
typedef struct s_storage_type {
char *model;
char *content;
- char *content_type;
char *type_id;
xbt_dict_t properties;
- xbt_dict_t model_properties;
+ std::map<std::string, std::string>* model_properties;
sg_size_t size;
-} s_storage_type_t, *storage_type_t;
-
-typedef struct s_mount {
- void *storage;
- char *name;
-} s_mount_t, *mount_t;
+} s_storage_type_t;
+typedef s_storage_type_t* storage_type_t;
typedef struct surf_file {
char *name;