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.10 by root, Sat Nov 3 21:58:51 2007 UTC vs.
Revision 1.15 by root, Tue Nov 6 00:52:33 2007 UTC

… …
46select_modify (EV_P_ int fd, int oev, int nev) 46select_modify (EV_P_ int fd, int oev, int nev)
47{ 47{
48 int offs = fd >> 3; 48 int offs = fd >> 3;
49 int mask = 1 << (fd & 7); 49 int mask = 1 << (fd & 7);
50 50
51 if (oev == nev)
52 return;
53
51 if (vec_max < (fd >> 5) + 1) 54 if (vec_max < (fd >> 5) + 1)
52 { 55 {
53 int new_max = (fd >> 5) + 1; 56 int new_max = (fd >> 5) + 1;
54 57
55 vec_ri = (unsigned char *)realloc (vec_ri, new_max * 4); 58 vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4);
56 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 */
57 vec_wi = (unsigned char *)realloc (vec_wi, new_max * 4); 60 vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4);
58 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 */
59 62
60 for (; vec_max < new_max; ++vec_max) 63 for (; vec_max < new_max; ++vec_max)
61 ((uint32_t *)vec_ri)[vec_max] = 64 ((uint32_t *)vec_ri)[vec_max] =
62 ((uint32_t *)vec_wi)[vec_max] = 0; 65 ((uint32_t *)vec_wi)[vec_max] = 0;
63 } 66 }
… …
72} 75}
73 76
74static void 77static void
75select_poll (EV_P_ ev_tstamp timeout) 78select_poll (EV_P_ ev_tstamp timeout)
76{ 79{
80 int word, offs;
77 struct timeval tv; 81 struct timeval tv;
78 int res; 82 int res;
79 83
80 memcpy (vec_ro, vec_ri, vec_max * 4); 84 memcpy (vec_ro, vec_ri, vec_max * 4);
81 memcpy (vec_wo, vec_wi, vec_max * 4); 85 memcpy (vec_wo, vec_wi, vec_max * 4);
… …
83 tv.tv_sec = (long)timeout; 87 tv.tv_sec = (long)timeout;
84 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); 88 tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
85 89
86 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);
87 91
88 if (res > 0) 92 if (res < 0)
89 {
90 int word, offs;
91
92 for (word = vec_max; word--; )
93 {
94 if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
95 for (offs = 4; offs--; )
96 {
97 int idx = word * 4 + offs;
98 unsigned char byte_r = vec_ro [idx];
99 unsigned char byte_w = vec_wo [idx];
100 int bit;
101
102 if (byte_r | byte_w)
103 for (bit = 8; bit--; )
104 {
105 int events = 0;
106 events |= byte_r & (1 << bit) ? EV_READ : 0;
107 events |= byte_w & (1 << bit) ? EV_WRITE : 0;
108
109 if (events)
110 fd_event (idx * 8 + bit, events);
111 }
112 }
113 }
114 }
115 else if (res < 0)
116 { 93 {
117 if (errno == EBADF) 94 if (errno == EBADF)
118 fd_ebadf (); 95 fd_ebadf (EV_A);
119 else if (errno == ENOMEM) 96 else if (errno == ENOMEM && !syserr_cb)
120 fd_enomem (); 97 fd_enomem (EV_A);
98 else if (errno != EINTR)
99 syserr ("(libev) select");
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 }
121 } 125 }
122} 126}
123 127
124static int 128static int
125select_init (EV_P_ int flags) 129select_init (EV_P_ int flags)
126{ 130{
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;
130 134
135 vec_max = 0;
136 vec_ri = 0;
137 vec_ri = 0;
138 vec_wo = 0;
139 vec_wo = 0;
140
131 return EVMETHOD_SELECT; 141 return EVMETHOD_SELECT;
132} 142}
133 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