diff options
author | Benjamin Kosnik <bkoz@redhat.com> | 2006-09-14 09:48:15 +0000 |
---|---|---|
committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2006-09-14 09:48:15 +0000 |
commit | 2e362c747413dc3767d020f522df127964b275ac (patch) | |
tree | eef2837703208f056261f360e2ea7f39d3036693 /libstdc++-v3/config/cpu | |
parent | 06fcf75439fbafae348fa33a0630f7bd83a835aa (diff) | |
download | gcc-2e362c747413dc3767d020f522df127964b275ac.zip gcc-2e362c747413dc3767d020f522df127964b275ac.tar.gz gcc-2e362c747413dc3767d020f522df127964b275ac.tar.bz2 |
atomicity.h: Move to...
2006-09-13 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/atomicity.h: Move to...
* include/ext/atomicity.h: ...here.
* include/bits/concurrence.h: Move to...
* include/ext/concurrence.h: ...here.
* include/Makefile.am (ext_headers): Additions.
(bits_headers): Subtractions.
* include/Makefile.in: Regenerate.
* include/ext/bitmap_allocator.h (_Mutex), __threads_enabled,
_Lock, _Auto_Lock): Subsume into...
* include/bits/concurrence.h (__mutex): ..this. Error check
locking and unlocking.
(lock): Uglify to...
(__scoped_lock): Use __mutex.
(__glibcxx_mutex_define_initialized): Remove.
(__glibcxx_mutex_type): Remove.
* include/tr1/boost_shared_ptr.h: Formating tweaks, adjustments.
(_Lock_policy): Move from here...
* include/ext/concurrence.h: ... to here.
(__shared_ptr_default_lock_mode): To __default_lock_policy.
(_S_lockfree): To _S_atomic.
Document.
* libsupc++/guard.cc (static_mutex): Subsume into and fixup for...
* include/ext/concurrence.h (__recursive_mutex): ...this. Error
check locking and unlocking.
* libsupc++/eh_alloc.cc: Use __scoped_lock.
* config/os/aix/atomicity.h: Fixups for include paths, mutex to
__scoped_mutex change, removal of locking defines.
* config/os/irix/atomicity.h: Same.
* config/cpu/cris/atomicity.h: Same.
* config/cpu/m68k/atomicity.h: Same.
* config/cpu/hppa/atomicity.h: Same.
* config/cpu/mips/atomicity.h: Same.
* config/cpu/sparc/atomicity.h: Same.
* config/cpu/i386/atomicity.h: Same.
* config/cpu/i486/atomicity.h: Same.
* config/cpu/sh/atomicity.h: Same.
* config/cpu/generic/atomicity_mutex/atomicity.h: Same.
* include/ext/pool_allocator.h: Same.
* include/ext/bitmap_allocator.h: Same.
* include/ext/rc_string_base.h: Same.
* include/ext/mt_allocator.h: Same.
* include/bits/locale_classes.h: Same.
* include/bits/basic_string.h: Same.
* include/bits/ios_base.h: Same.
* include/tr1/memory: Same.
* src/pool_allocator.cc: Same.
* src/mt_allocator.cc: Same.
* src/locale_init.cc: Same.
* src/ios.cc: Same.
* src/locale.cc: Same.
* src/bitmap_allocator.cc: Same.
* src/ios_init.cc: Same.
* src/debug.cc: Same.
From-SVN: r116942
Diffstat (limited to 'libstdc++-v3/config/cpu')
-rw-r--r-- | libstdc++-v3/config/cpu/cris/atomicity.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h | 9 | ||||
-rw-r--r-- | libstdc++-v3/config/cpu/hppa/atomicity.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/config/cpu/i386/atomicity.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/config/cpu/i486/atomicity.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/config/cpu/m68k/atomicity.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/config/cpu/mips/atomicity.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/config/cpu/sh/atomicity.h | 9 | ||||
-rw-r--r-- | libstdc++-v3/config/cpu/sparc/atomicity.h | 2 |
9 files changed, 15 insertions, 17 deletions
diff --git a/libstdc++-v3/config/cpu/cris/atomicity.h b/libstdc++-v3/config/cpu/cris/atomicity.h index 0384b42..da16a1a 100644 --- a/libstdc++-v3/config/cpu/cris/atomicity.h +++ b/libstdc++-v3/config/cpu/cris/atomicity.h @@ -27,7 +27,7 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include <bits/atomicity.h> +#include <ext/atomicity.h> _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h b/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h index e62c5ae..b54309e 100644 --- a/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h +++ b/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h @@ -28,12 +28,12 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include <bits/atomicity.h> -#include <bits/concurrence.h> +#include <ext/atomicity.h> +#include <ext/concurrence.h> namespace { - __glibcxx_mutex_define_initialized(atomic_mutex); + __gnu_cxx::__mutex atomic_mutex; } // anonymous namespace _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) @@ -42,11 +42,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) __attribute__ ((__unused__)) __exchange_and_add(volatile _Atomic_word* __mem, int __val) { - __glibcxx_mutex_lock(atomic_mutex); + __gnu_cxx::__scoped_lock sentry(atomic_mutex); _Atomic_word __result; __result = *__mem; *__mem += __val; - __glibcxx_mutex_unlock(atomic_mutex); return __result; } diff --git a/libstdc++-v3/config/cpu/hppa/atomicity.h b/libstdc++-v3/config/cpu/hppa/atomicity.h index 1b1c883..76c09e0 100644 --- a/libstdc++-v3/config/cpu/hppa/atomicity.h +++ b/libstdc++-v3/config/cpu/hppa/atomicity.h @@ -28,7 +28,7 @@ // the GNU General Public License. #include <bits/c++config.h> -#include <bits/atomicity.h> +#include <ext/atomicity.h> _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/config/cpu/i386/atomicity.h b/libstdc++-v3/config/cpu/i386/atomicity.h index 1b31c2d..7232b5b 100644 --- a/libstdc++-v3/config/cpu/i386/atomicity.h +++ b/libstdc++-v3/config/cpu/i386/atomicity.h @@ -27,7 +27,7 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include <bits/atomicity.h> +#include <ext/atomicity.h> _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/config/cpu/i486/atomicity.h b/libstdc++-v3/config/cpu/i486/atomicity.h index c2cf509..4d8f652 100644 --- a/libstdc++-v3/config/cpu/i486/atomicity.h +++ b/libstdc++-v3/config/cpu/i486/atomicity.h @@ -27,7 +27,7 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include <bits/atomicity.h> +#include <ext/atomicity.h> _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/config/cpu/m68k/atomicity.h b/libstdc++-v3/config/cpu/m68k/atomicity.h index 370d77f..f63b582 100644 --- a/libstdc++-v3/config/cpu/m68k/atomicity.h +++ b/libstdc++-v3/config/cpu/m68k/atomicity.h @@ -27,7 +27,7 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include <bits/atomicity.h> +#include <ext/atomicity.h> _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/config/cpu/mips/atomicity.h b/libstdc++-v3/config/cpu/mips/atomicity.h index 33582a3..2989fa4 100644 --- a/libstdc++-v3/config/cpu/mips/atomicity.h +++ b/libstdc++-v3/config/cpu/mips/atomicity.h @@ -28,7 +28,7 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include <bits/atomicity.h> +#include <ext/atomicity.h> _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/config/cpu/sh/atomicity.h b/libstdc++-v3/config/cpu/sh/atomicity.h index 2294c5d..d200818 100644 --- a/libstdc++-v3/config/cpu/sh/atomicity.h +++ b/libstdc++-v3/config/cpu/sh/atomicity.h @@ -74,12 +74,12 @@ __atomic_add (volatile _Atomic_word* __mem, int __val) /* This is generic/atomicity.h */ -#include <bits/atomicity.h> -#include <bits/concurrence.h> +#include <ext/atomicity.h> +#include <ext/concurrence.h> namespace { - __glibcxx_mutex_define_initialized(atomic_mutex); + __gnu_cxx::__mutex atomic_mutex; } // anonymous namespace _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) @@ -88,11 +88,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) __attribute__ ((__unused__)) __exchange_and_add(volatile _Atomic_word* __mem, int __val) { - __glibcxx_mutex_lock(atomic_mutex); + __gnu_cxx::__scoped_lock sentry(atomic_mutex); _Atomic_word __result; __result = *__mem; *__mem += __val; - __glibcxx_mutex_unlock(atomic_mutex); return __result; } diff --git a/libstdc++-v3/config/cpu/sparc/atomicity.h b/libstdc++-v3/config/cpu/sparc/atomicity.h index ad43760..5fec033 100644 --- a/libstdc++-v3/config/cpu/sparc/atomicity.h +++ b/libstdc++-v3/config/cpu/sparc/atomicity.h @@ -28,7 +28,7 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include <bits/atomicity.h> +#include <ext/atomicity.h> _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) |