X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2505da34e3d93fa429d9f047e56257378901ee4..390ee57ed79bf7577c2bce6df6a25aba57ff476e:/src/surf/storage_interface.cpp diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp index 9362187009..ff31c4ca92 100644 --- a/src/surf/storage_interface.cpp +++ b/src/surf/storage_interface.cpp @@ -49,30 +49,15 @@ StorageModel::~StorageModel(){ * Resource * ************/ -Storage::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) - : Resource(model, name) - , PropertyHolder(props) - , contentType_(xbt_strdup(content_type)) - , size_(size), usedSize_(0) - , typeId_(xbt_strdup(type_id)) - , writeActions_(std::vector()) -{ - content_ = parseContent(content_name); - turnOn(); -} - -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) - : Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection)) - , PropertyHolder(props) - , contentType_(xbt_strdup(content_type)) - , size_(size), usedSize_(0) - , typeId_(xbt_strdup(type_id)) - , writeActions_(std::vector()) +Storage::Storage(Model* model, const char* name, 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) + : Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection)) + , contentType_(xbt_strdup(content_type)) + , size_(size) + , usedSize_(0) + , typeId_(xbt_strdup(type_id)) + , writeActions_(std::vector()) { content_ = parseContent(content_name); attach_ = xbt_strdup(attach);