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.59 by root, Mon Jan 17 12:11:12 2011 UTC vs.
Revision 1.63 by root, Sat Jun 4 05:33:29 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,
… …
142epoll_poll (EV_P_ ev_tstamp timeout) 142epoll_poll (EV_P_ ev_tstamp timeout)
143{ 143{
144 int i; 144 int i;
145 int eventcnt; 145 int eventcnt;
146 146
147 if (expect_false (epoll_epermcnt))
148 timeout = 0.;
149
147 /* epoll wait times cannot be larger than (LONG_MAX - 999UL) / HZ msecs, which is below */ 150 /* epoll wait times cannot be larger than (LONG_MAX - 999UL) / HZ msecs, which is below */
148 /* the default libev max wait time, however. */ 151 /* the default libev max wait time, however. */
149 EV_RELEASE_CB; 152 EV_RELEASE_CB;
150 eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, 153 eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, timeout * 1e3);
151 epoll_epermcnt ? 0 : ev_timeout_to_ms (timeout));
152 EV_ACQUIRE_CB; 154 EV_ACQUIRE_CB;
153 155
154 if (expect_false (eventcnt < 0)) 156 if (expect_false (eventcnt < 0))
155 { 157 {
156 if (errno != EINTR) 158 if (errno != EINTR)
… …
232 if (backend_fd < 0) 234 if (backend_fd < 0)
233 return 0; 235 return 0;
234 236
235 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); 237 fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
236 238
237 backend_fudge = 0.; /* kernel sources seem to indicate this to be zero */ 239 backend_mintime = 1./1024.; /* epoll does sometimes return early, this is just to avoid the worst */
238 backend_modify = epoll_modify; 240 backend_modify = epoll_modify;
239 backend_poll = epoll_poll; 241 backend_poll = epoll_poll;
240 242
241 epoll_eventmax = 64; /* initial number of events receivable per poll */ 243 epoll_eventmax = 64; /* initial number of events receivable per poll */
242 epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); 244 epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
243 245
244 return EVBACKEND_EPOLL; 246 return EVBACKEND_EPOLL;

Diff Legend

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