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.42 by root, Wed Jan 7 20:45:52 2009 UTC vs.
Revision 1.47 by sf-exg, Sat Jul 31 23:00:11 2010 UTC

138{ 138{
139 struct timeval tv; 139 struct timeval tv;
140 int res; 140 int res;
141 int fd_setsize; 141 int fd_setsize;
142 142
143 EV_RELEASE_CB;
143 tv.tv_sec = (long)timeout; 144 tv.tv_sec = (long)timeout;
144 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 145 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
145 146
146#if EV_SELECT_USE_FD_SET 147#if EV_SELECT_USE_FD_SET
147 fd_setsize = sizeof (fd_set); 148 fd_setsize = sizeof (fd_set);
164 fd_setsize = anfdmax < FD_SETSIZE ? anfdmax : FD_SETSIZE; 165 fd_setsize = anfdmax < FD_SETSIZE ? anfdmax : FD_SETSIZE;
165 res = select (fd_setsize, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 166 res = select (fd_setsize, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
166#else 167#else
167 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 168 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
168#endif 169#endif
170 EV_ACQUIRE_CB;
169 171
170 if (expect_false (res < 0)) 172 if (expect_false (res < 0))
171 { 173 {
172 #if EV_SELECT_IS_WINSOCKET 174 #if EV_SELECT_IS_WINSOCKET
173 errno = WSAGetLastError (); 175 errno = WSAGetLastError ();
180 else 182 else
181 errno -= WSABASEERR; 183 errno -= WSABASEERR;
182 #endif 184 #endif
183 185
184 #ifdef _WIN32 186 #ifdef _WIN32
185 /* select on windows errornously returns EINVAL when no fd sets have been 187 /* select on windows erroneously returns EINVAL when no fd sets have been
186 * provided (this is documented). what microsoft doesn't tell you that this bug 188 * provided (this is documented). what microsoft doesn't tell you that this bug
187 * exists even when the fd sets _are_ provided, so we have to check for this bug 189 * exists even when the fd sets _are_ provided, so we have to check for this bug
188 * here and emulate by sleeping manually. 190 * here and emulate by sleeping manually.
189 * we also get EINVAL when the timeout is invalid, but we ignore this case here 191 * we also get EINVAL when the timeout is invalid, but we ignore this case here
190 * and assume that EINVAL always means: you have to wait manually. 192 * and assume that EINVAL always means: you have to wait manually.
278 vec_eo = ev_malloc (sizeof (fd_set)); 280 vec_eo = ev_malloc (sizeof (fd_set));
279 #endif 281 #endif
280#else 282#else
281 vec_max = 0; 283 vec_max = 0;
282 vec_ri = 0; 284 vec_ri = 0;
283 vec_ri = 0; 285 vec_ro = 0;
286 vec_wi = 0;
284 vec_wo = 0; 287 vec_wo = 0;
288 #ifdef _WIN32
285 vec_wo = 0; 289 vec_eo = 0;
290 #endif
286#endif 291#endif
287 292
288 return EVBACKEND_SELECT; 293 return EVBACKEND_SELECT;
289} 294}
290 295
293{ 298{
294 ev_free (vec_ri); 299 ev_free (vec_ri);
295 ev_free (vec_ro); 300 ev_free (vec_ro);
296 ev_free (vec_wi); 301 ev_free (vec_wi);
297 ev_free (vec_wo); 302 ev_free (vec_wo);
303 #ifdef _WIN32
304 ev_free (vec_eo);
305 #endif
298} 306}
299 307
300 308

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines