ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mstd_mutex: Add missing Chrono bits

pull/12425/head
Kevin Bracey 2020-03-03 16:51:48 +02:00
parent f0ee31f119
commit b17355f588
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
platform/cxxsupport/mstd_mutex
View File

@ -46,6 +46,8 @@
#include <mstd_utility> #include <mstd_utility>
#include <mstd_functional> #include <mstd_functional>
#include <mstd_tuple>
#include <chrono>
#include "mbed_atomic.h" #include "mbed_atomic.h"
#include "mbed_assert.h" #include "mbed_assert.h"
@ -105,12 +107,10 @@ public:
unique_lock(mutex_type &m, defer_lock_t) noexcept : pm(&m), owns(false) { } unique_lock(mutex_type &m, defer_lock_t) noexcept : pm(&m), owns(false) { }
unique_lock(mutex_type &m, try_to_lock_t) : pm(&m), owns(m.try_lock()) { } unique_lock(mutex_type &m, try_to_lock_t) : pm(&m), owns(m.try_lock()) { }
unique_lock(mutex_type &m, adopt_lock_t) : pm(&m), owns(true) { } unique_lock(mutex_type &m, adopt_lock_t) : pm(&m), owns(true) { }
#if 0 // disabled until we have functional mstd::chrono for all toolchains
template <class Clock, class Duration> template <class Clock, class Duration>
unique_lock(mutex_type &m, const chrono::time_point<Clock, Duration> &abs_time) : pm(&m), owns(m.try_lock_until(abs_time)) { } unique_lock(mutex_type &m, const std::chrono::time_point<Clock, Duration> &abs_time) : pm(&m), owns(m.try_lock_until(abs_time)) { }
template <class Rep, class Period> template <class Rep, class Period>
unique_lock(mutex_type &m, const chrono::duration<Rep, Period> &rel_time) : pm(&m), owns(m.try_lock_for(rel_time)) { } unique_lock(mutex_type &m, const std::chrono::duration<Rep, Period> &rel_time) : pm(&m), owns(m.try_lock_for(rel_time)) { }
#endif
~unique_lock() { if (owns) pm->unlock(); } ~unique_lock() { if (owns) pm->unlock(); }
unique_lock(const unique_lock &) = delete; unique_lock(const unique_lock &) = delete;
@ -141,19 +141,17 @@ public:
return owns = pm->try_lock(); return owns = pm->try_lock();
} }
#if 0 // disabled until we have functional mstd::chrono for all toolchains
template <class Clock, class Duration> template <class Clock, class Duration>
bool try_lock_until(const chrono::time_point<Clock, Duration> &abs_time) { bool try_lock_until(const std::chrono::time_point<Clock, Duration> &abs_time) {
MBED_ASSERT(!owns); MBED_ASSERT(!owns);
return owns = pm->try_lock_until(abs_time); return owns = pm->try_lock_until(abs_time);
} }
template <class Rep, class Period> template <class Rep, class Period>
bool try_lock_for(const chrono::duration<Rep, Period> &rel_time) { bool try_lock_for(const std::chrono::duration<Rep, Period> &rel_time) {
MBED_ASSERT(!owns); MBED_ASSERT(!owns);
return owns = pm->try_lock_for(rel_time); return owns = pm->try_lock_for(rel_time);
} }
#endif
void unlock() { void unlock() {
MBED_ASSERT(owns); MBED_ASSERT(owns);
@ -313,9 +311,8 @@ using std::scoped_lock;
// [thread.lock.scoped] // [thread.lock.scoped]
// 2+ locks - use std::lock // 2+ locks - use std::lock
template <class... MutexTypes> template <class... MutexTypes>
class scoped_lock class scoped_lock {
#if 0 // no definition yet - needs tuple mstd::tuple<MutexTypes &...> pm;
tuple<MutexTypes &...> pm;
static void ignore(...) { } static void ignore(...) { }
public: public:
explicit scoped_lock(MutexTypes &... m) : pm(tie(m...)) { mstd::lock(m...); } explicit scoped_lock(MutexTypes &... m) : pm(tie(m...)) { mstd::lock(m...); }
@ -324,10 +321,7 @@ public:
scoped_lock(const scoped_lock &) = delete; scoped_lock(const scoped_lock &) = delete;
scoped_lock &operator=(const scoped_lock &) = delete; scoped_lock &operator=(const scoped_lock &) = delete;
} };
#else
;
#endif
// 0 locks - no-op // 0 locks - no-op
template <> template <>

9
platform/cxxsupport/mstd_tuple
View File

@ -41,6 +41,10 @@ using std::make_tuple;
using std::forward_as_tuple; using std::forward_as_tuple;
using std::tie; using std::tie;
using std::tuple_cat; using std::tuple_cat;
using std::tuple_size;
using std::tuple_element;
using std::tuple_element_t;
using std::get;
// [tuple.apply] // [tuple.apply]
#if __cpp_lib_apply >= 201603 #if __cpp_lib_apply >= 201603
@ -84,11 +88,6 @@ T make_from_tuple(Tuple&& t)
} }
#endif #endif
using std::tuple_size;
using std::tuple_element;
using std::tuple_element_t;
using std::get;
} // namespace mstd } // namespace mstd
#endif // MSTD_TUPLE_ #endif // MSTD_TUPLE_