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

Comparing libev/ev_select.c (file contents):
Revision 1.32 by root, Mon May 26 03:54:40 2008 UTC vs.
Revision 1.42 by root, Wed Jan 7 20:45:52 2009 UTC

1/* 1/*
2 * libev select fd activity backend 2 * libev select fd activity backend
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 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 *
… …
52#endif 52#endif
53 53
54#if EV_SELECT_IS_WINSOCKET 54#if EV_SELECT_IS_WINSOCKET
55# undef EV_SELECT_USE_FD_SET 55# undef EV_SELECT_USE_FD_SET
56# define EV_SELECT_USE_FD_SET 1 56# define EV_SELECT_USE_FD_SET 1
57# undef NFDBITS
58# define NFDBITS 0
57#endif 59#endif
58 60
59#if !EV_SELECT_USE_FD_SET 61#if !EV_SELECT_USE_FD_SET
60# define NFDBYTES (NFDBITS / 8) 62# define NFDBYTES (NFDBITS / 8)
61#endif 63#endif
… …
75 SOCKET handle = anfds [fd].handle; 77 SOCKET handle = anfds [fd].handle;
76 #else 78 #else
77 int handle = fd; 79 int handle = fd;
78 #endif 80 #endif
79 81
82 assert (("libev: fd >= FD_SETSIZE passed to fd_set-based select backend", fd < FD_SETSIZE));
83
84 /* FD_SET is broken on windows (it adds the fd to a set twice or more,
85 * which eventually leads to overflows). Need to call it only on changes.
86 */
87 #if EV_SELECT_IS_WINSOCKET
88 if ((oev ^ nev) & EV_READ)
89 #endif
80 if (nev & EV_READ) 90 if (nev & EV_READ)
81 FD_SET (handle, (fd_set *)vec_ri); 91 FD_SET (handle, (fd_set *)vec_ri);
82 else 92 else
83 FD_CLR (handle, (fd_set *)vec_ri); 93 FD_CLR (handle, (fd_set *)vec_ri);
84 94
95 #if EV_SELECT_IS_WINSOCKET
96 if ((oev ^ nev) & EV_WRITE)
97 #endif
85 if (nev & EV_WRITE) 98 if (nev & EV_WRITE)
86 FD_SET (handle, (fd_set *)vec_wi); 99 FD_SET (handle, (fd_set *)vec_wi);
87 else 100 else
88 FD_CLR (handle, (fd_set *)vec_wi); 101 FD_CLR (handle, (fd_set *)vec_wi);
89 102
90#else 103#else
91 104
92 int word = fd / NFDBITS; 105 int word = fd / NFDBITS;
93 fd_mask mask = 1UL << (fd % NFDBITS); 106 fd_mask mask = 1UL << (fd % NFDBITS);
… …
98 111
99 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES); 112 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
100 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */ 113 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */
101 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES); 114 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
102 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */ 115 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */
116 #ifdef _WIN32
117 vec_eo = ev_realloc (vec_eo, new_max * NFDBYTES); /* could free/malloc */
118 #endif
103 119
104 for (; vec_max < new_max; ++vec_max) 120 for (; vec_max < new_max; ++vec_max)
105 ((fd_mask *)vec_ri) [vec_max] = 121 ((fd_mask *)vec_ri) [vec_max] =
106 ((fd_mask *)vec_wi) [vec_max] = 0; 122 ((fd_mask *)vec_wi) [vec_max] = 0;
107 } 123 }
… …
120static void 136static void
121select_poll (EV_P_ ev_tstamp timeout) 137select_poll (EV_P_ ev_tstamp timeout)
122{ 138{
123 struct timeval tv; 139 struct timeval tv;
124 int res; 140 int res;
125 141 int fd_setsize;
126#if EV_SELECT_USE_FD_SET
127 memcpy (vec_ro, vec_ri, sizeof (fd_set));
128 memcpy (vec_wo, vec_wi, sizeof (fd_set));
129#else
130 memcpy (vec_ro, vec_ri, vec_max * NFDBYTES);
131 memcpy (vec_wo, vec_wi, vec_max * NFDBYTES);
132#endif
133 142
134 tv.tv_sec = (long)timeout; 143 tv.tv_sec = (long)timeout;
135 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 144 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
145
146#if EV_SELECT_USE_FD_SET
147 fd_setsize = sizeof (fd_set);
148#else
149 fd_setsize = vec_max * NFDBYTES;
150#endif
151
152 memcpy (vec_ro, vec_ri, fd_setsize);
153 memcpy (vec_wo, vec_wi, fd_setsize);
136 154
137#ifdef _WIN32 155#ifdef _WIN32
138 /* pass in the write set as except set. 156 /* pass in the write set as except set.
139 * the idea behind this is to work around a windows bug that causes 157 * the idea behind this is to work around a windows bug that causes
140 * errors to be reported as an exception and not by setting 158 * errors to be reported as an exception and not by setting
141 * the writable bit. this is so uncontrollably lame. 159 * the writable bit. this is so uncontrollably lame.
142 */ 160 */
161 memcpy (vec_eo, vec_wi, fd_setsize);
143 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_wo, &tv); 162 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_eo, &tv);
163#elif EV_SELECT_USE_FD_SET
164 fd_setsize = anfdmax < FD_SETSIZE ? anfdmax : FD_SETSIZE;
165 res = select (fd_setsize, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
144#else 166#else
145 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 167 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
146#endif 168#endif
147 169
148 if (expect_false (res < 0)) 170 if (expect_false (res < 0))
… …
160 #endif 182 #endif
161 183
162 #ifdef _WIN32 184 #ifdef _WIN32
163 /* select on windows errornously returns EINVAL when no fd sets have been 185 /* select on windows errornously returns EINVAL when no fd sets have been
164 * provided (this is documented). what microsoft doesn't tell you that this bug 186 * provided (this is documented). what microsoft doesn't tell you that this bug
165 * exists even when the fd sets are provided, so we have to check for this bug 187 * exists even when the fd sets _are_ provided, so we have to check for this bug
166 * here and emulate by sleeping manually. 188 * here and emulate by sleeping manually.
167 * we also get EINVAL when the timeout is invalid, but we ignore this case here 189 * we also get EINVAL when the timeout is invalid, but we ignore this case here
168 * and assume that EINVAL always means: you have to wait manually. 190 * and assume that EINVAL always means: you have to wait manually.
169 */ 191 */
170 if (errno == EINVAL) 192 if (errno == EINVAL)
… …
177 if (errno == EBADF) 199 if (errno == EBADF)
178 fd_ebadf (EV_A); 200 fd_ebadf (EV_A);
179 else if (errno == ENOMEM && !syserr_cb) 201 else if (errno == ENOMEM && !syserr_cb)
180 fd_enomem (EV_A); 202 fd_enomem (EV_A);
181 else if (errno != EINTR) 203 else if (errno != EINTR)
182 syserr ("(libev) select"); 204 ev_syserr ("(libev) select");
183 205
184 return; 206 return;
185 } 207 }
186 208
187#if EV_SELECT_USE_FD_SET 209#if EV_SELECT_USE_FD_SET
… …
199 int handle = fd; 221 int handle = fd;
200 #endif 222 #endif
201 223
202 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ; 224 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
203 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE; 225 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
226 #ifdef _WIN32
227 if (FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
228 #endif
204 229
205 if (expect_true (events)) 230 if (expect_true (events))
206 fd_event (EV_A_ fd, events); 231 fd_event (EV_A_ fd, events);
207 } 232 }
208 } 233 }
… …
213 int word, bit; 238 int word, bit;
214 for (word = vec_max; word--; ) 239 for (word = vec_max; word--; )
215 { 240 {
216 fd_mask word_r = ((fd_mask *)vec_ro) [word]; 241 fd_mask word_r = ((fd_mask *)vec_ro) [word];
217 fd_mask word_w = ((fd_mask *)vec_wo) [word]; 242 fd_mask word_w = ((fd_mask *)vec_wo) [word];
243 #ifdef _WIN32
244 word_w |= ((fd_mask *)vec_eo) [word];
245 #endif
218 246
219 if (word_r || word_w) 247 if (word_r || word_w)
220 for (bit = NFDBITS; bit--; ) 248 for (bit = NFDBITS; bit--; )
221 { 249 {
222 fd_mask mask = 1UL << bit; 250 fd_mask mask = 1UL << bit;
… …
240 backend_fudge = 0.; /* posix says this is zero */ 268 backend_fudge = 0.; /* posix says this is zero */
241 backend_modify = select_modify; 269 backend_modify = select_modify;
242 backend_poll = select_poll; 270 backend_poll = select_poll;
243 271
244#if EV_SELECT_USE_FD_SET 272#if EV_SELECT_USE_FD_SET
245 vec_max = FD_SETSIZE / 32;
246 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri); 273 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
247 vec_ro = ev_malloc (sizeof (fd_set)); 274 vec_ro = ev_malloc (sizeof (fd_set));
248 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi); 275 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
249 vec_wo = ev_malloc (sizeof (fd_set)); 276 vec_wo = ev_malloc (sizeof (fd_set));
277 #ifdef _WIN32
278 vec_eo = ev_malloc (sizeof (fd_set));
279 #endif
250#else 280#else
251 vec_max = 0; 281 vec_max = 0;
252 vec_ri = 0; 282 vec_ri = 0;
253 vec_ri = 0; 283 vec_ri = 0;
254 vec_wo = 0; 284 vec_wo = 0;

Diff Legend

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