X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50ddfe2f5b5035e0ed9556b334d6977ee81ff83a..83f28c874af4faaeaaa19571afc2cd52c801da39:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 9c9b487391..7a8e40aa5c 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -56,13 +56,11 @@ StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(), "property Bwrite, storage", type_id.c_str()); - StorageImpl* storage = - new StorageN11(this, id, get_maxmin_system(), Bread, Bwrite, type_id, content_name, storage_type->size, attach); - XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id.c_str(), type_id.c_str(), Bread); - return storage; + return new StorageN11(this, std::move(id), get_maxmin_system(), Bread, Bwrite, std::move(type_id), + std::move(content_name), storage_type->size, std::move(attach)); } double StorageN11Model::next_occuring_event(double now) @@ -101,17 +99,17 @@ StorageN11::StorageN11(StorageModel* model, std::string name, kernel::lmm::Syste StorageAction* StorageN11::io_start(sg_size_t size, s4u::Io::OpType type) { - return new StorageN11Action(get_model(), size, is_off(), this, type); + return new StorageN11Action(get_model(), size, not is_on(), this, type); } StorageAction* StorageN11::read(sg_size_t size) { - return new StorageN11Action(get_model(), size, is_off(), this, s4u::Io::OpType::READ); + return new StorageN11Action(get_model(), size, not is_on(), this, s4u::Io::OpType::READ); } StorageAction* StorageN11::write(sg_size_t size) { - return new StorageN11Action(get_model(), size, is_off(), this, s4u::Io::OpType::WRITE); + return new StorageN11Action(get_model(), size, not is_on(), this, s4u::Io::OpType::WRITE); } /**********