*/
#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"
using namespace std;
using namespace PBD;
free (block);
}
+/** Allocate an item's worth of memory in the Pool by taking one from the free list.
+ * @return Pointer to free item.
+ */
void *
Pool::alloc ()
{
void *ptr;
-// cerr << _name << " pool " << " alloc, thread = " << pthread_name() << " space = " << free_list->read_space() << endl;
-
if (free_list.read (&ptr, 1) < 1) {
fatal << "CRITICAL: " << _name << " POOL OUT OF MEMORY - RECOMPILE WITH LARGER SIZE!!" << endmsg;
/*NOTREACHED*/
}
}
+/** Release an item's memory by writing its location to the free list */
void
Pool::release (void *ptr)
{
free_list.write (&ptr, 1);
-// cerr << _name << ": release, now has " << free_list->read_space() << endl;
}
/*---------------------------------------------*/
MultiAllocSingleReleasePool::MultiAllocSingleReleasePool (string n, unsigned long isize, unsigned long nitems)
- : Pool (n, isize, nitems),
- m_lock(0)
+ : Pool (n, isize, nitems)
{
}
MultiAllocSingleReleasePool::~MultiAllocSingleReleasePool ()
{
- delete m_lock;
}
SingleAllocMultiReleasePool::SingleAllocMultiReleasePool (string n, unsigned long isize, unsigned long nitems)
- : Pool (n, isize, nitems),
- m_lock(0)
+ : Pool (n, isize, nitems)
{
}
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;
}
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);
}
static void
free_per_thread_pool (void* ptr)
{
- Pool* pptr = static_cast<Pool*>(ptr);
- delete pptr;
+ /* Rather than deleting the CrossThreadPool now, we add it to our trash buffer.
+ * This prevents problems if other threads still require access to this CrossThreadPool.
+ * We assume that some other agent will clean out the trash buffer as required.
+ */
+ CrossThreadPool* cp = static_cast<CrossThreadPool*> (ptr);
+ assert (cp);
+
+ if (cp->empty()) {
+ /* This CrossThreadPool is already empty, and the thread is finishing so nothing
+ * more can be added to it. We can just delete the pool.
+ */
+ delete cp;
+ } else {
+ /* This CrossThreadPool is not empty, meaning that there's some Events in it
+ * which another thread may yet read, so we can't delete the pool just yet.
+ * Put it in the trash and hope someone deals with it at some stage.
+ */
+ cp->parent()->add_to_trash (cp);
+ }
}
PerThreadPool::PerThreadPool ()
+ : _key (free_per_thread_pool)
+ , _trash (0)
{
- {
- /* for some reason this appears necessary to get glib's thread private stuff to work */
- GPrivate* key;
- key = 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.
+ * @param n Name.
+ * @param isize Size of each item in the pool.
+ * @param nitems Number of items in the pool.
+ */
void
PerThreadPool::create_per_thread_pool (string n, unsigned long isize, unsigned long nitems)
{
- Pool* p = new CrossThreadPool (n, isize, nitems);
- 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
+ * calling create_per_thread_pool in the current thread.
+ */
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;
}
-CrossThreadPool::CrossThreadPool (string n, unsigned long isize, unsigned long nitems)
+void
+PerThreadPool::set_trash (RingBuffer<CrossThreadPool*>* t)
+{
+ Glib::Threads::Mutex::Lock lm (_trash_mutex);
+ _trash = t;
+}
+
+/** Add a CrossThreadPool to our trash, if we have one. If not, a warning is emitted. */
+void
+PerThreadPool::add_to_trash (CrossThreadPool* p)
+{
+ Glib::Threads::Mutex::Lock lm (_trash_mutex);
+
+ if (!_trash) {
+ warning << "Pool " << p->name() << " has no trash collector; a memory leak has therefore occurred" << endmsg;
+ return;
+ }
+
+ /* we have a lock here so that multiple threads can safely call add_to_trash (even though there
+ can only be one writer to the _trash RingBuffer)
+ */
+
+ _trash->write (&p, 1);
+}
+
+CrossThreadPool::CrossThreadPool (string n, unsigned long isize, unsigned long nitems, PerThreadPool* p)
: Pool (n, isize, nitems)
, pending (nitems)
+ , _parent (p)
{
}
CrossThreadPool::alloc ()
{
void* ptr;
+
+ 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_name(), name()));
free_list.write (&ptr, 1);
}
return Pool::alloc ();
{
pending.write (&t, 1);
}
+
+/** @return true if there is nothing in this pool */
+bool
+CrossThreadPool::empty ()
+{
+ return (free_list.write_space() == pending.read_space());
+}
+
projects / ardour.git / blobdiff