Skip to content

Fix client connection race #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sthibaul merged 1 commit into from
Apr 23, 2026
Merged

Fix client connection race #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions speech-dispatcher.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2018, 2022-2023 Samuel Thibault <samuel.thibault@ens-lyon.org>
# Copyright (C) 2018, 2022-2023, 2026 Samuel Thibault <samuel.thibault@ens-lyon.org>
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand All @@ -19,5 +19,5 @@ Requires=speech-dispatcher.socket

[Service]
Type=simple
ExecStart=@bindir@/speech-dispatcher -s -t 0
ExecStart=@bindir@/speech-dispatcher -s
ExecReload=/bin/kill -HUP $MAINPID
15 changes: 12 additions & 3 deletions src/server/speechd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ static gboolean speechd_client_terminate(gpointer key, gpointer value, gpointer
static gboolean speechd_reload_dead_modules(gpointer user_data);
static gboolean speechd_reload_configuration(gpointer user_data);
enum quit_reason {
QUIT_TIMEOUT,
QUIT_SIGINT,
QUIT_SIGTERM,
QUIT_TIMEOUT,
};
static enum quit_reason quit_reason = QUIT_TIMEOUT;
static gboolean speechd_quit(gpointer user_data);

static gboolean server_process_incoming (gint fd,
Expand Down Expand Up @@ -863,7 +864,11 @@ static void speechd_check_modules(void)

static gboolean speechd_quit(gpointer user_data)
{
switch ((enum quit_reason)(uintptr_t) user_data) {
/* Don't drop an existing non-timeout reason. */
if (quit_reason == QUIT_TIMEOUT)
quit_reason = (enum quit_reason)(uintptr_t) user_data;

switch (quit_reason) {
case QUIT_SIGINT:
MSG(4, "Got SIGINT");
break;
Expand Down Expand Up @@ -1440,7 +1445,11 @@ int main(int argc, char *argv[])

check_client_count();

g_main_loop_run(main_loop);
do {
g_main_loop_run(main_loop);
/* Make a last client check before existing on timeout.
* Systemd will restart us if a client connected in between. */
} while (quit_reason == QUIT_TIMEOUT && client_count > 0);

MSG(1, "Terminating...");

Expand Down
Loading