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.28 by root, Sun Mar 16 16:38:23 2008 UTC vs.
Revision 1.36 by root, Wed Jun 4 07:42:58 2008 UTC

1/* 1/*
2 * libev select fd activity backend 2 * libev select fd activity backend
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 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 EINTR 57# undef NFDBITS
58# define EINTR WSAEINTR 58# define NFDBITS 0
59# undef EBADF
60# define EBADF WSAENOTSOCK
61# undef ENOMEM
62# define ENOMEM (errno + 1)
63#endif 59#endif
64 60
65#if !EV_SELECT_USE_FD_SET 61#if !EV_SELECT_USE_FD_SET
66# define NFDBYTES (NFDBITS / 8) 62# define NFDBYTES (NFDBITS / 8)
67#endif 63#endif
… …
96#else 92#else
97 93
98 int word = fd / NFDBITS; 94 int word = fd / NFDBITS;
99 fd_mask mask = 1UL << (fd % NFDBITS); 95 fd_mask mask = 1UL << (fd % NFDBITS);
100 96
101 if (expect_false (vec_max < word + 1)) 97 if (expect_false (vec_max <= word))
102 { 98 {
103 int new_max = word + 1; 99 int new_max = word + 1;
104 100
105 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES); 101 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
106 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */ 102 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */
107 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES); 103 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
108 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */ 104 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */
105 #ifdef _WIN32
106 vec_eo = ev_realloc (vec_eo, new_max * NFDBYTES); /* could free/malloc */
107 #endif
109 108
110 for (; vec_max < new_max; ++vec_max) 109 for (; vec_max < new_max; ++vec_max)
111 ((fd_mask *)vec_ri) [vec_max] = 110 ((fd_mask *)vec_ri) [vec_max] =
112 ((fd_mask *)vec_wi) [vec_max] = 0; 111 ((fd_mask *)vec_wi) [vec_max] = 0;
113 } 112 }
… …
126static void 125static void
127select_poll (EV_P_ ev_tstamp timeout) 126select_poll (EV_P_ ev_tstamp timeout)
128{ 127{
129 struct timeval tv; 128 struct timeval tv;
130 int res; 129 int res;
131 130 int fd_setsize;
132#if EV_SELECT_USE_FD_SET
133 memcpy (vec_ro, vec_ri, sizeof (fd_set));
134 memcpy (vec_wo, vec_wi, sizeof (fd_set));
135#else
136 memcpy (vec_ro, vec_ri, vec_max * NFDBYTES);
137 memcpy (vec_wo, vec_wi, vec_max * NFDBYTES);
138#endif
139 131
140 tv.tv_sec = (long)timeout; 132 tv.tv_sec = (long)timeout;
141 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 133 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
142 134
135#if EV_SELECT_USE_FD_SET
136 fd_setsize = sizeof (fd_set);
137#else
138 fd_setsize = vec_max * NFDBYTES;
139#endif
140
141 memcpy (vec_ro, vec_ri, fd_setsize);
142 memcpy (vec_wo, vec_wi, fd_setsize);
143
144#ifdef _WIN32
145 /* pass in the write set as except set.
146 * the idea behind this is to work around a windows bug that causes
147 * errors to be reported as an exception and not by setting
148 * the writable bit. this is so uncontrollably lame.
149 */
150 memcpy (vec_eo, vec_wi, fd_setsize);
151 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_eo, &tv);
152#else
143 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 153 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
154#endif
144 155
145 if (expect_false (res < 0)) 156 if (expect_false (res < 0))
146 { 157 {
147 #if EV_SELECT_IS_WINSOCKET 158 #if EV_SELECT_IS_WINSOCKET
148 errno = WSAGetLastError (); 159 errno = WSAGetLastError ();
160 #endif
161 #ifdef WSABASEERR
162 /* on windows, select returns incompatible error codes, fix this */
163 if (errno >= WSABASEERR && errno < WSABASEERR + 1000)
164 if (errno == WSAENOTSOCK)
165 errno = EBADF;
166 else
167 errno -= WSABASEERR;
168 #endif
169
170 #ifdef _WIN32
171 /* select on windows errornously returns EINVAL when no fd sets have been
172 * provided (this is documented). what microsoft doesn't tell you that this bug
173 * exists even when the fd sets are provided, so we have to check for this bug
174 * here and emulate by sleeping manually.
175 * we also get EINVAL when the timeout is invalid, but we ignore this case here
176 * and assume that EINVAL always means: you have to wait manually.
177 */
178 if (errno == EINVAL)
179 {
180 ev_sleep (timeout);
181 return;
182 }
149 #endif 183 #endif
150 184
151 if (errno == EBADF) 185 if (errno == EBADF)
152 fd_ebadf (EV_A); 186 fd_ebadf (EV_A);
153 else if (errno == ENOMEM && !syserr_cb) 187 else if (errno == ENOMEM && !syserr_cb)
… …
173 int handle = fd; 207 int handle = fd;
174 #endif 208 #endif
175 209
176 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ; 210 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
177 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE; 211 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
212 #ifdef _WIN32
213 if (FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
214 #endif
178 215
179 if (expect_true (events)) 216 if (expect_true (events))
180 fd_event (EV_A_ fd, events); 217 fd_event (EV_A_ fd, events);
181 } 218 }
182 } 219 }
… …
187 int word, bit; 224 int word, bit;
188 for (word = vec_max; word--; ) 225 for (word = vec_max; word--; )
189 { 226 {
190 fd_mask word_r = ((fd_mask *)vec_ro) [word]; 227 fd_mask word_r = ((fd_mask *)vec_ro) [word];
191 fd_mask word_w = ((fd_mask *)vec_wo) [word]; 228 fd_mask word_w = ((fd_mask *)vec_wo) [word];
229 #ifdef _WIN32
230 word_w |= ((fd_mask *)vec_eo) [word];
231 #endif
192 232
193 if (word_r || word_w) 233 if (word_r || word_w)
194 for (bit = NFDBITS; bit--; ) 234 for (bit = NFDBITS; bit--; )
195 { 235 {
196 fd_mask mask = 1UL << bit; 236 fd_mask mask = 1UL << bit;
… …
219 vec_max = FD_SETSIZE / 32; 259 vec_max = FD_SETSIZE / 32;
220 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri); 260 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
221 vec_ro = ev_malloc (sizeof (fd_set)); 261 vec_ro = ev_malloc (sizeof (fd_set));
222 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi); 262 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
223 vec_wo = ev_malloc (sizeof (fd_set)); 263 vec_wo = ev_malloc (sizeof (fd_set));
264 #ifdef _WIN32
265 vec_eo = ev_malloc (sizeof (fd_set));
266 #endif
224#else 267#else
225 vec_max = 0; 268 vec_max = 0;
226 vec_ri = 0; 269 vec_ri = 0;
227 vec_ri = 0; 270 vec_ri = 0;
228 vec_wo = 0; 271 vec_wo = 0;

Diff Legend

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