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

Comparing libev/event.c (file contents):
Revision 1.28 by root, Mon Nov 12 08:00:05 2007 UTC vs.
Revision 1.32 by root, Thu Nov 29 12:21:06 2007 UTC

… …
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)
… …
158static void 158static void
159x_cb_io (EV_P_ struct ev_io *w, int revents) 159x_cb_io (EV_P_ struct ev_io *w, int revents)
160{ 160{
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) || !(ev->ev_events & EV_PERSIST))
164 event_del (ev); 164 event_del (ev);
165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 {
167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
170 165
171 x_cb (ev, revents); 166 x_cb (ev, revents);
172} 167}
173 168
174static void 169static void
… …
207 202
208int event_add (struct event *ev, struct timeval *tv) 203int event_add (struct event *ev, struct timeval *tv)
209{ 204{
210 dLOOPev; 205 dLOOPev;
211 206
212 /* disable all watchers */
213 event_del (ev);
214
215 if (ev->ev_events & EV_SIGNAL) 207 if (ev->ev_events & EV_SIGNAL)
216 { 208 {
209 if (!ev_is_active (&ev->iosig.sig))
210 {
217 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 211 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
218 ev_signal_start (EV_A_ &ev->iosig.sig); 212 ev_signal_start (EV_A_ &ev->iosig.sig);
219 213
220 ev->ev_flags |= EVLIST_SIGNAL; 214 ev->ev_flags |= EVLIST_SIGNAL;
215 }
221 } 216 }
222 else if (ev->ev_events & (EV_READ | EV_WRITE)) 217 else if (ev->ev_events & (EV_READ | EV_WRITE))
223 { 218 {
219 if (!ev_is_active (&ev->iosig.io))
220 {
224 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 221 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); 222 ev_io_start (EV_A_ &ev->iosig.io);
226 223
227 ev->ev_flags |= EVLIST_INSERTED; 224 ev->ev_flags |= EVLIST_INSERTED;
225 }
228 } 226 }
229 227
230 if (tv) 228 if (tv)
231 { 229 {
232 ev_timer_set (&ev->to, tv_get (tv), 0.); 230 ev->to.repeat = tv_get (tv);
233 ev_timer_start (EV_A_ &ev->to); 231 ev_timer_again (EV_A_ &ev->to);
234
235 ev->ev_flags |= EVLIST_TIMEOUT; 232 ev->ev_flags |= EVLIST_TIMEOUT;
236 } 233 }
234 else
235 {
236 ev_timer_stop (EV_A_ &ev->to);
237 ev->ev_flags &= ~EVLIST_TIMEOUT;
238 }
237 239
238 ev->ev_flags |= EVLIST_ACTIVE; 240 ev->ev_flags |= EVLIST_ACTIVE;
239 241
240 return 0; 242 return 0;
241} 243}
… …
243int event_del (struct event *ev) 245int event_del (struct event *ev)
244{ 246{
245 dLOOPev; 247 dLOOPev;
246 248
247 if (ev->ev_events & EV_SIGNAL) 249 if (ev->ev_events & EV_SIGNAL)
248 {
249 /* sig */
250 if (ev_is_active (&ev->iosig.sig))
251 ev_signal_stop (EV_A_ &ev->iosig.sig); 250 ev_signal_stop (EV_A_ &ev->iosig.sig);
252 }
253 else if (ev->ev_events & (EV_READ | EV_WRITE)) 251 else if (ev->ev_events & (EV_READ | EV_WRITE))
254 {
255 /* io */
256 if (ev_is_active (&ev->iosig.io))
257 ev_io_stop (EV_A_ &ev->iosig.io); 252 ev_io_stop (EV_A_ &ev->iosig.io);
258 }
259 253
260 if (ev_is_active (&ev->to)) 254 if (ev_is_active (&ev->to))
261 ev_timer_stop (EV_A_ &ev->to); 255 ev_timer_stop (EV_A_ &ev->to);
262 256
263 ev->ev_flags = EVLIST_INIT; 257 ev->ev_flags = EVLIST_INIT;
… …
345static void 339static void
346x_loopexit_cb (int revents, void *base) 340x_loopexit_cb (int revents, void *base)
347{ 341{
348 dLOOPbase; 342 dLOOPbase;
349 343
350 ev_unloop (EV_A_ EVUNLOOP_ONCE); 344 ev_unloop (EV_A_ EVUNLOOP_ONE);
351} 345}
352 346
353int event_base_loopexit (struct event_base *base, struct timeval *tv) 347int event_base_loopexit (struct event_base *base, struct timeval *tv)
354{ 348{
355 ev_tstamp after = tv_get (tv); 349 ev_tstamp after = tv_get (tv);

Diff Legend

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