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

Fix race-condition when detecting xjadeo/harvid version

Browse Source 
Apparently it can happen that waitpid() can return before
the Terminated signal handler is invoked.
This commit is contained in:
Robin Gareus
2025-05-13 22:43:10 +02:00
parent c4da3f2120
commit 18e5061b46
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/video_timeline.cc
View File

@@ -722,11 +722,13 @@ VideoTimeLine::find_xjadeo () {
<< endmsg;
}
volatile bool terminated = false;
if (found_xjadeo ()) {
ARDOUR::SystemExec version_check (_xjadeo_bin, X_("--version"), true);
xjadeo_version = "";
version_check.ReadStdout.connect_same_thread (*this, std::bind (&VideoTimeLine::xjadeo_readversion, this, _1 ,_2));
version_check.Terminated.connect_same_thread (*this, std::bind (&VideoTimeLine::xjadeo_readversion, this, "\n" ,1));
version_check.Terminated.connect_same_thread (*this, [&] { xjadeo_readversion ("\n",1); terminated = true;} );
if (version_check.start (ARDOUR::SystemExec::MergeWithStdin)) {
warning << _(
"Video-monitor 'xjadeo' cannot be launched."
@@ -742,10 +744,16 @@ VideoTimeLine::find_xjadeo () {
#endif
int timeout = 300;
while (xjadeo_version.empty() && --timeout) {
while (!terminated && --timeout) {
Glib::usleep(10000);
}
if (!timeout) {
_xjadeo_bin = X_("");
warning << _("Video-monitor 'xjadeo' version detection timed out.") << endmsg;
return;
}
bool v_ok = false;
size_t vo = xjadeo_version.find(" version ");
if (vo != string::npos) {
@@ -795,10 +803,13 @@ VideoTimeLine::find_harvid () {
if (harvid_bin.empty ()) {
return;
}
volatile bool terminated = false;
ARDOUR::SystemExec version_check (harvid_bin, X_("--version"), true);
harvid_version = "";
version_check.ReadStdout.connect_same_thread (*this, std::bind (&VideoTimeLine::harvid_readversion, this, _1 ,_2));
version_check.Terminated.connect_same_thread (*this, std::bind (&VideoTimeLine::harvid_readversion, this, "\n" ,1));
version_check.Terminated.connect_same_thread (*this, [&] { harvid_readversion ("\n",1); terminated = true;} );
if (version_check.start (ARDOUR::SystemExec::MergeWithStdin)) {
return;
}
@@ -810,10 +821,15 @@ VideoTimeLine::find_harvid () {
#endif
int timeout = 300;
while (harvid_version.empty() && --timeout) {
while (!terminated && --timeout) {
Glib::usleep(10000);
}
if (!timeout) {
warning << _("Video-decoder 'harvid' version detection timed out.") << endmsg;
return;
}
size_t vo = harvid_version.find("harvid v");
if (vo != string::npos) {
int v_major, v_minor, v_micro;