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.45 by sf-exg, Sat Jul 31 23:00:11 2010 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 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 *
… …
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{
… …
111 { 115 {
112 int fd = kqueue_events [i].ident; 116 int fd = kqueue_events [i].ident;
113 117
114 if (expect_false (kqueue_events [i].flags & EV_ERROR)) 118 if (expect_false (kqueue_events [i].flags & EV_ERROR))
115 { 119 {
116 int err = kqueue_events [i].data; 120 int err = kqueue_events [i].data;
117 121
118 /* we are only interested in errors for fds that we are interested in :) */ 122 /* we are only interested in errors for fds that we are interested in :) */
119 if (anfds [fd].events) 123 if (anfds [fd].events)
120 { 124 {
121 if (err == ENOENT) /* resubmit changes on ENOENT */ 125 if (err == ENOENT) /* resubmit changes on ENOENT */
122 kqueue_modify (EV_A_ fd, 0, anfds [fd].events); 126 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
123 else if (err == EBADF) /* on EBADF, we re-check the fd */ 127 else if (err == EBADF) /* on EBADF, we re-check the fd */
124 { 128 {
125 if (fd_valid (fd)) 129 if (fd_valid (fd))
… …
127 else 131 else
128 fd_kill (EV_A_ fd); 132 fd_kill (EV_A_ fd);
129 } 133 }
130 else /* on all other errors, we error out on the fd */ 134 else /* on all other errors, we error out on the fd */
131 fd_kill (EV_A_ fd); 135 fd_kill (EV_A_ fd);
132 } 136 }
133 } 137 }
134 else 138 else
135 fd_event ( 139 fd_event (
136 EV_A_ 140 EV_A_
137 fd, 141 fd,
… …
150} 154}
151 155
152int inline_size 156int inline_size
153kqueue_init (EV_P_ int flags) 157kqueue_init (EV_P_ int flags)
154{ 158{
155 /* Initalize the kernel queue */ 159 /* Initialize the kernel queue */
156 if ((backend_fd = kqueue ()) < 0) 160 if ((backend_fd = kqueue ()) < 0)
157 return 0; 161 return 0;
158 162
159 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */ 163 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
160 164

Diff Legend

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