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

Diff Legend

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