OSDN Git Service

2008-05-14 Benjamin Kosnik <bkoz@redhat.com>
authorbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 15 May 2008 00:52:48 +0000 (00:52 +0000)
committerbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 15 May 2008 00:52:48 +0000 (00:52 +0000)
* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135321 138bc75d-0d04-0410-961f-82ee72b054a4

16 files changed:
libstdc++-v3/ChangeLog
libstdc++-v3/include/std/mutex
libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc
libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc
libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc
libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc
libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc
libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc
libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc
libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc
libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc
libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc
libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc
libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc
libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc
libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc

index bb4e3d6..2f06c8e 100644 (file)
@@ -1,5 +1,23 @@
 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
index 935b16e..6a75e78 100644 (file)
@@ -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
index fca1ffa..3ed9b6e 100644 (file)
@@ -1,4 +1,5 @@
-// { 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.
 //
index 8a4d413..f365d11 100644 (file)
@@ -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 } 
index 76bc761..d0a9102 100644 (file)
@@ -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 } 
index 6fad4b5..3fe33b2 100644 (file)
@@ -1,4 +1,5 @@
-// { 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.
 //
index 3ca6b4a..c63c606 100644 (file)
@@ -1,4 +1,5 @@
-// { 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)
        {
index 8f3034a..d4cd9f7 100644 (file)
@@ -1,4 +1,5 @@
-// { 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.
 //
index 20a3caa..b7380d6 100644 (file)
@@ -1,4 +1,5 @@
-// { 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.
 //
index 617a652..7c7845e 100644 (file)
@@ -1,4 +1,5 @@
-// { 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)
        {
index 1a15729..4c845fa 100644 (file)
@@ -1,4 +1,5 @@
-// { 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.
 //
index eb76d11..1125ea6 100644 (file)
@@ -1,4 +1,5 @@
-// { 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.
 //
index 54877e4..ca39974 100644 (file)
@@ -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 } 
index 80a38b3..7f530c3 100644 (file)
@@ -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 } 
index 3586cfa..464d1a8 100644 (file)
@@ -1,4 +1,5 @@
-// { 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.
 //
index d28513f..fb3be90 100644 (file)
@@ -1,4 +1,5 @@
-// { 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.
 //