-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2021. 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/modelchecker.h"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
+#include <boost/range/algorithm.hpp>
#include <cmath> // isfinite()
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
void ActivityImpl::register_simcall(smx_simcall_t simcall)
{
simcalls_.push_back(simcall);
- simcall->issuer_->waiting_synchro = this;
+ 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()
return surf_action_ ? surf_action_->get_remains() : 0;
}
+const char* ActivityImpl::get_state_str() const
+{
+ return to_c_str(state_);
+}
+
bool ActivityImpl::test()
{
if (state_ != State::WAITING && state_ != State::RUNNING) {
xbt_assert(std::isfinite(timeout), "timeout is not finite!");
/* Associate this simcall to the synchro */
- register_simcall(&issuer->simcall);
+ register_simcall(&issuer->simcall_);
if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = SIMCALL_GET_MC_VALUE(issuer->simcall);
+ int idx = issuer->simcall_.mc_value_;
if (idx == 0) {
state_ = simgrid::kernel::activity::State::DONE;
} else {
/* If the synchro is already finished then perform the error handling */
if (state_ != simgrid::kernel::activity::State::RUNNING)
finish();
- else {
- /* we need a sleep action (even when there is no timeout) to be notified of host failures */
+ else if (timeout == 0.) {
+ // still running and timeout == 0 ? We need to report a timeout
+ state_ = simgrid::kernel::activity::State::TIMEOUT;
+ finish();
+ } else {
+ /* we need a sleep action (even when the timeout is infinite) to be notified of host failures */
set_timeout(timeout);
}
}