From 6c24e53a8911034ca583564ff22fc0c63d821174 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 14 Feb 2025 14:25:28 +0100 Subject: [PATCH] os: drop `upstart` specific SIGSTOP signaling logic Upstart is long dead, discontinued a decade ago, so there's no need to keep around a special signaling logic just for it. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- os/connection.c | 4 ---- os/osdep.h | 1 - os/utils.c | 4 ---- 3 files changed, 9 deletions(-) diff --git a/os/connection.c b/os/connection.c index 8dcc2bf4e..997d06405 100644 --- a/os/connection.c +++ b/os/connection.c @@ -122,8 +122,6 @@ struct ospoll *server_poll; Bool NewOutputPending; /* not yet attempted to write some new output */ Bool NoListenAll; /* Don't establish any listening sockets */ -Bool RunFromSigStopParent; /* send SIGSTOP to our own process; Upstart (or - equivalent) will send SIGCONT back. */ static char dynamic_display[7]; /* display name */ Bool PartialNetwork; /* continue even if unable to bind all addrs */ #if !defined(WIN32) @@ -206,8 +204,6 @@ NotifyParentProcess(void) kill(ParentProcess, SIGUSR1); } } - if (RunFromSigStopParent) - raise(SIGSTOP); #ifdef HAVE_SYSTEMD_DAEMON /* If we have been started as a systemd service, tell systemd that we are ready. Otherwise sd_notify() won't do anything. */ diff --git a/os/osdep.h b/os/osdep.h index 86e1f6486..3c198a712 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -204,7 +204,6 @@ void CloseDownConnection(ClientPtr client); extern int LimitClients; extern Bool PartialNetwork; -extern Bool RunFromSigStopParent; extern int limitDataSpace; extern int limitStackSpace; diff --git a/os/utils.c b/os/utils.c index f0b706b8d..1d4c2865d 100644 --- a/os/utils.c +++ b/os/utils.c @@ -339,7 +339,6 @@ UseMsg(void) #endif /* XINERAMA */ ErrorF("-dumbSched Disable smart scheduling and threaded input, enable old behavior\n"); ErrorF("-schedInterval int Set scheduler interval in msec\n"); - ErrorF("-sigstop Enable SIGSTOP based startup\n"); ErrorF("+extension name Enable extension\n"); ErrorF("-extension name Disable extension\n"); ListStaticExtensions(); @@ -788,9 +787,6 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } - else if (strcmp(argv[i], "-sigstop") == 0) { - RunFromSigStopParent = TRUE; - } else if (strcmp(argv[i], "+extension") == 0) { if (++i < argc) { if (!EnableDisableExtension(argv[i], TRUE))