smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Safeguard IO::_ports (iterators) with RWLock #9730

Browse source
This commit is contained in:
Robin Gareus 2024-06-23 16:05:48 +02:00
parent 8718a1ba99
commit dbcf3cfd67
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/ardour/ardour/io.h
View file

@ -136,20 +136,13 @@ public:
bool has_port (std::shared_ptr<Port>) const;
std::shared_ptr<Port> nth (uint32_t n) const {
if (n < _ports.num_ports()) {
return _ports.port(n);
} else {
return std::shared_ptr<Port> ();
}
}
std::shared_ptr<Port> nth (uint32_t n) const;
std::shared_ptr<Port> port_by_name (const std::string& str) const;
std::shared_ptr<AudioPort> audio(uint32_t n) const;
std::shared_ptr<MidiPort> midi(uint32_t n) const;
const ChanCount& n_ports () const { return _ports.count(); }
const ChanCount& n_ports () const;
/* The process lock will be held on emission of this signal if
* IOChange contains ConfigurationChanged. In other cases,

28
libs/ardour/io.cc
View file

@ -393,8 +393,9 @@ IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed)
const size_t n = count.get(*t);
const ChanCount n_ports = _ports.count ();
/* remove unused ports */
for (size_t i = n_ports().get(*t); i > n; --i) {
for (size_t i = n_ports.get(*t); i > n; --i) {
port = _ports.port(*t, i-1);
assert(port);
@ -424,7 +425,7 @@ IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed)
deleted_ports.clear ();
/* create any necessary new ports */
while (n_ports().get(*t) < n) {
while (_ports.count ().get(*t) < n) {
string portname = build_legal_port_name (*t);
@ -454,7 +455,8 @@ IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed)
}
if (changed) {
PortCountChanged (n_ports()); /* EMIT SIGNAL */
const ChanCount n_ports = _ports.count ();
PortCountChanged (n_ports); /* EMIT SIGNAL */
_session.set_dirty ();
}
@ -1590,6 +1592,7 @@ bool
IO::connected () const
{
/* do we have any connections at all? */
Glib::Threads::RWLock::ReaderLock rl (_io_lock);
for (PortSet::const_iterator p = _ports.begin(); p != _ports.end(); ++p) {
if (p->connected()) {
@ -1629,6 +1632,7 @@ IO::connected_to (std::shared_ptr<const IO> other) const
bool
IO::connected_to (const string& str) const
{
Glib::Threads::RWLock::ReaderLock rl (_io_lock);
for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) {
if (i->connected_to (str)) {
return true;
@ -1722,6 +1726,7 @@ IO::port_by_name (const std::string& str) const
bool
IO::physically_connected () const
{
Glib::Threads::RWLock::ReaderLock rl (_io_lock);
for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) {
if (i->physically_connected()) {
return true;
@ -1734,6 +1739,7 @@ IO::physically_connected () const
bool
IO::has_ext_connection () const
{
Glib::Threads::RWLock::ReaderLock rl (_io_lock);
for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) {
if (i->has_ext_connection()) {
return true;
@ -1749,3 +1755,19 @@ IO::has_port (std::shared_ptr<Port> p) const
Glib::Threads::RWLock::ReaderLock rl (_io_lock);
return _ports.contains (p);
}
std::shared_ptr<Port>
IO::nth (uint32_t n) const {
Glib::Threads::RWLock::ReaderLock rl (_io_lock);
if (n < _ports.num_ports()) {
return _ports.port(n);
} else {
return std::shared_ptr<Port> ();
}
}
const ChanCount&
IO::n_ports () const {
Glib::Threads::RWLock::ReaderLock rl (_io_lock);
return _ports.count();
}