mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hang when waiting for condition variables.

Browse Source
This commit is contained in:
Rui Batista
2016-10-09 15:58:08 +01:00
parent 1bbba9bc3b
commit 34f315363b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/fifo.c
+8 -5
View File
@@ -91,8 +91,9 @@ void fifo_init()
// leave once the thread is actually started
assert(-1 != pthread_mutex_lock(&my_mutex));
while ((my_stop_is_acknowledged == 0) || ((pthread_cond_wait(&my_cond_stop_is_acknowledged, &my_mutex) == -1) && errno == EINTR))
continue; // Restart when interrupted by handler
while (my_stop_is_acknowledged == 0)
while((pthread_cond_wait(&my_cond_stop_is_acknowledged, &my_mutex) == -1) && errno == EINTR)
;
my_stop_is_acknowledged = 0;
pthread_mutex_unlock(&my_mutex);
}
@@ -172,8 +173,9 @@ espeak_ng_STATUS fifo_stop()
}
if (a_command_is_running) {
while ((my_stop_is_acknowledged == 0) || ((pthread_cond_wait(&my_cond_stop_is_acknowledged, &my_mutex) == -1) && errno == EINTR))
continue; // Restart when interrupted by handler
while (my_stop_is_acknowledged == 0)
while((pthread_cond_wait(&my_cond_stop_is_acknowledged, &my_mutex) == -1) && errno == EINTR)
continue; // Restart when interrupted by handler
}
my_stop_is_required = 0;
@@ -293,7 +295,8 @@ static void *say_thread(void *p)
assert(!a_status);
if (!a_start_is_required) {
while ((my_start_is_required == 0) || ((pthread_cond_wait(&my_cond_start_is_required, &my_mutex) == -1) && errno == EINTR))
while (my_start_is_required == 0)
while((pthread_cond_wait(&my_cond_start_is_required, &my_mutex) == -1) && errno == EINTR)
continue; // Restart when interrupted by handler
}