From 342259a3280879dd7ca3d6552288ab44ec907d85 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 12 Jul 2013 07:37:31 +0000 Subject: [PATCH] signal.c: for valgrind * signal.c (ruby_signal): suppress valgrind error in install_sighandler(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- signal.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/signal.c b/signal.c index 47c096b24c..cd96b03e08 100644 --- a/signal.c +++ b/signal.c @@ -23,6 +23,19 @@ # include #endif +#ifdef HAVE_VALGRIND_MEMCHECK_H +# include +# ifndef VALGRIND_MAKE_MEM_DEFINED +# define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE((p), (n)) +# endif +# ifndef VALGRIND_MAKE_MEM_UNDEFINED +# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE((p), (n)) +# endif +#else +# define VALGRIND_MAKE_MEM_DEFINED(p, n) 0 +# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0 +#endif + #if defined(__native_client__) && defined(NACL_NEWLIB) # include "nacl/signal.h" #endif @@ -521,6 +534,7 @@ ruby_signal(int signum, sighandler_t handler) ) sigact.sa_flags |= SA_ONSTACK; #endif + VALGRIND_MAKE_MEM_DEFINED(&old, sizeof(old)); if (sigaction(signum, &sigact, &old) < 0) { if (errno != 0 && errno != EINVAL) { rb_bug_errno("sigaction", errno);