|
|
Boost-Commit : |
From: anthony_at_[hidden]
Date: 2007-11-14 09:49:58
Author: anthonyw
Date: 2007-11-14 09:49:58 EST (Wed, 14 Nov 2007)
New Revision: 41090
URL: http://svn.boost.org/trac/boost/changeset/41090
Log:
fixes for pthread implementation
Added:
trunk/boost/thread/pthread/tss.hpp (contents, props changed)
Text files modified:
trunk/boost/thread/tss.hpp | 122 ---------------------------------------
trunk/libs/thread/src/pthread/thread.cpp | 4
2 files changed, 4 insertions(+), 122 deletions(-)
Added: trunk/boost/thread/pthread/tss.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/thread/pthread/tss.hpp 2007-11-14 09:49:58 EST (Wed, 14 Nov 2007)
@@ -0,0 +1,109 @@
+#ifndef BOOST_THREAD_PTHREAD_TSS_HPP
+#define BOOST_THREAD_PTHREAD_TSS_HPP
+
+// Copyright (C) 2001-2003 William E. Kempf
+// Copyright (C) 2006 Roland Schwarz
+// Copyright (C) 2007 Anthony Williams
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/thread/detail/config.hpp>
+#include <boost/utility.hpp>
+#include <boost/function.hpp>
+#include <boost/thread/exceptions.hpp>
+
+#include <pthread.h>
+
+namespace boost {
+
+// disable warnings about non dll import
+// see: http://www.boost.org/more/separate_compilation.html#dlls
+#ifdef BOOST_MSVC
+# pragma warning(push)
+# pragma warning(disable: 4251 4231 4660 4275)
+#endif
+
+namespace detail {
+
+class BOOST_THREAD_DECL tss : private noncopyable
+{
+public:
+ tss(boost::function1<void, void*>* pcleanup) {
+ if (pcleanup == 0) throw boost::thread_resource_error();
+ try
+ {
+ init(pcleanup);
+ }
+ catch (...)
+ {
+ delete pcleanup;
+ throw boost::thread_resource_error();
+ }
+ }
+
+ ~tss();
+ void* get() const;
+ void set(void* value);
+ void cleanup(void* p);
+
+private:
+ unsigned int m_slot; //This is a "pseudo-slot", not a native slot
+
+ void init(boost::function1<void, void*>* pcleanup);
+};
+
+template <typename T>
+struct tss_adapter
+{
+ template <typename F>
+ tss_adapter(const F& cleanup) : m_cleanup(cleanup) { }
+ void operator()(void* p) { m_cleanup(static_cast<T*>(p)); }
+ boost::function1<void, T*> m_cleanup;
+};
+
+} // namespace detail
+
+template <typename T>
+class thread_specific_ptr : private noncopyable
+{
+public:
+ thread_specific_ptr()
+ : m_tss(new boost::function1<void, void*>(
+ boost::detail::tss_adapter<T>(
+ &thread_specific_ptr<T>::cleanup)))
+ {
+ }
+ thread_specific_ptr(void (*clean)(T*))
+ : m_tss(new boost::function1<void, void*>(
+ boost::detail::tss_adapter<T>(clean)))
+ {
+ }
+ ~thread_specific_ptr() { reset(); }
+
+ T* get() const { return static_cast<T*>(m_tss.get()); }
+ T* operator->() const { return get(); }
+ T& operator*() const { return *get(); }
+ T* release() { T* temp = get(); if (temp) m_tss.set(0); return temp; }
+ void reset(T* p=0)
+ {
+ T* cur = get();
+ if (cur == p) return;
+ m_tss.set(p);
+ if (cur) m_tss.cleanup(cur);
+ }
+
+private:
+ static void cleanup(T* p) { delete p; }
+ detail::tss m_tss;
+};
+
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+
+} // namespace boost
+
+
+
+#endif
Modified: trunk/boost/thread/tss.hpp
==============================================================================
--- trunk/boost/thread/tss.hpp (original)
+++ trunk/boost/thread/tss.hpp 2007-11-14 09:49:58 EST (Wed, 14 Nov 2007)
@@ -1,130 +1,12 @@
-// Copyright (C) 2001-2003 William E. Kempf
-// Copyright (C) 2006 Roland Schwarz
// Copyright (C) 2007 Anthony Williams
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_TSS_WEK070601_HPP
-#define BOOST_TSS_WEK070601_HPP
+#ifndef BOOST_THREAD_TSS_HPP
+#define BOOST_THREAD_TSS_HPP
-#include <boost/thread/detail/config.hpp>
-
-#ifdef BOOST_HAS_WINTHREADS
#include <boost/thread/detail/platform.hpp>
#include BOOST_THREAD_PLATFORM(tss.hpp)
-#else
-
-#include <boost/utility.hpp>
-#include <boost/function.hpp>
-#include <boost/thread/exceptions.hpp>
-
-#if defined(BOOST_HAS_PTHREADS)
-# include <pthread.h>
-#endif
-
-namespace boost {
-
-// disable warnings about non dll import
-// see: http://www.boost.org/more/separate_compilation.html#dlls
-#ifdef BOOST_MSVC
-# pragma warning(push)
-# pragma warning(disable: 4251 4231 4660 4275)
-#endif
-
-namespace detail {
-
-class BOOST_THREAD_DECL tss : private noncopyable
-{
-public:
- tss(boost::function1<void, void*>* pcleanup) {
- if (pcleanup == 0) throw boost::thread_resource_error();
- try
- {
- init(pcleanup);
- }
- catch (...)
- {
- delete pcleanup;
- throw boost::thread_resource_error();
- }
- }
-
- ~tss();
- void* get() const;
- void set(void* value);
- void cleanup(void* p);
-
-private:
- unsigned int m_slot; //This is a "pseudo-slot", not a native slot
- void init(boost::function1<void, void*>* pcleanup);
-};
-
-template <typename T>
-struct tss_adapter
-{
- template <typename F>
- tss_adapter(const F& cleanup) : m_cleanup(cleanup) { }
- void operator()(void* p) { m_cleanup(static_cast<T*>(p)); }
- boost::function1<void, T*> m_cleanup;
-};
-
-} // namespace detail
-
-template <typename T>
-class thread_specific_ptr : private noncopyable
-{
-public:
- thread_specific_ptr()
- : m_tss(new boost::function1<void, void*>(
- boost::detail::tss_adapter<T>(
- &thread_specific_ptr<T>::cleanup)))
- {
- }
- thread_specific_ptr(void (*clean)(T*))
- : m_tss(new boost::function1<void, void*>(
- boost::detail::tss_adapter<T>(clean)))
- {
- }
- ~thread_specific_ptr() { reset(); }
-
- T* get() const { return static_cast<T*>(m_tss.get()); }
- T* operator->() const { return get(); }
- T& operator*() const { return *get(); }
- T* release() { T* temp = get(); if (temp) m_tss.set(0); return temp; }
- void reset(T* p=0)
- {
- T* cur = get();
- if (cur == p) return;
- m_tss.set(p);
- if (cur) m_tss.cleanup(cur);
- }
-
-private:
- static void cleanup(T* p) { delete p; }
- detail::tss m_tss;
-};
-
-#ifdef BOOST_MSVC
-# pragma warning(pop)
#endif
-
-} // namespace boost
-
-#endif
-
-#endif //BOOST_TSS_WEK070601_HPP
-
-// Change Log:
-// 6 Jun 01
-// WEKEMPF Initial version.
-// 30 May 02 WEKEMPF
-// Added interface to set specific cleanup handlers.
-// Removed TLS slot limits from most implementations.
-// 22 Mar 04 GlassfordM for WEKEMPF
-// Fixed: thread_specific_ptr::reset() doesn't check error returned
-// by tss::set(); tss::set() now throws if it fails.
-// Fixed: calling thread_specific_ptr::reset() or
-// thread_specific_ptr::release() causes double-delete: once on
-// reset()/release() and once on ~thread_specific_ptr().
Modified: trunk/libs/thread/src/pthread/thread.cpp
==============================================================================
--- trunk/libs/thread/src/pthread/thread.cpp (original)
+++ trunk/libs/thread/src/pthread/thread.cpp 2007-11-14 09:49:58 EST (Wed, 14 Nov 2007)
@@ -493,9 +493,9 @@
void thread_group::interrupt_all()
{
- boost::lock_guard<mutex> guard(m);
+ boost::lock_guard<mutex> guard(m_mutex);
- for(std::list<thread*>::iterator it=threads.begin(),end=threads.end();
+ for(std::list<thread*>::iterator it=m_threads.begin(),end=m_threads.end();
it!=end;
++it)
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk