-/* Copyright (c) 2018-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-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/ActivitySet.hpp>
#include <simgrid/s4u/Disk.hpp>
#include <simgrid/s4u/Io.hpp>
#include <xbt/log.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous I/Os");
namespace simgrid::s4u {
-xbt::signal<void(Io const&)> Io::on_start;
Io::Io(kernel::activity::IoImplPtr pimpl)
{
if (state_ == State::STARTING && remains_ <= 0)
XBT_DEBUG("This IO has a size of 0 byte. It cannot start yet");
else
- vetoable_start();
+ start();
return this;
}
if (state_ == State::STARTING && remains_ <= 0)
XBT_DEBUG("This IO has a size of 0 byte. It cannot start yet");
else
- vetoable_start();
+ start();
return this;
}
-Io* Io::start()
+Io* Io::do_start()
{
kernel::actor::simcall_answered(
[this] { (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)).set_name(get_name()).start(); });
pimpl_->suspend();
state_ = State::STARTED;
- on_start(*this);
+ fire_on_start();
+ fire_on_this_start();
return this;
}
-ssize_t Io::wait_any_for(const std::vector<IoPtr>& ios, double timeout)
+ssize_t Io::deprecated_wait_any_for(const std::vector<IoPtr>& ios, double timeout) // XBT_ATTRIB_DEPRECATED_v339
{
- std::vector<ActivityPtr> activities;
+ ActivitySet set;
for (const auto& io : ios)
- activities.push_back(boost::dynamic_pointer_cast<Activity>(io));
- return Activity::wait_any_for(activities, timeout);
+ set.push(io);
+
+ auto* ret = set.wait_any_for(timeout).get();
+ for (size_t i = 0; i < ios.size(); i++)
+ if (ios[i].get() == ret)
+ return i;
+
+ return -1;
}
IoPtr Io::set_disk(const_sg_disk_t disk)
// Setting the disk may allow to start the activity, let's try
if (state_ == State::STARTING)
- vetoable_start();
+ start();
return this;
}