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.15 by root, Tue Nov 6 00:52:33 2007 UTC vs.
Revision 1.21 by root, Fri Nov 23 05:00:45 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/* for broken bsd's */ 32#ifndef _WIN32
33#include <sys/time.h>
34#include <sys/types.h>
35#include <unistd.h>
36
37/* for unix systems */ 33/* for unix systems */
38#ifndef WIN32
39# include <sys/select.h> 34# include <sys/select.h>
35# include <inttypes.h>
36#endif
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)
40#endif 59#endif
41 60
42#include <string.h> 61#include <string.h>
43#include <inttypes.h>
44 62
45static void 63static void
46select_modify (EV_P_ int fd, int oev, int nev) 64select_modify (EV_P_ int fd, int oev, int nev)
47{ 65{
48 int offs = fd >> 3;
49 int mask = 1 << (fd & 7);
50
51 if (oev == nev) 66 if (oev == nev)
52 return; 67 return;
53 68
69 {
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;
91 int mask = 1UL << (fd % NFDBITS);
92
54 if (vec_max < (fd >> 5) + 1) 93 if (vec_max < word + 1)
55 { 94 {
56 int new_max = (fd >> 5) + 1; 95 int new_max = word + 1;
57 96
58 vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4); 97 vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
59 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 */
60 vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4); 99 vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
61 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 */
62 101
63 for (; vec_max < new_max; ++vec_max) 102 for (; vec_max < new_max; ++vec_max)
64 ((uint32_t *)vec_ri)[vec_max] = 103 ((fd_mask *)vec_ri)[vec_max] =
65 ((uint32_t *)vec_wi)[vec_max] = 0; 104 ((fd_mask *)vec_wi)[vec_max] = 0;
66 } 105 }
67 106
68 vec_ri [offs] |= mask; 107 ((fd_mask *)vec_ri) [word] |= mask;
69 if (!(nev & EV_READ)) 108 if (!(nev & EV_READ))
70 vec_ri [offs] &= ~mask; 109 ((fd_mask *)vec_ri) [word] &= ~mask;
71 110
72 vec_wi [offs] |= mask; 111 ((fd_mask *)vec_wi) [word] |= mask;
73 if (!(nev & EV_WRITE)) 112 if (!(nev & EV_WRITE))
74 vec_wi [offs] &= ~mask; 113 ((fd_mask *)vec_wi) [word] &= ~mask;
114#endif
115 }
75} 116}
76 117
77static void 118static void
78select_poll (EV_P_ ev_tstamp timeout) 119select_poll (EV_P_ ev_tstamp timeout)
79{ 120{
80 int word, offs;
81 struct timeval tv; 121 struct timeval tv;
82 int res; 122 int res;
83 123
124#if EV_SELECT_USE_FD_SET
125 memcpy (vec_ro, vec_ri, sizeof (fd_set));
126 memcpy (vec_wo, vec_wi, sizeof (fd_set));
127#else
84 memcpy (vec_ro, vec_ri, vec_max * 4); 128 memcpy (vec_ro, vec_ri, vec_max * NFDBYTES);
85 memcpy (vec_wo, vec_wi, vec_max * 4); 129 memcpy (vec_wo, vec_wi, vec_max * NFDBYTES);
130#endif
86 131
87 tv.tv_sec = (long)timeout; 132 tv.tv_sec = (long)timeout;
88 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 133 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
89 134
90 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);
91 136
92 if (res < 0) 137 if (res < 0)
93 { 138 {
139 #if EV_SELECT_IS_WINSOCKET
140 errno = WSAGetLastError ();
141 #endif
142
94 if (errno == EBADF) 143 if (errno == EBADF)
95 fd_ebadf (EV_A); 144 fd_ebadf (EV_A);
96 else if (errno == ENOMEM && !syserr_cb) 145 else if (errno == ENOMEM && !syserr_cb)
97 fd_enomem (EV_A); 146 fd_enomem (EV_A);
98 else if (errno != EINTR) 147 else if (errno != EINTR)
99 syserr ("(libev) select"); 148 syserr ("(libev) select");
100 149
101 return; 150 return;
102 } 151 }
103 152
153#if EV_SELECT_USE_FD_SET
154
155 {
156 int fd;
157
158 for (fd = 0; fd < anfdmax; ++fd)
159 if (anfds [fd].events)
160 {
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
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;
104 for (word = vec_max; word--; ) 180 for (word = vec_max; word--; )
105 { 181 {
106 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word]) 182 fd_mask word_r = ((fd_mask *)vec_ro) [word];
107 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--; )
108 { 187 {
109 int idx = word * 4 + offs; 188 fd_mask mask = 1UL << bit;
110 unsigned char byte_r = vec_ro [idx];
111 unsigned char byte_w = vec_wo [idx];
112 int bit;
113
114 if (byte_r | byte_w)
115 for (bit = 8; bit--; )
116 {
117 int events = 0; 189 int events = 0;
190
118 events |= byte_r & (1 << bit) ? EV_READ : 0; 191 events |= word_r & mask ? EV_READ : 0;
119 events |= byte_w & (1 << bit) ? EV_WRITE : 0; 192 events |= word_w & mask ? EV_WRITE : 0;
120 193
121 if (events) 194 if (events)
122 fd_event (EV_A_ idx * 8 + bit, events); 195 fd_event (EV_A_ word * NFDBITS + bit, events);
123 }
124 } 196 }
125 } 197 }
198 }
199
200#endif
126} 201}
127 202
128static int 203static int
129select_init (EV_P_ int flags) 204select_init (EV_P_ int flags)
130{ 205{
131 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */ 206 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */
132 method_modify = select_modify; 207 method_modify = select_modify;
133 method_poll = select_poll; 208 method_poll = select_poll;
134 209
210#if EV_SELECT_USE_FD_SET
211 vec_max = FD_SETSIZE / 32;
212 vec_ri = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
213 vec_ro = ev_malloc (sizeof (fd_set));
214 vec_wi = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
215 vec_wo = ev_malloc (sizeof (fd_set));
216#else
135 vec_max = 0; 217 vec_max = 0;
136 vec_ri = 0; 218 vec_ri = 0;
137 vec_ri = 0; 219 vec_ri = 0;
138 vec_wo = 0; 220 vec_wo = 0;
139 vec_wo = 0; 221 vec_wo = 0;
222#endif
140 223
141 return EVMETHOD_SELECT; 224 return EVBACKEND_SELECT;
142} 225}
143 226
144static void 227static void
145select_destroy (EV_P) 228select_destroy (EV_P)
146{ 229{

Diff Legend

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