From 9ce2ab98eb392998c0d0d75033bab03681ae6cea Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Sat, 20 Sep 2014 16:40:54 +0200
Subject: SIGRTMAX is used internally by valgrind
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
TODO | 2 ++
doc/info/mds.texinfo | 2 +-
src/libmdsserver/macros.h | 2 +-
src/mds-vt.c | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/TODO b/TODO
index 141d49e..b2bc3b9 100644
--- a/TODO
+++ b/TODO
@@ -56,3 +56,5 @@ Implement reconnect_to_display()
src/libmdsserver/config.h should be sed:ed rather than use #ifndef
+Something is up with the test...
+
diff --git a/doc/info/mds.texinfo b/doc/info/mds.texinfo
index 6648760..bcf3073 100644
--- a/doc/info/mds.texinfo
+++ b/doc/info/mds.texinfo
@@ -382,7 +382,7 @@ instead of @command{SIGUSR1}.
If you need servers to free up allocated
memory that they do not use, send the signal
@command{SIGDANGER}, or if not defined
-@command{SIGRTMAX}. Unimportant servers may
+@command{SIGRTMIN + 1}. Unimportant servers may
choose to die on @command{SIGDANGER}.
diff --git a/src/libmdsserver/macros.h b/src/libmdsserver/macros.h
index b40581d..481d281 100644
--- a/src/libmdsserver/macros.h
+++ b/src/libmdsserver/macros.h
@@ -374,7 +374,7 @@
* Quick, free up all your unused memory or kill yourself!
*/
#ifndef SIGDANGER
-# define SIGDANGER SIGRTMAX
+# define SIGDANGER (SIGRTMIN + 1)
#endif
diff --git a/src/mds-vt.c b/src/mds-vt.c
index 39df209..01b7b7c 100644
--- a/src/mds-vt.c
+++ b/src/mds-vt.c
@@ -267,9 +267,9 @@ int initialise_server(void)
fail_if (server_initialised() < 0);
fail_if (mds_message_initialise(&received));
- fail_if (xsigaction(SIGRTMIN + 1, received_switch_vt) < 0);
fail_if (xsigaction(SIGRTMIN + 2, received_switch_vt) < 0);
- vt_construct_mode(1, SIGRTMIN + 1, SIGRTMIN + 2, &mode);
+ fail_if (xsigaction(SIGRTMIN + 3, received_switch_vt) < 0);
+ vt_construct_mode(1, SIGRTMIN + 2, SIGRTMIN + 3, &mode);
fail_if (vt_get_set_mode(display_tty_fd, 1, &mode) < 0);
if (vt_set_exclusive(display_tty_fd, 1) < 0)
xperror(*argv);
@@ -713,7 +713,7 @@ void signal_all(int signo)
*/
void received_switch_vt(int signo)
{
- int leaving = signo == (SIGRTMIN + 1);
+ int leaving = signo == (SIGRTMIN + 2);
switching_vt = leaving ? 1 : -1;
}
--
cgit v1.2.3-70-g09d2