X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6a1650c1da9d6a60f8fc5d12ebce854120ccdb7..390f07ace843ed23ed4d2a1d26f90148d07836ad:/doc/doxygen/uhood_switch.doc diff --git a/doc/doxygen/uhood_switch.doc b/doc/doxygen/uhood_switch.doc index ff66dbf10f..3f3dc808f5 100644 --- a/doc/doxygen/uhood_switch.doc +++ b/doc/doxygen/uhood_switch.doc @@ -260,8 +260,7 @@ T simgrid::kernel::Future::get() template T simgrid::kernel::FutureState::get() { - if (status_ != FutureStatus::ready) - xbt_die("Deadlock: this future is not ready"); + xbt_assert(status_ == FutureStatus::ready, "Deadlock: this future is not ready"); status_ = FutureStatus::done; if (exception_) { std::exception_ptr exception = std::move(exception_); @@ -328,7 +327,7 @@ number and its arguments (among some other things): @code{cpp} struct s_smx_simcall { // Simcall number: - e_smx_simcall_t call; + Simcall call; // Issuing actor: smx_actor_t issuer; // Arguments of the simcall: @@ -478,8 +477,7 @@ template auto kernel_sync(F code) -> decltype(code().get()) { typedef decltype(code().get()) T; - if (SIMIX_is_maestro()) - xbt_die("Can't execute blocking call in kernel mode"); + xbt_assert(not SIMIX_is_maestro(), "Can't execute blocking call in kernel mode"); smx_actor_t self = SIMIX_process_self(); simgrid::xbt::Result result; @@ -749,7 +747,7 @@ bool ConditionVariable::wait_for(std::unique_lock& lock, double duration, P pred) { return this->wait_until(lock, - SIMIX_get_clock() + duration, std::move(pred)); + simgrid::s4u::Engine::get_clock() + duration, std::move(pred)); } @endcode