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

Comparing libev/event.c (file contents):
Revision 1.27 by root, Mon Nov 12 01:11:36 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)
… …
207 207
208int event_add (struct event *ev, struct timeval *tv) 208int event_add (struct event *ev, struct timeval *tv)
209{ 209{
210 dLOOPev; 210 dLOOPev;
211 211
212 /* disable all watchers */
213 event_del (ev);
214
215 if (ev->ev_events & EV_SIGNAL) 212 if (ev->ev_events & EV_SIGNAL)
216 { 213 {
214 if (!ev_is_active (&ev->iosig.sig))
215 {
217 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 216 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
218 ev_signal_start (EV_A_ &ev->iosig.sig); 217 ev_signal_start (EV_A_ &ev->iosig.sig);
219 218
220 ev->ev_flags |= EVLIST_SIGNAL; 219 ev->ev_flags |= EVLIST_SIGNAL;
220 }
221 } 221 }
222 else if (ev->ev_events & (EV_READ | EV_WRITE)) 222 else if (ev->ev_events & (EV_READ | EV_WRITE))
223 { 223 {
224 if (!ev_is_active (&ev->iosig.io))
225 {
224 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));
225 ev_io_start (EV_A_ &ev->iosig.io); 227 ev_io_start (EV_A_ &ev->iosig.io);
226 228
227 ev->ev_flags |= EVLIST_INSERTED; 229 ev->ev_flags |= EVLIST_INSERTED;
230 }
228 } 231 }
229 232
230 if (tv) 233 if (tv)
231 { 234 {
232 ev_timer_set (&ev->to, tv_get (tv), 0.); 235 ev->to.repeat = tv_get (tv);
233 ev_timer_start (EV_A_ &ev->to); 236 ev_timer_again (EV_A_ &ev->to);
234
235 ev->ev_flags |= EVLIST_TIMEOUT; 237 ev->ev_flags |= EVLIST_TIMEOUT;
236 } 238 }
239 else
240 if (ev_is_active (&ev->to))
241 ev_timer_stop (EV_A_ &ev->to);
237 242
238 ev->ev_flags |= EVLIST_ACTIVE; 243 ev->ev_flags |= EVLIST_ACTIVE;
239 244
240 return 0; 245 return 0;
241} 246}
… …
345static void 350static void
346x_loopexit_cb (int revents, void *base) 351x_loopexit_cb (int revents, void *base)
347{ 352{
348 dLOOPbase; 353 dLOOPbase;
349 354
350 ev_unloop (EV_A_ EVUNLOOP_ONCE); 355 ev_unloop (EV_A_ EVUNLOOP_ONE);
351} 356}
352 357
353int event_base_loopexit (struct event_base *base, struct timeval *tv) 358int event_base_loopexit (struct event_base *base, struct timeval *tv)
354{ 359{
355 ev_tstamp after = tv_get (tv); 360 ev_tstamp after = tv_get (tv);

Diff Legend

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