allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

vtl: fix possible race condition when terminating external program

Browse Source
This commit is contained in:
Robin Gareus
2013-03-28 23:32:02 +01:00
parent bbb4aa0141
commit 0c2d95b08f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/system_exec.cc
View File

@@ -409,6 +409,7 @@ SystemExec::make_argp(std::string args) {
void void
SystemExec::terminate () SystemExec::terminate ()
{ {
::pthread_mutex_lock(&write_lock);
close_stdin(); close_stdin();
if (pid) { if (pid) {
::usleep(100000); ::usleep(100000);
@@ -428,6 +429,8 @@ SystemExec::terminate ()
wait(); wait();
if (thread_active) pthread_join(thread_id_tt, NULL); if (thread_active) pthread_join(thread_id_tt, NULL);
thread_active = false;
::pthread_mutex_unlock(&write_lock);
} }
int int
@@ -626,6 +629,7 @@ SystemExec::close_stdin()
::close(pin[1]); ::close(pin[1]);
::close(pout[0]); ::close(pout[0]);
::close(pout[1]); ::close(pout[1]);
pin[1] = - 1; // mark as closed
} }
int int