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

Comparing libev/event.c (file contents):
Revision 1.26 by root, Mon Nov 12 00:31:08 2007 UTC vs.
Revision 1.31 by root, Wed Nov 14 05:30:02 2007 UTC

… …
89 89
90void *event_init (void) 90void *event_init (void)
91{ 91{
92#if EV_MULTIPLICITY 92#if EV_MULTIPLICITY
93 if (x_cur) 93 if (x_cur)
94 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 94 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
95 else 95 else
96 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 96 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
97#else 97#else
98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
99 99
100 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); 100 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
101#endif 101#endif
102 102
103 return x_cur; 103 return x_cur;
104} 104}
105 105
106void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
107{ 107{
108 dLOOPbase; 108 dLOOPbase;
109 109
110#if EV_MULTIPLICITY 110#if EV_MULTIPLICITY
111 if (ev_default_loop (EVMETHOD_AUTO) != loop) 111 if (ev_default_loop (EVFLAG_AUTO) != loop)
112 ev_loop_destroy (loop); 112 ev_loop_destroy (loop);
113#endif 113#endif
114} 114}
115 115
116int event_dispatch (void) 116int event_dispatch (void)
… …
161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
162 162
163 if (revents & EV_ERROR) 163 if (revents & EV_ERROR)
164 event_del (ev); 164 event_del (ev);
165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 {
166 ev_io_stop (EV_A_ w); 167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
167 170
168 x_cb (ev, revents); 171 x_cb (ev, revents);
169} 172}
170 173
171static void 174static void
… …
192 ev->ev_events = events; 195 ev->ev_events = events;
193 ev->ev_pri = 0; 196 ev->ev_pri = 0;
194 ev->ev_callback = cb; 197 ev->ev_callback = cb;
195 ev->ev_arg = arg; 198 ev->ev_arg = arg;
196 ev->ev_res = 0; 199 ev->ev_res = 0;
200 ev->ev_flags = EVLIST_INIT;
197} 201}
198 202
199int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 203int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
200{ 204{
201 return event_base_once (x_cur, fd, events, cb, arg, tv); 205 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
203 207
204int event_add (struct event *ev, struct timeval *tv) 208int event_add (struct event *ev, struct timeval *tv)
205{ 209{
206 dLOOPev; 210 dLOOPev;
207 211
208 /* disable all watchers */
209 event_del (ev);
210
211 if (ev->ev_events & EV_SIGNAL) 212 if (ev->ev_events & EV_SIGNAL)
212 { 213 {
214 if (!ev_is_active (&ev->iosig.sig))
215 {
213 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 216 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
214 ev_signal_start (EV_A_ &ev->iosig.sig); 217 ev_signal_start (EV_A_ &ev->iosig.sig);
218
219 ev->ev_flags |= EVLIST_SIGNAL;
220 }
215 } 221 }
216 else if (ev->ev_events & (EV_READ | EV_WRITE)) 222 else if (ev->ev_events & (EV_READ | EV_WRITE))
217 { 223 {
224 if (!ev_is_active (&ev->iosig.io))
225 {
218 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 226 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
219 ev_io_start (EV_A_ &ev->iosig.io); 227 ev_io_start (EV_A_ &ev->iosig.io);
228
229 ev->ev_flags |= EVLIST_INSERTED;
230 }
220 } 231 }
221 232
222 if (tv) 233 if (tv)
223 { 234 {
224 ev_timer_set (&ev->to, tv_get (tv), 0.); 235 ev->to.repeat = tv_get (tv);
236 ev_timer_again (EV_A_ &ev->to);
237 ev->ev_flags |= EVLIST_TIMEOUT;
238 }
239 else
240 if (ev_is_active (&ev->to))
225 ev_timer_start (EV_A_ &ev->to); 241 ev_timer_stop (EV_A_ &ev->to);
226 } 242
243 ev->ev_flags |= EVLIST_ACTIVE;
227 244
228 return 0; 245 return 0;
229} 246}
230 247
231int event_del (struct event *ev) 248int event_del (struct event *ev)
… …
246 } 263 }
247 264
248 if (ev_is_active (&ev->to)) 265 if (ev_is_active (&ev->to))
249 ev_timer_stop (EV_A_ &ev->to); 266 ev_timer_stop (EV_A_ &ev->to);
250 267
268 ev->ev_flags = EVLIST_INIT;
269
251 return 0; 270 return 0;
252} 271}
253 272
254void event_active (struct event *ev, int res, short ncalls) 273void event_active (struct event *ev, int res, short ncalls)
255{ 274{
… …
331static void 350static void
332x_loopexit_cb (int revents, void *base) 351x_loopexit_cb (int revents, void *base)
333{ 352{
334 dLOOPbase; 353 dLOOPbase;
335 354
336 ev_unloop (EV_A_ EVUNLOOP_ONCE); 355 ev_unloop (EV_A_ EVUNLOOP_ONE);
337} 356}
338 357
339int event_base_loopexit (struct event_base *base, struct timeval *tv) 358int event_base_loopexit (struct event_base *base, struct timeval *tv)
340{ 359{
341 ev_tstamp after = tv_get (tv); 360 ev_tstamp after = tv_get (tv);

Diff Legend

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