ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/event.c
(Generate patch)

Comparing libev/event.c (file contents):
Revision 1.13 by root, Sun Nov 4 18:29:44 2007 UTC vs.
Revision 1.15 by root, Sun Nov 4 20:38:07 2007 UTC

… …
156} 156}
157 157
158static void 158static void
159x_cb_to (EV_P_ struct ev_timer *w, int revents) 159x_cb_to (EV_P_ struct ev_timer *w, int revents)
160{ 160{
161 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
162
163 event_del (ev);
164
165 x_cb (ev, revents);
162} 166}
163 167
164void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 168void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
165{ 169{
166 if (!ev->initialised) 170 printf ("event set %p\n", ev);//D
167 {
168 ev->initialised = 1;
169
170 if (events & EV_SIGNAL) 171 if (events & EV_SIGNAL)
171 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 172 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
172 else 173 else
173 ev_watcher_init (&ev->iosig.io, x_cb_io); 174 ev_watcher_init (&ev->iosig.io, x_cb_io);
174 175
175 ev_watcher_init (&ev->to, x_cb_to); 176 ev_watcher_init (&ev->to, x_cb_to);
176 }
177 177
178 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 178 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
179 ev->ev_fd = fd; 179 ev->ev_fd = fd;
180 ev->ev_events = events; 180 ev->ev_events = events;
181 ev->ev_pri = 0; 181 ev->ev_pri = 0;
… …
189 return event_base_once (x_cur, fd, events, cb, arg, tv); 189 return event_base_once (x_cur, fd, events, cb, arg, tv);
190} 190}
191 191
192int event_add (struct event *ev, struct timeval *tv) 192int event_add (struct event *ev, struct timeval *tv)
193{ 193{
194 printf ("event add %p %p\n", ev, &ev->to);//D
194 dLOOPev; 195 dLOOPev;
195 196
196 /* disable all watchers */ 197 /* disable all watchers */
197 event_del (ev); 198 event_del (ev);
198 199
… …
216 return 0; 217 return 0;
217} 218}
218 219
219int event_del (struct event *ev) 220int event_del (struct event *ev)
220{ 221{
222 printf ("event del %p\n", ev);//D
221 dLOOPev; 223 dLOOPev;
222 224
223 if (ev->ev_events & EV_SIGNAL) 225 if (ev->ev_events & EV_SIGNAL)
224 { 226 {
225 /* sig */ 227 /* sig */
… …
231 /* io */ 233 /* io */
232 if (ev_is_active (&ev->iosig.io)) 234 if (ev_is_active (&ev->iosig.io))
233 ev_io_stop (EV_A_ &ev->iosig.io); 235 ev_io_stop (EV_A_ &ev->iosig.io);
234 } 236 }
235 237
238 printf ("to %p %d\n", &ev->to, ev->to.active);//D
236 if (ev_is_active (&ev->to)) 239 if (ev_is_active (&ev->to))
237 ev_timer_stop (EV_A_ &ev->to); 240 ev_timer_stop (EV_A_ &ev->to);
238 241
239 return 0; 242 return 0;
240} 243}
… …
246 short revents = 0; 249 short revents = 0;
247 250
248 if (ev->ev_events & EV_SIGNAL) 251 if (ev->ev_events & EV_SIGNAL)
249 { 252 {
250 /* sig */ 253 /* sig */
251 if (ev->iosig.sig.pending) 254 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
252 revents |= EV_SIGNAL; 255 revents |= EV_SIGNAL;
253 } 256 }
254 else 257 else
255 { 258 {
256 /* io */ 259 /* io */
257 if (ev->iosig.io.pending) 260 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
258 revents |= ev->ev_events & (EV_READ | EV_WRITE); 261 revents |= ev->ev_events & (EV_READ | EV_WRITE);
259 } 262 }
260 263
261 if (ev->to.pending) 264 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
262 { 265 {
263 revents |= EV_TIMEOUT; 266 revents |= EV_TIMEOUT;
264 267
265 if (tv) 268 if (tv)
266 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 269 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */

Diff Legend

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