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.35 by root, Mon May 26 04:59:08 2008 UTC vs.
Revision 1.43 by root, Thu Jul 9 09:11:20 2009 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 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 *
… …
52#endif 52#endif
53 53
54#if EV_SELECT_IS_WINSOCKET 54#if EV_SELECT_IS_WINSOCKET
55# undef EV_SELECT_USE_FD_SET 55# undef EV_SELECT_USE_FD_SET
56# define EV_SELECT_USE_FD_SET 1 56# define EV_SELECT_USE_FD_SET 1
57# undef NFDBITS
58# define NFDBITS 0
57#endif 59#endif
58 60
59#if !EV_SELECT_USE_FD_SET 61#if !EV_SELECT_USE_FD_SET
60# define NFDBYTES (NFDBITS / 8) 62# define NFDBYTES (NFDBITS / 8)
61#endif 63#endif
… …
75 SOCKET handle = anfds [fd].handle; 77 SOCKET handle = anfds [fd].handle;
76 #else 78 #else
77 int handle = fd; 79 int handle = fd;
78 #endif 80 #endif
79 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
80 if (nev & EV_READ) 90 if (nev & EV_READ)
81 FD_SET (handle, (fd_set *)vec_ri); 91 FD_SET (handle, (fd_set *)vec_ri);
82 else 92 else
83 FD_CLR (handle, (fd_set *)vec_ri); 93 FD_CLR (handle, (fd_set *)vec_ri);
84 94
95 #if EV_SELECT_IS_WINSOCKET
96 if ((oev ^ nev) & EV_WRITE)
97 #endif
85 if (nev & EV_WRITE) 98 if (nev & EV_WRITE)
86 FD_SET (handle, (fd_set *)vec_wi); 99 FD_SET (handle, (fd_set *)vec_wi);
87 else 100 else
88 FD_CLR (handle, (fd_set *)vec_wi); 101 FD_CLR (handle, (fd_set *)vec_wi);
89 102
90#else 103#else
91 104
92 int word = fd / NFDBITS; 105 int word = fd / NFDBITS;
93 fd_mask mask = 1UL << (fd % NFDBITS); 106 fd_mask mask = 1UL << (fd % NFDBITS);
… …
125{ 138{
126 struct timeval tv; 139 struct timeval tv;
127 int res; 140 int res;
128 int fd_setsize; 141 int fd_setsize;
129 142
143 if (expect_false (suspend_cb)) suspend_cb (EV_A);
130 tv.tv_sec = (long)timeout; 144 tv.tv_sec = (long)timeout;
131 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 145 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
132 146
133#if EV_SELECT_USE_FD_SET 147#if EV_SELECT_USE_FD_SET
134 fd_setsize = sizeof (fd_set); 148 fd_setsize = sizeof (fd_set);
… …
145 * errors to be reported as an exception and not by setting 159 * errors to be reported as an exception and not by setting
146 * the writable bit. this is so uncontrollably lame. 160 * the writable bit. this is so uncontrollably lame.
147 */ 161 */
148 memcpy (vec_eo, vec_wi, fd_setsize); 162 memcpy (vec_eo, vec_wi, fd_setsize);
149 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_eo, &tv); 163 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_eo, &tv);
164#elif EV_SELECT_USE_FD_SET
165 fd_setsize = anfdmax < FD_SETSIZE ? anfdmax : FD_SETSIZE;
166 res = select (fd_setsize, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
150#else 167#else
151 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);
152#endif 169#endif
170 if (expect_false (resume_cb)) resume_cb (EV_A);
153 171
154 if (expect_false (res < 0)) 172 if (expect_false (res < 0))
155 { 173 {
156 #if EV_SELECT_IS_WINSOCKET 174 #if EV_SELECT_IS_WINSOCKET
157 errno = WSAGetLastError (); 175 errno = WSAGetLastError ();
… …
166 #endif 184 #endif
167 185
168 #ifdef _WIN32 186 #ifdef _WIN32
169 /* select on windows errornously returns EINVAL when no fd sets have been 187 /* select on windows errornously returns EINVAL when no fd sets have been
170 * 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
171 * 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
172 * here and emulate by sleeping manually. 190 * here and emulate by sleeping manually.
173 * 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
174 * and assume that EINVAL always means: you have to wait manually. 192 * and assume that EINVAL always means: you have to wait manually.
175 */ 193 */
176 if (errno == EINVAL) 194 if (errno == EINVAL)
… …
183 if (errno == EBADF) 201 if (errno == EBADF)
184 fd_ebadf (EV_A); 202 fd_ebadf (EV_A);
185 else if (errno == ENOMEM && !syserr_cb) 203 else if (errno == ENOMEM && !syserr_cb)
186 fd_enomem (EV_A); 204 fd_enomem (EV_A);
187 else if (errno != EINTR) 205 else if (errno != EINTR)
188 syserr ("(libev) select"); 206 ev_syserr ("(libev) select");
189 207
190 return; 208 return;
191 } 209 }
192 210
193#if EV_SELECT_USE_FD_SET 211#if EV_SELECT_USE_FD_SET
… …
252 backend_fudge = 0.; /* posix says this is zero */ 270 backend_fudge = 0.; /* posix says this is zero */
253 backend_modify = select_modify; 271 backend_modify = select_modify;
254 backend_poll = select_poll; 272 backend_poll = select_poll;
255 273
256#if EV_SELECT_USE_FD_SET 274#if EV_SELECT_USE_FD_SET
257 vec_max = FD_SETSIZE / 32;
258 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri); 275 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
259 vec_ro = ev_malloc (sizeof (fd_set)); 276 vec_ro = ev_malloc (sizeof (fd_set));
260 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi); 277 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
261 vec_wo = ev_malloc (sizeof (fd_set)); 278 vec_wo = ev_malloc (sizeof (fd_set));
262 #ifdef _WIN32 279 #ifdef _WIN32

Diff Legend

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