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.33 by root, Mon May 26 04:14:32 2008 UTC vs.
Revision 1.48 by root, Fri Oct 15 22:44:42 2010 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);
… …
125{ 138{
126 struct timeval tv; 139 struct timeval tv;
127 int res; 140 int res;
128 int fd_setsize; 141 int fd_setsize;
129 142
130 tv.tv_sec = (long)timeout; 143 EV_RELEASE_CB;
131 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 144 EV_TV_SET (tv, timeout);
132 145
133#if EV_SELECT_USE_FD_SET 146#if EV_SELECT_USE_FD_SET
134 fd_setsize = sizeof (fd_set); 147 fd_setsize = sizeof (fd_set);
135#else 148#else
136 fd_setsize = vec_max * NFDBYTES; 149 fd_setsize = vec_max * NFDBYTES;
… …
145 * errors to be reported as an exception and not by setting 158 * errors to be reported as an exception and not by setting
146 * the writable bit. this is so uncontrollably lame. 159 * the writable bit. this is so uncontrollably lame.
147 */ 160 */
148 memcpy (vec_eo, vec_wi, fd_setsize); 161 memcpy (vec_eo, vec_wi, fd_setsize);
149 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_eo, &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);
150#else 166#else
151 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);
152#endif 168#endif
169 EV_ACQUIRE_CB;
153 170
154 if (expect_false (res < 0)) 171 if (expect_false (res < 0))
155 { 172 {
156 #if EV_SELECT_IS_WINSOCKET 173 #if EV_SELECT_IS_WINSOCKET
157 errno = WSAGetLastError (); 174 errno = WSAGetLastError ();
… …
164 else 181 else
165 errno -= WSABASEERR; 182 errno -= WSABASEERR;
166 #endif 183 #endif
167 184
168 #ifdef _WIN32 185 #ifdef _WIN32
169 /* select on windows errornously returns EINVAL when no fd sets have been 186 /* select on windows erroneously returns EINVAL when no fd sets have been
170 * provided (this is documented). what microsoft doesn't tell you that this bug 187 * provided (this is documented). what microsoft doesn't tell you that this bug
171 * exists even when the fd sets are provided, so we have to check for this bug 188 * exists even when the fd sets _are_ provided, so we have to check for this bug
172 * here and emulate by sleeping manually. 189 * here and emulate by sleeping manually.
173 * we also get EINVAL when the timeout is invalid, but we ignore this case here 190 * we also get EINVAL when the timeout is invalid, but we ignore this case here
174 * and assume that EINVAL always means: you have to wait manually. 191 * and assume that EINVAL always means: you have to wait manually.
175 */ 192 */
176 if (errno == EINVAL) 193 if (errno == EINVAL)
… …
183 if (errno == EBADF) 200 if (errno == EBADF)
184 fd_ebadf (EV_A); 201 fd_ebadf (EV_A);
185 else if (errno == ENOMEM && !syserr_cb) 202 else if (errno == ENOMEM && !syserr_cb)
186 fd_enomem (EV_A); 203 fd_enomem (EV_A);
187 else if (errno != EINTR) 204 else if (errno != EINTR)
188 syserr ("(libev) select"); 205 ev_syserr ("(libev) select");
189 206
190 return; 207 return;
191 } 208 }
192 209
193#if EV_SELECT_USE_FD_SET 210#if EV_SELECT_USE_FD_SET
… …
252 backend_fudge = 0.; /* posix says this is zero */ 269 backend_fudge = 0.; /* posix says this is zero */
253 backend_modify = select_modify; 270 backend_modify = select_modify;
254 backend_poll = select_poll; 271 backend_poll = select_poll;
255 272
256#if EV_SELECT_USE_FD_SET 273#if EV_SELECT_USE_FD_SET
257 vec_max = FD_SETSIZE / 32;
258 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri); 274 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
259 vec_ro = ev_malloc (sizeof (fd_set)); 275 vec_ro = ev_malloc (sizeof (fd_set));
260 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi); 276 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
261 vec_wo = ev_malloc (sizeof (fd_set)); 277 vec_wo = ev_malloc (sizeof (fd_set));
262 #ifdef _WIN32 278 #ifdef _WIN32
263 vec_eo = ev_malloc (sizeof (fd_set)); 279 vec_eo = ev_malloc (sizeof (fd_set));
264 #endif 280 #endif
265#else 281#else
266 vec_max = 0; 282 vec_max = 0;
267 vec_ri = 0; 283 vec_ri = 0;
268 vec_ri = 0; 284 vec_ro = 0;
285 vec_wi = 0;
269 vec_wo = 0; 286 vec_wo = 0;
287 #ifdef _WIN32
270 vec_wo = 0; 288 vec_eo = 0;
289 #endif
271#endif 290#endif
272 291
273 return EVBACKEND_SELECT; 292 return EVBACKEND_SELECT;
274} 293}
275 294
… …
278{ 297{
279 ev_free (vec_ri); 298 ev_free (vec_ri);
280 ev_free (vec_ro); 299 ev_free (vec_ro);
281 ev_free (vec_wi); 300 ev_free (vec_wi);
282 ev_free (vec_wo); 301 ev_free (vec_wo);
302 #ifdef _WIN32
303 ev_free (vec_eo);
304 #endif
283} 305}
284 306
285 307

Diff Legend

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