Towards fixing AU preset invalidation

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

diff --git a/libs/pbd/pool.cc b/libs/pbd/pool.cc
index ccdb85b6c6feadf0e8e30b44887dd60eccefaaf7..249a31ddb3c36f234c79d8cb922d1a373a695146 100644 (file)
--- 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,6 +75,12 @@ 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;
                abort(); /*NOTREACHED*/
@@ -78,7 +91,7 @@ Pool::alloc ()
 }
 
 /** Release an item's memory by writing its location to the free list */
-void           
+void
 Pool::release (void *ptr)
 {
        free_list.write (&ptr, 1);
@@ -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)
@@ -215,7 +228,7 @@ 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;
@@ -224,7 +237,7 @@ PerThreadPool::add_to_trash (CrossThreadPool* p)
        /* 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);
 }
 
@@ -233,7 +246,7 @@ CrossThreadPool::CrossThreadPool  (string n, unsigned long isize, unsigned long
        , pending (nitems)
        , _parent (p)
 {
-       
+
 }
 
 void
@@ -248,10 +261,10 @@ 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);
@@ -264,7 +277,7 @@ CrossThreadPool::flush_pending ()
 }
 
 void*
-CrossThreadPool::alloc () 
+CrossThreadPool::alloc ()
 {
        /* process anything waiting to be deleted (i.e. moved back to the free list)  */
        flush_pending ();
@@ -273,7 +286,7 @@ CrossThreadPool::alloc ()
 }
 
 void
-CrossThreadPool::push (void* t) 
+CrossThreadPool::push (void* t)
 {
        pending.write (&t, 1);
 }