X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c19a107a096f503e67217fb178fa98eb742ceb4d..HEAD:/src/s4u/s4u_Disk.cpp diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp index 10b19e4674..c97f72bc00 100644 --- a/src/s4u/s4u_Disk.cpp +++ b/src/s4u/s4u_Disk.cpp @@ -1,13 +1,12 @@ -/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2019-2023. 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. */ -#include "simgrid/s4u/Disk.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Io.hpp" -#include "simgrid/simix.hpp" +#include +#include +#include + #include "src/kernel/resource/DiskImpl.hpp" namespace simgrid { @@ -18,11 +17,39 @@ namespace s4u { xbt::signal Disk::on_creation; xbt::signal Disk::on_destruction; -xbt::signal Disk::on_state_change; +xbt::signal Disk::on_onoff; + +const std::string& Disk::get_name() const +{ + return pimpl_->get_name(); +} + +const char* Disk::get_cname() const +{ + return pimpl_->get_cname(); +} + +Disk* Disk::set_read_bandwidth(double read_bw) +{ + kernel::actor::simcall_object_access(pimpl_, [this, read_bw] { pimpl_->set_read_bandwidth(read_bw); }); + return this; +} + +Disk* Disk::set_write_bandwidth(double write_bw) +{ + kernel::actor::simcall_object_access(pimpl_, [this, write_bw] { pimpl_->set_write_bandwidth(write_bw); }); + return this; +} double Disk::get_read_bandwidth() const { - return this->pimpl_->get_read_bandwidth(); + return pimpl_->get_read_bandwidth(); +} + +Disk* Disk::set_readwrite_bandwidth(double bw) +{ + kernel::actor::simcall_object_access(pimpl_, [this, bw] { pimpl_->set_readwrite_bandwidth(bw); }); + return this; } double Disk::get_write_bandwidth() const @@ -30,6 +57,12 @@ double Disk::get_write_bandwidth() const return pimpl_->get_write_bandwidth(); } +Disk* Disk::set_host(Host* host) +{ + pimpl_->set_host(host); + return this; +} + Host* Disk::get_host() const { return pimpl_->get_host(); @@ -42,39 +75,120 @@ const std::unordered_map* Disk::get_properties() const const char* Disk::get_property(const std::string& key) const { - return this->pimpl_->get_property(key); + return pimpl_->get_property(key); } -void Disk::set_property(const std::string& key, const std::string& value) +Disk* Disk::set_property(const std::string& key, const std::string& value) { - kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); + kernel::actor::simcall_object_access(pimpl_, [this, &key, &value] { this->pimpl_->set_property(key, value); }); + return this; } -IoPtr Disk::io_init(sg_size_t size, Io::OpType type) +Disk* Disk::set_properties(const std::unordered_map& properties) +{ + kernel::actor::simcall_object_access(pimpl_, [this, properties] { this->pimpl_->set_properties(properties); }); + return this; +} + +Disk* Disk::set_state_profile(kernel::profile::Profile* profile) +{ + xbt_assert(not pimpl_->is_sealed(), "Cannot set a state profile once the Disk is sealed"); + kernel::actor::simcall_object_access(pimpl_, [this, profile]() { this->pimpl_->set_state_profile(profile); }); + return this; +} + +Disk* Disk::set_read_bandwidth_profile(kernel::profile::Profile* profile) +{ + xbt_assert(not pimpl_->is_sealed(), "Cannot set a bandwidth profile once the Disk is sealed"); + kernel::actor::simcall_object_access(pimpl_, + [this, profile]() { this->pimpl_->set_read_bandwidth_profile(profile); }); + return this; +} + +Disk* Disk::set_write_bandwidth_profile(kernel::profile::Profile* profile) +{ + xbt_assert(not pimpl_->is_sealed(), "Cannot set a bandwidth profile once the Disk is sealed"); + kernel::actor::simcall_object_access(pimpl_, + [this, profile]() { this->pimpl_->set_write_bandwidth_profile(profile); }); + return this; +} +int Disk::get_concurrency_limit() const +{ + return pimpl_->get_concurrency_limit(); +} + +Disk* Disk::set_concurrency_limit(int limit) +{ + kernel::actor::simcall_object_access(pimpl_, [this, limit] { pimpl_->set_concurrency_limit(limit); }); + return this; +} + +IoPtr Disk::io_init(sg_size_t size, Io::OpType type) const { return Io::init()->set_disk(this)->set_size(size)->set_op_type(type); } -IoPtr Disk::read_async(sg_size_t size) +IoPtr Disk::read_async(sg_size_t size) const { return IoPtr(io_init(size, Io::OpType::READ))->start(); } -sg_size_t Disk::read(sg_size_t size) +sg_size_t Disk::read(sg_size_t size) const { return IoPtr(io_init(size, Io::OpType::READ))->start()->wait()->get_performed_ioops(); } -IoPtr Disk::write_async(sg_size_t size) +sg_size_t Disk::read(sg_size_t size, double priority) const +{ + return IoPtr(io_init(size, Io::OpType::READ)) + ->set_priority(priority) + ->start() + ->wait() + ->get_performed_ioops(); +} + +IoPtr Disk::write_async(sg_size_t size) const { return IoPtr(io_init(size, Io::OpType::WRITE)->start()); } -sg_size_t Disk::write(sg_size_t size) +sg_size_t Disk::write(sg_size_t size) const { return IoPtr(io_init(size, Io::OpType::WRITE))->start()->wait()->get_performed_ioops(); } +sg_size_t Disk::write(sg_size_t size, double priority) const +{ + return IoPtr(io_init(size, Io::OpType::WRITE)) + ->set_priority(priority) + ->start() + ->wait() + ->get_performed_ioops(); +} + +Disk* Disk::set_sharing_policy(Disk::Operation op, Disk::SharingPolicy policy, const NonLinearResourceCb& cb) +{ + kernel::actor::simcall_object_access(pimpl_, [this, op, policy, &cb] { pimpl_->set_sharing_policy(op, policy, cb); }); + return this; +} + +Disk::SharingPolicy Disk::get_sharing_policy(Operation op) const +{ + return this->pimpl_->get_sharing_policy(op); +} + +Disk* Disk::set_factor_cb(const std::function& cb) +{ + kernel::actor::simcall_object_access(pimpl_, [this, &cb] { pimpl_->set_factor_cb(cb); }); + return this; +} + +Disk* Disk::seal() +{ + kernel::actor::simcall_answered([this] { pimpl_->seal(); }); + Disk::on_creation(*this); // notify the signal + return this; +} } // namespace s4u } // namespace simgrid @@ -100,18 +214,18 @@ double sg_disk_write_bandwidth(const_sg_disk_t disk) return disk->get_write_bandwidth(); } -sg_size_t sg_disk_read(sg_disk_t disk, sg_size_t size) +sg_size_t sg_disk_read(const_sg_disk_t disk, sg_size_t size) { return disk->read(size); } -sg_size_t sg_disk_write(sg_disk_t disk, sg_size_t size) +sg_size_t sg_disk_write(const_sg_disk_t disk, sg_size_t size) { return disk->write(size); } void* sg_disk_get_data(const_sg_disk_t disk) { - return disk->get_data(); + return disk->get_data(); } void sg_disk_set_data(sg_disk_t disk, void* data)