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.41 by root, Wed Jan 13 12:44:33 2010 UTC vs.
Revision 1.50 by root, Fri Jun 3 00:04:52 2011 UTC

1/* 1/*
2 * libev kqueue backend 2 * libev kqueue backend
3 * 3 *
4 * Copyright (c) 2007,2008,2009 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,
… …
50 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2); 50 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2);
51 51
52 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);
53} 53}
54 54
55/* OS X at least needs this */
56#ifndef EV_ENABLE
57# define EV_ENABLE 0
58#endif
55#ifndef NOTE_EOF 59#ifndef NOTE_EOF
56# define NOTE_EOF 0 60# define NOTE_EOF 0
57#endif 61#endif
58 62
59static void 63static void
… …
70 74
71 /* to detect close/reopen reliably, we have to re-add */ 75 /* to detect close/reopen reliably, we have to re-add */
72 /* event requests even when oev == nev */ 76 /* event requests even when oev == nev */
73 77
74 if (nev & EV_READ) 78 if (nev & EV_READ)
75 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);
76 80
77 if (nev & EV_WRITE) 81 if (nev & EV_WRITE)
78 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);
79} 83}
80 84
81static void 85static void
82kqueue_poll (EV_P_ ev_tstamp timeout) 86kqueue_poll (EV_P_ ev_tstamp timeout)
83{ 87{
… …
91 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt); 95 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt);
92 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 96 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
93 } 97 }
94 98
95 EV_RELEASE_CB; 99 EV_RELEASE_CB;
96 ts.tv_sec = (time_t)timeout; 100 EV_TS_SET (ts, timeout);
97 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9);
98 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);
99 EV_ACQUIRE_CB; 102 EV_ACQUIRE_CB;
100 kqueue_changecnt = 0; 103 kqueue_changecnt = 0;
101 104
102 if (expect_false (res < 0)) 105 if (expect_false (res < 0))
103 { 106 {
104 if (errno != EINTR) 107 if (errno != EINTR)
105 ev_syserr ("(libev) kevent"); 108 ev_syserr ("(libev) kevent");
106 109
107 return; 110 return;
108 } 111 }
109 112
110 for (i = 0; i < res; ++i) 113 for (i = 0; i < res; ++i)
111 { 114 {
112 int fd = kqueue_events [i].ident; 115 int fd = kqueue_events [i].ident;
113 116
114 if (expect_false (kqueue_events [i].flags & EV_ERROR)) 117 if (expect_false (kqueue_events [i].flags & EV_ERROR))
115 { 118 {
116 int err = kqueue_events [i].data; 119 int err = kqueue_events [i].data;
117 120
118 /* 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 :) */
119 if (anfds [fd].events) 122 if (anfds [fd].events)
120 { 123 {
121 if (err == ENOENT) /* resubmit changes on ENOENT */ 124 if (err == ENOENT) /* resubmit changes on ENOENT */
122 kqueue_modify (EV_A_ fd, 0, anfds [fd].events); 125 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
123 else if (err == EBADF) /* on EBADF, we re-check the fd */ 126 else if (err == EBADF) /* on EBADF, we re-check the fd */
124 { 127 {
125 if (fd_valid (fd)) 128 if (fd_valid (fd))
… …
127 else 130 else
128 fd_kill (EV_A_ fd); 131 fd_kill (EV_A_ fd);
129 } 132 }
130 else /* on all other errors, we error out on the fd */ 133 else /* on all other errors, we error out on the fd */
131 fd_kill (EV_A_ fd); 134 fd_kill (EV_A_ fd);
132 } 135 }
133 } 136 }
134 else 137 else
135 fd_event ( 138 fd_event (
136 EV_A_ 139 EV_A_
137 fd, 140 fd,
… …
150} 153}
151 154
152int inline_size 155int inline_size
153kqueue_init (EV_P_ int flags) 156kqueue_init (EV_P_ int flags)
154{ 157{
155 /* Initalize the kernel queue */ 158 /* Initialize the kernel queue */
156 if ((backend_fd = kqueue ()) < 0) 159 if ((backend_fd = kqueue ()) < 0)
157 return 0; 160 return 0;
158 161
159 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 */
160 163
161 backend_fudge = 0.; 164 backend_fudge = 1e-9; /* apparently, they did the right thing in freebsd */
162 backend_modify = kqueue_modify; 165 backend_modify = kqueue_modify;
163 backend_poll = kqueue_poll; 166 backend_poll = kqueue_poll;
164 167
165 kqueue_eventmax = 64; /* initial number of events receivable per poll */ 168 kqueue_eventmax = 64; /* initial number of events receivable per poll */
166 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 169 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);

Diff Legend

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