ardour/livetrax
13
0
Fork 0
Code

fix deadlock in mutex'ed PresentationInfo code

Browse Source
This commit is contained in:
Paul Davis 2017-01-28 09:57:21 +01:00
parent c3d0af413a
commit e998ef5a75
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/ardour/presentation_info.cc
View File

@ -61,14 +61,22 @@ PresentationInfo::suspend_change_signal ()
void void
PresentationInfo::unsuspend_change_signal () PresentationInfo::unsuspend_change_signal ()
{ {
Glib::Threads::Mutex::Lock lm (static_signal_lock);
if (g_atomic_int_get (const_cast<gint*> (&_change_signal_suspended)) == 1) { if (g_atomic_int_get (const_cast<gint*> (&_change_signal_suspended)) == 1) {
if (!_pending_static_changes.empty()) { /* atomically grab currently pending flags */
PropertyChange pc;
{
Glib::Threads::Mutex::Lock lm (static_signal_lock);
pc = _pending_static_changes;
_pending_static_changes.clear ();
}
if (!pc.empty()) {
std::cerr << "PI change (unsuspended): "; std::cerr << "PI change (unsuspended): ";
for (PropertyChange::const_iterator x = _pending_static_changes.begin(); x != _pending_static_changes.end(); ++x) { for (PropertyChange::const_iterator x = pc.begin(); x != pc.end(); ++x) {
std::cerr << g_quark_to_string (*x) << ','; std::cerr << g_quark_to_string (*x) << ',';
} }
std::cerr << '\n'; std::cerr << '\n';
@ -79,9 +87,7 @@ PresentationInfo::unsuspend_change_signal ()
* they are handling this one. * they are handling this one.
*/ */
Change (_pending_static_changes); /* EMIT SIGNAL */ Change (pc); /* EMIT SIGNAL */
_pending_static_changes.clear ();
} }
g_atomic_int_add (const_cast<gint*>(&_change_signal_suspended), -1); g_atomic_int_add (const_cast<gint*>(&_change_signal_suspended), -1);
@ -95,9 +101,9 @@ PresentationInfo::send_static_change (const PropertyChange& what_changed)
return; return;
} }
Glib::Threads::Mutex::Lock lm (static_signal_lock);
if (g_atomic_int_get (&_change_signal_suspended)) { if (g_atomic_int_get (&_change_signal_suspended)) {
Glib::Threads::Mutex::Lock lm (static_signal_lock);
_pending_static_changes.add (what_changed); _pending_static_changes.add (what_changed);
return; return;
} }