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.37 by root, Mon Jun 9 14:11:30 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
… …
81 SOCKET handle = anfds [fd].handle; 77 SOCKET handle = anfds [fd].handle;
82 #else 78 #else
83 int handle = fd; 79 int handle = fd;
84 #endif 80 #endif
85 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
86 if (nev & EV_READ) 88 if (nev & EV_READ)
87 FD_SET (handle, (fd_set *)vec_ri); 89 FD_SET (handle, (fd_set *)vec_ri);
88 else 90 else
89 FD_CLR (handle, (fd_set *)vec_ri); 91 FD_CLR (handle, (fd_set *)vec_ri);
90 92
93 #if EV_SELECT_IS_WINSOCKET
94 if ((oev ^ nev) & EV_WRITE)
95 #endif
91 if (nev & EV_WRITE) 96 if (nev & EV_WRITE)
92 FD_SET (handle, (fd_set *)vec_wi); 97 FD_SET (handle, (fd_set *)vec_wi);
93 else 98 else
94 FD_CLR (handle, (fd_set *)vec_wi); 99 FD_CLR (handle, (fd_set *)vec_wi);
95 100
96#else 101#else
97 102
98 int word = fd / NFDBITS; 103 int word = fd / NFDBITS;
99 int mask = 1UL << (fd % NFDBITS); 104 fd_mask mask = 1UL << (fd % NFDBITS);
100 105
101 if (expect_false (vec_max < word + 1)) 106 if (expect_false (vec_max <= word))
102 { 107 {
103 int new_max = word + 1; 108 int new_max = word + 1;
104 109
105 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES); 110 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
106 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 */
107 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES); 112 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
108 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
109 117
110 for (; vec_max < new_max; ++vec_max) 118 for (; vec_max < new_max; ++vec_max)
111 ((fd_mask *)vec_ri)[vec_max] = 119 ((fd_mask *)vec_ri) [vec_max] =
112 ((fd_mask *)vec_wi)[vec_max] = 0; 120 ((fd_mask *)vec_wi) [vec_max] = 0;
113 } 121 }
114 122
115 ((fd_mask *)vec_ri) [word] |= mask; 123 ((fd_mask *)vec_ri) [word] |= mask;
116 if (!(nev & EV_READ)) 124 if (!(nev & EV_READ))
117 ((fd_mask *)vec_ri) [word] &= ~mask; 125 ((fd_mask *)vec_ri) [word] &= ~mask;
… …
126static void 134static void
127select_poll (EV_P_ ev_tstamp timeout) 135select_poll (EV_P_ ev_tstamp timeout)
128{ 136{
129 struct timeval tv; 137 struct timeval tv;
130 int res; 138 int res;
131 139 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 140
140 tv.tv_sec = (long)timeout; 141 tv.tv_sec = (long)timeout;
141 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 142 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
142 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);
152
153#ifdef _WIN32
154 /* pass in the write set as except set.
155 * the idea behind this is to work around a windows bug that causes
156 * errors to be reported as an exception and not by setting
157 * the writable bit. this is so uncontrollably lame.
158 */
159 memcpy (vec_eo, vec_wi, fd_setsize);
160 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_eo, &tv);
161#else
143 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);
163#endif
144 164
145 if (expect_false (res < 0)) 165 if (expect_false (res < 0))
146 { 166 {
147 #if EV_SELECT_IS_WINSOCKET 167 #if EV_SELECT_IS_WINSOCKET
148 errno = WSAGetLastError (); 168 errno = WSAGetLastError ();
169 #endif
170 #ifdef WSABASEERR
171 /* on windows, select returns incompatible error codes, fix this */
172 if (errno >= WSABASEERR && errno < WSABASEERR + 1000)
173 if (errno == WSAENOTSOCK)
174 errno = EBADF;
175 else
176 errno -= WSABASEERR;
177 #endif
178
179 #ifdef _WIN32
180 /* select on windows errornously returns EINVAL when no fd sets have been
181 * provided (this is documented). what microsoft doesn't tell you that this bug
182 * exists even when the fd sets are provided, so we have to check for this bug
183 * here and emulate by sleeping manually.
184 * we also get EINVAL when the timeout is invalid, but we ignore this case here
185 * and assume that EINVAL always means: you have to wait manually.
186 */
187 if (errno == EINVAL)
188 {
189 ev_sleep (timeout);
190 return;
191 }
149 #endif 192 #endif
150 193
151 if (errno == EBADF) 194 if (errno == EBADF)
152 fd_ebadf (EV_A); 195 fd_ebadf (EV_A);
153 else if (errno == ENOMEM && !syserr_cb) 196 else if (errno == ENOMEM && !syserr_cb)
… …
173 int handle = fd; 216 int handle = fd;
174 #endif 217 #endif
175 218
176 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ; 219 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
177 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
178 224
179 if (expect_true (events)) 225 if (expect_true (events))
180 fd_event (EV_A_ fd, events); 226 fd_event (EV_A_ fd, events);
181 } 227 }
182 } 228 }
… …
187 int word, bit; 233 int word, bit;
188 for (word = vec_max; word--; ) 234 for (word = vec_max; word--; )
189 { 235 {
190 fd_mask word_r = ((fd_mask *)vec_ro) [word]; 236 fd_mask word_r = ((fd_mask *)vec_ro) [word];
191 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
192 241
193 if (word_r || word_w) 242 if (word_r || word_w)
194 for (bit = NFDBITS; bit--; ) 243 for (bit = NFDBITS; bit--; )
195 { 244 {
196 fd_mask mask = 1UL << bit; 245 fd_mask mask = 1UL << bit;
… …
219 vec_max = FD_SETSIZE / 32; 268 vec_max = FD_SETSIZE / 32;
220 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);
221 vec_ro = ev_malloc (sizeof (fd_set)); 270 vec_ro = ev_malloc (sizeof (fd_set));
222 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);
223 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
224#else 276#else
225 vec_max = 0; 277 vec_max = 0;
226 vec_ri = 0; 278 vec_ri = 0;
227 vec_ri = 0; 279 vec_ri = 0;
228 vec_wo = 0; 280 vec_wo = 0;

Diff Legend

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