mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 11:43:34 +08:00
* io/sys/poll.h: Add comment explaining poll is a cancellation
point. * sysdeps/unix/sysv/linux/sys/epoll.h: Add comment explaining epoll_wait is a cancellation point.
This commit is contained in:
parent
1b804a349f
commit
7761a3ac53
@ -1,7 +1,11 @@
|
||||
2005-11-15 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* io/sys/poll.h: Add comment explaining poll is a cancellation point.
|
||||
|
||||
* sysdeps/unix/sysv/linux/syscalls.list (epoll_wait): Align with
|
||||
poll, make cancelable.
|
||||
* sysdeps/unix/sysv/linux/sys/epoll.h: Add comment explaining
|
||||
epoll_wait is a cancellation point.
|
||||
|
||||
2005-11-15 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* Compatibility definitions for System V `poll' interface.
|
||||
Copyright (C) 1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
|
||||
Copyright (C) 1994,1996-2001,2004,2005 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
|
||||
@ -44,7 +44,10 @@ __BEGIN_DECLS
|
||||
FDS. If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
|
||||
an event to occur; if TIMEOUT is -1, block until an event occurs.
|
||||
Returns the number of file descriptors with events, zero if timed out,
|
||||
or -1 for errors. */
|
||||
or -1 for errors.
|
||||
|
||||
This function is a cancellation point and therefore not marked with
|
||||
__THROW. */
|
||||
extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
|
||||
|
||||
__END_DECLS
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 2002, 2003, 2004, 2005 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
|
||||
@ -98,9 +98,12 @@ extern int epoll_ctl (int __epfd, int __op, int __fd,
|
||||
"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). */
|
||||
specifies the maximum wait time in milliseconds (-1 == infinite).
|
||||
|
||||
This function is a cancellation point and therefore not marked with
|
||||
__THROW. */
|
||||
extern int epoll_wait (int __epfd, struct epoll_event *__events,
|
||||
int __maxevents, int __timeout) __THROW;
|
||||
int __maxevents, int __timeout);
|
||||
|
||||
__END_DECLS
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user