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.16 by root, Tue Nov 6 13:17:55 2007 UTC vs.
Revision 1.19 by root, Thu Nov 8 16:58:00 2007 UTC

… …
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 unix systems */ 32/* for unix systems */
33#ifdef WIN32 33#if WIN32
34typedef unsigned int uint32_t; 34typedef unsigned int uint32_t;
35# ifndef EV_SELECT_USE_FD_SET
36# define EV_SELECT_USE_FD_SET 1
37# endif
35#else 38#else
36# include <sys/select.h> 39# include <sys/select.h>
37# include <inttypes.h> 40# include <inttypes.h>
38#endif 41#endif
39 42
43#if EV_SELECT_USE_WIN32_HANDLES
44# undef EV_SELECT_USE_FD_SET
45# define EV_SELECT_USE_FD_SET 1
46#endif
47
40#include <string.h> 48#include <string.h>
41 49
42static void 50static void
43select_modify (EV_P_ int fd, int oev, int nev) 51select_modify (EV_P_ int fd, int oev, int nev)
44{ 52{
45 int offs = fd >> 3;
46 int mask = 1 << (fd & 7);
47
48 if (oev == nev) 53 if (oev == nev)
49 return; 54 return;
50 55
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 {
74 int offs = fd >> 3;
75 int mask = 1 << (fd & 7);
76
51 if (vec_max < (fd >> 5) + 1) 77 if (vec_max < (fd >> 5) + 1)
52 { 78 {
53 int new_max = (fd >> 5) + 1; 79 int new_max = (fd >> 5) + 1;
54 80
55 vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4); 81 vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4);
56 vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */ 82 vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */
57 vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4); 83 vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4);
58 vec_wo = (unsigned char *)ev_realloc (vec_wo, new_max * 4); /* could free/malloc */ 84 vec_wo = (unsigned char *)ev_realloc (vec_wo, new_max * 4); /* could free/malloc */
59 85
60 for (; vec_max < new_max; ++vec_max) 86 for (; vec_max < new_max; ++vec_max)
61 ((uint32_t *)vec_ri)[vec_max] = 87 ((uint32_t *)vec_ri)[vec_max] =
62 ((uint32_t *)vec_wi)[vec_max] = 0; 88 ((uint32_t *)vec_wi)[vec_max] = 0;
63 } 89 }
64 90
65 vec_ri [offs] |= mask; 91 vec_ri [offs] |= mask;
66 if (!(nev & EV_READ)) 92 if (!(nev & EV_READ))
67 vec_ri [offs] &= ~mask; 93 vec_ri [offs] &= ~mask;
68 94
69 vec_wi [offs] |= mask; 95 vec_wi [offs] |= mask;
70 if (!(nev & EV_WRITE)) 96 if (!(nev & EV_WRITE))
71 vec_wi [offs] &= ~mask; 97 vec_wi [offs] &= ~mask;
98 }
99#endif
72} 100}
73 101
74static void 102static void
75select_poll (EV_P_ ev_tstamp timeout) 103select_poll (EV_P_ ev_tstamp timeout)
76{ 104{
77 int word, offs; 105 int word, offs;
78 struct timeval tv; 106 struct timeval tv;
79 int res; 107 int res;
80 108
109#if EV_SELECT_USE_FD_SET
110 memcpy (vec_ro, vec_ri, sizeof (struct fd_set));
111 memcpy (vec_wo, vec_wi, sizeof (struct fd_set));
112#else
81 memcpy (vec_ro, vec_ri, vec_max * 4); 113 memcpy (vec_ro, vec_ri, vec_max * 4);
82 memcpy (vec_wo, vec_wi, vec_max * 4); 114 memcpy (vec_wo, vec_wi, vec_max * 4);
115#endif
83 116
84 tv.tv_sec = (long)timeout; 117 tv.tv_sec = (long)timeout;
85 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 118 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
86 119
87 res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 120 res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
88 121
89 if (res < 0) 122 if (res < 0)
90 { 123 {
124#ifdef WIN32
125 if (errno == WSAEINTR ) errno = EINTR;
126 if (errno == WSAENOTSOCK) errno = EBADF;
127#endif
128
91 if (errno == EBADF) 129 if (errno == EBADF)
92 fd_ebadf (EV_A); 130 fd_ebadf (EV_A);
93 else if (errno == ENOMEM && !syserr_cb) 131 else if (errno == ENOMEM && !syserr_cb)
94 fd_enomem (EV_A); 132 fd_enomem (EV_A);
95 else if (errno != EINTR) 133 else if (errno != EINTR)
96 syserr ("(libev) select"); 134 syserr ("(libev) select");
97 135
98 return; 136 return;
99 } 137 }
100 138
139#if EV_SELECT_USE_FD_SET
140# if EV_SELECT_USE_WIN32_HANDLES
141 for (word = 0; word < anfdmax; ++word)
142 {
143 if (!anfd [word].events)
144 {
145 int fd = _get_osfhandle (word);
146
147 if (fd >= 0)
148 {
149 int events = 0;
150
151 if (FD_ISSET (fd, (struct fd_set *)vec_ro)) events |= EV_READ;
152 if (FD_ISSET (fd, (struct fd_set *)vec_wo)) events |= EV_WRITE;
153
154 if (events)
155 fd_event (EV_A_ word, events);
156 }
157 }
158 }
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
166 if (events)
167 fd_event (EV_A_ word, events);
168 }
169# endif
170#else
101 for (word = vec_max; word--; ) 171 for (word = vec_max; word--; )
102 { 172 {
103 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word]) 173 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
104 for (offs = 4; offs--; ) 174 for (offs = 4; offs--; )
105 { 175 {
… …
118 if (events) 188 if (events)
119 fd_event (EV_A_ idx * 8 + bit, events); 189 fd_event (EV_A_ idx * 8 + bit, events);
120 } 190 }
121 } 191 }
122 } 192 }
193#endif
123} 194}
124 195
125static int 196static int
126select_init (EV_P_ int flags) 197select_init (EV_P_ int flags)
127{ 198{
128 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */ 199 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */
129 method_modify = select_modify; 200 method_modify = select_modify;
130 method_poll = select_poll; 201 method_poll = select_poll;
131 202
203#if EV_SELECT_USE_FD_SET
204 vec_max = FD_SETSIZE / 32;
205 vec_ri = ev_malloc (sizeof (struct fd_set)); FD_ZERO ((struct fd_set *)vec_ri);
206 vec_ro = ev_malloc (sizeof (struct fd_set));
207 vec_wi = ev_malloc (sizeof (struct fd_set)); FD_ZERO ((struct fd_set *)vec_wi);
208 vec_wo = ev_malloc (sizeof (struct fd_set));
209#else
132 vec_max = 0; 210 vec_max = 0;
133 vec_ri = 0; 211 vec_ri = 0;
134 vec_ri = 0; 212 vec_ri = 0;
135 vec_wo = 0; 213 vec_wo = 0;
136 vec_wo = 0; 214 vec_wo = 0;
215#endif
137 216
138 return EVMETHOD_SELECT; 217 return EVMETHOD_SELECT;
139} 218}
140 219
141static void 220static void

Diff Legend

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