X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..8c753c341f0c7f6d5ea38c4cb7bf7da6f0ef0a1b:/src/surf/StorageImpl.cpp diff --git a/src/surf/StorageImpl.cpp b/src/surf/StorageImpl.cpp index 9604ecb8c8..55a31bd6e0 100644 --- a/src/surf/StorageImpl.cpp +++ b/src/surf/StorageImpl.cpp @@ -34,15 +34,15 @@ StorageModel::~StorageModel() * Resource * ************/ -StorageImpl::StorageImpl(kernel::resource::Model* model, std::string name, kernel::lmm::System* maxminSystem, +StorageImpl::StorageImpl(kernel::resource::Model* model, const std::string& name, kernel::lmm::System* maxminSystem, double bread, double bwrite, std::string type_id, std::string content_name, sg_size_t size, std::string attach) - : Resource(model, name.c_str(), maxminSystem->constraint_new(this, std::max(bread, bwrite))) + : Resource(model, name, maxminSystem->constraint_new(this, std::max(bread, bwrite))) , piface_(name, this) - , typeId_(type_id) - , content_name(content_name) + , typeId_(std::move(type_id)) + , content_name(std::move(content_name)) , size_(size) - , attach_(attach) + , attach_(std::move(attach)) { StorageImpl::turn_on(); XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size); @@ -71,17 +71,16 @@ void StorageImpl::destroy() bool StorageImpl::is_used() { THROW_UNIMPLEMENTED; - return false; } -void StorageImpl::apply_event(tmgr_trace_event_t /*event*/, double /*value*/) +void StorageImpl::apply_event(kernel::profile::Event* /*event*/, double /*value*/) { THROW_UNIMPLEMENTED; } void StorageImpl::turn_on() { - if (is_off()) { + if (not is_on()) { Resource::turn_on(); s4u::Storage::on_state_change(this->piface_); }