From 6069c870f88e70ad00954be028d333bb07757f4b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 30 Jan 2020 04:16:19 +0100 Subject: [PATCH] Fix recursive locks during undo/redo due to state save undo may restore locations, which may trigger a state-save. This can result in a deadlock: Location::set_state () -> Locations::get_state() both acquire a the same lock: #2 0x000055a8421836d0 in Glib::Threads::Mutex::Lock::Lock(Glib::Threads::Mutex&) (this=0x7ffe38dcad40, mutex=...) at /usr/include/glibmm-2.4/glibmm/threads.h:687 #3 0x00007fc637731e9c in ARDOUR::Locations::get_state() (this=0x55a8466d4740) at ../libs/ardour/location.cc:1075 #4 0x00007fc637bf14b7 in ARDOUR::Session::state(bool, ARDOUR::Session::snapshot_t, bool) (this=0x55a846d0f050, save_template=false, snapshot_type=ARDOUR::Session::NormalSave, only_used_assets=false) at ../libs/ardour/session_state.cc:1406 #5 0x00007fc637bed2c8 in ARDOUR::Session::save_state(std::__cxx11::basic_string, std::allocator >, bool, bool, bool, bool, bool) (this=0x55a846d0f050, snapshot_name="", pending=true, switch_to_snapshot=false, template_only=false, for_archive=false, only_used_assets=false) at ../libs/ardour/session_state.cc:815 #6 0x00007fc637b4d967 in ARDOUR::Session::auto_punch_start_changed(ARDOUR::Location*) (this=0x55a846d0f050, location=0x55a848fe11d0) at ../libs/ardour/session.cc:1395 #7 0x00007fc637b4da21 in ARDOUR::Session::auto_punch_end_changed(ARDOUR::Location*) (this=0x7fc637b4da21 , location=0x7ffe38dcbf10) at ../libs/ardour/session.cc:1403 [..] #14 0x00007fc637730a2a in ARDOUR::Location::set_state(XMLNode const&, int) (this=0x55a848fe11d0, node=..., version=6000) at ../libs/ardour/location.cc:715 #15 0x00007fc637732428 in ARDOUR::Locations::set_state(XMLNode const&, int) (this=0x55a8466d4740, node=..., version=6000) at ../libs/ardour/location.cc:1130 #16 0x000055a842388dd7 in MementoCommand::undo() (this=0x55a84d1e5f10) at ../libs/pbd/pbd/memento_command.h:141 #17 0x00007fc635b50707 in UndoTransaction::undo() (this=0x55a84d513b80) at ../libs/pbd/undo.cc:128 #18 0x00007fc635b50e1c in UndoHistory::undo(unsigned int) (this=0x55a846d11338, n=0) at ../libs/pbd/undo.cc:267 #19 0x00007fc637c0dfff in ARDOUR::Session::undo(unsigned int) (this=0x55a846d0f050, n=1) at ../libs/ardour/session_state.cc:5577 --- libs/ardour/session_state.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 757344f69c..5b6a0b0435 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -5596,7 +5596,7 @@ Session::undo (uint32_t n) if (actively_recording()) { return; } - + StateProtector stp (this); _history.undo (n); } @@ -5607,5 +5607,6 @@ Session::redo (uint32_t n) return; } + StateProtector stp (this); _history.redo (n); }