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.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,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 *
… …
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 tv.tv_sec = (long)timeout; 143 EV_RELEASE_CB;
144 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 144 EV_TV_SET (tv, timeout);
145 145
146#if EV_SELECT_USE_FD_SET 146#if EV_SELECT_USE_FD_SET
147 fd_setsize = sizeof (fd_set); 147 fd_setsize = sizeof (fd_set);
148#else 148#else
149 fd_setsize = vec_max * NFDBYTES; 149 fd_setsize = vec_max * NFDBYTES;
… …
164 fd_setsize = anfdmax < FD_SETSIZE ? anfdmax : FD_SETSIZE; 164 fd_setsize = anfdmax < FD_SETSIZE ? anfdmax : FD_SETSIZE;
165 res = select (fd_setsize, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 165 res = select (fd_setsize, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
166#else 166#else
167 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);
168#endif 168#endif
169 EV_ACQUIRE_CB;
169 170
170 if (expect_false (res < 0)) 171 if (expect_false (res < 0))
171 { 172 {
172 #if EV_SELECT_IS_WINSOCKET 173 #if EV_SELECT_IS_WINSOCKET
173 errno = WSAGetLastError (); 174 errno = WSAGetLastError ();
… …
180 else 181 else
181 errno -= WSABASEERR; 182 errno -= WSABASEERR;
182 #endif 183 #endif
183 184
184 #ifdef _WIN32 185 #ifdef _WIN32
185 /* 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
186 * 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
187 * 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
188 * here and emulate by sleeping manually. 189 * here and emulate by sleeping manually.
189 * 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
190 * and assume that EINVAL always means: you have to wait manually. 191 * and assume that EINVAL always means: you have to wait manually.
… …
278 vec_eo = ev_malloc (sizeof (fd_set)); 279 vec_eo = ev_malloc (sizeof (fd_set));
279 #endif 280 #endif
280#else 281#else
281 vec_max = 0; 282 vec_max = 0;
282 vec_ri = 0; 283 vec_ri = 0;
283 vec_ri = 0; 284 vec_ro = 0;
285 vec_wi = 0;
284 vec_wo = 0; 286 vec_wo = 0;
287 #ifdef _WIN32
285 vec_wo = 0; 288 vec_eo = 0;
289 #endif
286#endif 290#endif
287 291
288 return EVBACKEND_SELECT; 292 return EVBACKEND_SELECT;
289} 293}
290 294
… …
293{ 297{
294 ev_free (vec_ri); 298 ev_free (vec_ri);
295 ev_free (vec_ro); 299 ev_free (vec_ro);
296 ev_free (vec_wi); 300 ev_free (vec_wi);
297 ev_free (vec_wo); 301 ev_free (vec_wo);
302 #ifdef _WIN32
303 ev_free (vec_eo);
304 #endif
298} 305}
299 306
300 307

Diff Legend

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