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.38 by root, Fri Jul 10 19:10:19 2009 UTC vs.
Revision 1.53 by root, Sun Feb 12 08:39:38 2012 UTC

1/* 1/*
2 * libev kqueue backend 2 * libev kqueue backend
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012 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,
… …
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#include <sys/types.h> 40#include <sys/types.h>
41#include <sys/time.h> 41#include <sys/time.h>
42#include <sys/queue.h>
43#include <sys/event.h> 42#include <sys/event.h>
44#include <string.h> 43#include <string.h>
45#include <errno.h> 44#include <errno.h>
46 45
47void inline_speed 46void inline_speed
… …
51 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2); 50 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2);
52 51
53 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);
54} 53}
55 54
55/* OS X at least needs this */
56#ifndef EV_ENABLE
57# define EV_ENABLE 0
58#endif
56#ifndef NOTE_EOF 59#ifndef NOTE_EOF
57# define NOTE_EOF 0 60# define NOTE_EOF 0
58#endif 61#endif
59 62
60static void 63static void
… …
71 74
72 /* to detect close/reopen reliably, we have to re-add */ 75 /* to detect close/reopen reliably, we have to re-add */
73 /* event requests even when oev == nev */ 76 /* event requests even when oev == nev */
74 77
75 if (nev & EV_READ) 78 if (nev & EV_READ)
76 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);
77 80
78 if (nev & EV_WRITE) 81 if (nev & EV_WRITE)
79 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);
80} 83}
81 84
82static void 85static void
83kqueue_poll (EV_P_ ev_tstamp timeout) 86kqueue_poll (EV_P_ ev_tstamp timeout)
84{ 87{
85 int res, i; 88 int res, i;
86 struct timespec ts; 89 struct timespec ts;
87
88 EV_RELEASE_CB;
89 90
90 /* need to resize so there is enough space for errors */ 91 /* need to resize so there is enough space for errors */
91 if (kqueue_changecnt > kqueue_eventmax) 92 if (kqueue_changecnt > kqueue_eventmax)
92 { 93 {
93 ev_free (kqueue_events); 94 ev_free (kqueue_events);
94 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt); 95 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt);
95 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 96 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
96 } 97 }
97 98
98 ts.tv_sec = (time_t)timeout; 99 EV_RELEASE_CB;
99 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9); 100 EV_TS_SET (ts, timeout);
100 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;
101 kqueue_changecnt = 0; 103 kqueue_changecnt = 0;
102 104
103 EV_ACQUIRE_CB;
104
105 if (expect_false (res < 0)) 105 if (expect_false (res < 0))
106 { 106 {
107 if (errno != EINTR) 107 if (errno != EINTR)
108 ev_syserr ("(libev) kevent"); 108 ev_syserr ("(libev) kevent");
109 109
110 return; 110 return;
111 } 111 }
112 112
113 for (i = 0; i < res; ++i) 113 for (i = 0; i < res; ++i)
114 { 114 {
115 int fd = kqueue_events [i].ident; 115 int fd = kqueue_events [i].ident;
116 116
117 if (expect_false (kqueue_events [i].flags & EV_ERROR)) 117 if (expect_false (kqueue_events [i].flags & EV_ERROR))
118 { 118 {
119 int err = kqueue_events [i].data; 119 int err = kqueue_events [i].data;
120 120
121 /* 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 :) */
122 if (anfds [fd].events) 122 if (anfds [fd].events)
123 { 123 {
124 if (err == ENOENT) /* resubmit changes on ENOENT */ 124 if (err == ENOENT) /* resubmit changes on ENOENT */
125 kqueue_modify (EV_A_ fd, 0, anfds [fd].events); 125 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
126 else if (err == EBADF) /* on EBADF, we re-check the fd */ 126 else if (err == EBADF) /* on EBADF, we re-check the fd */
127 { 127 {
128 if (fd_valid (fd)) 128 if (fd_valid (fd))
… …
130 else 130 else
131 fd_kill (EV_A_ fd); 131 fd_kill (EV_A_ fd);
132 } 132 }
133 else /* on all other errors, we error out on the fd */ 133 else /* on all other errors, we error out on the fd */
134 fd_kill (EV_A_ fd); 134 fd_kill (EV_A_ fd);
135 } 135 }
136 } 136 }
137 else 137 else
138 fd_event ( 138 fd_event (
139 EV_A_ 139 EV_A_
140 fd, 140 fd,
… …
153} 153}
154 154
155int inline_size 155int inline_size
156kqueue_init (EV_P_ int flags) 156kqueue_init (EV_P_ int flags)
157{ 157{
158 /* Initalize the kernel queue */ 158 /* Initialize the kernel queue */
159 if ((backend_fd = kqueue ()) < 0) 159 if ((backend_fd = kqueue ()) < 0)
160 return 0; 160 return 0;
161 161
162 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 */
163 163
164 backend_fudge = 0.; 164 backend_mintime = 1e-9; /* apparently, they did the right thing in freebsd */
165 backend_modify = kqueue_modify; 165 backend_modify = kqueue_modify;
166 backend_poll = kqueue_poll; 166 backend_poll = kqueue_poll;
167 167
168 kqueue_eventmax = 64; /* initial number of events receivable per poll */ 168 kqueue_eventmax = 64; /* initial number of events receivable per poll */
169 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 169 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
170 170
171 kqueue_changes = 0; 171 kqueue_changes = 0;
… …
194 194
195 /* re-register interest in fds */ 195 /* re-register interest in fds */
196 fd_rearm_all (EV_A); 196 fd_rearm_all (EV_A);
197} 197}
198 198
199/* sys/event.h defines EV_ERROR */
200#undef EV_ERROR
201

Diff Legend

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