diff mbox

[10/12] Add another test for setcontext

Message ID 20180721142035.21059-11-hjl.tools@gmail.com
State New, archived
Headers show

Commit Message

H.J. Lu July 21, 2018, 2:20 p.m. UTC
* stdlib/Makefile (tests): Add tst-setcontext4.
	* stdlib/tst-setcontext4.c: New file.
---
 stdlib/Makefile          |   2 +-
 stdlib/tst-setcontext4.c | 217 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 218 insertions(+), 1 deletion(-)
 create mode 100644 stdlib/tst-setcontext4.c

Comments

Carlos O'Donell July 25, 2018, 3:36 a.m. UTC | #1
On 07/21/2018 10:20 AM, H.J. Lu wrote:
> 	* stdlib/Makefile (tests): Add tst-setcontext4.
> 	* stdlib/tst-setcontext4.c: New file.

OK for 2.28.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> ---
>  stdlib/Makefile          |   2 +-
>  stdlib/tst-setcontext4.c | 217 +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 218 insertions(+), 1 deletion(-)
>  create mode 100644 stdlib/tst-setcontext4.c
> 
> diff --git a/stdlib/Makefile b/stdlib/Makefile
> index 40d07ade20..73d0e7c2a2 100644
> --- a/stdlib/Makefile
> +++ b/stdlib/Makefile
> @@ -85,7 +85,7 @@ tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
>  		   test-at_quick_exit-race test-cxa_atexit-race             \
>  		   test-on_exit-race test-dlclose-exit-race 		    \
>  		   tst-makecontext-align test-bz22786 tst-strtod-nan-sign \
> -		   tst-swapcontext1 tst-swapcontext2
> +		   tst-swapcontext1 tst-swapcontext2 tst-setcontext4

OK.

>  
>  tests-internal	:= tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \
>  		   tst-tls-atexit tst-tls-atexit-nodelete
> diff --git a/stdlib/tst-setcontext4.c b/stdlib/tst-setcontext4.c
> new file mode 100644
> index 0000000000..64d3fc9137
> --- /dev/null
> +++ b/stdlib/tst-setcontext4.c
> @@ -0,0 +1,217 @@
> +/* Testcase checks, if setcontext(), swapcontext() restores signal-mask
> +   and if pending signals are delivered after those calls.

OK.

> +   Copyright (C) 2018 Free Software Foundation, Inc.
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library; if not, see
> +   <http://www.gnu.org/licenses/>.  */
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <sys/types.h>
> +#include <signal.h>
> +#include <ucontext.h>
> +#include <unistd.h>
> +
> +volatile int global;
> +volatile sig_atomic_t handlerCalled;
> +
> +static void
> +check (const char *funcName)
> +{
> +  sigset_t set;
> +
> +  /* check if SIGUSR2 is unblocked after setcontext-call.  */
> +  sigprocmask (SIG_BLOCK, NULL, &set);
> +
> +  if (sigismember (&set, SIGUSR2) != 0)
> +    {
> +      printf ("FAIL: SIGUSR2 is blocked after %s.\n", funcName);
> +      exit (1);

OK.

> +    }
> +
> +  if (sigismember (&set, SIGUSR1) != 1)
> +    {
> +      printf ("FAIL: SIGUSR1 is not blocked after %s.\n", funcName);
> +      exit (1);

OK.

> +    }
> +}
> +
> +static void
> +signalmask (int how, int signum)
> +{
> +  sigset_t set;
> +  sigemptyset (&set);
> +  sigaddset (&set, signum);
> +  if (sigprocmask (how, &set, NULL) != 0)
> +    {
> +      printf ("FAIL: sigprocmaks (%d, %d, NULL): %m\n", how, signum);
> +      exit (1);
> +    }
> +}
> +
> +static void
> +signalpending (int signum, const char *msg)
> +{
> +  sigset_t set;
> +  sigemptyset (&set);
> +  if (sigpending (&set) != 0)
> +    {
> +      printf ("FAIL: sigpending: %m\n");
> +      exit (1);
> +    }
> +  if (sigismember (&set, SIGUSR2) != 1)
> +    {
> +      printf ("FAIL: Signal %d is not pending %s\n", signum, msg);
> +      exit (1);
> +    }
> +}
> +
> +static void
> +handler (int __attribute__ ((unused)) signum)
> +{
> +  handlerCalled ++;
> +}
> +

OK.

> +static int
> +do_test (void)
> +{
> +  ucontext_t ctx, oldctx;
> +  struct sigaction action;
> +  pid_t pid;
> +
> +  pid = getpid ();
> +
> +  /* unblock SIGUSR2 */
> +  signalmask (SIG_UNBLOCK, SIGUSR2);
> +
> +  /* block SIGUSR1 */
> +  signalmask (SIG_BLOCK, SIGUSR1);
> +
> +  /* register handler for SIGUSR2  */
> +  action.sa_flags = 0;
> +  action.sa_handler = handler;
> +  sigemptyset (&action.sa_mask);
> +  sigaction (SIGUSR2, &action, NULL);

OK.

> +
> +  if (getcontext (&ctx) != 0)
> +    {
> +      printf ("FAIL: getcontext: %m\n");
> +      exit (1);
> +    }
> +

OK.

> +  global++;
> +
> +  if (global == 1)
> +    {
> +      puts ("after getcontext");
> +
> +      /* block SIGUSR2  */
> +      signalmask (SIG_BLOCK, SIGUSR2);
> +
> +      /* send SIGUSR2 to me  */
> +      handlerCalled = 0;
> +      kill (pid, SIGUSR2);
> +
> +      /* was SIGUSR2 handler called?  */
> +      if (handlerCalled != 0)
> +	{
> +	  puts ("FAIL: signal handler was called, but signal was blocked.");
> +	  exit (1);
> +	}
> +
> +      /* is SIGUSR2 pending?  */
> +      signalpending (SIGUSR2, "before setcontext");
> +
> +      /* SIGUSR2 will be unblocked by setcontext-call.  */
> +      if (setcontext (&ctx) != 0)
> +	{
> +	  printf ("FAIL: setcontext: %m\n");
> +	  exit (1);
> +	}

OK.

> +    }
> +  else if (global == 2)
> +    {
> +      puts ("after setcontext");
> +
> +      /* check SIGUSR1/2  */
> +      check ("setcontext");
> +
> +      /* was SIGUSR2 handler called? */
> +      if (handlerCalled != 1)
> +	{
> +	  puts ("FAIL: signal handler was not called after setcontext.");
> +	  exit (1);
> +	}

OK.

> +
> +      /* block SIGUSR2 */
> +      signalmask (SIG_BLOCK, SIGUSR2);
> +
> +      /* send SIGUSR2 to me  */
> +      handlerCalled = 0;
> +      kill (pid, SIGUSR2);
> +
> +      /* was SIGUSR2 handler called?  */
> +      if (handlerCalled != 0)
> +	{
> +	  puts ("FAIL: signal handler was called, but signal was blocked.");
> +	  exit (1);
> +	}
> +
> +      /* is SIGUSR2 pending?  */
> +      signalpending (SIGUSR2, "before swapcontext");
> +
> +      if (swapcontext (&oldctx, &ctx) != 0)
> +	{
> +	  printf ("FAIL: swapcontext: %m\n");
> +	  exit (1);
> +	}
> +
> +      puts ("FAIL: returned from (&oldctx, &ctx)");
> +      exit (1);
> +    }
> +  else if ( global != 3 )
> +    {
> +      puts ("FAIL: 'global' not incremented three times");
> +      exit (1);

OK.

> +    }
> +
> +  puts ("after swapcontext");
> +  /* check SIGUSR1/2  */
> +  check ("swapcontext");
> +
> +  /* was SIGUSR2 handler called? */
> +  if (handlerCalled != 1)
> +    {
> +      puts ("FAIL: signal handler was not called after swapcontext.");
> +      exit (1);
> +    }
> +
> +  /* check sigmask in old context of swapcontext-call  */
> +  if (sigismember (&oldctx.uc_sigmask, SIGUSR2) != 1)
> +    {
> +      puts ("FAIL: SIGUSR2 is not blocked in oldctx.uc_sigmask.");
> +      exit (1);
> +    }
> +
> +  if (sigismember (&oldctx.uc_sigmask, SIGUSR1) != 1)
> +    {
> +      puts ("FAIL: SIGUSR1 is not blocked in oldctx.uc_sigmaks.");
> +      exit (1);
> +    }
> +
> +  return 0;
> +}
> +
> +#include <support/test-driver.c>
> 

OK.

Cheers,
Carlos.
Florian Weimer July 25, 2018, 4:21 p.m. UTC | #2
On 07/21/2018 04:20 PM, H.J. Lu wrote:
> +  /* check sigmask in old context of swapcontext-call  */
> +  if (sigismember (&oldctx.uc_sigmask, SIGUSR2) != 1)
> +    {
> +      puts ("FAIL: SIGUSR2 is not blocked in oldctx.uc_sigmask.");
> +      exit (1);
> +    }

This breaks on ia64 because uc_sigmask does not have the correct type there:

tst-setcontext4.c: In function ‘do_test’:
tst-setcontext4.c:202:20: error: passing argument 1 of ‘sigismember’ 
from incompatible pointer type [-Werror=incompatible-pointer-types]
    if (sigismember (&oldctx.uc_sigmask, SIGUSR2) != 1)
In file included from ../include/signal.h:2,
                  from tst-setcontext4.c:23:
../signal/signal.h:208:41: note: expected ‘const sigset_t *’ {aka ‘const 
struct <anonymous> *’} but argument is of type ‘long unsigned int *’
  extern int sigismember (const sigset_t *__set, int __signo)
                          ~~~~~~~~~~~~~~~~^~~~~

I don't have a quick solution for this.  How important is this part of 
the test?

Thanks,
Florian
diff mbox

Patch

diff --git a/stdlib/Makefile b/stdlib/Makefile
index 40d07ade20..73d0e7c2a2 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -85,7 +85,7 @@  tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
 		   test-at_quick_exit-race test-cxa_atexit-race             \
 		   test-on_exit-race test-dlclose-exit-race 		    \
 		   tst-makecontext-align test-bz22786 tst-strtod-nan-sign \
-		   tst-swapcontext1 tst-swapcontext2
+		   tst-swapcontext1 tst-swapcontext2 tst-setcontext4
 
 tests-internal	:= tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \
 		   tst-tls-atexit tst-tls-atexit-nodelete
diff --git a/stdlib/tst-setcontext4.c b/stdlib/tst-setcontext4.c
new file mode 100644
index 0000000000..64d3fc9137
--- /dev/null
+++ b/stdlib/tst-setcontext4.c
@@ -0,0 +1,217 @@ 
+/* Testcase checks, if setcontext(), swapcontext() restores signal-mask
+   and if pending signals are delivered after those calls.
+   Copyright (C) 2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <ucontext.h>
+#include <unistd.h>
+
+volatile int global;
+volatile sig_atomic_t handlerCalled;
+
+static void
+check (const char *funcName)
+{
+  sigset_t set;
+
+  /* check if SIGUSR2 is unblocked after setcontext-call.  */
+  sigprocmask (SIG_BLOCK, NULL, &set);
+
+  if (sigismember (&set, SIGUSR2) != 0)
+    {
+      printf ("FAIL: SIGUSR2 is blocked after %s.\n", funcName);
+      exit (1);
+    }
+
+  if (sigismember (&set, SIGUSR1) != 1)
+    {
+      printf ("FAIL: SIGUSR1 is not blocked after %s.\n", funcName);
+      exit (1);
+    }
+}
+
+static void
+signalmask (int how, int signum)
+{
+  sigset_t set;
+  sigemptyset (&set);
+  sigaddset (&set, signum);
+  if (sigprocmask (how, &set, NULL) != 0)
+    {
+      printf ("FAIL: sigprocmaks (%d, %d, NULL): %m\n", how, signum);
+      exit (1);
+    }
+}
+
+static void
+signalpending (int signum, const char *msg)
+{
+  sigset_t set;
+  sigemptyset (&set);
+  if (sigpending (&set) != 0)
+    {
+      printf ("FAIL: sigpending: %m\n");
+      exit (1);
+    }
+  if (sigismember (&set, SIGUSR2) != 1)
+    {
+      printf ("FAIL: Signal %d is not pending %s\n", signum, msg);
+      exit (1);
+    }
+}
+
+static void
+handler (int __attribute__ ((unused)) signum)
+{
+  handlerCalled ++;
+}
+
+static int
+do_test (void)
+{
+  ucontext_t ctx, oldctx;
+  struct sigaction action;
+  pid_t pid;
+
+  pid = getpid ();
+
+  /* unblock SIGUSR2 */
+  signalmask (SIG_UNBLOCK, SIGUSR2);
+
+  /* block SIGUSR1 */
+  signalmask (SIG_BLOCK, SIGUSR1);
+
+  /* register handler for SIGUSR2  */
+  action.sa_flags = 0;
+  action.sa_handler = handler;
+  sigemptyset (&action.sa_mask);
+  sigaction (SIGUSR2, &action, NULL);
+
+  if (getcontext (&ctx) != 0)
+    {
+      printf ("FAIL: getcontext: %m\n");
+      exit (1);
+    }
+
+  global++;
+
+  if (global == 1)
+    {
+      puts ("after getcontext");
+
+      /* block SIGUSR2  */
+      signalmask (SIG_BLOCK, SIGUSR2);
+
+      /* send SIGUSR2 to me  */
+      handlerCalled = 0;
+      kill (pid, SIGUSR2);
+
+      /* was SIGUSR2 handler called?  */
+      if (handlerCalled != 0)
+	{
+	  puts ("FAIL: signal handler was called, but signal was blocked.");
+	  exit (1);
+	}
+
+      /* is SIGUSR2 pending?  */
+      signalpending (SIGUSR2, "before setcontext");
+
+      /* SIGUSR2 will be unblocked by setcontext-call.  */
+      if (setcontext (&ctx) != 0)
+	{
+	  printf ("FAIL: setcontext: %m\n");
+	  exit (1);
+	}
+    }
+  else if (global == 2)
+    {
+      puts ("after setcontext");
+
+      /* check SIGUSR1/2  */
+      check ("setcontext");
+
+      /* was SIGUSR2 handler called? */
+      if (handlerCalled != 1)
+	{
+	  puts ("FAIL: signal handler was not called after setcontext.");
+	  exit (1);
+	}
+
+      /* block SIGUSR2 */
+      signalmask (SIG_BLOCK, SIGUSR2);
+
+      /* send SIGUSR2 to me  */
+      handlerCalled = 0;
+      kill (pid, SIGUSR2);
+
+      /* was SIGUSR2 handler called?  */
+      if (handlerCalled != 0)
+	{
+	  puts ("FAIL: signal handler was called, but signal was blocked.");
+	  exit (1);
+	}
+
+      /* is SIGUSR2 pending?  */
+      signalpending (SIGUSR2, "before swapcontext");
+
+      if (swapcontext (&oldctx, &ctx) != 0)
+	{
+	  printf ("FAIL: swapcontext: %m\n");
+	  exit (1);
+	}
+
+      puts ("FAIL: returned from (&oldctx, &ctx)");
+      exit (1);
+    }
+  else if ( global != 3 )
+    {
+      puts ("FAIL: 'global' not incremented three times");
+      exit (1);
+    }
+
+  puts ("after swapcontext");
+  /* check SIGUSR1/2  */
+  check ("swapcontext");
+
+  /* was SIGUSR2 handler called? */
+  if (handlerCalled != 1)
+    {
+      puts ("FAIL: signal handler was not called after swapcontext.");
+      exit (1);
+    }
+
+  /* check sigmask in old context of swapcontext-call  */
+  if (sigismember (&oldctx.uc_sigmask, SIGUSR2) != 1)
+    {
+      puts ("FAIL: SIGUSR2 is not blocked in oldctx.uc_sigmask.");
+      exit (1);
+    }
+
+  if (sigismember (&oldctx.uc_sigmask, SIGUSR1) != 1)
+    {
+      puts ("FAIL: SIGUSR1 is not blocked in oldctx.uc_sigmaks.");
+      exit (1);
+    }
+
+  return 0;
+}
+
+#include <support/test-driver.c>