smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-21 21:06:03 +01:00
Code Issues Projects Releases Wiki Activity

flush pending Session Events at session close

Browse source 
This prevents a memory leak: The session is closed.
The session-butler drops memory pool trash. The Engine keeps running.

Once the AudioEngine is taken down (sample-rate switch, or at exit),
the backend process-thread is terminated but there is no trash-can anymore.

If there are unprocessed SessionEvents, this calls
free_per_thread_pool() -> cp->parent()->add_to_trash (cp).
"parent()" in this case the trash-can the butler emptied.
This commit is contained in:
Robin Gareus 2016-04-28 21:37:18 +02:00
parent 633f218911
commit 17d782829e
1 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

36
libs/ardour/session.cc
View file

@ -745,6 +745,42 @@ Session::destroy ()
delete midi_clock;
delete _tempo_map;
/* clear event queue, the session is gone, nobody is interested in
* those anymore, but they do leak memory if not removed
*/
while (!immediate_events.empty ()) {
Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
SessionEvent *ev = immediate_events.front ();
DEBUG_TRACE (DEBUG::SessionEvents, string_compose ("Drop event: %1\n", enum_2_string (ev->type)));
immediate_events.pop_front ();
bool remove = true;
bool del = true;
switch (ev->type) {
case SessionEvent::AutoLoop:
case SessionEvent::AutoLoopDeclick:
case SessionEvent::Skip:
case SessionEvent::PunchIn:
case SessionEvent::PunchOut:
case SessionEvent::StopOnce:
case SessionEvent::RangeStop:
case SessionEvent::RangeLocate:
remove = false;
del = false;
break;
case SessionEvent::RealTimeOperation:
process_rtop (ev);
del = false;
default:
break;
}
if (remove) {
del = del && !_remove_event (ev);
}
if (del) {
delete ev;
}
}
DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n");
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS