[PATCH 14/18] flag parameters: NONBLOCK in signalfd

[PATCH 14/18] flag parameters: NONBLOCK in signalfd

[Ulrich Drepper]

This patch adds support for the SFD_NONBLOCK flag to signalfd4.  The
additional changes needed are minimal thanks to the previous preparation.

The following test must be adjusted for architectures other than x86 and
x86-64 and in case the syscall numbers changed.

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/syscall.h>

#ifndef __NR_signalfd4
# ifdef __x86_64__
#  define __NR_signalfd4 289
# elif defined __i386__
#  define __NR_signalfd4 327
# else
#  error "need __NR_signalfd4"
# endif
#endif

#define SFD_NONBLOCK (1 << 1)

int
main (void)
{
  sigset_t ss;
  sigemptyset (&ss);
  sigaddset (&ss, SIGUSR1);
  int fd = syscall (__NR_signalfd4, -1, &ss, 8, 0);
  if (fd == -1)
    {
      puts ("signalfd4(0) failed");
      return 1;
    }
  int fl = fcntl (fd, F_GETFL);
  if (fl == -1)
    {
      puts ("fcntl failed");
      return 1;
    }
  if (fl & O_NONBLOCK)
    {
      puts ("signalfd4(0) set non-blocking mode");
      return 1;
    }
  close (fd);

  fd = syscall (__NR_signalfd4, -1, &ss, 8, SFD_NONBLOCK);
  if (fd == -1)
    {
      puts ("signalfd4(SFD_NONBLOCK) failed");
      return 1;
    }
  fl = fcntl (fd, F_GETFL);
  if (fl == -1)
    {
      puts ("fcntl failed");
      return 1;
    }
  if ((fl & O_NONBLOCK) == 0)
    {
      puts ("signalfd4(SFD_NONBLOCK) does not set non-blocking mode");
      return 1;
    }
  close (fd);

  puts ("OK");

  return 0;
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 fs/signalfd.c            |    1 +
 include/linux/signalfd.h |    1 +
 2 files changed, 2 insertions(+)


Signed-off-by: Ulrich Drepper <drepper@redhat.com>

diff --git a/fs/signalfd.c b/fs/signalfd.c
index 6197256..a73333b 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -208,6 +208,7 @@ static const struct file_operations signalfd_fops = {
 
 static const struct flags_rmap signalfd_file_flags_remap[] = {
 	{ SFD_CLOEXEC, O_CLOEXEC },
+	{ SFD_NONBLOCK, O_NONBLOCK }
 };
 
 asmlinkage long sys_signalfd4(int ufd, sigset_t __user *user_mask,
diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h
index ea037f2..98a749a 100644
--- a/include/linux/signalfd.h
+++ b/include/linux/signalfd.h
@@ -11,6 +11,7 @@
 
 /* Flags for signalfd4.  */
 #define SFD_CLOEXEC (1 << 0)
+#define SFD_NONBLOCK (1 << 1)
 
 struct signalfd_siginfo {
 	__u32 ssi_signo;

Re: [PATCH 14/18] flag parameters: NONBLOCK in signalfd

[Davide Libenzi]

On Sun, 4 May 2008, Ulrich Drepper wrote:

> This patch adds support for the SFD_NONBLOCK flag to signalfd4.  The
> additional changes needed are minimal thanks to the previous preparation.
> 
> The following test must be adjusted for architectures other than x86 and
> x86-64 and in case the syscall numbers changed.

> Signed-off-by: Ulrich Drepper <drepper@redhat.com>

Acked-by: Davide Libenzi <davidel@xmailserver.org>



- Davide