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.32 by root, Mon May 26 03:54:40 2008 UTC vs.
Revision 1.39 by root, Mon Jan 5 14:41:35 2009 UTC

… …
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 /* FD_SET is broken on windows (it adds the fd to a set twice or more,
83 * which eventually leads to overflows). Need to call it only on changes.
84 */
85 #if EV_SELECT_IS_WINSOCKET
86 if ((oev ^ nev) & EV_READ)
87 #endif
80 if (nev & EV_READ) 88 if (nev & EV_READ)
81 FD_SET (handle, (fd_set *)vec_ri); 89 FD_SET (handle, (fd_set *)vec_ri);
82 else 90 else
83 FD_CLR (handle, (fd_set *)vec_ri); 91 FD_CLR (handle, (fd_set *)vec_ri);
84 92
93 #if EV_SELECT_IS_WINSOCKET
94 if ((oev ^ nev) & EV_WRITE)
95 #endif
85 if (nev & EV_WRITE) 96 if (nev & EV_WRITE)
86 FD_SET (handle, (fd_set *)vec_wi); 97 FD_SET (handle, (fd_set *)vec_wi);
87 else 98 else
88 FD_CLR (handle, (fd_set *)vec_wi); 99 FD_CLR (handle, (fd_set *)vec_wi);
89 100
90#else 101#else
91 102
92 int word = fd / NFDBITS; 103 int word = fd / NFDBITS;
93 fd_mask mask = 1UL << (fd % NFDBITS); 104 fd_mask mask = 1UL << (fd % NFDBITS);
… …
98 109
99 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES); 110 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
100 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */ 111 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */
101 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES); 112 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
102 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */ 113 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */
114 #ifdef _WIN32
115 vec_eo = ev_realloc (vec_eo, new_max * NFDBYTES); /* could free/malloc */
116 #endif
103 117
104 for (; vec_max < new_max; ++vec_max) 118 for (; vec_max < new_max; ++vec_max)
105 ((fd_mask *)vec_ri) [vec_max] = 119 ((fd_mask *)vec_ri) [vec_max] =
106 ((fd_mask *)vec_wi) [vec_max] = 0; 120 ((fd_mask *)vec_wi) [vec_max] = 0;
107 } 121 }
… …
120static void 134static void
121select_poll (EV_P_ ev_tstamp timeout) 135select_poll (EV_P_ ev_tstamp timeout)
122{ 136{
123 struct timeval tv; 137 struct timeval tv;
124 int res; 138 int res;
125 139 int fd_setsize;
126#if EV_SELECT_USE_FD_SET
127 memcpy (vec_ro, vec_ri, sizeof (fd_set));
128 memcpy (vec_wo, vec_wi, sizeof (fd_set));
129#else
130 memcpy (vec_ro, vec_ri, vec_max * NFDBYTES);
131 memcpy (vec_wo, vec_wi, vec_max * NFDBYTES);
132#endif
133 140
134 tv.tv_sec = (long)timeout; 141 tv.tv_sec = (long)timeout;
135 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 142 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
143
144#if EV_SELECT_USE_FD_SET
145 fd_setsize = sizeof (fd_set);
146#else
147 fd_setsize = vec_max * NFDBYTES;
148#endif
149
150 memcpy (vec_ro, vec_ri, fd_setsize);
151 memcpy (vec_wo, vec_wi, fd_setsize);
136 152
137#ifdef _WIN32 153#ifdef _WIN32
138 /* pass in the write set as except set. 154 /* pass in the write set as except set.
139 * the idea behind this is to work around a windows bug that causes 155 * the idea behind this is to work around a windows bug that causes
140 * errors to be reported as an exception and not by setting 156 * errors to be reported as an exception and not by setting
141 * the writable bit. this is so uncontrollably lame. 157 * the writable bit. this is so uncontrollably lame.
142 */ 158 */
159 memcpy (vec_eo, vec_wi, fd_setsize);
143 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_wo, &tv); 160 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_eo, &tv);
144#else 161#else
145 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 162 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
146#endif 163#endif
147 164
148 if (expect_false (res < 0)) 165 if (expect_false (res < 0))
… …
160 #endif 177 #endif
161 178
162 #ifdef _WIN32 179 #ifdef _WIN32
163 /* select on windows errornously returns EINVAL when no fd sets have been 180 /* select on windows errornously returns EINVAL when no fd sets have been
164 * provided (this is documented). what microsoft doesn't tell you that this bug 181 * provided (this is documented). what microsoft doesn't tell you that this bug
165 * exists even when the fd sets are provided, so we have to check for this bug 182 * exists even when the fd sets _are_ provided, so we have to check for this bug
166 * here and emulate by sleeping manually. 183 * here and emulate by sleeping manually.
167 * we also get EINVAL when the timeout is invalid, but we ignore this case here 184 * we also get EINVAL when the timeout is invalid, but we ignore this case here
168 * and assume that EINVAL always means: you have to wait manually. 185 * and assume that EINVAL always means: you have to wait manually.
169 */ 186 */
170 if (errno == EINVAL) 187 if (errno == EINVAL)
… …
177 if (errno == EBADF) 194 if (errno == EBADF)
178 fd_ebadf (EV_A); 195 fd_ebadf (EV_A);
179 else if (errno == ENOMEM && !syserr_cb) 196 else if (errno == ENOMEM && !syserr_cb)
180 fd_enomem (EV_A); 197 fd_enomem (EV_A);
181 else if (errno != EINTR) 198 else if (errno != EINTR)
182 syserr ("(libev) select"); 199 ev_syserr ("(libev) select");
183 200
184 return; 201 return;
185 } 202 }
186 203
187#if EV_SELECT_USE_FD_SET 204#if EV_SELECT_USE_FD_SET
… …
199 int handle = fd; 216 int handle = fd;
200 #endif 217 #endif
201 218
202 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ; 219 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
203 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE; 220 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
221 #ifdef _WIN32
222 if (FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
223 #endif
204 224
205 if (expect_true (events)) 225 if (expect_true (events))
206 fd_event (EV_A_ fd, events); 226 fd_event (EV_A_ fd, events);
207 } 227 }
208 } 228 }
… …
213 int word, bit; 233 int word, bit;
214 for (word = vec_max; word--; ) 234 for (word = vec_max; word--; )
215 { 235 {
216 fd_mask word_r = ((fd_mask *)vec_ro) [word]; 236 fd_mask word_r = ((fd_mask *)vec_ro) [word];
217 fd_mask word_w = ((fd_mask *)vec_wo) [word]; 237 fd_mask word_w = ((fd_mask *)vec_wo) [word];
238 #ifdef _WIN32
239 word_w |= ((fd_mask *)vec_eo) [word];
240 #endif
218 241
219 if (word_r || word_w) 242 if (word_r || word_w)
220 for (bit = NFDBITS; bit--; ) 243 for (bit = NFDBITS; bit--; )
221 { 244 {
222 fd_mask mask = 1UL << bit; 245 fd_mask mask = 1UL << bit;
… …
245 vec_max = FD_SETSIZE / 32; 268 vec_max = FD_SETSIZE / 32;
246 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri); 269 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
247 vec_ro = ev_malloc (sizeof (fd_set)); 270 vec_ro = ev_malloc (sizeof (fd_set));
248 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi); 271 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
249 vec_wo = ev_malloc (sizeof (fd_set)); 272 vec_wo = ev_malloc (sizeof (fd_set));
273 #ifdef _WIN32
274 vec_eo = ev_malloc (sizeof (fd_set));
275 #endif
250#else 276#else
251 vec_max = 0; 277 vec_max = 0;
252 vec_ri = 0; 278 vec_ri = 0;
253 vec_ri = 0; 279 vec_ri = 0;
254 vec_wo = 0; 280 vec_wo = 0;

Diff Legend

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