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
Use a reference for ExecImpl::wait_any_for()'s vector.
[simgrid.git]
/
src
/
s4u
/
s4u_Disk.cpp
diff --git
a/src/s4u/s4u_Disk.cpp
b/src/s4u/s4u_Disk.cpp
index e955497001ec7d4d0afb10eed0a2ef9369a648ee..265b7f555bf761f7f520884e5939bea14b06c755 100644
(file)
--- a/
src/s4u/s4u_Disk.cpp
+++ b/
src/s4u/s4u_Disk.cpp
@@
-28,19
+28,19
@@
Disk* Disk::set_name(const std::string& name)
Disk* Disk::set_read_bandwidth(double read_bw)
{
Disk* Disk::set_read_bandwidth(double read_bw)
{
-
pimpl_->set_read_bandwidth(read_bw
);
+
kernel::actor::simcall([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)
{
-
pimpl_->set_write_bandwidth(write_bw
);
+
kernel::actor::simcall([this, write_bw] { pimpl_->set_write_bandwidth(write_bw); }
);
return this;
}
double Disk::get_read_bandwidth() const
{
return this;
}
double Disk::get_read_bandwidth() const
{
- return
this->
pimpl_->get_read_bandwidth();
+ return pimpl_->get_read_bandwidth();
}
double Disk::get_write_bandwidth() const
}
double Disk::get_write_bandwidth() const
@@
-66,44
+66,46
@@
const std::unordered_map<std::string, std::string>* Disk::get_properties() const
const char* Disk::get_property(const std::string& key) 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([this, &key, &value] { this->pimpl_->set_property(key, value); });
+ return this;
}
}
-IoPtr Disk::io_init(sg_size_t size, Io::OpType type)
+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);
}
{
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))->vetoable_start();
}
{
return IoPtr(io_init(size, Io::OpType::READ))->vetoable_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))->vetoable_start()->wait()->get_performed_ioops();
}
{
return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start()->wait()->get_performed_ioops();
}
-IoPtr Disk::write_async(sg_size_t size)
+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)->vetoable_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))->vetoable_start()->wait()->get_performed_ioops();
}
{
return IoPtr(io_init(size, Io::OpType::WRITE))->vetoable_start()->wait()->get_performed_ioops();
}
-
void
Disk::seal()
+
Disk*
Disk::seal()
{
kernel::actor::simcall([this]{ pimpl_->seal(); });
get_host()->add_disk(this);
Disk::on_creation(*this);
{
kernel::actor::simcall([this]{ pimpl_->seal(); });
get_host()->add_disk(this);
Disk::on_creation(*this);
+ return this;
}
} // namespace s4u
} // namespace simgrid
}
} // namespace s4u
} // namespace simgrid
@@
-130,11
+132,11
@@
double sg_disk_write_bandwidth(const_sg_disk_t disk)
return disk->get_write_bandwidth();
}
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);
}
{
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);
}
{
return disk->write(size);
}