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.19 by root, Thu Nov 8 16:58:00 2007 UTC vs.
Revision 1.20 by root, Mon Nov 12 00:31:08 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
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)
46#endif 59#endif
47 60
48#include <string.h> 61#include <string.h>
49 62
50static void 63static void
51select_modify (EV_P_ int fd, int oev, int nev) 64select_modify (EV_P_ int fd, int oev, int nev)
52{ 65{
53 if (oev == nev) 66 if (oev == nev)
54 return; 67 return;
55 68
56#if EV_SELECT_USE_FD_SET
57# if EV_SELECT_USE_WIN32_HANDLES
58 fd = _get_osfhandle (fd);
59 if (fd < 0)
60 return;
61# endif
62
63 if (nev & EV_READ)
64 FD_SET (fd, (struct fd_set *)vec_ri);
65 else
66 FD_CLR (fd, (struct fd_set *)vec_ri);
67
68 if (nev & EV_WRITE)
69 FD_SET (fd, (struct fd_set *)vec_wi);
70 else
71 FD_CLR (fd, (struct fd_set *)vec_wi);
72#else
73 { 69 {
74 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;
75 int mask = 1 << (fd & 7); 91 int mask = 1UL << (fd % NFDBITS);
76 92
77 if (vec_max < (fd >> 5) + 1) 93 if (vec_max < word + 1)
78 { 94 {
79 int new_max = (fd >> 5) + 1; 95 int new_max = word + 1;
80 96
81 vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4); 97 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
82 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 */
83 vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4); 99 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
84 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 */
85 101
86 for (; vec_max < new_max; ++vec_max) 102 for (; vec_max < new_max; ++vec_max)
87 ((uint32_t *)vec_ri)[vec_max] = 103 ((fd_mask *)vec_ri)[vec_max] =
88 ((uint32_t *)vec_wi)[vec_max] = 0; 104 ((fd_mask *)vec_wi)[vec_max] = 0;
89 } 105 }
90 106
91 vec_ri [offs] |= mask; 107 ((fd_mask *)vec_ri) [word] |= mask;
92 if (!(nev & EV_READ)) 108 if (!(nev & EV_READ))
93 vec_ri [offs] &= ~mask; 109 ((fd_mask *)vec_ri) [word] &= ~mask;
94 110
95 vec_wi [offs] |= mask; 111 ((fd_mask *)vec_wi) [word] |= mask;
96 if (!(nev & EV_WRITE)) 112 if (!(nev & EV_WRITE))
97 vec_wi [offs] &= ~mask; 113 ((fd_mask *)vec_wi) [word] &= ~mask;
114#endif
98 } 115 }
99#endif
100} 116}
101 117
102static void 118static void
103select_poll (EV_P_ ev_tstamp timeout) 119select_poll (EV_P_ ev_tstamp timeout)
104{ 120{
105 int word, offs;
106 struct timeval tv; 121 struct timeval tv;
107 int res; 122 int res;
108 123
109#if EV_SELECT_USE_FD_SET 124#if EV_SELECT_USE_FD_SET
110 memcpy (vec_ro, vec_ri, sizeof (struct fd_set)); 125 memcpy (vec_ro, vec_ri, sizeof (fd_set));
111 memcpy (vec_wo, vec_wi, sizeof (struct fd_set)); 126 memcpy (vec_wo, vec_wi, sizeof (fd_set));
112#else 127#else
113 memcpy (vec_ro, vec_ri, vec_max * 4); 128 memcpy (vec_ro, vec_ri, vec_max * NFDBYTES);
114 memcpy (vec_wo, vec_wi, vec_max * 4); 129 memcpy (vec_wo, vec_wi, vec_max * NFDBYTES);
115#endif 130#endif
116 131
117 tv.tv_sec = (long)timeout; 132 tv.tv_sec = (long)timeout;
118 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 133 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
119 134
120 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);
121 136
122 if (res < 0) 137 if (res < 0)
123 { 138 {
124#ifdef WIN32 139 #if EV_SELECT_IS_WINSOCKET
125 if (errno == WSAEINTR ) errno = EINTR; 140 errno = WSAGetLastError ();
126 if (errno == WSAENOTSOCK) errno = EBADF; 141 #endif
127#endif
128 142
129 if (errno == EBADF) 143 if (errno == EBADF)
130 fd_ebadf (EV_A); 144 fd_ebadf (EV_A);
131 else if (errno == ENOMEM && !syserr_cb) 145 else if (errno == ENOMEM && !syserr_cb)
132 fd_enomem (EV_A); 146 fd_enomem (EV_A);
… …
135 149
136 return; 150 return;
137 } 151 }
138 152
139#if EV_SELECT_USE_FD_SET 153#if EV_SELECT_USE_FD_SET
140# if EV_SELECT_USE_WIN32_HANDLES 154
155 {
156 int fd;
157
141 for (word = 0; word < anfdmax; ++word) 158 for (fd = 0; fd < anfdmax; ++fd)
142 {
143 if (!anfd [word].events) 159 if (anfds [fd].events)
144 { 160 {
145 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
146 167
147 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--; )
148 { 187 {
188 fd_mask mask = 1UL << bit;
149 int events = 0; 189 int events = 0;
150 190
151 if (FD_ISSET (fd, (struct fd_set *)vec_ro)) events |= EV_READ; 191 events |= word_r & mask ? EV_READ : 0;
152 if (FD_ISSET (fd, (struct fd_set *)vec_wo)) events |= EV_WRITE; 192 events |= word_w & mask ? EV_WRITE : 0;
153 193
154 if (events) 194 if (events)
155 fd_event (EV_A_ word, events); 195 fd_event (EV_A_ word * NFDBITS + bit, events);
156 } 196 }
157 } 197 }
158 } 198 }
159# else
160 for (word = 0; word < FD_SETSIZE; ++word)
161 {
162 int events = 0;
163 if (FD_ISSET (word, (struct fd_set *)vec_ro)) events |= EV_READ;
164 if (FD_ISSET (word, (struct fd_set *)vec_wo)) events |= EV_WRITE;
165 199
166 if (events)
167 fd_event (EV_A_ word, events);
168 }
169# endif
170#else
171 for (word = vec_max; word--; )
172 {
173 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
174 for (offs = 4; offs--; )
175 {
176 int idx = word * 4 + offs;
177 unsigned char byte_r = vec_ro [idx];
178 unsigned char byte_w = vec_wo [idx];
179 int bit;
180
181 if (byte_r | byte_w)
182 for (bit = 8; bit--; )
183 {
184 int events = 0;
185 events |= byte_r & (1 << bit) ? EV_READ : 0;
186 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
187
188 if (events)
189 fd_event (EV_A_ idx * 8 + bit, events);
190 }
191 }
192 }
193#endif 200#endif
194} 201}
195 202
196static int 203static int
197select_init (EV_P_ int flags) 204select_init (EV_P_ int flags)
… …
200 method_modify = select_modify; 207 method_modify = select_modify;
201 method_poll = select_poll; 208 method_poll = select_poll;
202 209
203#if EV_SELECT_USE_FD_SET 210#if EV_SELECT_USE_FD_SET
204 vec_max = FD_SETSIZE / 32; 211 vec_max = FD_SETSIZE / 32;
205 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);
206 vec_ro = ev_malloc (sizeof (struct fd_set)); 213 vec_ro = ev_malloc (sizeof (fd_set));
207 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);
208 vec_wo = ev_malloc (sizeof (struct fd_set)); 215 vec_wo = ev_malloc (sizeof (fd_set));
209#else 216#else
210 vec_max = 0; 217 vec_max = 0;
211 vec_ri = 0; 218 vec_ri = 0;
212 vec_ri = 0; 219 vec_ri = 0;
213 vec_wo = 0; 220 vec_wo = 0;

Diff Legend

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