-/* 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 <simgrid/s4u/Disk.hpp>
+#include <simgrid/s4u/Io.hpp>
+#include <simgrid/simix.hpp>
+
#include "src/kernel/resource/DiskImpl.hpp"
namespace simgrid {
xbt::signal<void(Disk&)> Disk::on_creation;
xbt::signal<void(Disk const&)> Disk::on_destruction;
-xbt::signal<void(Disk const&)> Disk::on_state_change;
+xbt::signal<void(Disk const&)> Disk::on_onoff;
-Disk* Disk::set_name(const std::string& name)
+const std::string& Disk::get_name() const
{
- name_ = name;
- return this;
+ 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([this, read_bw] { pimpl_->set_read_bandwidth(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([this, write_bw] { pimpl_->set_write_bandwidth(write_bw); });
+ kernel::actor::simcall_object_access(pimpl_, [this, write_bw] { pimpl_->set_write_bandwidth(write_bw); });
return this;
}
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
{
return pimpl_->get_write_bandwidth();
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;
}
Disk* Disk::set_properties(const std::unordered_map<std::string, std::string>& properties)
{
- kernel::actor::simcall([this, properties] { this->pimpl_->set_properties(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::read_async(sg_size_t size) const
{
- return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start();
+ return IoPtr(io_init(size, Io::OpType::READ))->start();
}
sg_size_t Disk::read(sg_size_t size) const
{
- return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start()->wait()->get_performed_ioops();
+ return IoPtr(io_init(size, Io::OpType::READ))->start()->wait()->get_performed_ioops();
+}
+
+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)->vetoable_start());
+ return IoPtr(io_init(size, Io::OpType::WRITE)->start());
}
sg_size_t Disk::write(sg_size_t size) const
{
- return IoPtr(io_init(size, Io::OpType::WRITE))->vetoable_start()->wait()->get_performed_ioops();
+ 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<IoFactorCb>& cb)
+{
+ kernel::actor::simcall_object_access(pimpl_, [this, &cb] { pimpl_->set_factor_cb(cb); });
+ return this;
}
Disk* Disk::seal()
{
- kernel::actor::simcall([this]{ pimpl_->seal(); });
- get_host()->add_disk(this);
- Disk::on_creation(*this);
+ kernel::actor::simcall_answered([this] { pimpl_->seal(); });
+ Disk::on_creation(*this); // notify the signal
return this;
}
} // namespace s4u
void* sg_disk_get_data(const_sg_disk_t disk)
{
- return disk->get_data();
+ return disk->get_data<void>();
}
void sg_disk_set_data(sg_disk_t disk, void* data)
