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

Comparing libev/event.c (file contents):
Revision 1.25 by root, Fri Nov 9 21:48:23 2007 UTC vs.
Revision 1.32 by root, Thu Nov 29 12:21:06 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)
… …
139x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
140{ 140{
141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
142 142
143 ev->ev_res = revents; 143 ev->ev_res = revents;
144 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
145} 145}
146 146
147static void 147static void
148x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
149{ 149{
… …
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 ev_io_stop (EV_A_ w);
167 165
168 x_cb (ev, revents); 166 x_cb (ev, revents);
169} 167}
170 168
171static void 169static void
… …
192 ev->ev_events = events; 190 ev->ev_events = events;
193 ev->ev_pri = 0; 191 ev->ev_pri = 0;
194 ev->ev_callback = cb; 192 ev->ev_callback = cb;
195 ev->ev_arg = arg; 193 ev->ev_arg = arg;
196 ev->ev_res = 0; 194 ev->ev_res = 0;
195 ev->ev_flags = EVLIST_INIT;
197} 196}
198 197
199int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 198int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
200{ 199{
201 return event_base_once (x_cur, fd, events, cb, arg, tv); 200 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
203 202
204int event_add (struct event *ev, struct timeval *tv) 203int event_add (struct event *ev, struct timeval *tv)
205{ 204{
206 dLOOPev; 205 dLOOPev;
207 206
208 /* disable all watchers */
209 event_del (ev);
210
211 if (ev->ev_events & EV_SIGNAL) 207 if (ev->ev_events & EV_SIGNAL)
212 { 208 {
209 if (!ev_is_active (&ev->iosig.sig))
210 {
213 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 211 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
214 ev_signal_start (EV_A_ &ev->iosig.sig); 212 ev_signal_start (EV_A_ &ev->iosig.sig);
213
214 ev->ev_flags |= EVLIST_SIGNAL;
215 }
215 } 216 }
216 else if (ev->ev_events & (EV_READ | EV_WRITE)) 217 else if (ev->ev_events & (EV_READ | EV_WRITE))
217 { 218 {
219 if (!ev_is_active (&ev->iosig.io))
220 {
218 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));
219 ev_io_start (EV_A_ &ev->iosig.io); 222 ev_io_start (EV_A_ &ev->iosig.io);
223
224 ev->ev_flags |= EVLIST_INSERTED;
225 }
220 } 226 }
221 227
222 if (tv) 228 if (tv)
223 { 229 {
224 ev_timer_set (&ev->to, tv_get (tv), 0.); 230 ev->to.repeat = tv_get (tv);
231 ev_timer_again (EV_A_ &ev->to);
232 ev->ev_flags |= EVLIST_TIMEOUT;
233 }
234 else
235 {
225 ev_timer_start (EV_A_ &ev->to); 236 ev_timer_stop (EV_A_ &ev->to);
237 ev->ev_flags &= ~EVLIST_TIMEOUT;
226 } 238 }
239
240 ev->ev_flags |= EVLIST_ACTIVE;
227 241
228 return 0; 242 return 0;
229} 243}
230 244
231int event_del (struct event *ev) 245int event_del (struct event *ev)
232{ 246{
233 dLOOPev; 247 dLOOPev;
234 248
235 if (ev->ev_events & EV_SIGNAL) 249 if (ev->ev_events & EV_SIGNAL)
236 {
237 /* sig */
238 if (ev_is_active (&ev->iosig.sig))
239 ev_signal_stop (EV_A_ &ev->iosig.sig); 250 ev_signal_stop (EV_A_ &ev->iosig.sig);
240 }
241 else if (ev->ev_events & (EV_READ | EV_WRITE)) 251 else if (ev->ev_events & (EV_READ | EV_WRITE))
242 {
243 /* io */
244 if (ev_is_active (&ev->iosig.io))
245 ev_io_stop (EV_A_ &ev->iosig.io); 252 ev_io_stop (EV_A_ &ev->iosig.io);
246 }
247 253
248 if (ev_is_active (&ev->to)) 254 if (ev_is_active (&ev->to))
249 ev_timer_stop (EV_A_ &ev->to); 255 ev_timer_stop (EV_A_ &ev->to);
256
257 ev->ev_flags = EVLIST_INIT;
250 258
251 return 0; 259 return 0;
252} 260}
253 261
254void event_active (struct event *ev, int res, short ncalls) 262void event_active (struct event *ev, int res, short ncalls)
… …
331static void 339static void
332x_loopexit_cb (int revents, void *base) 340x_loopexit_cb (int revents, void *base)
333{ 341{
334 dLOOPbase; 342 dLOOPbase;
335 343
336 ev_unloop (EV_A_ EVUNLOOP_ONCE); 344 ev_unloop (EV_A_ EVUNLOOP_ONE);
337} 345}
338 346
339int event_base_loopexit (struct event_base *base, struct timeval *tv) 347int event_base_loopexit (struct event_base *base, struct timeval *tv)
340{ 348{
341 ev_tstamp after = tv_get (tv); 349 ev_tstamp after = tv_get (tv);
… …
356static void 364static void
357x_once_cb (int revents, void *arg) 365x_once_cb (int revents, void *arg)
358{ 366{
359 struct x_once *once = (struct x_once *)arg; 367 struct x_once *once = (struct x_once *)arg;
360 368
361 once->cb (once->fd, revents, once->arg); 369 once->cb (once->fd, (short)revents, once->arg);
362 free (once); 370 free (once);
363} 371}
364 372
365int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 373int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
366{ 374{

Diff Legend

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