generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement N3891: A proposal to rename shared_mutex to shared_timed_mutex

Browse Source 
This is as straightforward as it sounds, a renamed from shared_mutex to
shared_timed_mutex.

Note that libcxx .dylib and .so files built with c++14 support need to
be rebuilt.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@204078 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer
2014-03-17 20:19:44 +00:00
parent cb036e3f2c
commit f9f95be930
30 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_assign.fail.cpp
View File

@@ -17,16 +17,16 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m0;
std::shared_mutex m1;
std::shared_timed_mutex m0;
std::shared_timed_mutex m1;
#endif // _LIBCPP_STD_VER > 11
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_lock<std::shared_mutex> lk0(m0);
std::shared_lock<std::shared_mutex> lk1(m1);
std::shared_lock<std::shared_timed_mutex> lk0(m0);
std::shared_lock<std::shared_timed_mutex> lk1(m1);
lk1 = lk0;
#else
# error

6
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_ctor.fail.cpp
View File

@@ -16,14 +16,14 @@
#include <shared_mutex>
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
#endif // _LIBCPP_STD_VER > 11
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_lock<std::shared_mutex> lk0(m);
std::shared_lock<std::shared_mutex> lk = lk0;
std::shared_lock<std::shared_timed_mutex> lk0(m);
std::shared_lock<std::shared_timed_mutex> lk = lk0;
#else
# error
#endif // _LIBCPP_STD_VER > 11

2
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/default.pass.cpp
View File

@@ -19,7 +19,7 @@
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_lock<std::shared_mutex> ul;
std::shared_lock<std::shared_timed_mutex> ul;
assert(!ul.owns_lock());
assert(ul.mutex() == nullptr);
#endif // _LIBCPP_STD_VER > 11

8
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp
View File

@@ -18,16 +18,16 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m0;
std::shared_mutex m1;
std::shared_timed_mutex m0;
std::shared_timed_mutex m1;
#endif // _LIBCPP_STD_VER > 11
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_lock<std::shared_mutex> lk0(m0);
std::shared_lock<std::shared_mutex> lk1(m1);
std::shared_lock<std::shared_timed_mutex> lk0(m0);
std::shared_lock<std::shared_timed_mutex> lk1(m1);
lk1 = std::move(lk0);
assert(lk1.mutex() == &m0);
assert(lk1.owns_lock() == true);

6
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp
View File

@@ -17,14 +17,14 @@
#include <cassert>
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
#endif // _LIBCPP_STD_VER > 11
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_lock<std::shared_mutex> lk0(m);
std::shared_lock<std::shared_mutex> lk = std::move(lk0);
std::shared_lock<std::shared_timed_mutex> lk0(m);
std::shared_lock<std::shared_timed_mutex> lk = std::move(lk0);
assert(lk.mutex() == &m);
assert(lk.owns_lock() == true);
assert(lk0.mutex() == nullptr);

6
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex.pass.cpp
View File

@@ -21,7 +21,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::system_clock Clock;
typedef Clock::time_point time_point;
@@ -34,7 +34,7 @@ void f()
time_point t0 = Clock::now();
time_point t1;
{
std::shared_lock<std::shared_mutex> ul(m);
std::shared_lock<std::shared_timed_mutex> ul(m);
t1 = Clock::now();
}
ns d = t1 - t0 - ms(250);
@@ -46,7 +46,7 @@ void g()
time_point t0 = Clock::now();
time_point t1;
{
std::shared_lock<std::shared_mutex> ul(m);
std::shared_lock<std::shared_timed_mutex> ul(m);
t1 = Clock::now();
}
ns d = t1 - t0;

4
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp
View File

@@ -19,9 +19,9 @@
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
m.lock();
std::shared_lock<std::shared_mutex> lk(m, std::adopt_lock);
std::shared_lock<std::shared_timed_mutex> lk(m, std::adopt_lock);
assert(lk.mutex() == &m);
assert(lk.owns_lock() == true);
#endif // _LIBCPP_STD_VER > 11

4
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp
View File

@@ -19,8 +19,8 @@
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_lock<std::shared_mutex> lk(m, std::defer_lock);
std::shared_timed_mutex m;
std::shared_lock<std::shared_timed_mutex> lk(m, std::defer_lock);
assert(lk.mutex() == &m);
assert(lk.owns_lock() == false);
#endif // _LIBCPP_STD_VER > 11

6
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_duration.pass.cpp
View File

@@ -22,7 +22,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::steady_clock Clock;
typedef Clock::time_point time_point;
@@ -33,7 +33,7 @@ typedef std::chrono::nanoseconds ns;
void f1()
{
time_point t0 = Clock::now();
std::shared_lock<std::shared_mutex> lk(m, ms(300));
std::shared_lock<std::shared_timed_mutex> lk(m, ms(300));
assert(lk.owns_lock() == true);
time_point t1 = Clock::now();
ns d = t1 - t0 - ms(250);
@@ -43,7 +43,7 @@ void f1()
void f2()
{
time_point t0 = Clock::now();
std::shared_lock<std::shared_mutex> lk(m, ms(250));
std::shared_lock<std::shared_timed_mutex> lk(m, ms(250));
assert(lk.owns_lock() == false);
time_point t1 = Clock::now();
ns d = t1 - t0 - ms(250);

8
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_time_point.pass.cpp
View File

@@ -9,7 +9,7 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// template <class Clock, class Duration>
// shared_lock(mutex_type& m, const chrono::time_point<Clock, Duration>& abs_time);
@@ -22,7 +22,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::steady_clock Clock;
typedef Clock::time_point time_point;
@@ -33,7 +33,7 @@ typedef std::chrono::nanoseconds ns;
void f1()
{
time_point t0 = Clock::now();
std::shared_lock<std::shared_mutex> lk(m, Clock::now() + ms(300));
std::shared_lock<std::shared_timed_mutex> lk(m, Clock::now() + ms(300));
assert(lk.owns_lock() == true);
time_point t1 = Clock::now();
ns d = t1 - t0 - ms(250);
@@ -43,7 +43,7 @@ void f1()
void f2()
{
time_point t0 = Clock::now();
std::shared_lock<std::shared_mutex> lk(m, Clock::now() + ms(250));
std::shared_lock<std::shared_timed_mutex> lk(m, Clock::now() + ms(250));
assert(lk.owns_lock() == false);
time_point t1 = Clock::now();
ns d = t1 - t0 - ms(250);

10
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_try_to_lock.pass.cpp
View File

@@ -21,7 +21,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::system_clock Clock;
typedef Clock::time_point time_point;
@@ -33,20 +33,20 @@ void f()
{
time_point t0 = Clock::now();
{
std::shared_lock<std::shared_mutex> lk(m, std::try_to_lock);
std::shared_lock<std::shared_timed_mutex> lk(m, std::try_to_lock);
assert(lk.owns_lock() == false);
}
{
std::shared_lock<std::shared_mutex> lk(m, std::try_to_lock);
std::shared_lock<std::shared_timed_mutex> lk(m, std::try_to_lock);
assert(lk.owns_lock() == false);
}
{
std::shared_lock<std::shared_mutex> lk(m, std::try_to_lock);
std::shared_lock<std::shared_timed_mutex> lk(m, std::try_to_lock);
assert(lk.owns_lock() == false);
}
while (true)
{
std::shared_lock<std::shared_mutex> lk(m, std::try_to_lock);
std::shared_lock<std::shared_timed_mutex> lk(m, std::try_to_lock);
if (lk.owns_lock())
break;
}

4
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
View File

@@ -21,7 +21,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::system_clock Clock;
typedef Clock::time_point time_point;
@@ -31,7 +31,7 @@ typedef std::chrono::nanoseconds ns;
void f()
{
std::shared_lock<std::shared_mutex> lk(m, std::defer_lock);
std::shared_lock<std::shared_timed_mutex> lk(m, std::defer_lock);
time_point t0 = Clock::now();
lk.lock();
time_point t1 = Clock::now();

6
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/mutex.pass.cpp
View File

@@ -18,16 +18,16 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
#endif // _LIBCPP_STD_VER > 11
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_lock<std::shared_mutex> lk0;
std::shared_lock<std::shared_timed_mutex> lk0;
assert(lk0.mutex() == nullptr);
std::shared_lock<std::shared_mutex> lk1(m);
std::shared_lock<std::shared_timed_mutex> lk1(m);
assert(lk1.mutex() == &m);
lk1.unlock();
assert(lk1.mutex() == &m);

6
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/op_bool.pass.cpp
View File

@@ -18,16 +18,16 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
#endif // _LIBCPP_STD_VER > 11
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_lock<std::shared_mutex> lk0;
std::shared_lock<std::shared_timed_mutex> lk0;
assert(static_cast<bool>(lk0) == false);
std::shared_lock<std::shared_mutex> lk1(m);
std::shared_lock<std::shared_timed_mutex> lk1(m);
assert(static_cast<bool>(lk1) == true);
lk1.unlock();
assert(static_cast<bool>(lk1) == false);

6
test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/owns_lock.pass.cpp
View File

@@ -18,16 +18,16 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
#endif // _LIBCPP_STD_VER > 11
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_lock<std::shared_mutex> lk0;
std::shared_lock<std::shared_timed_mutex> lk0;
assert(lk0.owns_lock() == false);
std::shared_lock<std::shared_mutex> lk1(m);
std::shared_lock<std::shared_timed_mutex> lk1(m);
assert(lk1.owns_lock() == true);
lk1.unlock();
assert(lk1.owns_lock() == false);

0
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/nothing_to_do.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/nothing_to_do.pass.cpp
View File

8
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/assign.fail.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/assign.fail.cpp
View File

@@ -9,17 +9,17 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// shared_mutex& operator=(const shared_mutex&) = delete;
// shared_timed_mutex& operator=(const shared_timed_mutex&) = delete;
#include <shared_mutex>
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_mutex m0;
std::shared_mutex m1;
std::shared_timed_mutex m0;
std::shared_timed_mutex m1;
m1 = m0;
#else
# error

8
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/copy.fail.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/copy.fail.cpp
View File

@@ -9,17 +9,17 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// shared_mutex(const shared_mutex&) = delete;
// shared_timed_mutex(const shared_timed_mutex&) = delete;
#include <shared_mutex>
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_mutex m0;
std::shared_mutex m1(m0);
std::shared_timed_mutex m0;
std::shared_timed_mutex m1(m0);
#else
# error
#endif

6
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/default.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/default.pass.cpp
View File

@@ -9,15 +9,15 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// shared_mutex();
// shared_timed_mutex();
#include <shared_mutex>
int main()
{
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
#endif
}

4
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/lock.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock.pass.cpp
View File

@@ -9,7 +9,7 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// void lock();
@@ -20,7 +20,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::system_clock Clock;
typedef Clock::time_point time_point;

4
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/lock_shared.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock_shared.pass.cpp
View File

@@ -9,7 +9,7 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// void lock_shared();
@@ -21,7 +21,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::system_clock Clock;
typedef Clock::time_point time_point;

4
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/try_lock.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock.pass.cpp
View File

@@ -9,7 +9,7 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// bool try_lock();
@@ -20,7 +20,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::system_clock Clock;
typedef Clock::time_point time_point;

4
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/try_lock_for.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_for.pass.cpp
View File

@@ -9,7 +9,7 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// template <class Rep, class Period>
// bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
@@ -21,7 +21,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::steady_clock Clock;
typedef Clock::time_point time_point;

4
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/try_lock_shared.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared.pass.cpp
View File

@@ -9,7 +9,7 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// bool try_lock_shared();
@@ -21,7 +21,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::system_clock Clock;
typedef Clock::time_point time_point;

4
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/try_lock_shared_for.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_for.pass.cpp
View File

@@ -9,7 +9,7 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// template <class Rep, class Period>
// bool try_lock_shared_for(const chrono::duration<Rep, Period>& rel_time);
@@ -22,7 +22,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::steady_clock Clock;
typedef Clock::time_point time_point;

4
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/try_lock_shared_until.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_until.pass.cpp
View File

@@ -9,7 +9,7 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// template <class Clock, class Duration>
// bool try_lock_shared_until(const chrono::time_point<Clock, Duration>& abs_time);
@@ -22,7 +22,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::steady_clock Clock;
typedef Clock::time_point time_point;

4
test/thread/thread.mutex/thread.mutex.requirements/thread.sharedmutex.requirements/thread.sharedmutex.class/try_lock_until.pass.cpp → test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until.pass.cpp
View File

@@ -9,7 +9,7 @@
// <shared_mutex>
// class shared_mutex;
// class shared_timed_mutex;
// template <class Clock, class Duration>
// bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
@@ -21,7 +21,7 @@
#if _LIBCPP_STD_VER > 11
std::shared_mutex m;
std::shared_timed_mutex m;
typedef std::chrono::steady_clock Clock;
typedef Clock::time_point time_point;