leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flag parameters: NONBLOCK in timerfd_create

Browse Source 
This patch adds support for the TFD_NONBLOCK flag to timerfd_create.  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 <time.h>
#include <unistd.h>
#include <sys/syscall.h>

#ifndef __NR_timerfd_create
# ifdef __x86_64__
#  define __NR_timerfd_create 283
# elif defined __i386__
#  define __NR_timerfd_create 322
# else
#  error "need __NR_timerfd_create"
# endif
#endif

#define TFD_NONBLOCK O_NONBLOCK

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

  fd = syscall (__NR_timerfd_create, CLOCK_REALTIME, TFD_NONBLOCK);
  if (fd == -1)
    {
      puts ("timerfd_create(TFD_NONBLOCK) failed");
      return 1;
    }
  fl = fcntl (fd, F_GETFL);
  if (fl == -1)
    {
      puts ("fcntl failed");
      return 1;
    }
  if ((fl & O_NONBLOCK) == 0)
    {
      puts ("timerfd_create(TFD_NONBLOCK) 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:39 -07:00
committed by Linus Torvalds
parent e7d476dfdf
commit 6b1ef0e60d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/timerfd.c
View File

@@ -184,7 +184,7 @@ asmlinkage long sys_timerfd_create(int clockid, int flags)
int ufd; int ufd;
struct timerfd_ctx *ctx; struct timerfd_ctx *ctx;
if (flags & ~TFD_CLOEXEC) if (flags & ~(TFD_CLOEXEC | TFD_NONBLOCK))
return -EINVAL; return -EINVAL;
if (clockid != CLOCK_MONOTONIC && if (clockid != CLOCK_MONOTONIC &&
clockid != CLOCK_REALTIME) clockid != CLOCK_REALTIME)
@@ -199,7 +199,7 @@ asmlinkage long sys_timerfd_create(int clockid, int flags)
hrtimer_init(&ctx->tmr, clockid, HRTIMER_MODE_ABS); hrtimer_init(&ctx->tmr, clockid, HRTIMER_MODE_ABS);
ufd = anon_inode_getfd("[timerfd]", &timerfd_fops, ctx, ufd = anon_inode_getfd("[timerfd]", &timerfd_fops, ctx,
flags & O_CLOEXEC); flags & (O_CLOEXEC | O_NONBLOCK));
if (ufd < 0) if (ufd < 0)
kfree(ctx); kfree(ctx);

3
include/linux/timerfd.h
View File

@@ -8,7 +8,7 @@
#ifndef _LINUX_TIMERFD_H #ifndef _LINUX_TIMERFD_H
#define _LINUX_TIMERFD_H #define _LINUX_TIMERFD_H
/* For O_CLOEXEC */ /* For O_CLOEXEC and O_NONBLOCK */
#include <linux/fcntl.h> #include <linux/fcntl.h>
/* Flags for timerfd_settime. */ /* Flags for timerfd_settime. */
@@ -16,6 +16,7 @@
/* Flags for timerfd_create. */ /* Flags for timerfd_create. */
#define TFD_CLOEXEC O_CLOEXEC #define TFD_CLOEXEC O_CLOEXEC
#define TFD_NONBLOCK O_NONBLOCK
#endif /* _LINUX_TIMERFD_H */ #endif /* _LINUX_TIMERFD_H */