ardour/livetrax
13
0
Fork 0
Code

fully clean up request buffers when a thread dies

Browse Source
This commit is contained in:
Paul Davis 2016-01-14 10:53:32 -05:00
parent 077c65cc2a
commit 35807a1929
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/pbd/event_loop.cc
View File

@ -219,3 +219,15 @@ EventLoop::pre_register (const string& emitting_thread_name, uint32_t num_reques
}
}
void
EventLoop::remove_request_buffer_from_map (void* ptr)
{
Glib::Threads::RWLock::ReaderLock lm (thread_buffer_requests_lock);
for (ThreadRequestBufferList::iterator x = thread_buffer_requests.begin(); x != thread_buffer_requests.end(); ++x) {
if (x->second.request_buffer == ptr) {
thread_buffer_requests.erase (x);
break;
}
}
}

6
libs/pbd/pbd/abstract_ui.cc
View File

@ -54,7 +54,7 @@ cleanup_request_buffer (void* ptr)
* a request. If the UI has finished processing requests, then
* we will leak this buffer object.
*/
DEBUG_TRACE (PBD::DEBUG::AbstractUI, string_compose ("thread \"%1\" exits: marking request buffer as dead @ %2\n", pthread_name(), rb));
rb->dead = true;
}
@ -246,9 +246,13 @@ AbstractUI<RequestObject>::handle_ui_requests ()
DEBUG_TRACE (PBD::DEBUG::AbstractUI, string_compose ("%1/%2 deleting dead per-thread request buffer for %3 @ %4\n",
event_loop_name(), pthread_name(), i->second));
cerr << event_loop_name() << " noticed that a buffer was dead\n";
/* remove it from the EventLoop static map of all request buffers */
EventLoop::remove_request_buffer_from_map ((*i).second);
/* delete it */
delete (*i).second;
RequestBufferMapIterator tmp = i;
++tmp;
/* remove it from this thread's list of request buffers */
request_buffers.erase (i);
i = tmp;
} else {

1
libs/pbd/pbd/event_loop.h
View File

@ -93,6 +93,7 @@ class LIBPBD_API EventLoop
static void register_request_buffer_factory (const std::string& target_thread_name, void* (*factory) (uint32_t));
static void pre_register (const std::string& emitting_thread_name, uint32_t num_requests);
static void remove_request_buffer_from_map (void* ptr);
private:
static Glib::Threads::Private<EventLoop> thread_event_loop;