Update.

	* sysdeps/unix/sysv/linux/syscalls.list: Add epoll_create,
	epoll_ctl, and epoll_wait.
	* sysdeps/unix/sysv/linux/Versions [libc: GLIBC_2.3.2]: Add
	epoll_create, epoll_ctl, and epoll_wait.
	* sysdeps/unix/sysv/linux/sys/epoll.h: New file.
	* sysdeps/unix/sysv/linux/Dist: Add sys/epoll.h.
	* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
	Add sys/epoll.h.

2002-12-16  Art Haas  <ahaas@airmail.net>

	* sysdeps/generic/bp-semctl.h: Convert GCC extension initializer
	syntax to C99
	* sysdeps/unix/sysv/aix/settimer.c: Same.
	* sysdeps/unix/sysv/aix/sleep.c: Same.
	* sysdeps/unix/sysv/aix/usleep.c: Same.

2002-12-16  Ulrich Drepper  <drepper@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index a82c5c9..f01dfe0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2002-12-16  Ulrich Drepper  <drepper@redhat.com>
 
+       * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_create,
+       epoll_ctl, and epoll_wait.
+       * sysdeps/unix/sysv/linux/Versions [libc: GLIBC_2.3.2]: Add
+       epoll_create, epoll_ctl, and epoll_wait.
+       * sysdeps/unix/sysv/linux/sys/epoll.h: New file.
+       * sysdeps/unix/sysv/linux/Dist: Add sys/epoll.h.
+       * sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers):
+       Add sys/epoll.h.
+
+2002-12-16  Art Haas  <ahaas@airmail.net>
+
+       * sysdeps/generic/bp-semctl.h: Convert GCC extension initializer
+       syntax to C99
+       * sysdeps/unix/sysv/aix/settimer.c: Same.
+       * sysdeps/unix/sysv/aix/sleep.c: Same.
+       * sysdeps/unix/sysv/aix/usleep.c: Same.
+
+2002-12-16  Ulrich Drepper  <drepper@redhat.com>
+
        * stdio-common/Makefile (routines): Remove lockfile.  Add
        flockfile, ftrylockfile, and funlockfile.
        * sysdeps/generic/lockfile.c: Removed.  Each function has its own file.

diff --git a/nptl/sem_destroy.c b/nptl/sem_destroy.c
index 790a80e..1c823dc 100644 (file)
--- a/nptl/sem_destroy.c
+++ b/nptl/sem_destroy.c
@@ -32,3 +32,7 @@ __new_sem_destroy (sem)
   return 0;
 }
 versioned_symbol (libpthread, __new_sem_destroy, sem_destroy, GLIBC_2_1);
+#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
+strong_alias (__new_sem_destroy, __old_sem_destroy)
+compat_symbol (libpthread, __old_sem_destroy, sem_destroy, GLIBC_2_0);
+#endif

diff --git a/nptl/sem_getvalue.c b/nptl/sem_getvalue.c
index ee976c3..6bc7ea8 100644 (file)
--- a/nptl/sem_getvalue.c
+++ b/nptl/sem_getvalue.c
@@ -36,3 +36,7 @@ __new_sem_getvalue (sem, sval)
   return 0;
 }
 versioned_symbol (libpthread, __new_sem_getvalue, sem_getvalue, GLIBC_2_1);
+#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
+strong_alias (__new_sem_getvalue, __old_sem_getvalue)
+compat_symbol (libpthread, __old_sem_getvalue, sem_getvalue, GLIBC_2_0);
+#endif

diff --git a/nptl/sem_init.c b/nptl/sem_init.c
index c8b80ff..8709911 100644 (file)
--- a/nptl/sem_init.c
+++ b/nptl/sem_init.c
@@ -49,3 +49,7 @@ __new_sem_init (sem, pshared, value)
   return 0;
 }
 versioned_symbol (libpthread, __new_sem_init, sem_init, GLIBC_2_1);
+#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
+strong_alias (__new_sem_init, __old_sem_init)
+compat_symbol (libpthread, __old_sem_init, sem_init, GLIBC_2_0);
+#endif

diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index d38b0b4..ed8836d 100644 (file)
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -57,6 +57,7 @@ scsi/sg.h
 scsi/scsi.h
 scsi/scsi_ioctl.h
 sys/acct.h
+sys/epoll.h
 sys/fsuid.h
 sys/kd.h
 sys/kdaemon.h

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 8e0f659..e6d044f 100644 (file)
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -20,7 +20,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
                  sys/kd.h sys/soundcard.h sys/vt.h \
                  sys/quota.h sys/fsuid.h \
                  scsi/sg.h scsi/scsi.h scsi/scsi_ioctl.h sys/pci.h \
-                 sys/ultrasound.h sys/raw.h sys/personality.h
+                 sys/ultrasound.h sys/raw.h sys/personality.h sys/epoll.h
 
 install-others += $(inst_includedir)/bits/syscall.h
 

diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 9dd6b2a..7cb8327 100644 (file)
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -105,6 +105,10 @@ libc {
     #errlist-compat    126
     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
   }
+  GLIBC_2.3.2 {
+    # New kernel interfaces.
+    epoll_create; epoll_ctl; epoll_wait;
+  }
   GLIBC_PRIVATE {
     # needed by libpthread.
     __libc_sigaction;

diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h
new file mode 100644 (file)
index 0000000..1add423
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sys/epoll.h
@@ -0,0 +1,102 @@
+/* Copyright (C) 2002 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef        _SYS_EPOLL_H
+#define        _SYS_EPOLL_H    1
+
+#include <sys/types.h>
+
+
+enum EPOLL_EVENTS
+  {
+    EPOLLIN = 0x001,
+#define EPOLLIN EPOLLIN
+    EPOLLPRI = 0x002,
+#define EPOLLPRI EPOLLPRI
+    EPOLLOUT = 0x004,
+#define EPOLLOUT EPOLLOUT
+    EPOLLRDNORM = 0x040,
+#define EPOLLRDNORM EPOLLRDNORM
+    EPOLLRDBAND = 0x080,
+#define EPOLLRDBAND EPOLLRDBAND
+    EPOLLWRNORM = 0x100,
+#define EPOLLWRNORM EPOLLWRNORM
+    EPOLLWRBAND = 0x200,
+#define EPOLLWRBAND EPOLLWRBAND
+    EPOLLMSG = 0x400,
+#define EPOLLMSG EPOLLMSG
+    EPOLLERR = 0x008,
+#define EPOLLERR EPOLLERR
+    EPOLLHUP = 0x010
+#define EPOLLHUP EPOLLHUP
+  };
+
+
+/* Valid opcodes ( "op" parameter ) to issue to epoll_ctl().  */
+#define EPOLL_CTL_ADD 1        /* Add a file decriptor to the interface.  */
+#define EPOLL_CTL_DEL 2        /* Remove a file decriptor from the interface.  */
+#define EPOLL_CTL_MOD 3        /* Change file decriptor epoll_event structure.  */
+
+
+typedef union epoll_data
+{
+  void *ptr;
+  int fd;
+  uint32_t u32;
+  uint64_t u64;
+} epoll_data_t;
+
+struct epoll_event
+{
+  uint32_t events;     /* Epoll events */
+  epoll_data_t data;   /* User data variable */
+};
+
+
+__BEGIN_DECLS
+
+/* Creates an epoll instance.  Returns an fd for the new instance.
+   The "size" parameter is a hint specifying the number of file
+   descriptors to be associated with the new instance.  The fd
+   returned by epoll_create() should be closed with close().  */
+extern int epoll_create (int __size) __THROW;
+
+
+/* Manipulate an epoll instance "epfd". Returns 0 in case of success,
+   -1 in case of error ( the "errno" variable will contain the
+   specific error code ) The "op" parameter is one of the EPOLL_CTL_*
+   constants defined above. The "fd" parameter is the target of the
+   operation. The "event" parameter describes which events the caller
+   is interested in and any associated user data.  */
+extern int epoll_ctl (int __epfd, int __op, int __fd,
+                     struct epoll_event *__event) __THROW;
+
+
+/* Wait for events on an epoll instance "epfd". Returns the number of
+   triggered events returned in "events" buffer. Or -1 in case of
+   error with the "errno" variable set to the specific error code. The
+   "events" parameter is a buffer that will contain triggered
+   events. The "maxevents" is the maximum number of events to be
+   returned ( usually size of "events" ). The "timeout" parameter
+   specifies the maximum wait time in milliseconds (-1 == infinite).  */
+extern int epoll_wait (int __epfd, struct epoll_event *__events,
+                      int __maxevents, int __timeout) __THROW;
+
+__END_DECLS
+
+#endif /* sys/epoll.h */

diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 003cb91..738cad7 100644 (file)
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -7,6 +7,9 @@ capset          EXTRA   capset          i:pp    capset
 creat          -       creat           Ci:si   __libc_creat creat
 create_module  EXTRA   create_module   3       create_module
 delete_module  EXTRA   delete_module   3       delete_module
+epoll_create   EXTRA   epoll_create    i:i     epoll_create
+epoll_ctl      EXTRA   epoll_ctl       i:iiip  epoll_ctl
+epoll_wait     EXTRA   epoll_wait      i:ipii  epoll_wait
 fdatasync      -       fdatasync       i:i     fdatasync
 flock          -       flock           i:ii    __flock         flock
 fork           -       fork            i:      __libc_fork     __fork fork