ceos/espeakup
1
0
Fork 0
mirror of https://github.com/linux-speakup/espeakup.git synced 2026-08-09 09:19:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixup! espeak: detect a wedged engine, restart it, and eventually give up

Browse source
This commit is contained in:
Alexander Epaneshnikov 2026-06-11 11:35:52 +03:00 • committed by Samuel Thibault
commit cc1447b16a
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/espeak.c
View file

@ -21,6 +21,7 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include <stdatomic.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -63,8 +64,9 @@ int paused_espeak = 1;
#define ESPEAK_HEALTHY_SECS 60 #define ESPEAK_HEALTHY_SECS 60
/* Set by the synth callback whenever espeak makes synthesis progress; /* Set by the synth callback whenever espeak makes synthesis progress;
* used to tell a merely backlogged engine from a wedged one. */ * used to tell a merely backlogged engine from a wedged one. The
static volatile int synth_progressed = 0; * callback runs in espeak's own thread, so the flag is atomic. */
static atomic_int synth_progressed = 0;
static int stalled_retries = 0; static int stalled_retries = 0;
static int restart_attempts = 0; static int restart_attempts = 0;
static struct timespec last_restart; static struct timespec last_restart;
@ -72,7 +74,7 @@ static struct timespec last_restart;
static int callback(short *wav, int numsamples, espeak_EVENT *events) static int callback(short *wav, int numsamples, espeak_EVENT *events)
{ {
int i; int i;
synth_progressed = 1; atomic_store(&synth_progressed, 1);
for (i = 0; events[i].type != espeakEVENT_LIST_TERMINATED; i++) { for (i = 0; events[i].type != espeakEVENT_LIST_TERMINATED; i++) {
if (events[i].type == espeakEVENT_MARK) { if (events[i].type == espeakEVENT_MARK) {
int mark = atoi(events[i].id.name); int mark = atoi(events[i].id.name);
@ -388,9 +390,8 @@ static void espeak_wait_retry(void)
* either, exit so that the init system respawns us in a clean state. */ * either, exit so that the init system respawns us in a clean state. */
static void espeak_handle_failure(struct synth_t *s) static void espeak_handle_failure(struct synth_t *s)
{ {
if (synth_progressed) { if (atomic_exchange(&synth_progressed, 0)) {
/* Espeak is making progress, it is merely backlogged. */ /* Espeak is making progress, it is merely backlogged. */
synth_progressed = 0;
stalled_retries = 0; stalled_retries = 0;
} else if (++stalled_retries >= ESPEAK_STALL_RETRIES) { } else if (++stalled_retries >= ESPEAK_STALL_RETRIES) {
stalled_retries = 0; stalled_retries = 0;