smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 20:55:48 +01:00
Code Issues Projects Releases Wiki Activity

CPM: fix locks, do not reacquire descriptor

Browse source
This commit is contained in:
Robin Gareus 2023-05-03 02:05:07 +02:00
parent 287a21c09e
commit 7c02ab9937
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/control_protocol_manager.h
View file

@ -48,12 +48,14 @@ class LIBARDOUR_API ControlProtocolInfo {
std::string name;
std::string path;
bool requested;
bool automatic;
XMLNode* state;
ControlProtocolInfo()
: descriptor (0)
, protocol (0)
, requested(false)
, requested (false)
, automatic (false)
, state (0)
{}
~ControlProtocolInfo();

44
libs/ardour/control_protocol_manager.cc
View file

@ -96,13 +96,9 @@ ControlProtocolManager::set_session (Session* s)
return;
}
{
Glib::Threads::RWLock::ReaderLock lm (protocols_lock);
for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
if ((*i)->requested) {
(void) activate (**i);
}
for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
if ((*i)->requested) {
(void) activate (**i);
}
}
@ -134,6 +130,7 @@ ControlProtocolManager::activate (ControlProtocolInfo& cpi)
return 0;
}
Glib::Threads::RWLock::WriterLock lm (protocols_lock);
if ((cp = instantiate (cpi)) == 0) {
return -1;
}
@ -216,7 +213,9 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi)
return 0;
}
cpi.descriptor = get_descriptor (cpi.path);
if (!cpi.descriptor) {
cpi.descriptor = get_descriptor (cpi.path);
}
DEBUG_TRACE (DEBUG::ControlProtocols, string_compose ("instantiating %1\n", cpi.name));
@ -270,26 +269,24 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi, bool lock_required)
cpi.descriptor->destroy (cpi.descriptor, cpi.protocol);
Glib::Threads::RWLock::WriterLock lm (protocols_lock, Glib::Threads::NOT_LOCK);
if (lock_required) {
/* the lock is required when the protocol is torn down by a user from the GUI. */
Glib::Threads::RWLock::WriterLock lm (protocols_lock);
list<ControlProtocol*>::iterator p = find (control_protocols.begin(), control_protocols.end(), cpi.protocol);
if (p != control_protocols.end()) {
control_protocols.erase (p);
} else {
cerr << "Programming error: ControlProtocolManager::teardown() called for " << cpi.name << ", but it was not found in control_protocols" << endl;
}
lm.acquire ();
}
list<ControlProtocol*>::iterator p = find (control_protocols.begin(), control_protocols.end(), cpi.protocol);
if (p != control_protocols.end()) {
control_protocols.erase (p);
} else {
list<ControlProtocol*>::iterator p = find (control_protocols.begin(), control_protocols.end(), cpi.protocol);
if (p != control_protocols.end()) {
control_protocols.erase (p);
} else {
cerr << "Programming error: ControlProtocolManager::teardown() called for " << cpi.name << ", but it was not found in control_protocols" << endl;
}
cerr << "Programming error: ControlProtocolManager::teardown() called for " << cpi.name << ", but it was not found in control_protocols" << endl;
}
if (lock_required) {
lm.release();
}
cpi.protocol = 0;
delete (Glib::Module*) cpi.descriptor->module;
/* cpi->descriptor is now inaccessible since dlclose() or equivalent
* has been performed, and the descriptor is (or could be) a static
@ -375,6 +372,7 @@ ControlProtocolManager::control_protocol_discover (string path)
if (!descriptor->probe (descriptor)) {
warning << string_compose (_("Control protocol %1 not usable"), descriptor->name) << endmsg;
delete (Glib::Module*) descriptor->module;
} else {
ControlProtocolInfo* cpi = new ControlProtocolInfo ();
@ -422,6 +420,8 @@ ControlProtocolManager::get_descriptor (string path)
if (descriptor) {
descriptor->module = (void*)module;
} else {
delete module;
}
return descriptor;