This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Fwd: [PATCH] libstdc++/67408
- From: Sebastian Huber <sebastian dot huber at embedded-brains dot de>
- To: libstdc++ at gcc dot gnu dot org
- Date: Wed, 2 Sep 2015 10:01:23 +0200
- Subject: Fwd: [PATCH] libstdc++/67408
- Authentication-results: sourceware.org; auth=none
- References: <1441105769-9004-1-git-send-email-sebastian dot huber at embedded-brains dot de>
See also:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67408#c6
-------- Forwarded Message --------
Subject: [PATCH] libstdc++/67408
Date: Tue, 1 Sep 2015 13:09:29 +0200
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
To: gcc-patches@gcc.gnu.org
CC: Sebastian Huber <sebastian.huber@embedded-brains.de>
2015-09-01 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR libstdc++/67408
* include/std/mutex (__timed_mutex_impl): Use __timedlock().
(timed_mutex): Add friend class __timed_mutex_impl. Add
__timedlock().
(recursive_timed_mutex): Likewise.
---
libstdc++-v3/include/std/mutex | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex
index deb85df..2958e01 100644
--- a/libstdc++-v3/include/std/mutex
+++ b/libstdc++-v3/include/std/mutex
@@ -230,8 +230,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static_cast<long>(__ns.count())
};
- auto __mutex = static_cast<_Derived*>(this)->native_handle();
- return !__gthread_mutex_timedlock(__mutex, &__ts);
+ return !static_cast<_Derived*>(this)->__timedlock(&__ts);
}
template<typename _Clock, typename _Duration>
@@ -293,6 +292,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
native_handle_type
native_handle()
{ return &_M_mutex; }
+
+ private:
+ friend class __timed_mutex_impl;
+
+ int
+ __timedlock(const __gthread_time_t *__abs_timeout)
+ { return __gthread_mutex_timedlock(&_M_mutex, __abs_timeout); }
};
/// recursive_timed_mutex
@@ -346,6 +352,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
native_handle_type
native_handle()
{ return &_M_mutex; }
+
+ private:
+ friend class __timed_mutex_impl;
+
+ int
+ __timedlock(const __gthread_time_t *__abs_timeout)
+ { return __gthread_recursive_mutex_timedlock(&_M_mutex, __abs_timeout); }
};
#endif
#endif // _GLIBCXX_HAS_GTHREADS
--
1.8.4.5