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.9 by root, Sat Nov 3 09:19:58 2007 UTC vs.
Revision 1.17 by root, Tue Nov 6 16:09:37 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 */
33#include <sys/time.h>
34#include <sys/types.h>
35#include <unistd.h>
36
37/* for unix systems */ 32/* for unix systems */
38#ifndef WIN32 33#ifdef WIN32
34typedef unsigned int uint32_t;
35# define EV_SELECT_USE_FD_SET 1
36#else
39# include <sys/select.h> 37# include <sys/select.h>
38# include <inttypes.h>
40#endif 39#endif
41 40
42#include <string.h> 41#include <string.h>
43#include <inttypes.h>
44
45static unsigned char *vec_ri, *vec_ro, *vec_wi, *vec_wo;
46static int vec_max;
47 42
48static void 43static void
49select_modify (int fd, int oev, int nev) 44select_modify (EV_P_ int fd, int oev, int nev)
50{ 45{
51 int offs = fd >> 3; 46 if (oev == nev)
52 int mask = 1 << (fd & 7); 47 return;
53 48
54 if (vec_max < (fd >> 5) + 1) 49#if EV_SELECT_USE_FD_SET
55 { 50 if (nev & EV_READ)
56 int new_max = (fd >> 5) + 1; 51 FD_SET (fd, (struct fd_set *)vec_ri);
52 else
53 FD_CLR (fd, (struct fd_set *)vec_ri);
57 54
58 vec_ri = (unsigned char *)realloc (vec_ri, new_max * 4); 55 if (nev & EV_WRITE)
59 vec_ro = (unsigned char *)realloc (vec_ro, new_max * 4); /* could free/malloc */ 56 FD_SET (fd, (struct fd_set *)vec_wi);
60 vec_wi = (unsigned char *)realloc (vec_wi, new_max * 4); 57 else
61 vec_wo = (unsigned char *)realloc (vec_wo, new_max * 4); /* could free/malloc */ 58 FD_CLR (fd, (struct fd_set *)vec_wi);
59#else
60 {
61 int offs = fd >> 3;
62 int mask = 1 << (fd & 7);
62 63
63 for (; vec_max < new_max; ++vec_max) 64 if (vec_max < (fd >> 5) + 1)
64 ((uint32_t *)vec_ri)[vec_max] = 65 {
65 ((uint32_t *)vec_wi)[vec_max] = 0; 66 int new_max = (fd >> 5) + 1;
66 }
67 67
68 vec_ri [offs] |= mask; 68 vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4);
69 if (!(nev & EV_READ)) 69 vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */
70 vec_ri [offs] &= ~mask; 70 vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4);
71 vec_wo = (unsigned char *)ev_realloc (vec_wo, new_max * 4); /* could free/malloc */
71 72
73 for (; vec_max < new_max; ++vec_max)
74 ((uint32_t *)vec_ri)[vec_max] =
75 ((uint32_t *)vec_wi)[vec_max] = 0;
76 }
77
78 vec_ri [offs] |= mask;
79 if (!(nev & EV_READ))
80 vec_ri [offs] &= ~mask;
81
72 vec_wi [offs] |= mask; 82 vec_wi [offs] |= mask;
73 if (!(nev & EV_WRITE)) 83 if (!(nev & EV_WRITE))
74 vec_wi [offs] &= ~mask; 84 vec_wi [offs] &= ~mask;
85 }
86#endif
75} 87}
76 88
77static void 89static void
78select_poll (ev_tstamp timeout) 90select_poll (EV_P_ ev_tstamp timeout)
79{ 91{
92 int word, offs;
80 struct timeval tv; 93 struct timeval tv;
81 int res; 94 int res;
82 95
96#if EV_SELECT_USE_FD_SET
97 memcpy (vec_ro, vec_ri, sizeof (struct fd_set));
98 memcpy (vec_wo, vec_wi, sizeof (struct fd_set));
99#else
83 memcpy (vec_ro, vec_ri, vec_max * 4); 100 memcpy (vec_ro, vec_ri, vec_max * 4);
84 memcpy (vec_wo, vec_wi, vec_max * 4); 101 memcpy (vec_wo, vec_wi, vec_max * 4);
102#endif
85 103
86 tv.tv_sec = (long)timeout; 104 tv.tv_sec = (long)timeout;
87 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 105 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
88 106
89 res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 107 res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
90 108
91 if (res > 0) 109 if (res < 0)
92 { 110 {
93 int word, offs; 111#ifdef WIN32
112 if (errno == WSAEINTR ) errno = EINTR;
113 if (errno == WSAENOTSOCK) errno = EBADF;
114#endif
94 115
95 for (word = vec_max; word--; ) 116 if (errno == EBADF)
96 { 117 fd_ebadf (EV_A);
97 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word]) 118 else if (errno == ENOMEM && !syserr_cb)
98 for (offs = 4; offs--; ) 119 fd_enomem (EV_A);
99 { 120 else if (errno != EINTR)
100 int idx = word * 4 + offs; 121 syserr ("(libev) select");
101 unsigned char byte_r = vec_ro [idx];
102 unsigned char byte_w = vec_wo [idx];
103 int bit;
104 122
105 if (byte_r | byte_w) 123 return;
106 for (bit = 8; bit--; ) 124 }
107 {
108 int events = 0;
109 events |= byte_r & (1 << bit) ? EV_READ : 0;
110 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
111 125
112 if (events) 126#if EV_SELECT_USE_FD_SET
113 fd_event (idx * 8 + bit, events); 127 for (word = 0; word < FD_SETSIZE; ++word)
114 } 128 {
115 } 129 int events = 0;
116 } 130 if (FD_ISSET (word, (struct fd_set *)vec_ro)) events |= EV_READ;
131 if (FD_ISSET (word, (struct fd_set *)vec_wo)) events |= EV_WRITE;
132
133 if (events)
134 fd_event (EV_A_ word, events);
117 } 135 }
118 else if (res < 0) 136#else
137 for (word = vec_max; word--; )
119 { 138 {
120 if (errno == EBADF) 139 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
121 fd_ebadf (); 140 for (offs = 4; offs--; )
122 else if (errno == ENOMEM) 141 {
123 fd_enomem (); 142 int idx = word * 4 + offs;
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;
151 events |= byte_r & (1 << bit) ? EV_READ : 0;
152 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
153
154 if (events)
155 fd_event (EV_A_ idx * 8 + bit, events);
156 }
157 }
124 } 158 }
159#endif
160}
161
162static int
163select_init (EV_P_ int flags)
164{
165 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */
166 method_modify = select_modify;
167 method_poll = select_poll;
168
169#if EV_SELECT_USE_FD_SET
170 vec_max = FD_SETSIZE / 32;
171 vec_ri = ev_malloc (sizeof (struct fd_set)); FD_ZERO ((struct fd_set *)vec_ri);
172 vec_ro = ev_malloc (sizeof (struct fd_set));
173 vec_wi = ev_malloc (sizeof (struct fd_set)); FD_ZERO ((struct fd_set *)vec_wi);
174 vec_wo = ev_malloc (sizeof (struct fd_set));
175#else
176 vec_max = 0;
177 vec_ri = 0;
178 vec_ri = 0;
179 vec_wo = 0;
180 vec_wo = 0;
181#endif
182
183 return EVMETHOD_SELECT;
125} 184}
126 185
127static void 186static void
128select_init (int flags) 187select_destroy (EV_P)
129{ 188{
130 ev_method = EVMETHOD_SELECT; 189 ev_free (vec_ri);
131 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */ 190 ev_free (vec_ro);
132 method_modify = select_modify; 191 ev_free (vec_wi);
133 method_poll = select_poll; 192 ev_free (vec_wo);
134} 193}
135 194
195

Diff Legend

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