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.7 by root, Thu Nov 1 13:11:12 2007 UTC vs.
Revision 1.14 by root, Tue Nov 6 00:10:04 2007 UTC

… …
33#include <sys/time.h> 33#include <sys/time.h>
34#include <sys/types.h> 34#include <sys/types.h>
35#include <unistd.h> 35#include <unistd.h>
36 36
37/* for unix systems */ 37/* for unix systems */
38#ifndef WIN32
38#include <sys/select.h> 39# include <sys/select.h>
40#endif
39 41
40#include <string.h> 42#include <string.h>
41#include <inttypes.h> 43#include <inttypes.h>
42 44
43static unsigned char *vec_ri, *vec_ro, *vec_wi, *vec_wo;
44static int vec_max;
45
46static void 45static void
47select_modify (int fd, int oev, int nev) 46select_modify (EV_P_ int fd, int oev, int nev)
48{ 47{
49 int offs = fd >> 3; 48 int offs = fd >> 3;
50 int mask = 1 << (fd & 7); 49 int mask = 1 << (fd & 7);
50
51 if (oev == nev)
52 return;
51 53
52 if (vec_max < (fd >> 5) + 1) 54 if (vec_max < (fd >> 5) + 1)
53 { 55 {
54 int new_max = (fd >> 5) + 1; 56 int new_max = (fd >> 5) + 1;
55 57
56 vec_ri = (unsigned char *)realloc (vec_ri, new_max * 4); 58 vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4);
57 vec_ro = (unsigned char *)realloc (vec_ro, new_max * 4); /* could free/malloc */ 59 vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */
58 vec_wi = (unsigned char *)realloc (vec_wi, new_max * 4); 60 vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4);
59 vec_wo = (unsigned char *)realloc (vec_wo, new_max * 4); /* could free/malloc */ 61 vec_wo = (unsigned char *)ev_realloc (vec_wo, new_max * 4); /* could free/malloc */
60 62
61 for (; vec_max < new_max; ++vec_max) 63 for (; vec_max < new_max; ++vec_max)
62 ((uint32_t *)vec_ri)[vec_max] = 64 ((uint32_t *)vec_ri)[vec_max] =
63 ((uint32_t *)vec_wi)[vec_max] = 0; 65 ((uint32_t *)vec_wi)[vec_max] = 0;
64 } 66 }
… …
71 if (!(nev & EV_WRITE)) 73 if (!(nev & EV_WRITE))
72 vec_wi [offs] &= ~mask; 74 vec_wi [offs] &= ~mask;
73} 75}
74 76
75static void 77static void
76select_poll (ev_tstamp timeout) 78select_poll (EV_P_ ev_tstamp timeout)
77{ 79{
80 int word, offs;
78 struct timeval tv; 81 struct timeval tv;
79 int res; 82 int res;
80 83
81 memcpy (vec_ro, vec_ri, vec_max * 4); 84 memcpy (vec_ro, vec_ri, vec_max * 4);
82 memcpy (vec_wo, vec_wi, vec_max * 4); 85 memcpy (vec_wo, vec_wi, vec_max * 4);
… …
84 tv.tv_sec = (long)timeout; 87 tv.tv_sec = (long)timeout;
85 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 88 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
86 89
87 res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 90 res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
88 91
89 if (res > 0) 92 if (res < 0)
90 {
91 int word, offs;
92
93 for (word = vec_max; word--; )
94 {
95 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
96 for (offs = 4; offs--; )
97 {
98 int idx = word * 4 + offs;
99 unsigned char byte_r = vec_ro [idx];
100 unsigned char byte_w = vec_wo [idx];
101 int bit;
102
103 if (byte_r | byte_w)
104 for (bit = 8; bit--; )
105 {
106 int events = 0;
107 events |= byte_r & (1 << bit) ? EV_READ : 0;
108 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
109
110 if (events)
111 fd_event (idx * 8 + bit, events);
112 }
113 }
114 }
115 }
116 else if (res < 0)
117 { 93 {
118 if (errno == EBADF) 94 if (errno == EBADF)
119 fd_recheck (); 95 fd_ebadf (EV_A);
96 else if (errno == ENOMEM && !syserr_cb)
97 fd_enomem (EV_A);
98 else if (errno != EINTR)
99 syserr ();
100
101 return;
102 }
103
104 for (word = vec_max; word--; )
105 {
106 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
107 for (offs = 4; offs--; )
108 {
109 int idx = word * 4 + offs;
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;
118 events |= byte_r & (1 << bit) ? EV_READ : 0;
119 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
120
121 if (events)
122 fd_event (EV_A_ idx * 8 + bit, events);
123 }
124 }
120 } 125 }
121} 126}
122 127
123static void 128static int
124select_init (int flags) 129select_init (EV_P_ int flags)
125{ 130{
126 ev_method = EVMETHOD_SELECT;
127 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */ 131 method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */
128 method_modify = select_modify; 132 method_modify = select_modify;
129 method_poll = select_poll; 133 method_poll = select_poll;
134
135 vec_max = 0;
136 vec_ri = 0;
137 vec_ri = 0;
138 vec_wo = 0;
139 vec_wo = 0;
140
141 return EVMETHOD_SELECT;
130} 142}
131 143
144static void
145select_destroy (EV_P)
146{
147 ev_free (vec_ri);
148 ev_free (vec_ro);
149 ev_free (vec_wi);
150 ev_free (vec_wo);
151}
152
153

Diff Legend

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