qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* nscd/connections.c (main_loop_epoll): Pass NULL as event 

argument for epoll_ctl(EPOLL_CTL_DEL) calls.
This commit is contained in:
Ulrich Drepper 2005-08-09 06:16:47 +00:00
parent 4630012fef
commit 908c9e87c3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2005-08-08 Ulrich Drepper <drepper@redhat.com> 2005-08-08 Ulrich Drepper <drepper@redhat.com>
* nscd/connections.c (main_loop_epoll): Pass NULL as event
argument for epoll_ctl(EPOLL_CTL_DEL) calls.
* nscd/nscd_stat.c (receive_print_stats): Really print values of * nscd/nscd_stat.c (receive_print_stats): Really print values of
thread number, paranoia, and restart interval the server is using. thread number, paranoia, and restart interval the server is using.

8
nscd/connections.c
View File

@ -1459,7 +1459,7 @@ fd_ready (int fd)
{ {
/* We got another thread. */ /* We got another thread. */
++nthreads; ++nthreads;
/* The new thread might new a kick. */ /* The new thread might need a kick. */
do_signal = true; do_signal = true;
} }
@ -1644,8 +1644,7 @@ main_loop_epoll (int efd)
else else
{ {
/* Remove the descriptor from the epoll descriptor. */ /* Remove the descriptor from the epoll descriptor. */
struct epoll_event ev = { 0, }; (void) epoll_ctl (efd, EPOLL_CTL_DEL, revs[cnt].data.fd, NULL);
(void) epoll_ctl (efd, EPOLL_CTL_DEL, revs[cnt].data.fd, &ev);
/* Get a worked to handle the request. */ /* Get a worked to handle the request. */
fd_ready (revs[cnt].data.fd); fd_ready (revs[cnt].data.fd);
@ -1667,8 +1666,7 @@ main_loop_epoll (int efd)
if (cnt != sock && starttime[cnt] != 0 && starttime[cnt] < laststart) if (cnt != sock && starttime[cnt] != 0 && starttime[cnt] < laststart)
{ {
/* We are waiting for this one for too long. Close it. */ /* We are waiting for this one for too long. Close it. */
struct epoll_event ev = {0, }; (void) epoll_ctl (efd, EPOLL_CTL_DEL, cnt, NULL);
(void) epoll_ctl (efd, EPOLL_CTL_DEL, cnt, &ev);
(void) close (cnt); (void) close (cnt);