X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fpbd%2Fpool.cc;h=ef14cd0a750b487855096a12145237ff8e4dc097;hb=4178db5f632721eefb58c42d684fc10f8f4fb9da;hp=cdcd9abdd7a9e40d3f0d97d7fba76b44e62d8442;hpb=bb8cb93789b2eec65e4d82e5ceb64054673cbc4f;p=ardour.git

diff --git a/libs/pbd/pool.cc b/libs/pbd/pool.cc
index cdcd9abdd7..ef14cd0a75 100644
--- a/libs/pbd/pool.cc
+++ b/libs/pbd/pool.cc
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 1998-99 Paul Barton-Davis
- 
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -35,12 +35,15 @@ using namespace PBD;
 Pool::Pool (string n, unsigned long item_size, unsigned long nitems)
 	: free_list (nitems)
 	, _name (n)
+#ifndef NDEBUG
+	, max_usage (0)
+#endif
 {
 	_name = n;
 
 	/* since some overloaded ::operator new() might use this,
 	   its important that we use a "lower level" allocator to
-	   get more space.  
+	   get more space.
 	*/
 
 	block = malloc (nitems * item_size);
@@ -57,6 +60,10 @@ Pool::Pool (string n, unsigned long item_size, unsigned long nitems)
 
 Pool::~Pool ()
 {
+#ifndef NDEBUG
+	// TODO: after collecting some stats, use DEBUG::PoolStats here
+	cerr << "Pool: '" << _name << "' max: " << max_usage << " / " << total() << endmsg;
+#endif
 	free (block);
 }
 
@@ -68,9 +75,15 @@ Pool::alloc ()
 {
 	void *ptr;
 
+#ifndef NDEBUG
+	if (used () > max_usage) {
+		max_usage = used () + 1;
+	}
+#endif
+
 	if (free_list.read (&ptr, 1) < 1) {
 		fatal << "CRITICAL: " << _name << " POOL OUT OF MEMORY - RECOMPILE WITH LARGER SIZE!!" << endmsg;
-		/*NOTREACHED*/
+		abort(); /*NOTREACHED*/
 		return 0;
 	} else {
 		return ptr;
@@ -86,7 +99,7 @@ Pool::release (void *ptr)
 
 /*---------------------------------------------*/
 
-MultiAllocSingleReleasePool::MultiAllocSingleReleasePool (string n, unsigned long isize, unsigned long nitems) 
+MultiAllocSingleReleasePool::MultiAllocSingleReleasePool (string n, unsigned long isize, unsigned long nitems)
 	: Pool (n, isize, nitems)
 {
 }
@@ -95,7 +108,7 @@ MultiAllocSingleReleasePool::~MultiAllocSingleReleasePool ()
 {
 }
 
-SingleAllocMultiReleasePool::SingleAllocMultiReleasePool (string n, unsigned long isize, unsigned long nitems) 
+SingleAllocMultiReleasePool::SingleAllocMultiReleasePool (string n, unsigned long isize, unsigned long nitems)
 	: Pool (n, isize, nitems)
 {
 }
@@ -134,7 +147,7 @@ SingleAllocMultiReleasePool::release (void* ptr)
 
 /*-------------------------------------------------------*/
 
-static void 
+static void
 free_per_thread_pool (void* ptr)
 {
 	/* Rather than deleting the CrossThreadPool now, we add it to our trash buffer.
@@ -157,7 +170,7 @@ free_per_thread_pool (void* ptr)
 		cp->parent()->add_to_trash (cp);
 	}
 }
- 
+
 PerThreadPool::PerThreadPool ()
 	: _key (free_per_thread_pool)
 	, _trash (0)
@@ -175,16 +188,30 @@ PerThreadPool::create_per_thread_pool (string n, unsigned long isize, unsigned l
 	_key.set (new CrossThreadPool (n, isize, nitems, this));
 }
 
+/** @return True if CrossThreadPool for the current thread exists,
+ *  False otherwise
+ */
+bool
+PerThreadPool::has_per_thread_pool ()
+{
+	CrossThreadPool* p = _key.get();
+	if (p) {
+		return true;
+	}
+	return false;
+}
+
+
 /** @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 ()
+PerThreadPool::per_thread_pool (bool must_exist)
 {
 	CrossThreadPool* p = _key.get();
-	if (!p) {
+	if (!p && must_exist) {
 		fatal << "programming error: no per-thread pool \"" << _name << "\" for thread " << pthread_name() << endmsg;
-		/*NOTREACHED*/
+		abort(); /*NOTREACHED*/
 	}
 	return p;
 }
@@ -222,21 +249,44 @@ CrossThreadPool::CrossThreadPool  (string n, unsigned long isize, unsigned long
 	
 }
 
-void*
-CrossThreadPool::alloc () 
+void
+CrossThreadPool::flush_pending_with_ev (void *ptr)
 {
-	void* ptr;
+	push (ptr);
+	flush_pending ();
+}
 
-	DEBUG_TRACE (DEBUG::Pool, string_compose ("%1 %2 has %3 pending free entries waiting\n", pthread_name(), name(), pending.read_space()));
+void
+CrossThreadPool::flush_pending ()
+{
+	void* ptr;
+	bool did_release = false;
+	
+	DEBUG_TRACE (DEBUG::Pool, string_compose ("%1 %2 has %3 pending free entries waiting, status size %4 free %5 used %6\n", pthread_name(), name(), pending.read_space(),
+	                                          total(), available(), used()));
+	
 	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);
+		did_release = true;
 	}
+
+	if (did_release) {
+		DEBUG_TRACE (DEBUG::Pool, string_compose ("Pool size: %1 free %2 used %3 pending now %4\n", total(), available(), used(), pending_size()));
+	}
+}
+
+void*
+CrossThreadPool::alloc ()
+{
+	/* process anything waiting to be deleted (i.e. moved back to the free list)  */
+	flush_pending ();
+	/* now allocate from the potentially larger free list */
 	return Pool::alloc ();
 }
 
 void
-CrossThreadPool::push (void* t) 
+CrossThreadPool::push (void* t)
 {
 	pending.write (&t, 1);
 }