-/* 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. */
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) {
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);
}
}