to make _Sp_counted_base::add_ref_lock() thread-safe. Check whether
to destroy resources by testing for equality, not inequality. Add
empty critical sections to solve memory visibility issues.
* testsuite/tr1/2_general_utilities/memory/
shared_ptr/cons/auto_ptr_neg.cc: Use dg-excess-errors instead of
explicitly listing line numbers which need to be kept in sync.
* testsuite/tr1/2_general_utilities/memory/
shared_ptr/assign/auto_ptr_neg.cc: Same.
* testsuite/tr1/2_general_utilities/memory/
shared_ptr/assign/auto_ptr_rvalue_neg.cc: Same.
* testsuite/tr1/2_general_utilities/memory/
shared_ptr/cons/weak_ptr_expired.cc: Make XFAIL for consistency when
-fno-exceptions.
* testsuite/tr1/2_general_utilities/memory/
enable_shared_from_this/not_shared.cc: Add explanatory comments.
* testsuite/tr1/2_general_utilities/memory/
enable_shared_from_this/not_shared2.cc: Same.
* testsuite/tr1/2_general_utilities/memory/
enable_shared_from_this/not_shared3.cc: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97620
138bc75d-0d04-0410-961f-
82ee72b054a4
+2005-04-05 Jonathan Wakely <redi@gcc.gnu.org>
+
+ * include/tr1/memory, include/tr1/boost_shared_ptr.h: Use mutex
+ to make _Sp_counted_base::add_ref_lock() thread-safe. Check whether
+ to destroy resources by testing for equality, not inequality. Add
+ empty critical sections to solve memory visibility issues.
+ * testsuite/tr1/2_general_utilities/memory/
+ shared_ptr/cons/auto_ptr_neg.cc: Use dg-excess-errors instead of
+ explicitly listing line numbers which need to be kept in sync.
+ * testsuite/tr1/2_general_utilities/memory/
+ shared_ptr/assign/auto_ptr_neg.cc: Same.
+ * testsuite/tr1/2_general_utilities/memory/
+ shared_ptr/assign/auto_ptr_rvalue_neg.cc: Same.
+ * testsuite/tr1/2_general_utilities/memory/
+ shared_ptr/cons/weak_ptr_expired.cc: Make XFAIL for consistency when
+ -fno-exceptions.
+ * testsuite/tr1/2_general_utilities/memory/
+ enable_shared_from_this/not_shared.cc: Add explanatory comments.
+ * testsuite/tr1/2_general_utilities/memory/
+ enable_shared_from_this/not_shared2.cc: Same.
+ * testsuite/tr1/2_general_utilities/memory/
+ enable_shared_from_this/not_shared3.cc: Same.
+
2005-04-05 Kelley Cook <kcook@gcc.gnu.org>
* acconfig.h: Delete macros already ACDEFINED.
void
add_ref_lock()
{
- if (_M_use_count <= 0) // TODO not yet MT safe XXX
+ __gnu_cxx::lock lock(_M_mutex);
+ if (__gnu_cxx::__exchange_and_add(&_M_use_count, 1) == 0)
{
+ _M_use_count = 0;
__throw_bad_weak_ptr();
}
- __gnu_cxx::__atomic_add(&_M_use_count, 1);
}
void
release() // nothrow
{
- if (__gnu_cxx::__exchange_and_add(&_M_use_count, -1) <= 1)
+ if (__gnu_cxx::__exchange_and_add(&_M_use_count, -1) == 1)
{
dispose();
+ __glibcxx_mutex_lock(_M_mutex);
+ __glibcxx_mutex_unlock(_M_mutex);
weak_release();
}
}
void
weak_release() // nothrow
{
- if (__gnu_cxx::__exchange_and_add(&_M_weak_count, -1) <= 1)
+ if (__gnu_cxx::__exchange_and_add(&_M_weak_count, -1) == 1)
{
+ __glibcxx_mutex_lock(_M_mutex);
+ __glibcxx_mutex_unlock(_M_mutex);
destroy();
}
}
_Atomic_word _M_use_count; // #shared
_Atomic_word _M_weak_count; // #weak + (#shared != 0)
+ __gnu_cxx::mutex_type _M_mutex;
};
template <typename _Ptr, typename _Deleter>
#include <bits/gthr.h>
#include <bits/atomicity.h>
#include <bits/functexcept.h>
+#include <bits/concurrence.h>
#include <debug/debug.h>
#include <tr1/boost_shared_ptr.h>
}
catch (const std::tr1::bad_weak_ptr&)
{
+ // Expected.
__throw_exception_again;
}
catch (...)
{
+ // Failed.
}
return 0;
}
catch (const std::tr1::bad_weak_ptr&)
{
+ // Expected.
__throw_exception_again;
}
+ catch (...)
+ {
+ // Failed.
+ }
return 0;
}
}
catch (const std::tr1::bad_weak_ptr&)
{
+ // Expected.
__throw_exception_again;
}
+ catch (...)
+ {
+ // Failed.
+ }
return 0;
}
test01();
return 0;
}
-// { dg-error "In constructor" "" { target *-*-* } 0 }
-// { dg-error "cannot convert" "" { target *-*-* } 0 }
-// { dg-error "instantiated from" "" { target *-*-* } 0 }
+// { dg-excess-errors "In constructor" }
test01();
return 0;
}
-// { dg-error "auto_ptr" "" { target *-*-* } 0 }
-// { dg-error "shared_ptr" "" { target *-*-* } 0 }
+// { dg-excess-errors "candidates are" }
test01();
return 0;
}
-// { dg-error "shared_ptr" "candidates are" { target *-*-* } 478 }
-
-// { dg-error "shared_ptr" "" { target *-*-* } 468 }
+// { dg-excess-errors "candidates are" }
+// { dg-do run { xfail *-*-* } }
// Copyright (C) 2005 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
std::tr1::shared_ptr<A> a1(new A);
std::tr1::weak_ptr<A> wa(a1);
a1.reset();
+ VERIFY( wa.expired() );
try
{
std::tr1::shared_ptr<A> a2(wa);
catch (const std::tr1::bad_weak_ptr&)
{
// Expected.
+ __throw_exception_again;
}
catch (...)
{
// Failed.
- __throw_exception_again;
}
- VERIFY( wa.expired() );
return 0;
}