A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
transitions in the same actor are dependent
[simgrid.git]
/
src
/
s4u
/
s4u_Disk.cpp
diff --git
a/src/s4u/s4u_Disk.cpp
b/src/s4u/s4u_Disk.cpp
index 5793eb5b0f8aa9118fdc4d76e65627220e914d15..9e3d59f8b3ce8bb23c9cfb4283cf3326fb186ba0 100644
(file)
--- a/
src/s4u/s4u_Disk.cpp
+++ b/
src/s4u/s4u_Disk.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2019-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2019-202
3
. 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. */
/* 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. */
@@
-31,13
+31,13
@@
const char* Disk::get_cname() const
Disk* Disk::set_read_bandwidth(double read_bw)
{
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)
{
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 this;
}
@@
-48,7
+48,7
@@
double Disk::get_read_bandwidth() const
Disk* Disk::set_readwrite_bandwidth(double bw)
{
Disk* Disk::set_readwrite_bandwidth(double bw)
{
- kernel::actor::simcall
(
[this, bw] { pimpl_->set_readwrite_bandwidth(bw); });
+ kernel::actor::simcall
_object_access(pimpl_,
[this, bw] { pimpl_->set_readwrite_bandwidth(bw); });
return this;
}
return this;
}
@@
-80,34
+80,36
@@
const char* Disk::get_property(const std::string& key) const
Disk* 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;
}
Disk* Disk::set_properties(const std::unordered_map<std::string, std::string>& properties)
{
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");
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
(
[this, profile]() { this->pimpl_->set_state_profile(profile); });
+ 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");
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([this, profile]() { this->pimpl_->set_read_bandwidth_profile(profile); });
+ 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");
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([this, profile]() { this->pimpl_->set_write_bandwidth_profile(profile); });
+ kernel::actor::simcall_object_access(pimpl_,
+ [this, profile]() { this->pimpl_->set_write_bandwidth_profile(profile); });
return this;
}
return this;
}
@@
-118,45
+120,45
@@
IoPtr Disk::io_init(sg_size_t size, Io::OpType type) const
IoPtr Disk::read_async(sg_size_t size) const
{
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
{
}
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)
}
sg_size_t Disk::read(sg_size_t size, double priority) const
{
return IoPtr(io_init(size, Io::OpType::READ))
->set_priority(priority)
- ->
vetoable_
start()
+ ->start()
->wait()
->get_performed_ioops();
}
IoPtr Disk::write_async(sg_size_t size) const
{
->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
{
}
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)
}
sg_size_t Disk::write(sg_size_t size, double priority) const
{
return IoPtr(io_init(size, Io::OpType::WRITE))
->set_priority(priority)
- ->
vetoable_
start()
+ ->start()
->wait()
->get_performed_ioops();
}
Disk* Disk::set_sharing_policy(Disk::Operation op, Disk::SharingPolicy policy, const NonLinearResourceCb& cb)
{
->wait()
->get_performed_ioops();
}
Disk* Disk::set_sharing_policy(Disk::Operation op, Disk::SharingPolicy policy, const NonLinearResourceCb& cb)
{
- kernel::actor::simcall
(
[this, op, policy, &cb] { pimpl_->set_sharing_policy(op, policy, cb); });
+ kernel::actor::simcall
_object_access(pimpl_,
[this, op, policy, &cb] { pimpl_->set_sharing_policy(op, policy, cb); });
return this;
}
return this;
}
@@
-167,13
+169,13
@@
Disk::SharingPolicy Disk::get_sharing_policy(Operation op) const
Disk* Disk::set_factor_cb(const std::function<IoFactorCb>& cb)
{
Disk* Disk::set_factor_cb(const std::function<IoFactorCb>& cb)
{
- kernel::actor::simcall
(
[this, &cb] { pimpl_->set_factor_cb(cb); });
+ kernel::actor::simcall
_object_access(pimpl_,
[this, &cb] { pimpl_->set_factor_cb(cb); });
return this;
}
Disk* Disk::seal()
{
return this;
}
Disk* Disk::seal()
{
- kernel::actor::simcall
([this]
{ pimpl_->seal(); });
+ kernel::actor::simcall
_answered([this]
{ pimpl_->seal(); });
Disk::on_creation(*this); // notify the signal
return this;
}
Disk::on_creation(*this); // notify the signal
return this;
}
@@
-213,7
+215,7
@@
sg_size_t sg_disk_write(const_sg_disk_t disk, sg_size_t size)
void* sg_disk_get_data(const_sg_disk_t disk)
{
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)
}
void sg_disk_set_data(sg_disk_t disk, void* data)