Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

flag parameters: NONBLOCK in eventfd

Browse Source 
This patch adds support for the EFD_NONBLOCK flag to eventfd2.  The
additional changes needed are minimal.

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 <stdio.h>
#include <unistd.h>
#include <sys/syscall.h>

#ifndef __NR_eventfd2
# ifdef __x86_64__
#  define __NR_eventfd2 290
# elif defined __i386__
#  define __NR_eventfd2 328
# else
#  error "need __NR_eventfd2"
# endif
#endif

#define EFD_NONBLOCK O_NONBLOCK

int
main (void)
{
  int fd = syscall (__NR_eventfd2, 1, 0);
  if (fd == -1)
    {
      puts ("eventfd2(0) failed");
      return 1;
    }
  int fl = fcntl (fd, F_GETFL);
  if (fl == -1)
    {
      puts ("fcntl failed");
      return 1;
    }
  if (fl & O_NONBLOCK)
    {
      puts ("eventfd2(0) sets non-blocking mode");
      return 1;
    }
  close (fd);

  fd = syscall (__NR_eventfd2, 1, EFD_NONBLOCK);
  if (fd == -1)
    {
      puts ("eventfd2(EFD_NONBLOCK) failed");
      return 1;
    }
  fl = fcntl (fd, F_GETFL);
  if (fl == -1)
    {
      puts ("fcntl failed");
      return 1;
    }
  if ((fl & O_NONBLOCK) == 0)
    {
      puts ("eventfd2(EFD_NONBLOCK) does not set non-blocking mode");
      return 1;
    }
  close (fd);

  puts ("OK");

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

Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ulrich Drepper 2008-07-23 21:29:38 -07:00 committed by Linus Torvalds
parent 5fb5e04926
commit e7d476dfdf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/eventfd.c
View File

@ -203,7 +203,7 @@ asmlinkage long sys_eventfd2(unsigned int count, int flags)
int fd; int fd;
struct eventfd_ctx *ctx; struct eventfd_ctx *ctx;
if (flags & ~EFD_CLOEXEC) if (flags & ~(EFD_CLOEXEC | EFD_NONBLOCK))
return -EINVAL; return -EINVAL;
ctx = kmalloc(sizeof(*ctx), GFP_KERNEL); ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
@ -218,7 +218,7 @@ asmlinkage long sys_eventfd2(unsigned int count, int flags)
* anon_inode_getfd() will install the fd. * anon_inode_getfd() will install the fd.
*/ */
fd = anon_inode_getfd("[eventfd]", &eventfd_fops, ctx, fd = anon_inode_getfd("[eventfd]", &eventfd_fops, ctx,
flags & O_CLOEXEC); flags & (O_CLOEXEC | O_NONBLOCK));
if (fd < 0) if (fd < 0)
kfree(ctx); kfree(ctx);
return fd; return fd;

3
include/linux/eventfd.h
View File

@ -10,11 +10,12 @@
#ifdef CONFIG_EVENTFD #ifdef CONFIG_EVENTFD
/* For O_CLOEXEC */ /* For O_CLOEXEC and O_NONBLOCK */
#include <linux/fcntl.h> #include <linux/fcntl.h>
/* Flags for eventfd2. */ /* Flags for eventfd2. */
#define EFD_CLOEXEC O_CLOEXEC #define EFD_CLOEXEC O_CLOEXEC
#define EFD_NONBLOCK O_NONBLOCK
struct file *eventfd_fget(int fd); struct file *eventfd_fget(int fd);
int eventfd_signal(struct file *file, int n); int eventfd_signal(struct file *file, int n);