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

Comparing libev/ev_kqueue.c (file contents):
Revision 1.32 by ayin, Mon Dec 17 11:54:29 2007 UTC vs.
Revision 1.48 by root, Wed Feb 16 08:02:50 2011 UTC

1/* 1/*
2 * libev kqueue backend 2 * libev kqueue backend
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 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 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met:
10 * 9 *
11 * * Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright notice,
12 * notice, this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
13 * 12 *
14 * * Redistributions in binary form must reproduce the above 13 * 2. Redistributions in binary form must reproduce the above copyright
15 * copyright notice, this list of conditions and the following 14 * notice, this list of conditions and the following disclaimer in the
16 * disclaimer in the documentation and/or other materials provided 15 * documentation and/or other materials provided with the distribution.
17 * with the distribution.
18 * 16 *
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Alternatively, the contents of this file may be used under the terms of
29 * the GNU General Public License ("GPL") version 2 or any later version,
30 * in which case the provisions of the GPL are applicable instead of
31 * the above. If you wish to allow the use of your version of this file
32 * only under the terms of the GPL and not to allow others to use your
33 * version of this file under the BSD license, indicate your decision
34 * by deleting the provisions above and replace them with the notice
35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL.
30 */ 38 */
31 39
32#include <sys/types.h> 40#include <sys/types.h>
33#include <sys/time.h> 41#include <sys/time.h>
34#include <sys/queue.h>
35#include <sys/event.h> 42#include <sys/event.h>
36#include <string.h> 43#include <string.h>
37#include <errno.h> 44#include <errno.h>
38 45
39void inline_speed 46void inline_speed
… …
43 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2); 50 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2);
44 51
45 EV_SET (&kqueue_changes [kqueue_changecnt - 1], fd, filter, flags, fflags, 0, 0); 52 EV_SET (&kqueue_changes [kqueue_changecnt - 1], fd, filter, flags, fflags, 0, 0);
46} 53}
47 54
55/* OS X at least needs this */
56#ifndef EV_ENABLE
57# define EV_ENABLE 0
58#endif
48#ifndef NOTE_EOF 59#ifndef NOTE_EOF
49# define NOTE_EOF 0 60# define NOTE_EOF 0
50#endif 61#endif
51 62
52static void 63static void
… …
63 74
64 /* to detect close/reopen reliably, we have to re-add */ 75 /* to detect close/reopen reliably, we have to re-add */
65 /* event requests even when oev == nev */ 76 /* event requests even when oev == nev */
66 77
67 if (nev & EV_READ) 78 if (nev & EV_READ)
68 kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD, NOTE_EOF); 79 kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD | EV_ENABLE, NOTE_EOF);
69 80
70 if (nev & EV_WRITE) 81 if (nev & EV_WRITE)
71 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF); 82 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD | EV_ENABLE, NOTE_EOF);
72} 83}
73 84
74static void 85static void
75kqueue_poll (EV_P_ ev_tstamp timeout) 86kqueue_poll (EV_P_ ev_tstamp timeout)
76{ 87{
… …
83 ev_free (kqueue_events); 94 ev_free (kqueue_events);
84 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt); 95 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt);
85 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 96 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
86 } 97 }
87 98
88 ts.tv_sec = (time_t)timeout; 99 EV_RELEASE_CB;
89 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9); 100 EV_TS_SET (ts, timeout);
90 res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts); 101 res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
102 EV_ACQUIRE_CB;
91 kqueue_changecnt = 0; 103 kqueue_changecnt = 0;
92 104
93 if (expect_false (res < 0)) 105 if (expect_false (res < 0))
94 { 106 {
95 if (errno != EINTR) 107 if (errno != EINTR)
96 syserr ("(libev) kevent"); 108 ev_syserr ("(libev) kevent");
97 109
98 return; 110 return;
99 } 111 }
100 112
101 for (i = 0; i < res; ++i) 113 for (i = 0; i < res; ++i)
102 { 114 {
103 int fd = kqueue_events [i].ident; 115 int fd = kqueue_events [i].ident;
104 116
105 if (expect_false (kqueue_events [i].flags & EV_ERROR)) 117 if (expect_false (kqueue_events [i].flags & EV_ERROR))
106 { 118 {
107 int err = kqueue_events [i].data; 119 int err = kqueue_events [i].data;
108 120
109 /* we are only interested in errors for fds that we are interested in :) */ 121 /* we are only interested in errors for fds that we are interested in :) */
110 if (anfds [fd].events) 122 if (anfds [fd].events)
111 { 123 {
112 if (err == ENOENT) /* resubmit changes on ENOENT */ 124 if (err == ENOENT) /* resubmit changes on ENOENT */
113 kqueue_modify (EV_A_ fd, 0, anfds [fd].events); 125 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
114 else if (err == EBADF) /* on EBADF, we re-check the fd */ 126 else if (err == EBADF) /* on EBADF, we re-check the fd */
115 { 127 {
116 if (fd_valid (fd)) 128 if (fd_valid (fd))
… …
118 else 130 else
119 fd_kill (EV_A_ fd); 131 fd_kill (EV_A_ fd);
120 } 132 }
121 else /* on all other errors, we error out on the fd */ 133 else /* on all other errors, we error out on the fd */
122 fd_kill (EV_A_ fd); 134 fd_kill (EV_A_ fd);
123 } 135 }
124 } 136 }
125 else 137 else
126 fd_event ( 138 fd_event (
127 EV_A_ 139 EV_A_
128 fd, 140 fd,
… …
141} 153}
142 154
143int inline_size 155int inline_size
144kqueue_init (EV_P_ int flags) 156kqueue_init (EV_P_ int flags)
145{ 157{
146 /* Initalize the kernel queue */ 158 /* Initialize the kernel queue */
147 if ((backend_fd = kqueue ()) < 0) 159 if ((backend_fd = kqueue ()) < 0)
148 return 0; 160 return 0;
149 161
150 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */ 162 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
151 163
… …
174kqueue_fork (EV_P) 186kqueue_fork (EV_P)
175{ 187{
176 close (backend_fd); 188 close (backend_fd);
177 189
178 while ((backend_fd = kqueue ()) < 0) 190 while ((backend_fd = kqueue ()) < 0)
179 syserr ("(libev) kqueue"); 191 ev_syserr ("(libev) kqueue");
180 192
181 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); 193 fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
182 194
183 /* re-register interest in fds */ 195 /* re-register interest in fds */
184 fd_rearm_all (EV_A); 196 fd_rearm_all (EV_A);

Diff Legend

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