Merge branch 'master' into windows

[ardour.git] / libs / pbd / pool.cc

diff --git a/libs/pbd/pool.cc b/libs/pbd/pool.cc
index 9a5e65332b4f18d24581876e843574a296b06c8f..cdcd9abdd7a9e40d3f0d97d7fba76b44e62d8442 100644 (file)
--- a/libs/pbd/pool.cc
+++ b/libs/pbd/pool.cc
@@ -19,12 +19,12 @@
 */
 
 #include <cstdlib>
-#include <iostream>
 #include <vector>
 #include <cstdlib>
 #include <cassert>
 
 #include "pbd/pool.h"
+#include "pbd/pthread_utils.h"
 #include "pbd/error.h"
 #include "pbd/debug.h"
 #include "pbd/compose.h"
@@ -88,37 +88,27 @@ Pool::release (void *ptr)
 
 MultiAllocSingleReleasePool::MultiAllocSingleReleasePool (string n, unsigned long isize, unsigned long nitems) 
        : Pool (n, isize, nitems)
-       , m_lock(0)
 {
 }
 
 MultiAllocSingleReleasePool::~MultiAllocSingleReleasePool ()
 {
-    delete m_lock;
 }
 
 SingleAllocMultiReleasePool::SingleAllocMultiReleasePool (string n, unsigned long isize, unsigned long nitems) 
        : Pool (n, isize, nitems)
-       , m_lock(0)
 {
 }
 
 SingleAllocMultiReleasePool::~SingleAllocMultiReleasePool ()
 {
-    delete m_lock;
 }
 
 void*
 MultiAllocSingleReleasePool::alloc ()
 {
        void *ptr;
-    if(!m_lock) {
-        m_lock = new Glib::Mutex();
-        // umm, I'm not sure that this doesn't also allocate memory.
-        if(!m_lock) error << "cannot create Glib::Mutex in pool.cc" << endmsg;
-    }
-    
-    Glib::Mutex::Lock guard(*m_lock);
+       Glib::Threads::Mutex::Lock guard (m_lock);
        ptr = Pool::alloc ();
        return ptr;
 }
@@ -138,12 +128,7 @@ SingleAllocMultiReleasePool::alloc ()
 void
 SingleAllocMultiReleasePool::release (void* ptr)
 {
-    if(!m_lock) {
-        m_lock = new Glib::Mutex();
-        // umm, I'm not sure that this doesn't also allocate memory.
-        if(!m_lock) error << "cannot create Glib::Mutex in pool.cc" << endmsg;
-    }
-    Glib::Mutex::Lock guard(*m_lock);
+       Glib::Threads::Mutex::Lock guard (m_lock);
        Pool::release (ptr);
 }
 
@@ -174,14 +159,9 @@ free_per_thread_pool (void* ptr)
 }
  
 PerThreadPool::PerThreadPool ()
-       : _trash (0)
+       : _key (free_per_thread_pool)
+       , _trash (0)
 {
-       {
-               /* for some reason this appears necessary to get glib's thread private stuff to work */
-               g_private_new (NULL);
-       }
-
-       _key = g_private_new (free_per_thread_pool);
 }
 
 /** Create a new CrossThreadPool and set the current thread's private _key to point to it.
@@ -192,8 +172,7 @@ PerThreadPool::PerThreadPool ()
 void
 PerThreadPool::create_per_thread_pool (string n, unsigned long isize, unsigned long nitems)
 {
-       CrossThreadPool* p = new CrossThreadPool (n, isize, nitems, this);
-       g_private_set (_key, p);
+       _key.set (new CrossThreadPool (n, isize, nitems, this));
 }
 
 /** @return CrossThreadPool for the current thread, which must previously have been created by
@@ -202,9 +181,9 @@ PerThreadPool::create_per_thread_pool (string n, unsigned long isize, unsigned l
 CrossThreadPool*
 PerThreadPool::per_thread_pool ()
 {
-       CrossThreadPool* p = static_cast<CrossThreadPool*> (g_private_get (_key));
+       CrossThreadPool* p = _key.get();
        if (!p) {
-               fatal << "programming error: no per-thread pool \"" << _name << "\" for thread " << pthread_self() << endmsg;
+               fatal << "programming error: no per-thread pool \"" << _name << "\" for thread " << pthread_name() << endmsg;
                /*NOTREACHED*/
        }
        return p;
@@ -213,7 +192,7 @@ PerThreadPool::per_thread_pool ()
 void
 PerThreadPool::set_trash (RingBuffer<CrossThreadPool*>* t)
 {
-       Glib::Mutex::Lock lm (_trash_mutex);
+       Glib::Threads::Mutex::Lock lm (_trash_mutex);
        _trash = t;
 }
 
@@ -221,7 +200,7 @@ PerThreadPool::set_trash (RingBuffer<CrossThreadPool*>* t)
 void
 PerThreadPool::add_to_trash (CrossThreadPool* p)
 {
-       Glib::Mutex::Lock lm (_trash_mutex);
+       Glib::Threads::Mutex::Lock lm (_trash_mutex);
        
        if (!_trash) {
                warning << "Pool " << p->name() << " has no trash collector; a memory leak has therefore occurred" << endmsg;
@@ -248,9 +227,9 @@ CrossThreadPool::alloc ()
 {
        void* ptr;
 
-       DEBUG_TRACE (DEBUG::Pool, string_compose ("%1 %2 has %3 pending free entries waiting\n", pthread_self(), name(), pending.read_space()));
+       DEBUG_TRACE (DEBUG::Pool, string_compose ("%1 %2 has %3 pending free entries waiting\n", pthread_name(), name(), pending.read_space()));
        while (pending.read (&ptr, 1) == 1) {
-               DEBUG_TRACE (DEBUG::Pool, string_compose ("%1 %2 pushes back a pending free list entry before allocating\n", pthread_self(), name()));
+               DEBUG_TRACE (DEBUG::Pool, string_compose ("%1 %2 pushes back a pending free list entry before allocating\n", pthread_name(), name()));
                free_list.write (&ptr, 1);
        }
        return Pool::alloc ();