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.30 by root, Thu May 22 14:05:14 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 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
… …
98 100
99 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES); 101 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
100 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 */
101 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES); 103 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
102 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
103 108
104 for (; vec_max < new_max; ++vec_max) 109 for (; vec_max < new_max; ++vec_max)
105 ((fd_mask *)vec_ri) [vec_max] = 110 ((fd_mask *)vec_ri) [vec_max] =
106 ((fd_mask *)vec_wi) [vec_max] = 0; 111 ((fd_mask *)vec_wi) [vec_max] = 0;
107 } 112 }
… …
120static void 125static void
121select_poll (EV_P_ ev_tstamp timeout) 126select_poll (EV_P_ ev_tstamp timeout)
122{ 127{
123 struct timeval tv; 128 struct timeval tv;
124 int res; 129 int res;
125 130 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 131
134 tv.tv_sec = (long)timeout; 132 tv.tv_sec = (long)timeout;
135 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 133 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
136 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
137 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
138 155
139 if (expect_false (res < 0)) 156 if (expect_false (res < 0))
140 { 157 {
141 #if EV_SELECT_IS_WINSOCKET 158 #if EV_SELECT_IS_WINSOCKET
142 errno = WSAGetLastError (); 159 errno = WSAGetLastError ();
… …
190 int handle = fd; 207 int handle = fd;
191 #endif 208 #endif
192 209
193 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ; 210 if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
194 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
195 215
196 if (expect_true (events)) 216 if (expect_true (events))
197 fd_event (EV_A_ fd, events); 217 fd_event (EV_A_ fd, events);
198 } 218 }
199 } 219 }
… …
204 int word, bit; 224 int word, bit;
205 for (word = vec_max; word--; ) 225 for (word = vec_max; word--; )
206 { 226 {
207 fd_mask word_r = ((fd_mask *)vec_ro) [word]; 227 fd_mask word_r = ((fd_mask *)vec_ro) [word];
208 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
209 232
210 if (word_r || word_w) 233 if (word_r || word_w)
211 for (bit = NFDBITS; bit--; ) 234 for (bit = NFDBITS; bit--; )
212 { 235 {
213 fd_mask mask = 1UL << bit; 236 fd_mask mask = 1UL << bit;
… …
236 vec_max = FD_SETSIZE / 32; 259 vec_max = FD_SETSIZE / 32;
237 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);
238 vec_ro = ev_malloc (sizeof (fd_set)); 261 vec_ro = ev_malloc (sizeof (fd_set));
239 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);
240 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
241#else 267#else
242 vec_max = 0; 268 vec_max = 0;
243 vec_ri = 0; 269 vec_ri = 0;
244 vec_ri = 0; 270 vec_ri = 0;
245 vec_wo = 0; 271 vec_wo = 0;

Diff Legend

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