From ef0a3b53bef2d0de21f471e218cef6017b257128 Mon Sep 17 00:00:00 2001 From: bkoz Date: Tue, 2 Nov 2004 23:56:56 +0000 Subject: [PATCH 1/1] 2004-11-02 Benjamin Kosnik Lothar Werzinger PR libstdc++/17627 * src/debug.cc: Include concurrence, use mutexes. (_Safe_iterator_base::_M_attach): Here. (_Safe_iterator_base::_M_detach): Here. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90004 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/src/debug.cc | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0b0545302f5..dbbbea99113 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,12 @@ 2004-11-02 Benjamin Kosnik + Lothar Werzinger + + PR libstdc++/17627 + * src/debug.cc: Include concurrence, use mutexes. + (_Safe_iterator_base::_M_attach): Here. + (_Safe_iterator_base::_M_detach): Here. + +2004-11-02 Benjamin Kosnik PR libstdc++/17922 * include/bits/ios_base.h : Add enum values. diff --git a/libstdc++-v3/src/debug.cc b/libstdc++-v3/src/debug.cc index 0ca9238fe00..fe6bba45fc3 100644 --- a/libstdc++-v3/src/debug.cc +++ b/libstdc++-v3/src/debug.cc @@ -37,9 +37,17 @@ #include #include #include +#include using namespace std; +namespace __gnu_internal +{ + __glibcxx_mutex_define_initialized(iterator_base_attach_mutex); + __glibcxx_mutex_define_initialized(iterator_base_detach_mutex); + +} // namespace __gnu_internal + namespace __gnu_debug { const char* _S_debug_messages[] = @@ -188,6 +196,7 @@ namespace __gnu_debug // Attach to the new sequence (if there is one) if (__seq) { + __gnu_cxx::lock sentry(__gnu_internal::iterator_base_attach_mutex); _M_sequence = __seq; _M_version = _M_sequence->_M_version; _M_prior = 0; @@ -212,6 +221,7 @@ namespace __gnu_debug _Safe_iterator_base:: _M_detach() { + __gnu_cxx::lock sentry(__gnu_internal::iterator_base_detach_mutex); if (_M_sequence) { // Remove us from this sequence's list -- 2.11.0