-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2019. 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 <exception>
-#include <mutex>
-
-#include <xbt/ex.hpp>
-#include <xbt/log.hpp>
-
#include "simgrid/s4u/ConditionVariable.hpp"
#include "simgrid/simix.h"
#include "src/kernel/activity/ConditionVariableImpl.hpp"
+#include "xbt/log.hpp"
+
+#include <exception>
+#include <mutex>
namespace simgrid {
namespace s4u {
ConditionVariablePtr ConditionVariable::create()
{
- smx_cond_t cond = simcall_cond_init();
+ kernel::activity::ConditionVariableImpl* cond =
+ simix::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
return ConditionVariablePtr(&cond->cond_, false);
}
*/
void ConditionVariable::wait(MutexPtr lock)
{
- simcall_cond_wait(cond_, lock->mutex_);
+ simcall_cond_wait(cond_, lock->pimpl_);
}
void ConditionVariable::wait(std::unique_lock<Mutex>& lock)
{
- simcall_cond_wait(cond_, lock.mutex()->mutex_);
+ simcall_cond_wait(cond_, lock.mutex()->pimpl_);
}
std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout)
if (timeout < 0)
timeout = 0.0;
- try {
- simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout);
+ if (simcall_cond_wait_timeout(cond_, lock.mutex()->pimpl_, timeout)) {
+ // If we reached the timeout, we have to take the lock again:
+ lock.mutex()->lock();
+ return std::cv_status::timeout;
+ } else {
return std::cv_status::no_timeout;
- } catch (xbt_ex& e) {
-
- // If the exception was a timeout, we have to take the lock again:
- if (e.category == timeout_error) {
- try {
- lock.mutex()->lock();
- return std::cv_status::timeout;
- } catch (...) {
- std::terminate();
- }
- }
-
- // Another exception: should we reaquire the lock?
- std::terminate();
- } catch (...) {
- std::terminate();
}
}
*/
void ConditionVariable::notify_one()
{
- simgrid::simix::kernelImmediate([this]() { cond_->signal(); });
+ simgrid::simix::simcall([this]() { cond_->signal(); });
}
void ConditionVariable::notify_all()
{
- simgrid::simix::kernelImmediate([this]() { cond_->broadcast(); });
+ simgrid::simix::simcall([this]() { cond_->broadcast(); });
}
void intrusive_ptr_add_ref(ConditionVariable* cond)