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.40 by root, Tue Jan 6 19:46:56 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 *
… …
70 if (oev == nev) 70 if (oev == nev)
71 return; 71 return;
72 72
73 { 73 {
74#if EV_SELECT_USE_FD_SET 74#if EV_SELECT_USE_FD_SET
75 assert (("libev: fd >= FD_SETSIZE passed to fd_set-based select backend", fd < FD_SETSIZE));
76 75
77 #if EV_SELECT_IS_WINSOCKET 76 #if EV_SELECT_IS_WINSOCKET
78 SOCKET handle = anfds [fd].handle; 77 SOCKET handle = anfds [fd].handle;
79 #else 78 #else
80 int handle = fd; 79 int handle = fd;
81 #endif 80 #endif
81
82 assert (("libev: fd >= FD_SETSIZE passed to fd_set-based select backend", fd < FD_SETSIZE));
82 83
83 /* FD_SET is broken on windows (it adds the fd to a set twice or more, 84 /* FD_SET is broken on windows (it adds the fd to a set twice or more,
84 * which eventually leads to overflows). Need to call it only on changes. 85 * which eventually leads to overflows). Need to call it only on changes.
85 */ 86 */
86 #if EV_SELECT_IS_WINSOCKET 87 #if EV_SELECT_IS_WINSOCKET
… …
137{ 138{
138 struct timeval tv; 139 struct timeval tv;
139 int res; 140 int res;
140 int fd_setsize; 141 int fd_setsize;
141 142
142 tv.tv_sec = (long)timeout; 143 EV_RELEASE_CB;
143 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 144 EV_TV_SET (tv, timeout);
144 145
145#if EV_SELECT_USE_FD_SET 146#if EV_SELECT_USE_FD_SET
146 fd_setsize = sizeof (fd_set); 147 fd_setsize = sizeof (fd_set);
147#else 148#else
148 fd_setsize = vec_max * NFDBYTES; 149 fd_setsize = vec_max * NFDBYTES;
… …
163 fd_setsize = anfdmax < FD_SETSIZE ? anfdmax : FD_SETSIZE; 164 fd_setsize = anfdmax < FD_SETSIZE ? anfdmax : FD_SETSIZE;
164 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);
165#else 166#else
166 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);
167#endif 168#endif
169 EV_ACQUIRE_CB;
168 170
169 if (expect_false (res < 0)) 171 if (expect_false (res < 0))
170 { 172 {
171 #if EV_SELECT_IS_WINSOCKET 173 #if EV_SELECT_IS_WINSOCKET
172 errno = WSAGetLastError (); 174 errno = WSAGetLastError ();
… …
179 else 181 else
180 errno -= WSABASEERR; 182 errno -= WSABASEERR;
181 #endif 183 #endif
182 184
183 #ifdef _WIN32 185 #ifdef _WIN32
184 /* 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
185 * 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
186 * 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
187 * here and emulate by sleeping manually. 189 * here and emulate by sleeping manually.
188 * 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
189 * and assume that EINVAL always means: you have to wait manually. 191 * and assume that EINVAL always means: you have to wait manually.
… …
277 vec_eo = ev_malloc (sizeof (fd_set)); 279 vec_eo = ev_malloc (sizeof (fd_set));
278 #endif 280 #endif
279#else 281#else
280 vec_max = 0; 282 vec_max = 0;
281 vec_ri = 0; 283 vec_ri = 0;
282 vec_ri = 0; 284 vec_ro = 0;
285 vec_wi = 0;
283 vec_wo = 0; 286 vec_wo = 0;
287 #ifdef _WIN32
284 vec_wo = 0; 288 vec_eo = 0;
289 #endif
285#endif 290#endif
286 291
287 return EVBACKEND_SELECT; 292 return EVBACKEND_SELECT;
288} 293}
289 294
… …
292{ 297{
293 ev_free (vec_ri); 298 ev_free (vec_ri);
294 ev_free (vec_ro); 299 ev_free (vec_ro);
295 ev_free (vec_wi); 300 ev_free (vec_wi);
296 ev_free (vec_wo); 301 ev_free (vec_wo);
302 #ifdef _WIN32
303 ev_free (vec_eo);
304 #endif
297} 305}
298 306
299 307

Diff Legend

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