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

Comparing libev/event.c (file contents):
Revision 1.12 by root, Sun Nov 4 18:15:16 2007 UTC vs.
Revision 1.17 by root, Sun Nov 4 23:14:11 2007 UTC

… …
85{ 85{
86#if EV_MULTIPLICITY 86#if EV_MULTIPLICITY
87 if (x_cur) 87 if (x_cur)
88 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 88 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
89 else 89 else
90 x_cur = ev_default_loop (EVMETHOD_AUTO); 90 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
91#else 91#else
92 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 92 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
93 93
94 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 94 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
95#endif 95#endif
96 96
97 return x_cur; 97 return x_cur;
98} 98}
99 99
100void event_base_free (struct event_base *base) 100void event_base_free (struct event_base *base)
101{ 101{
102 dLOOPbase; 102 dLOOPbase;
103 103
104#if EV_MULTIPLICITY 104#if EV_MULTIPLICITY
105 if (ev_default_loop (EVMETHOD_AUTO) != loop)
105 ev_loop_delete (loop); 106 ev_loop_destroy (loop);
106#endif 107#endif
107} 108}
108 109
109int event_dispatch (void) 110int event_dispatch (void)
110{ 111{
… …
155} 156}
156 157
157static void 158static void
158x_cb_to (EV_P_ struct ev_timer *w, int revents) 159x_cb_to (EV_P_ struct ev_timer *w, int revents)
159{ 160{
160 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);
161} 166}
162 167
163void 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)
164{ 169{
165 if (!ev->initialised)
166 {
167 ev->initialised = 1;
168
169 if (events & EV_SIGNAL) 170 if (events & EV_SIGNAL)
170 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 171 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
171 else 172 else
172 ev_watcher_init (&ev->iosig.io, x_cb_io); 173 ev_watcher_init (&ev->iosig.io, x_cb_io);
173 174
174 ev_watcher_init (&ev->to, x_cb_to); 175 ev_watcher_init (&ev->to, x_cb_to);
175 }
176 176
177 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 177 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
178 ev->ev_fd = fd; 178 ev->ev_fd = fd;
179 ev->ev_events = events; 179 ev->ev_events = events;
180 ev->ev_pri = 0; 180 ev->ev_pri = 0;
… …
223 { 223 {
224 /* sig */ 224 /* sig */
225 if (ev_is_active (&ev->iosig.sig)) 225 if (ev_is_active (&ev->iosig.sig))
226 ev_signal_stop (EV_A_ &ev->iosig.sig); 226 ev_signal_stop (EV_A_ &ev->iosig.sig);
227 } 227 }
228 else 228 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 { 229 {
230 /* io */ 230 /* io */
231 if (ev_is_active (&ev->iosig.io)) 231 if (ev_is_active (&ev->iosig.io))
232 ev_io_stop (EV_A_ &ev->iosig.io); 232 ev_io_stop (EV_A_ &ev->iosig.io);
233 } 233 }
… …
245 short revents = 0; 245 short revents = 0;
246 246
247 if (ev->ev_events & EV_SIGNAL) 247 if (ev->ev_events & EV_SIGNAL)
248 { 248 {
249 /* sig */ 249 /* sig */
250 if (ev->iosig.sig.pending) 250 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
251 revents |= EV_SIGNAL; 251 revents |= EV_SIGNAL;
252 } 252 }
253 else 253 else if (ev->ev_events & (EV_READ | EV_WRITE))
254 { 254 {
255 /* io */ 255 /* io */
256 if (ev->iosig.io.pending) 256 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
257 revents |= ev->ev_events & (EV_READ | EV_WRITE); 257 revents |= ev->ev_events & (EV_READ | EV_WRITE);
258 } 258 }
259 259
260 if (ev->to.pending) 260 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
261 { 261 {
262 revents |= EV_TIMEOUT; 262 revents |= EV_TIMEOUT;
263 263
264 if (tv) 264 if (tv)
265 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 265 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
352 return 0; 352 return 0;
353} 353}
354 354
355int event_base_priority_init (struct event_base *base, int npri) 355int event_base_priority_init (struct event_base *base, int npri)
356{ 356{
357 dLOOPbase; 357 /*dLOOPbase;*/
358 358
359 return 0; 359 return 0;
360} 360}
361 361

Diff Legend

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