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.18 by root, Wed Nov 7 13:27:56 2007 UTC vs.
Revision 1.22 by root, Fri Nov 23 05:13:49 2007 UTC

… …
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifndef _WIN32
32/* for unix systems */ 33/* for unix systems */
33#if WIN32 34# include <sys/select.h>
34typedef unsigned int uint32_t; 35# include <inttypes.h>
36#endif
37
35# ifndef EV_SELECT_USE_FD_SET 38#ifndef EV_SELECT_USE_FD_SET
39# ifdef NFDBITS
40# define EV_SELECT_USE_FD_SET 0
41# else
36# define EV_SELECT_USE_FD_SET 1 42# define EV_SELECT_USE_FD_SET 1
37# endif 43# endif
38#else
39# include <sys/select.h>
40# include <inttypes.h>
41#endif 44#endif
42 45
43#if EV_SELECT_USE_WIN32_HANDLES 46#if EV_SELECT_IS_WINSOCKET
44# undef EV_SELECT_USE_FD_SET 47# undef EV_SELECT_USE_FD_SET
45# define EV_SELECT_USE_FD_SET 1 48# define EV_SELECT_USE_FD_SET 1
46#else 49# undef EINTR
50# define EINTR WSAEINTR
51# undef EBADF
52# define EBADF WSAENOTSOCK
53# undef ENOMEM
54# define ENOMEM (errno + 1)
55#endif
56
57#if !EV_SELECT_USE_FD_SET
58# define NFDBYTES (NFDBITS / 8)
47#endif 59#endif
48 60
49#include <string.h> 61#include <string.h>
50 62
51static void 63static void
52select_modify (EV_P_ int fd, int oev, int nev) 64select_modify (EV_P_ int fd, int oev, int nev)
53{ 65{
54 if (oev == nev) 66 if (oev == nev)
55 return; 67 return;
56 68
57#if EV_SELECT_USE_FD_SET
58# if EV_SELECT_USE_WIN32_HANDLES
59 fd = _get_osfhandle (fd);
60 if (fd < 0)
61 return;
62# endif
63
64 if (nev & EV_READ)
65 FD_SET (fd, (struct fd_set *)vec_ri);
66 else
67 FD_CLR (fd, (struct fd_set *)vec_ri);
68
69 if (nev & EV_WRITE)
70 FD_SET (fd, (struct fd_set *)vec_wi);
71 else
72 FD_CLR (fd, (struct fd_set *)vec_wi);
73#else
74 { 69 {
75 int offs = fd >> 3; 70#if EV_SELECT_USE_FD_SET
71
72 #if EV_SELECT_IS_WINSOCKET
73 SOCKET handle = anfds [fd].handle;
74 #else
75 int handle = fd;
76 #endif
77
78 if (nev & EV_READ)
79 FD_SET (handle, (fd_set *)vec_ri);
80 else
81 FD_CLR (handle, (fd_set *)vec_ri);
82
83 if (nev & EV_WRITE)
84 FD_SET (handle, (fd_set *)vec_wi);
85 else
86 FD_CLR (handle, (fd_set *)vec_wi);
87
88#else
89
90 int word = fd / NFDBITS;
76 int mask = 1 << (fd & 7); 91 int mask = 1UL << (fd % NFDBITS);
77 92
78 if (vec_max < (fd >> 5) + 1) 93 if (vec_max < word + 1)
79 { 94 {
80 int new_max = (fd >> 5) + 1; 95 int new_max = word + 1;
81 96
82 vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4); 97 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
83 vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */ 98 vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */
84 vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4); 99 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
85 vec_wo = (unsigned char *)ev_realloc (vec_wo, new_max * 4); /* could free/malloc */ 100 vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */
86 101
87 for (; vec_max < new_max; ++vec_max) 102 for (; vec_max < new_max; ++vec_max)
88 ((uint32_t *)vec_ri)[vec_max] = 103 ((fd_mask *)vec_ri)[vec_max] =
89 ((uint32_t *)vec_wi)[vec_max] = 0; 104 ((fd_mask *)vec_wi)[vec_max] = 0;
90 } 105 }
91 106
92 vec_ri [offs] |= mask; 107 ((fd_mask *)vec_ri) [word] |= mask;
93 if (!(nev & EV_READ)) 108 if (!(nev & EV_READ))
94 vec_ri [offs] &= ~mask; 109 ((fd_mask *)vec_ri) [word] &= ~mask;
95 110
96 vec_wi [offs] |= mask; 111 ((fd_mask *)vec_wi) [word] |= mask;
97 if (!(nev & EV_WRITE)) 112 if (!(nev & EV_WRITE))
98 vec_wi [offs] &= ~mask; 113 ((fd_mask *)vec_wi) [word] &= ~mask;
114#endif
99 } 115 }
100#endif
101} 116}
102 117
103static void 118static void
104select_poll (EV_P_ ev_tstamp timeout) 119select_poll (EV_P_ ev_tstamp timeout)
105{ 120{
106 int word, offs;
107 struct timeval tv; 121 struct timeval tv;
108 int res; 122 int res;
109 123
110#if EV_SELECT_USE_FD_SET 124#if EV_SELECT_USE_FD_SET
111 memcpy (vec_ro, vec_ri, sizeof (struct fd_set)); 125 memcpy (vec_ro, vec_ri, sizeof (fd_set));
112 memcpy (vec_wo, vec_wi, sizeof (struct fd_set)); 126 memcpy (vec_wo, vec_wi, sizeof (fd_set));
113#else 127#else
114 memcpy (vec_ro, vec_ri, vec_max * 4); 128 memcpy (vec_ro, vec_ri, vec_max * NFDBYTES);
115 memcpy (vec_wo, vec_wi, vec_max * 4); 129 memcpy (vec_wo, vec_wi, vec_max * NFDBYTES);
116#endif 130#endif
117 131
118 tv.tv_sec = (long)timeout; 132 tv.tv_sec = (long)timeout;
119 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 133 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
120 134
121 res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 135 res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
122 136
123 if (res < 0) 137 if (res < 0)
124 { 138 {
125#ifdef WIN32 139 #if EV_SELECT_IS_WINSOCKET
126 if (errno == WSAEINTR ) errno = EINTR; 140 errno = WSAGetLastError ();
127 if (errno == WSAENOTSOCK) errno = EBADF; 141 #endif
128#endif
129 142
130 if (errno == EBADF) 143 if (errno == EBADF)
131 fd_ebadf (EV_A); 144 fd_ebadf (EV_A);
132 else if (errno == ENOMEM && !syserr_cb) 145 else if (errno == ENOMEM && !syserr_cb)
133 fd_enomem (EV_A); 146 fd_enomem (EV_A);
… …
136 149
137 return; 150 return;
138 } 151 }
139 152
140#if EV_SELECT_USE_FD_SET 153#if EV_SELECT_USE_FD_SET
141# if EV_SELECT_USE_WIN32_HANDLES 154
155 {
156 int fd;
157
142 for (word = 0; word < anfdmax; ++word) 158 for (fd = 0; fd < anfdmax; ++fd)
143 {
144 if (!anfd [word].events) 159 if (anfds [fd].events)
145 { 160 {
146 int fd = _get_osfhandle (word); 161 int events = 0;
162 #if EV_SELECT_IS_WINSOCKET
163 SOCKET handle = anfds [fd].handle;
164 #else
165 int handle = fd;
166 #endif
147 167
148 if (fd >= 0) 168 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
169 if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
170
171 if (events)
172 fd_event (EV_A_ fd, events);
173 }
174 }
175
176#else
177
178 {
179 int word, bit;
180 for (word = vec_max; word--; )
181 {
182 fd_mask word_r = ((fd_mask *)vec_ro) [word];
183 fd_mask word_w = ((fd_mask *)vec_wo) [word];
184
185 if (word_r || word_w)
186 for (bit = NFDBITS; bit--; )
149 { 187 {
188 fd_mask mask = 1UL << bit;
150 int events = 0; 189 int events = 0;
151 190
152 if (FD_ISSET (fd, (struct fd_set *)vec_ro)) events |= EV_READ; 191 events |= word_r & mask ? EV_READ : 0;
153 if (FD_ISSET (fd, (struct fd_set *)vec_wo)) events |= EV_WRITE; 192 events |= word_w & mask ? EV_WRITE : 0;
154 193
155 if (events) 194 if (events)
156 fd_event (EV_A_ word, events); 195 fd_event (EV_A_ word * NFDBITS + bit, events);
157 } 196 }
158 } 197 }
159 } 198 }
160# else
161 for (word = 0; word < FD_SETSIZE; ++word)
162 {
163 int events = 0;
164 if (FD_ISSET (word, (struct fd_set *)vec_ro)) events |= EV_READ;
165 if (FD_ISSET (word, (struct fd_set *)vec_wo)) events |= EV_WRITE;
166 199
167 if (events)
168 fd_event (EV_A_ word, events);
169 }
170# endif
171#else
172 for (word = vec_max; word--; )
173 {
174 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
175 for (offs = 4; offs--; )
176 {
177 int idx = word * 4 + offs;
178 unsigned char byte_r = vec_ro [idx];
179 unsigned char byte_w = vec_wo [idx];
180 int bit;
181
182 if (byte_r | byte_w)
183 for (bit = 8; bit--; )
184 {
185 int events = 0;
186 events |= byte_r & (1 << bit) ? EV_READ : 0;
187 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
188
189 if (events)
190 fd_event (EV_A_ idx * 8 + bit, events);
191 }
192 }
193 }
194#endif 200#endif
195} 201}
196 202
197static int 203static int
198select_init (EV_P_ int flags) 204select_init (EV_P_ int flags)
199{ 205{
200 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */ 206 backend_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */
201 method_modify = select_modify; 207 backend_modify = select_modify;
202 method_poll = select_poll; 208 backend_poll = select_poll;
203 209
204#if EV_SELECT_USE_FD_SET 210#if EV_SELECT_USE_FD_SET
205 vec_max = FD_SETSIZE / 32; 211 vec_max = FD_SETSIZE / 32;
206 vec_ri = ev_malloc (sizeof (struct fd_set)); FD_ZERO ((struct fd_set *)vec_ri); 212 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
207 vec_ro = ev_malloc (sizeof (struct fd_set)); 213 vec_ro = ev_malloc (sizeof (fd_set));
208 vec_wi = ev_malloc (sizeof (struct fd_set)); FD_ZERO ((struct fd_set *)vec_wi); 214 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
209 vec_wo = ev_malloc (sizeof (struct fd_set)); 215 vec_wo = ev_malloc (sizeof (fd_set));
210#else 216#else
211 vec_max = 0; 217 vec_max = 0;
212 vec_ri = 0; 218 vec_ri = 0;
213 vec_ri = 0; 219 vec_ri = 0;
214 vec_wo = 0; 220 vec_wo = 0;
215 vec_wo = 0; 221 vec_wo = 0;
216#endif 222#endif
217 223
218 return EVMETHOD_SELECT; 224 return EVBACKEND_SELECT;
219} 225}
220 226
221static void 227static void
222select_destroy (EV_P) 228select_destroy (EV_P)
223{ 229{

Diff Legend

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