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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines