#include "src/kernel/activity/ActivityImpl.hpp"
#include "simgrid/modelchecker.h"
+#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
#include <boost/range/algorithm.hpp>
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_ != State::RUNNING)
- finish();
- else if (timeout == 0.) {
- // still running and timeout == 0 ? We need to report a timeout
- state_ = State::TIMEOUT;
+ if (state_ != State::RUNNING) {
finish();
} else {
/* we need a sleep action (even when the timeout is infinite) to be notified of host failures */
- set_timeout(timeout);
+ RawImplPtr synchro(new RawImpl([this, issuer]() {
+ this->unregister_simcall(&issuer->simcall_);
+ issuer->waiting_synchro_ = nullptr;
+ auto* observer = dynamic_cast<kernel::actor::ActivityWaitSimcall*>(issuer->simcall_.observer_);
+ xbt_assert(observer != nullptr);
+ observer->set_result(true);
+ }));
+ synchro->set_host(issuer->get_host()).set_timeout(timeout).start();
+ synchro->register_simcall(&issuer->simcall_);
}
}