#include "simgrid/modelchecker.h"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
-#include <array>
+#include <boost/range/algorithm.hpp>
#include <cmath> // isfinite()
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
simcall->issuer_->waiting_synchro_ = this;
}
+void ActivityImpl::unregister_simcall(smx_simcall_t simcall)
+{
+ // Remove the first occurrence of simcall:
+ auto j = boost::range::find(simcalls_, simcall);
+ if (j != simcalls_.end())
+ simcalls_.erase(j);
+}
+
void ActivityImpl::clean_action()
{
if (surf_action_) {
void ActivityImpl::wait_for(actor::ActorImpl* issuer, double timeout)
{
- XBT_DEBUG("Wait for execution of synchro %p, state %d", this, (int)state_);
+ XBT_DEBUG("Wait for execution of synchro %p, state %s", this, to_c_str(state_));
xbt_assert(std::isfinite(timeout), "timeout is not finite!");
/* Associate this simcall to the synchro */
register_simcall(&issuer->simcall_);
- if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = SIMCALL_GET_MC_VALUE(issuer->simcall_);
- if (idx == 0) {
- state_ = simgrid::kernel::activity::State::DONE;
- } else {
- /* If we reached this point, the wait simcall must have a timeout */
- /* Otherwise it shouldn't be enabled and executed by the MC */
- if (timeout < 0.0)
- THROW_IMPOSSIBLE;
- state_ = simgrid::kernel::activity::State::TIMEOUT;
- }
- finish();
- return;
- }
+ xbt_assert(not MC_is_active() && not MC_record_replay_is_active(), "MC is currently not supported here.");
/* If the synchro is already finished then perform the error handling */
- if (state_ != simgrid::kernel::activity::State::RUNNING)
+ if (state_ != State::RUNNING)
+ finish();
+ else if (timeout == 0.) {
+ // still running and timeout == 0 ? We need to report a timeout
+ state_ = State::TIMEOUT;
finish();
- else {
- /* we need a sleep action (even when there is no timeout) to be notified of host failures */
+ } else {
+ /* we need a sleep action (even when the timeout is infinite) to be notified of host failures */
set_timeout(timeout);
}
}
}
// boost::intrusive_ptr<Activity> support:
-void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
+void intrusive_ptr_add_ref(ActivityImpl* activity)
{
activity->refcount_.fetch_add(1, std::memory_order_relaxed);
}
-void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
+void intrusive_ptr_release(ActivityImpl* activity)
{
if (activity->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
std::atomic_thread_fence(std::memory_order_acquire);