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.36 by root, Wed Jun 4 07:42:58 2008 UTC vs.
Revision 1.49 by root, Sat Oct 16 06:46:55 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,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 *
… …
77 SOCKET handle = anfds [fd].handle; 77 SOCKET handle = anfds [fd].handle;
78 #else 78 #else
79 int handle = fd; 79 int handle = fd;
80 #endif 80 #endif
81 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
82 if (nev & EV_READ) 90 if (nev & EV_READ)
83 FD_SET (handle, (fd_set *)vec_ri); 91 FD_SET (handle, (fd_set *)vec_ri);
84 else 92 else
85 FD_CLR (handle, (fd_set *)vec_ri); 93 FD_CLR (handle, (fd_set *)vec_ri);
86 94
95 #if EV_SELECT_IS_WINSOCKET
96 if ((oev ^ nev) & EV_WRITE)
97 #endif
87 if (nev & EV_WRITE) 98 if (nev & EV_WRITE)
88 FD_SET (handle, (fd_set *)vec_wi); 99 FD_SET (handle, (fd_set *)vec_wi);
89 else 100 else
90 FD_CLR (handle, (fd_set *)vec_wi); 101 FD_CLR (handle, (fd_set *)vec_wi);
91 102
92#else 103#else
93 104
94 int word = fd / NFDBITS; 105 int word = fd / NFDBITS;
95 fd_mask mask = 1UL << (fd % NFDBITS); 106 fd_mask mask = 1UL << (fd % NFDBITS);
… …
127{ 138{
128 struct timeval tv; 139 struct timeval tv;
129 int res; 140 int res;
130 int fd_setsize; 141 int fd_setsize;
131 142
132 tv.tv_sec = (long)timeout; 143 EV_RELEASE_CB;
133 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 144 EV_TV_SET (tv, timeout);
134 145
135#if EV_SELECT_USE_FD_SET 146#if EV_SELECT_USE_FD_SET
136 fd_setsize = sizeof (fd_set); 147 fd_setsize = sizeof (fd_set);
137#else 148#else
138 fd_setsize = vec_max * NFDBYTES; 149 fd_setsize = vec_max * NFDBYTES;
… …
147 * errors to be reported as an exception and not by setting 158 * errors to be reported as an exception and not by setting
148 * the writable bit. this is so uncontrollably lame. 159 * the writable bit. this is so uncontrollably lame.
149 */ 160 */
150 memcpy (vec_eo, vec_wi, fd_setsize); 161 memcpy (vec_eo, vec_wi, fd_setsize);
151 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);
152#else 166#else
153 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);
154#endif 168#endif
169 EV_ACQUIRE_CB;
155 170
156 if (expect_false (res < 0)) 171 if (expect_false (res < 0))
157 { 172 {
158 #if EV_SELECT_IS_WINSOCKET 173 #if EV_SELECT_IS_WINSOCKET
159 errno = WSAGetLastError (); 174 errno = WSAGetLastError ();
… …
166 else 181 else
167 errno -= WSABASEERR; 182 errno -= WSABASEERR;
168 #endif 183 #endif
169 184
170 #ifdef _WIN32 185 #ifdef _WIN32
171 /* 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
172 * 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
173 * 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
174 * here and emulate by sleeping manually. 189 * here and emulate by sleeping manually.
175 * 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
176 * and assume that EINVAL always means: you have to wait manually. 191 * and assume that EINVAL always means: you have to wait manually.
177 */ 192 */
178 if (errno == EINVAL) 193 if (errno == EINVAL)
… …
185 if (errno == EBADF) 200 if (errno == EBADF)
186 fd_ebadf (EV_A); 201 fd_ebadf (EV_A);
187 else if (errno == ENOMEM && !syserr_cb) 202 else if (errno == ENOMEM && !syserr_cb)
188 fd_enomem (EV_A); 203 fd_enomem (EV_A);
189 else if (errno != EINTR) 204 else if (errno != EINTR)
190 syserr ("(libev) select"); 205 ev_syserr ("(libev) select");
191 206
192 return; 207 return;
193 } 208 }
194 209
195#if EV_SELECT_USE_FD_SET 210#if EV_SELECT_USE_FD_SET
… …
254 backend_fudge = 0.; /* posix says this is zero */ 269 backend_fudge = 0.; /* posix says this is zero */
255 backend_modify = select_modify; 270 backend_modify = select_modify;
256 backend_poll = select_poll; 271 backend_poll = select_poll;
257 272
258#if EV_SELECT_USE_FD_SET 273#if EV_SELECT_USE_FD_SET
259 vec_max = FD_SETSIZE / 32;
260 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);
261 vec_ro = ev_malloc (sizeof (fd_set)); 275 vec_ro = ev_malloc (sizeof (fd_set));
262 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);
263 vec_wo = ev_malloc (sizeof (fd_set)); 277 vec_wo = ev_malloc (sizeof (fd_set));
264 #ifdef _WIN32 278 #ifdef _WIN32
265 vec_eo = ev_malloc (sizeof (fd_set)); 279 vec_eo = ev_malloc (sizeof (fd_set));
266 #endif 280 #endif
267#else 281#else
268 vec_max = 0; 282 vec_max = 0;
269 vec_ri = 0; 283 vec_ri = 0;
270 vec_ri = 0; 284 vec_ro = 0;
285 vec_wi = 0;
271 vec_wo = 0; 286 vec_wo = 0;
287 #ifdef _WIN32
272 vec_wo = 0; 288 vec_eo = 0;
289 #endif
273#endif 290#endif
274 291
275 return EVBACKEND_SELECT; 292 return EVBACKEND_SELECT;
276} 293}
277 294
… …
280{ 297{
281 ev_free (vec_ri); 298 ev_free (vec_ri);
282 ev_free (vec_ro); 299 ev_free (vec_ro);
283 ev_free (vec_wi); 300 ev_free (vec_wi);
284 ev_free (vec_wo); 301 ev_free (vec_wo);
302 #ifdef _WIN32
303 ev_free (vec_eo);
304 #endif
285} 305}
286 306
287 307

Diff Legend

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