Attachment 110856 Details for Bug 87322 – [PATCH] logind: use SIGRTMIN to not conflict with xwayland

[patch] [PATCH] logind: use SIGRTMIN to not conflict with xwayland

0001-logind-use-SIGRTMIN-to-not-conflict-with-xwayland.patch (text/plain), 2.22 KB, created by David Herrmann on 2014-12-15 12:11:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Herrmann

Created: 2014-12-15 12:11:04 UTC

Size: 2.22 KB

patch

obsolete

>From 016086d06288ef7fcabcbcc7f5f3dd2ac5dcc701 Mon Sep 17 00:00:00 2001
>From: David Herrmann <dh.herrmann@gmail.com>
>Date: Mon, 15 Dec 2014 13:01:38 +0100
>Subject: [PATCH] logind: use SIGRTMIN to not conflict with xwayland
>
>xwayland uses SIGUSR1 as startup notification. Make sure to use SIGRTMIN
>and SIGRTMIN+1 for VT handling.
>
>A bonus is SIGRT* signals can be queued multiple times, so we will be able
>to correctly track them and will no longer loose signals (which wouldn't
>really matter, but is confusing in logs).
>
>Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
>---
> src/logind-util.c | 28 ++++++++++++++++++----------
> 1 file changed, 18 insertions(+), 10 deletions(-)
>
>diff --git a/src/logind-util.c b/src/logind-util.c
>index 554e64d..132a9a2 100644
>--- a/src/logind-util.c
>+++ b/src/logind-util.c
>@@ -692,14 +692,10 @@ signal_event(int fd, uint32_t mask, void *data)
> 		return 0;
> 	}
> 
>-	switch (sig.ssi_signo) {
>-	case SIGUSR1:
>+	if (sig.ssi_signo == (unsigned int)SIGRTMIN)
> 		ioctl(wl->vt, VT_RELDISP, 1);
>-		break;
>-	case SIGUSR2:
>+	else if (sig.ssi_signo == (unsigned int)SIGRTMIN + 1)
> 		ioctl(wl->vt, VT_RELDISP, VT_ACKACQ);
>-		break;
>-	}
> 
> 	return 0;
> }
>@@ -767,9 +763,21 @@ weston_logind_setup_vt(struct weston_logind *wl)
> 		goto err_kbmode;
> 	}
> 
>+	/*
>+	 * SIGRTMIN is used as global VT-release signal, SIGRTMIN + 1 is used
>+	 * as VT-acquire signal. Note that SIGRT* must be tested on runtime, as
>+	 * their exact values are not known at compile-time. POSIX requires 32
>+	 * of them to be available, though.
>+	 */
>+	if (SIGRTMIN + 1 > SIGRTMAX) {
>+		weston_log("logind: not enough RT signals available: %u-%u\n",
>+			   SIGRTMIN, SIGRTMAX);
>+		return -EINVAL;
>+	}
>+
> 	sigemptyset(&mask);
>-	sigaddset(&mask, SIGUSR1);
>-	sigaddset(&mask, SIGUSR2);
>+	sigaddset(&mask, SIGRTMIN);
>+	sigaddset(&mask, SIGRTMIN + 1);
> 	sigprocmask(SIG_BLOCK, &mask, NULL);
> 
> 	wl->sfd = signalfd(-1, &mask, SFD_NONBLOCK | SFD_CLOEXEC);
>@@ -790,8 +798,8 @@ weston_logind_setup_vt(struct weston_logind *wl)
> 	}
> 
> 	mode.mode = VT_PROCESS;
>-	mode.relsig = SIGUSR1;
>-	mode.acqsig = SIGUSR2;
>+	mode.relsig = SIGRTMIN;
>+	mode.acqsig = SIGRTMIN + 1;
> 	if (ioctl(wl->vt, VT_SETMODE, &mode) < 0) {
> 		r = -errno;
> 		weston_log("logind: cannot take over VT: %m\n");
>-- 
>2.1.3
>

Actions: View | Splinter Review

Attachments on bug 87322: 110856

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.