ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_epoll.c
(Generate patch)

Comparing libev/ev_epoll.c (file contents):
Revision 1.55 by root, Wed Jan 5 04:21:20 2011 UTC vs.
Revision 1.60 by root, Wed Feb 16 08:02:50 2011 UTC

… …
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
115 if (!epoll_ctl (backend_fd, EPOLL_CTL_MOD, fd, &ev)) 115 if (!epoll_ctl (backend_fd, EPOLL_CTL_MOD, fd, &ev))
116 return; 116 return;
117 } 117 }
118 else if (expect_true (errno == EPERM)) 118 else if (expect_true (errno == EPERM))
119 { 119 {
120 /* EPERM means the fd is always ready, but epoll is too snobbish */
121 /* to handle it, unlike select or poll. */
120 anfds [fd].emask = EV_EMASK_EPERM; 122 anfds [fd].emask = EV_EMASK_EPERM;
121 123
122 /* add fd to epoll_eperms, if not already inside */ 124 /* add fd to epoll_eperms, if not already inside */
123 if (!(oldmask & EV_EMASK_EPERM)) 125 if (!(oldmask & EV_EMASK_EPERM))
124 { 126 {
… …
139static void 141static void
140epoll_poll (EV_P_ ev_tstamp timeout) 142epoll_poll (EV_P_ ev_tstamp timeout)
141{ 143{
142 int i; 144 int i;
143 int eventcnt; 145 int eventcnt;
144 146
145 /* epoll wait times cannot be larger than (LONG_MAX - 999UL) / HZ msecs, which is below */ 147 /* epoll wait times cannot be larger than (LONG_MAX - 999UL) / HZ msecs, which is below */
146 /* the default libev max wait time, however. */ 148 /* the default libev max wait time, however. */
147 EV_RELEASE_CB; 149 EV_RELEASE_CB;
148 eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.)); 150 eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax,
151 epoll_epermcnt ? 0 : ev_timeout_to_ms (timeout));
149 EV_ACQUIRE_CB; 152 EV_ACQUIRE_CB;
150 153
151 if (expect_false (eventcnt < 0)) 154 if (expect_false (eventcnt < 0))
152 { 155 {
153 if (errno != EINTR) 156 if (errno != EINTR)
… …
201 ev_free (epoll_events); 204 ev_free (epoll_events);
202 epoll_eventmax = array_nextsize (sizeof (struct epoll_event), epoll_eventmax, epoll_eventmax + 1); 205 epoll_eventmax = array_nextsize (sizeof (struct epoll_event), epoll_eventmax, epoll_eventmax + 1);
203 epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); 206 epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
204 } 207 }
205 208
206 /* now add events for all fds where epoll fails, while select works... */ 209 /* now synthesize events for all fds where epoll fails, while select works... */
207 for (i = epoll_epermcnt; i--; ) 210 for (i = epoll_epermcnt; i--; )
208 { 211 {
209 int fd = epoll_eperms [i]; 212 int fd = epoll_eperms [i];
210 unsigned char events = anfds [fd].events & (EV_READ | EV_WRITE); 213 unsigned char events = anfds [fd].events & (EV_READ | EV_WRITE);
211 214

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines