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.13 by root, Sun Nov 4 23:14:11 2007 UTC vs.
Revision 1.16 by root, Tue Nov 6 13:17:55 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#else
39# include <sys/select.h> 36# include <sys/select.h>
37# include <inttypes.h>
40#endif 38#endif
41 39
42#include <string.h> 40#include <string.h>
43#include <inttypes.h>
44 41
45static void 42static void
46select_modify (EV_P_ int fd, int oev, int nev) 43select_modify (EV_P_ int fd, int oev, int nev)
47{ 44{
48 int offs = fd >> 3; 45 int offs = fd >> 3;
… …
53 50
54 if (vec_max < (fd >> 5) + 1) 51 if (vec_max < (fd >> 5) + 1)
55 { 52 {
56 int new_max = (fd >> 5) + 1; 53 int new_max = (fd >> 5) + 1;
57 54
58 vec_ri = (unsigned char *)realloc (vec_ri, new_max * 4); 55 vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4);
59 vec_ro = (unsigned char *)realloc (vec_ro, new_max * 4); /* could free/malloc */ 56 vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */
60 vec_wi = (unsigned char *)realloc (vec_wi, new_max * 4); 57 vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4);
61 vec_wo = (unsigned char *)realloc (vec_wo, new_max * 4); /* could free/malloc */ 58 vec_wo = (unsigned char *)ev_realloc (vec_wo, new_max * 4); /* could free/malloc */
62 59
63 for (; vec_max < new_max; ++vec_max) 60 for (; vec_max < new_max; ++vec_max)
64 ((uint32_t *)vec_ri)[vec_max] = 61 ((uint32_t *)vec_ri)[vec_max] =
65 ((uint32_t *)vec_wi)[vec_max] = 0; 62 ((uint32_t *)vec_wi)[vec_max] = 0;
66 } 63 }
… …
75} 72}
76 73
77static void 74static void
78select_poll (EV_P_ ev_tstamp timeout) 75select_poll (EV_P_ ev_tstamp timeout)
79{ 76{
77 int word, offs;
80 struct timeval tv; 78 struct timeval tv;
81 int res; 79 int res;
82 80
83 memcpy (vec_ro, vec_ri, vec_max * 4); 81 memcpy (vec_ro, vec_ri, vec_max * 4);
84 memcpy (vec_wo, vec_wi, vec_max * 4); 82 memcpy (vec_wo, vec_wi, vec_max * 4);
… …
86 tv.tv_sec = (long)timeout; 84 tv.tv_sec = (long)timeout;
87 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 85 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
88 86
89 res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv); 87 res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
90 88
91 if (res > 0) 89 if (res < 0)
92 {
93 int word, offs;
94
95 for (word = vec_max; word--; )
96 {
97 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
98 for (offs = 4; offs--; )
99 {
100 int idx = word * 4 + offs;
101 unsigned char byte_r = vec_ro [idx];
102 unsigned char byte_w = vec_wo [idx];
103 int bit;
104
105 if (byte_r | byte_w)
106 for (bit = 8; bit--; )
107 {
108 int events = 0;
109 events |= byte_r & (1 << bit) ? EV_READ : 0;
110 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
111
112 if (events)
113 fd_event (EV_A_ idx * 8 + bit, events);
114 }
115 }
116 }
117 }
118 else if (res < 0)
119 { 90 {
120 if (errno == EBADF) 91 if (errno == EBADF)
121 fd_ebadf (EV_A); 92 fd_ebadf (EV_A);
122 else if (errno == ENOMEM) 93 else if (errno == ENOMEM && !syserr_cb)
123 fd_enomem (EV_A); 94 fd_enomem (EV_A);
95 else if (errno != EINTR)
96 syserr ("(libev) select");
97
98 return;
99 }
100
101 for (word = vec_max; word--; )
102 {
103 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
104 for (offs = 4; offs--; )
105 {
106 int idx = word * 4 + offs;
107 unsigned char byte_r = vec_ro [idx];
108 unsigned char byte_w = vec_wo [idx];
109 int bit;
110
111 if (byte_r | byte_w)
112 for (bit = 8; bit--; )
113 {
114 int events = 0;
115 events |= byte_r & (1 << bit) ? EV_READ : 0;
116 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
117
118 if (events)
119 fd_event (EV_A_ idx * 8 + bit, events);
120 }
121 }
124 } 122 }
125} 123}
126 124
127static int 125static int
128select_init (EV_P_ int flags) 126select_init (EV_P_ int flags)
… …
141} 139}
142 140
143static void 141static void
144select_destroy (EV_P) 142select_destroy (EV_P)
145{ 143{
146 free (vec_ri); 144 ev_free (vec_ri);
147 free (vec_ro); 145 ev_free (vec_ro);
148 free (vec_wi); 146 ev_free (vec_wi);
149 free (vec_wo); 147 ev_free (vec_wo);
150} 148}
151 149
152 150

Diff Legend

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