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.27 by root, Tue Dec 25 07:05:45 2007 UTC vs.
Revision 1.33 by root, Mon May 26 04:14:32 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
58# define EINTR WSAEINTR
59# undef EBADF
60# define EBADF WSAENOTSOCK
61# undef ENOMEM
62# define ENOMEM (errno + 1)
63#endif 57#endif
64 58
65#if !EV_SELECT_USE_FD_SET 59#if !EV_SELECT_USE_FD_SET
66# define NFDBYTES (NFDBITS / 8) 60# define NFDBYTES (NFDBITS / 8)
67#endif 61#endif
… …
93 else 87 else
94 FD_CLR (handle, (fd_set *)vec_wi); 88 FD_CLR (handle, (fd_set *)vec_wi);
95 89
96#else 90#else
97 91
98 int word = fd / NFDBITS; 92 int word = fd / NFDBITS;
99 int mask = 1UL << (fd % NFDBITS); 93 fd_mask mask = 1UL << (fd % NFDBITS);
100 94
101 if (expect_false (vec_max < word + 1)) 95 if (expect_false (vec_max <= word))
102 { 96 {
103 int new_max = word + 1; 97 int new_max = word + 1;
104 98
105 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES); 99 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
106 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */ 100 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */
107 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES); 101 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
108 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */ 102 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */
103 #ifdef _WIN32
104 vec_eo = ev_realloc (vec_eo, new_max * NFDBYTES); /* could free/malloc */
105 #endif
109 106
110 for (; vec_max < new_max; ++vec_max) 107 for (; vec_max < new_max; ++vec_max)
111 ((fd_mask *)vec_ri)[vec_max] = 108 ((fd_mask *)vec_ri) [vec_max] =
112 ((fd_mask *)vec_wi)[vec_max] = 0; 109 ((fd_mask *)vec_wi) [vec_max] = 0;
113 } 110 }
114 111
115 ((fd_mask *)vec_ri) [word] |= mask; 112 ((fd_mask *)vec_ri) [word] |= mask;
116 if (!(nev & EV_READ)) 113 if (!(nev & EV_READ))
117 ((fd_mask *)vec_ri) [word] &= ~mask; 114 ((fd_mask *)vec_ri) [word] &= ~mask;
… …
126static void 123static void
127select_poll (EV_P_ ev_tstamp timeout) 124select_poll (EV_P_ ev_tstamp timeout)
128{ 125{
129 struct timeval tv; 126 struct timeval tv;
130 int res; 127 int res;
131 128 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 129
140 tv.tv_sec = (long)timeout; 130 tv.tv_sec = (long)timeout;
141 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 131 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
142 132
133#if EV_SELECT_USE_FD_SET
134 fd_setsize = sizeof (fd_set);
135#else
136 fd_setsize = vec_max * NFDBYTES;
137#endif
138
139 memcpy (vec_ro, vec_ri, fd_setsize);
140 memcpy (vec_wo, vec_wi, fd_setsize);
141
142#ifdef _WIN32
143 /* pass in the write set as except set.
144 * the idea behind this is to work around a windows bug that causes
145 * errors to be reported as an exception and not by setting
146 * the writable bit. this is so uncontrollably lame.
147 */
148 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);
150#else
143 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 151 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
152#endif
144 153
145 if (expect_false (res < 0)) 154 if (expect_false (res < 0))
146 { 155 {
147 #if EV_SELECT_IS_WINSOCKET 156 #if EV_SELECT_IS_WINSOCKET
148 errno = WSAGetLastError (); 157 errno = WSAGetLastError ();
158 #endif
159 #ifdef WSABASEERR
160 /* on windows, select returns incompatible error codes, fix this */
161 if (errno >= WSABASEERR && errno < WSABASEERR + 1000)
162 if (errno == WSAENOTSOCK)
163 errno = EBADF;
164 else
165 errno -= WSABASEERR;
166 #endif
167
168 #ifdef _WIN32
169 /* 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
171 * exists even when the fd sets are provided, so we have to check for this bug
172 * here and emulate by sleeping manually.
173 * 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.
175 */
176 if (errno == EINVAL)
177 {
178 ev_sleep (timeout);
179 return;
180 }
149 #endif 181 #endif
150 182
151 if (errno == EBADF) 183 if (errno == EBADF)
152 fd_ebadf (EV_A); 184 fd_ebadf (EV_A);
153 else if (errno == ENOMEM && !syserr_cb) 185 else if (errno == ENOMEM && !syserr_cb)
… …
173 int handle = fd; 205 int handle = fd;
174 #endif 206 #endif
175 207
176 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ; 208 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
177 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE; 209 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
210 #ifdef _WIN32
211 if (FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
212 #endif
178 213
179 if (expect_true (events)) 214 if (expect_true (events))
180 fd_event (EV_A_ fd, events); 215 fd_event (EV_A_ fd, events);
181 } 216 }
182 } 217 }
… …
187 int word, bit; 222 int word, bit;
188 for (word = vec_max; word--; ) 223 for (word = vec_max; word--; )
189 { 224 {
190 fd_mask word_r = ((fd_mask *)vec_ro) [word]; 225 fd_mask word_r = ((fd_mask *)vec_ro) [word];
191 fd_mask word_w = ((fd_mask *)vec_wo) [word]; 226 fd_mask word_w = ((fd_mask *)vec_wo) [word];
227 #ifdef _WIN32
228 word_w |= ((fd_mask *)vec_eo) [word];
229 #endif
192 230
193 if (word_r || word_w) 231 if (word_r || word_w)
194 for (bit = NFDBITS; bit--; ) 232 for (bit = NFDBITS; bit--; )
195 { 233 {
196 fd_mask mask = 1UL << bit; 234 fd_mask mask = 1UL << bit;
… …
219 vec_max = FD_SETSIZE / 32; 257 vec_max = FD_SETSIZE / 32;
220 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri); 258 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
221 vec_ro = ev_malloc (sizeof (fd_set)); 259 vec_ro = ev_malloc (sizeof (fd_set));
222 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi); 260 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
223 vec_wo = ev_malloc (sizeof (fd_set)); 261 vec_wo = ev_malloc (sizeof (fd_set));
262 #ifdef _WIN32
263 vec_eo = ev_malloc (sizeof (fd_set));
264 #endif
224#else 265#else
225 vec_max = 0; 266 vec_max = 0;
226 vec_ri = 0; 267 vec_ri = 0;
227 vec_ri = 0; 268 vec_ri = 0;
228 vec_wo = 0; 269 vec_wo = 0;

Diff Legend

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