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.35 by root, Wed Oct 29 06:32:48 2008 UTC vs.
Revision 1.47 by root, Fri Oct 15 22:48:25 2010 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 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 *
… …
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{
… …
91 ev_free (kqueue_events); 94 ev_free (kqueue_events);
92 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt); 95 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt);
93 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 96 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
94 } 97 }
95 98
96 ts.tv_sec = (time_t)timeout; 99 EV_RELEASE_CB;
97 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9); 100 EV_TS_SET (ts, timeout);
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);
102 EV_ACQUIRE_CB;
99 kqueue_changecnt = 0; 103 kqueue_changecnt = 0;
100 104
101 if (expect_false (res < 0)) 105 if (expect_false (res < 0))
102 { 106 {
103 if (errno != EINTR) 107 if (errno != EINTR)
… …
110 { 114 {
111 int fd = kqueue_events [i].ident; 115 int fd = kqueue_events [i].ident;
112 116
113 if (expect_false (kqueue_events [i].flags & EV_ERROR)) 117 if (expect_false (kqueue_events [i].flags & EV_ERROR))
114 { 118 {
115 int err = kqueue_events [i].data; 119 int err = kqueue_events [i].data;
116 120
117 /* 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 :) */
118 if (anfds [fd].events) 122 if (anfds [fd].events)
119 { 123 {
120 if (err == ENOENT) /* resubmit changes on ENOENT */ 124 if (err == ENOENT) /* resubmit changes on ENOENT */
121 kqueue_modify (EV_A_ fd, 0, anfds [fd].events); 125 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
122 else if (err == EBADF) /* on EBADF, we re-check the fd */ 126 else if (err == EBADF) /* on EBADF, we re-check the fd */
123 { 127 {
124 if (fd_valid (fd)) 128 if (fd_valid (fd))
… …
126 else 130 else
127 fd_kill (EV_A_ fd); 131 fd_kill (EV_A_ fd);
128 } 132 }
129 else /* on all other errors, we error out on the fd */ 133 else /* on all other errors, we error out on the fd */
130 fd_kill (EV_A_ fd); 134 fd_kill (EV_A_ fd);
131 } 135 }
132 } 136 }
133 else 137 else
134 fd_event ( 138 fd_event (
135 EV_A_ 139 EV_A_
136 fd, 140 fd,
… …
149} 153}
150 154
151int inline_size 155int inline_size
152kqueue_init (EV_P_ int flags) 156kqueue_init (EV_P_ int flags)
153{ 157{
154 /* Initalize the kernel queue */ 158 /* Initialize the kernel queue */
155 if ((backend_fd = kqueue ()) < 0) 159 if ((backend_fd = kqueue ()) < 0)
156 return 0; 160 return 0;
157 161
158 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 */
159 163

Diff Legend

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