From 4c1f0785858b31028eb208c42a33b30b9ec48676 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 1 Mar 2021 10:34:58 +0100 Subject: [PATCH] more fluent version --- src/kernel/resource/DiskImpl.cpp | 5 +++++ src/kernel/resource/DiskImpl.hpp | 2 +- src/s4u/s4u_Host.cpp | 4 +--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/kernel/resource/DiskImpl.cpp b/src/kernel/resource/DiskImpl.cpp index c0cfd58b7e..de8c7bb3d2 100644 --- a/src/kernel/resource/DiskImpl.cpp +++ b/src/kernel/resource/DiskImpl.cpp @@ -34,6 +34,11 @@ DiskModel::~DiskModel() /************ * Resource * ************/ +DiskImpl* DiskImpl::set_host(s4u::Host* host) +{ + host_ = host; + return this; +} DiskImpl* DiskImpl::set_read_bandwidth(double read_bw) { diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp index 60032910e5..e426216d43 100644 --- a/src/kernel/resource/DiskImpl.hpp +++ b/src/kernel/resource/DiskImpl.hpp @@ -70,8 +70,8 @@ public: /** @brief Public interface */ const s4u::Disk* get_iface() const { return &piface_; } s4u::Disk* get_iface() { return &piface_; } + DiskImpl* set_host(s4u::Host* host); s4u::Host* get_host() const { return host_; } - void set_host(s4u::Host* host) { host_ = host; } DiskImpl* set_read_bandwidth(double read_bw); double get_read_bandwidth() const { return read_bw_; } diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 0b4d103787..bfe5c6726d 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -269,9 +269,7 @@ std::vector Host::get_disks() const Disk* Host::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) { - auto pimpl = surf_disk_model->create_disk(name, read_bandwidth, write_bandwidth); - pimpl->set_host(this); - return pimpl->get_iface(); + return surf_disk_model->create_disk(name, read_bandwidth, write_bandwidth)->set_host(this)->get_iface(); } void Host::add_disk(const Disk* disk) -- 2.20.1