Skip to content

R
riscv-gcc-1
Commit 22ac021b by Benjamin Kosnik Committed by Benjamin Kosnik
Options

mutex (mutex::try_lock): Eat errors. 


2008-05-14  Benjamin Kosnik  <bkoz@redhat.com>

	* include/std/mutex (mutex::try_lock): Eat errors.
	(mutex::unlock): Same.
	(recursive_mutex::try_lock): Eat errors.
	(recursive_mutex::unlock): Same.
	* testsuite/30_threads/mutex/dest/destructor_locked.cc: Add
	-pthreads, adjust line numbers.
	* testsuite/30_threads/mutex/native_handle/1.cc: Same.
	* testsuite/30_threads/mutex/cons/1.cc: Same.
	* testsuite/30_threads/mutex/try_lock/1.cc: Same.
	* testsuite/30_threads/mutex/try_lock/2.cc: Same.
	* testsuite/30_threads/mutex/lock/1.cc: Same.
	* testsuite/30_threads/mutex/unlock/1.cc: Same.
	* testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc: Same.
	* testsuite/30_threads/recursive_mutex/native_handle/1.cc: Same.
	* testsuite/30_threads/recursive_mutex/cons/1.cc: Same.

From-SVN: r135321
parent 2fa9f315
Showing with 56 additions and 46 deletions
libstdc++-v3/ChangeLog
2008-05-14 Benjamin Kosnik <bkoz@redhat.com>
* include/std/mutex (mutex::try_lock): Eat errors.
(mutex::unlock): Same.
(recursive_mutex::try_lock): Eat errors.
(recursive_mutex::unlock): Same.
* testsuite/30_threads/mutex/dest/destructor_locked.cc: Add
-pthreads, adjust line numbers.
* testsuite/30_threads/mutex/native_handle/1.cc: Same.
* testsuite/30_threads/mutex/cons/1.cc: Same.
* testsuite/30_threads/mutex/try_lock/1.cc: Same.
* testsuite/30_threads/mutex/try_lock/2.cc: Same.
* testsuite/30_threads/mutex/lock/1.cc: Same.
* testsuite/30_threads/mutex/unlock/1.cc: Same.
* testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc: Same.
* testsuite/30_threads/recursive_mutex/native_handle/1.cc: Same.
* testsuite/30_threads/recursive_mutex/cons/1.cc: Same.
2008-05-14 Benjamin Kosnik <bkoz@redhat.com>
* include/std/sstream: Adjust braces.
* include/bits/fstream.tcc: Same.
* testsuite/29_atomics/atomic_flag/test_and_set/explicit.c: Add
......
libstdc++-v3/include/std/mutex
......@@ -59,14 +59,13 @@ namespace std
mutex()
{
// XXX EAGAIN, ENOMEM, EPERM, EBUSY(may), EINVAL(may)
#if defined __GTHREAD_MUTEX_INIT
native_handle_type __tmp = __GTHREAD_MUTEX_INIT;
_M_mutex = __tmp;
#else
__GTHREAD_MUTEX_INIT_FUNCTION(&_M_mutex);
#endif
// EAGAIN, ENOMEM, EPERM, EBUSY(may), EINVAL(may)
}
void
......@@ -82,23 +81,15 @@ namespace std
bool
try_lock()
{
int __e = __gthread_mutex_trylock(&_M_mutex);
// EINVAL, EAGAIN, EBUSY
if (__e)
__throw_system_error(__e);
else
return true;
// XXX EINVAL, EAGAIN, EBUSY
return !__gthread_mutex_trylock(&_M_mutex);
}
void
unlock()
{
int __e = __gthread_mutex_unlock(&_M_mutex);
// EINVAL, EAGAIN, EPERM
if (__e)
__throw_system_error(__e);
// XXX EINVAL, EAGAIN, EPERM
__gthread_mutex_unlock(&_M_mutex);
}
native_handle_type
......@@ -120,14 +111,13 @@ namespace std
recursive_mutex()
{
// XXX EAGAIN, ENOMEM, EPERM, EBUSY(may), EINVAL(may)
#if defined __GTHREAD_RECURSIVE_MUTEX_INIT
native_handle_type __tmp = __GTHREAD_RECURSIVE_MUTEX_INIT;
_M_mutex = __tmp;
#else
__GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION(&_M_mutex);
#endif
// EAGAIN, ENOMEM, EPERM, EBUSY(may), EINVAL(may)
}
......@@ -144,23 +134,15 @@ namespace std
bool
try_lock()
{
int __e = __gthread_recursive_mutex_trylock(&_M_mutex);
// EINVAL, EAGAIN, EBUSY
if (__e)
__throw_system_error(__e);
else
return true;
// XXX EINVAL, EAGAIN, EBUSY
return !__gthread_recursive_mutex_trylock(&_M_mutex);
}
void
unlock()
{
int __e = __gthread_recursive_mutex_unlock(&_M_mutex);
// EINVAL, EAGAIN, EBUSY
if (__e)
__throw_system_error(__e);
// XXX EINVAL, EAGAIN, EBUSY
__gthread_recursive_mutex_unlock(&_M_mutex);
}
native_handle_type
......
libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......
libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc
......@@ -39,4 +39,4 @@ void test01()
m1 = m2;
}
// { dg-error "within this context" "" { target *-*-* } 39 }
// { dg-error "is private" "" { target *-*-* } 111 }
// { dg-error "is private" "" { target *-*-* } 102 }
libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc
......@@ -38,4 +38,4 @@ void test01()
mutex_type m2(m1);
}
// { dg-error "within this context" "" { target *-*-* } 38 }
// { dg-error "is private" "" { target *-*-* } 110 }
// { dg-error "is private" "" { target *-*-* } 101 }
libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......
libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......@@ -41,11 +42,11 @@ int main()
mutex_type m;
m.lock();
// Lock already locked mutex, should be ok.
// XXX
// Lock already locked mutex.
try
{
m.lock();
// XXX Will block.
// m.lock();
}
catch (const std::system_error& e)
{
......
libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......
libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......
libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......@@ -45,7 +46,7 @@ int main()
try
{
b = m.try_lock();
VERIFY( b );
VERIFY( !b );
}
catch (const std::system_error& e)
{
......
libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......
libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......
libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc
......@@ -39,4 +39,4 @@ void test01()
m1 = m2;
}
// { dg-error "within this context" "" { target *-*-* } 39 }
// { dg-error "is private" "" { target *-*-* } 173 }
// { dg-error "is private" "" { target *-*-* } 155 }
libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc
......@@ -38,4 +38,4 @@ void test01()
mutex_type m2(m1);
}
// { dg-error "within this context" "" { target *-*-* } 38 }
// { dg-error "is private" "" { target *-*-* } 172 }
// { dg-error "is private" "" { target *-*-* } 154 }
libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......
libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc
// { dg-options "-std=gnu++0x" }
// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
// { dg-options "-pthread -std=gnu++0x" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment