… | |
… | |
32 | #include <stddef.h> |
32 | #include <stddef.h> |
33 | #include <stdlib.h> |
33 | #include <stdlib.h> |
34 | #include <sys/time.h> |
34 | #include <sys/time.h> |
35 | #include <assert.h> |
35 | #include <assert.h> |
36 | |
36 | |
|
|
37 | #include "ev.h" |
37 | #include "event.h" |
38 | #include "event.h" |
38 | |
39 | |
39 | #if EV_MULTIPLICITY |
40 | #if EV_MULTIPLICITY |
40 | # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base |
41 | # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base |
41 | # define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base |
42 | # define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base |
… | |
… | |
84 | { |
85 | { |
85 | #if EV_MULTIPLICITY |
86 | #if EV_MULTIPLICITY |
86 | if (x_cur) |
87 | if (x_cur) |
87 | x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); |
88 | x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); |
88 | else |
89 | else |
89 | x_cur = ev_default_loop (EVMETHOD_AUTO); |
90 | x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); |
90 | #else |
91 | #else |
91 | 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)); |
92 | |
93 | |
93 | x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); |
94 | x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); |
94 | #endif |
95 | #endif |
… | |
… | |
99 | void event_base_free (struct event_base *base) |
100 | void event_base_free (struct event_base *base) |
100 | { |
101 | { |
101 | dLOOPbase; |
102 | dLOOPbase; |
102 | |
103 | |
103 | #if EV_MULTIPLICITY |
104 | #if EV_MULTIPLICITY |
|
|
105 | if (ev_default_loop (EVMETHOD_AUTO) != loop) |
104 | ev_loop_delete (loop); |
106 | ev_loop_destroy (loop); |
105 | #endif |
107 | #endif |
106 | } |
108 | } |
107 | |
109 | |
108 | int event_dispatch (void) |
110 | int event_dispatch (void) |
109 | { |
111 | { |
… | |
… | |
154 | } |
156 | } |
155 | |
157 | |
156 | static void |
158 | static void |
157 | x_cb_to (EV_P_ struct ev_timer *w, int revents) |
159 | x_cb_to (EV_P_ struct ev_timer *w, int revents) |
158 | { |
160 | { |
159 | 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); |
160 | } |
166 | } |
161 | |
167 | |
162 | void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) |
168 | void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) |
163 | { |
169 | { |
164 | if (!ev->initialised) |
170 | printf ("event set %p\n", ev);//D |
165 | { |
|
|
166 | ev->initialised = 1; |
|
|
167 | |
|
|
168 | if (events & EV_SIGNAL) |
171 | if (events & EV_SIGNAL) |
169 | ev_watcher_init (&ev->iosig.sig, x_cb_sig); |
172 | ev_watcher_init (&ev->iosig.sig, x_cb_sig); |
170 | else |
173 | else |
171 | ev_watcher_init (&ev->iosig.io, x_cb_io); |
174 | ev_watcher_init (&ev->iosig.io, x_cb_io); |
172 | |
175 | |
173 | ev_watcher_init (&ev->to, x_cb_to); |
176 | ev_watcher_init (&ev->to, x_cb_to); |
174 | } |
|
|
175 | |
177 | |
176 | ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ |
178 | ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ |
177 | ev->ev_fd = fd; |
179 | ev->ev_fd = fd; |
178 | ev->ev_events = events; |
180 | ev->ev_events = events; |
179 | ev->ev_pri = 0; |
181 | ev->ev_pri = 0; |
… | |
… | |
187 | return event_base_once (x_cur, fd, events, cb, arg, tv); |
189 | return event_base_once (x_cur, fd, events, cb, arg, tv); |
188 | } |
190 | } |
189 | |
191 | |
190 | int event_add (struct event *ev, struct timeval *tv) |
192 | int event_add (struct event *ev, struct timeval *tv) |
191 | { |
193 | { |
|
|
194 | printf ("event add %p %p\n", ev, &ev->to);//D |
192 | dLOOPev; |
195 | dLOOPev; |
193 | |
196 | |
194 | /* disable all watchers */ |
197 | /* disable all watchers */ |
195 | event_del (ev); |
198 | event_del (ev); |
196 | |
199 | |
… | |
… | |
214 | return 0; |
217 | return 0; |
215 | } |
218 | } |
216 | |
219 | |
217 | int event_del (struct event *ev) |
220 | int event_del (struct event *ev) |
218 | { |
221 | { |
|
|
222 | printf ("event del %p\n", ev);//D |
219 | dLOOPev; |
223 | dLOOPev; |
220 | |
224 | |
221 | if (ev->ev_events & EV_SIGNAL) |
225 | if (ev->ev_events & EV_SIGNAL) |
222 | { |
226 | { |
223 | /* sig */ |
227 | /* sig */ |
… | |
… | |
229 | /* io */ |
233 | /* io */ |
230 | if (ev_is_active (&ev->iosig.io)) |
234 | if (ev_is_active (&ev->iosig.io)) |
231 | ev_io_stop (EV_A_ &ev->iosig.io); |
235 | ev_io_stop (EV_A_ &ev->iosig.io); |
232 | } |
236 | } |
233 | |
237 | |
|
|
238 | printf ("to %p %d\n", &ev->to, ev->to.active);//D |
234 | if (ev_is_active (&ev->to)) |
239 | if (ev_is_active (&ev->to)) |
235 | ev_timer_stop (EV_A_ &ev->to); |
240 | ev_timer_stop (EV_A_ &ev->to); |
236 | |
241 | |
237 | return 0; |
242 | return 0; |
238 | } |
243 | } |
… | |
… | |
244 | short revents = 0; |
249 | short revents = 0; |
245 | |
250 | |
246 | if (ev->ev_events & EV_SIGNAL) |
251 | if (ev->ev_events & EV_SIGNAL) |
247 | { |
252 | { |
248 | /* sig */ |
253 | /* sig */ |
249 | if (ev->iosig.sig.pending) |
254 | if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) |
250 | revents |= EV_SIGNAL; |
255 | revents |= EV_SIGNAL; |
251 | } |
256 | } |
252 | else |
257 | else |
253 | { |
258 | { |
254 | /* io */ |
259 | /* io */ |
255 | if (ev->iosig.io.pending) |
260 | if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io)) |
256 | revents |= ev->ev_events & (EV_READ | EV_WRITE); |
261 | revents |= ev->ev_events & (EV_READ | EV_WRITE); |
257 | } |
262 | } |
258 | |
263 | |
259 | if (ev->to.pending) |
264 | if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) |
260 | { |
265 | { |
261 | revents |= EV_TIMEOUT; |
266 | revents |= EV_TIMEOUT; |
262 | |
267 | |
263 | if (tv) |
268 | if (tv) |
264 | tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ |
269 | tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ |
… | |
… | |
351 | return 0; |
356 | return 0; |
352 | } |
357 | } |
353 | |
358 | |
354 | int event_base_priority_init (struct event_base *base, int npri) |
359 | int event_base_priority_init (struct event_base *base, int npri) |
355 | { |
360 | { |
356 | dLOOPbase; |
361 | /*dLOOPbase;*/ |
357 | |
362 | |
358 | return 0; |
363 | return 0; |
359 | } |
364 | } |
360 | |
365 | |