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

fix 100% CPU usage after killing JACK caused by faulty logic in butler thread main loop

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6864 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-04-06 18:15:27 +00:00
parent 0bd844bd10
commit a2d2b69be2
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/ardour/session_butler.cc
View file

@ -175,7 +175,7 @@ Session::butler_thread_work ()
while (true) {
pfd[0].fd = butler_request_pipe[0];
pfd[0].events = POLLIN|POLLERR|POLLHUP;
if (poll (pfd, 1, (disk_work_outstanding ? 0 : -1)) < 0) {
if (errno == EINTR) {
@ -281,7 +281,7 @@ Session::butler_thread_work ()
}
if (i != dsl->end()) {
if (i != dsl->begin() && i != dsl->end()) {
/* we didn't get to all the streams */
disk_work_outstanding = true;
}
@ -333,8 +333,8 @@ Session::butler_thread_work ()
*/
request_stop ();
}
if (i != dsl->end()) {
if (i != dsl->begin() && i != dsl->end()) {
/* we didn't get to all the streams */
disk_work_outstanding = true;
}