• Ulrich Drepper's avatar
    flag parameters: NONBLOCK in inotify_init · 510df2dd
    Ulrich Drepper authored
    This patch adds non-blocking support for inotify_init1.  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_inotify_init1
    # ifdef __x86_64__
    #  define __NR_inotify_init1 294
    # elif defined __i386__
    #  define __NR_inotify_init1 332
    # else
    #  error "need __NR_inotify_init1"
    # endif
    #endif
    
    #define IN_NONBLOCK O_NONBLOCK
    
    int
    main (void)
    {
      int fd = syscall (__NR_inotify_init1, 0);
      if (fd == -1)
        {
          puts ("inotify_init1(0) failed");
          return 1;
        }
      int fl = fcntl (fd, F_GETFL);
      if (fl == -1)
        {
          puts ("fcntl failed");
          return 1;
        }
      if (fl & O_NONBLOCK)
        {
          puts ("inotify_init1(0) set non-blocking mode");
          return 1;
        }
      close (fd);
    
      fd = syscall (__NR_inotify_init1, IN_NONBLOCK);
      if (fd == -1)
        {
          puts ("inotify_init1(IN_NONBLOCK) failed");
          return 1;
        }
      fl = fcntl (fd, F_GETFL);
      if (fl == -1)
        {
          puts ("fcntl failed");
          return 1;
        }
      if ((fl & O_NONBLOCK) == 0)
        {
          puts ("inotify_init1(IN_NONBLOCK) set non-blocking mode");
          return 1;
        }
      close (fd);
    
      puts ("OK");
    
      return 0;
    }
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    Signed-off-by: default avatarUlrich Drepper <drepper@redhat.com>
    Acked-by: default avatarDavide Libenzi <davidel@xmailserver.org>
    Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    510df2dd
inotify_user.c 18.4 KB