… | |
… | |
35 | |
35 | |
36 | #ifndef WIN32 |
36 | #ifndef WIN32 |
37 | # include <sys/time.h> |
37 | # include <sys/time.h> |
38 | #endif |
38 | #endif |
39 | |
39 | |
40 | #include "ev.h" |
40 | #ifdef EV_EVENT_H |
|
|
41 | # include EV_EVENT_H |
|
|
42 | #else |
41 | #include "event.h" |
43 | # include "event.h" |
|
|
44 | #endif |
42 | |
45 | |
43 | #if EV_MULTIPLICITY |
46 | #if EV_MULTIPLICITY |
44 | # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base |
47 | # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base |
45 | # define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base |
48 | # define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base |
46 | #else |
49 | #else |
… | |
… | |
86 | |
89 | |
87 | void *event_init (void) |
90 | void *event_init (void) |
88 | { |
91 | { |
89 | #if EV_MULTIPLICITY |
92 | #if EV_MULTIPLICITY |
90 | if (x_cur) |
93 | if (x_cur) |
91 | x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); |
94 | x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); |
92 | else |
95 | else |
93 | x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); |
96 | x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); |
94 | #else |
97 | #else |
95 | 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)); |
96 | |
99 | |
97 | x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); |
100 | x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO); |
98 | #endif |
101 | #endif |
99 | |
102 | |
100 | return x_cur; |
103 | return x_cur; |
101 | } |
104 | } |
102 | |
105 | |
103 | void event_base_free (struct event_base *base) |
106 | void event_base_free (struct event_base *base) |
104 | { |
107 | { |
105 | dLOOPbase; |
108 | dLOOPbase; |
106 | |
109 | |
107 | #if EV_MULTIPLICITY |
110 | #if EV_MULTIPLICITY |
108 | if (ev_default_loop (EVMETHOD_AUTO) != loop) |
111 | if (ev_default_loop (EVFLAG_AUTO) != loop) |
109 | ev_loop_destroy (loop); |
112 | ev_loop_destroy (loop); |
110 | #endif |
113 | #endif |
111 | } |
114 | } |
112 | |
115 | |
113 | int event_dispatch (void) |
116 | int event_dispatch (void) |
… | |
… | |
136 | x_cb (struct event *ev, int revents) |
139 | x_cb (struct event *ev, int revents) |
137 | { |
140 | { |
138 | revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; |
141 | revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; |
139 | |
142 | |
140 | ev->ev_res = revents; |
143 | ev->ev_res = revents; |
141 | ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); |
144 | ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); |
142 | } |
145 | } |
143 | |
146 | |
144 | static void |
147 | static void |
145 | x_cb_sig (EV_P_ struct ev_signal *w, int revents) |
148 | x_cb_sig (EV_P_ struct ev_signal *w, int revents) |
146 | { |
149 | { |
… | |
… | |
158 | 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)); |
159 | |
162 | |
160 | if (revents & EV_ERROR) |
163 | if (revents & EV_ERROR) |
161 | event_del (ev); |
164 | event_del (ev); |
162 | else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) |
165 | else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) |
|
|
166 | { |
163 | ev_io_stop (EV_A_ w); |
167 | ev_io_stop (EV_A_ w); |
|
|
168 | ev->ev_flags &= ~EVLIST_INSERTED; |
|
|
169 | } |
164 | |
170 | |
165 | x_cb (ev, revents); |
171 | x_cb (ev, revents); |
166 | } |
172 | } |
167 | |
173 | |
168 | static void |
174 | static void |
… | |
… | |
176 | } |
182 | } |
177 | |
183 | |
178 | void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) |
184 | void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) |
179 | { |
185 | { |
180 | if (events & EV_SIGNAL) |
186 | if (events & EV_SIGNAL) |
181 | ev_watcher_init (&ev->iosig.sig, x_cb_sig); |
187 | ev_init (&ev->iosig.sig, x_cb_sig); |
182 | else |
188 | else |
183 | ev_watcher_init (&ev->iosig.io, x_cb_io); |
189 | ev_init (&ev->iosig.io, x_cb_io); |
184 | |
190 | |
185 | ev_watcher_init (&ev->to, x_cb_to); |
191 | ev_init (&ev->to, x_cb_to); |
186 | |
192 | |
187 | ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ |
193 | ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ |
188 | ev->ev_fd = fd; |
194 | ev->ev_fd = fd; |
189 | ev->ev_events = events; |
195 | ev->ev_events = events; |
190 | ev->ev_pri = 0; |
196 | ev->ev_pri = 0; |
191 | ev->ev_callback = cb; |
197 | ev->ev_callback = cb; |
192 | ev->ev_arg = arg; |
198 | ev->ev_arg = arg; |
193 | ev->ev_res = 0; |
199 | ev->ev_res = 0; |
|
|
200 | ev->ev_flags = EVLIST_INIT; |
194 | } |
201 | } |
195 | |
202 | |
196 | int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) |
203 | int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) |
197 | { |
204 | { |
198 | return event_base_once (x_cur, fd, events, cb, arg, tv); |
205 | return event_base_once (x_cur, fd, events, cb, arg, tv); |
… | |
… | |
200 | |
207 | |
201 | int event_add (struct event *ev, struct timeval *tv) |
208 | int event_add (struct event *ev, struct timeval *tv) |
202 | { |
209 | { |
203 | dLOOPev; |
210 | dLOOPev; |
204 | |
211 | |
205 | /* disable all watchers */ |
|
|
206 | event_del (ev); |
|
|
207 | |
|
|
208 | if (ev->ev_events & EV_SIGNAL) |
212 | if (ev->ev_events & EV_SIGNAL) |
209 | { |
213 | { |
|
|
214 | if (!ev_is_active (&ev->iosig.sig)) |
|
|
215 | { |
210 | ev_signal_set (&ev->iosig.sig, ev->ev_fd); |
216 | ev_signal_set (&ev->iosig.sig, ev->ev_fd); |
211 | ev_signal_start (EV_A_ &ev->iosig.sig); |
217 | ev_signal_start (EV_A_ &ev->iosig.sig); |
|
|
218 | |
|
|
219 | ev->ev_flags |= EVLIST_SIGNAL; |
|
|
220 | } |
212 | } |
221 | } |
213 | else if (ev->ev_events & (EV_READ | EV_WRITE)) |
222 | else if (ev->ev_events & (EV_READ | EV_WRITE)) |
214 | { |
223 | { |
|
|
224 | if (!ev_is_active (&ev->iosig.io)) |
|
|
225 | { |
215 | 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)); |
216 | ev_io_start (EV_A_ &ev->iosig.io); |
227 | ev_io_start (EV_A_ &ev->iosig.io); |
|
|
228 | |
|
|
229 | ev->ev_flags |= EVLIST_INSERTED; |
|
|
230 | } |
217 | } |
231 | } |
218 | |
232 | |
219 | if (tv) |
233 | if (tv) |
220 | { |
234 | { |
221 | ev_timer_set (&ev->to, tv_get (tv), 0.); |
235 | ev->to.repeat = tv_get (tv); |
|
|
236 | ev_timer_again (EV_A_ &ev->to); |
|
|
237 | ev->ev_flags |= EVLIST_TIMEOUT; |
|
|
238 | } |
|
|
239 | else |
|
|
240 | if (ev_is_active (&ev->to)) |
222 | ev_timer_start (EV_A_ &ev->to); |
241 | ev_timer_stop (EV_A_ &ev->to); |
223 | } |
242 | |
|
|
243 | ev->ev_flags |= EVLIST_ACTIVE; |
224 | |
244 | |
225 | return 0; |
245 | return 0; |
226 | } |
246 | } |
227 | |
247 | |
228 | int event_del (struct event *ev) |
248 | int event_del (struct event *ev) |
… | |
… | |
243 | } |
263 | } |
244 | |
264 | |
245 | if (ev_is_active (&ev->to)) |
265 | if (ev_is_active (&ev->to)) |
246 | ev_timer_stop (EV_A_ &ev->to); |
266 | ev_timer_stop (EV_A_ &ev->to); |
247 | |
267 | |
|
|
268 | ev->ev_flags = EVLIST_INIT; |
|
|
269 | |
248 | return 0; |
270 | return 0; |
249 | } |
271 | } |
250 | |
272 | |
251 | void event_active (struct event *ev, int res, short ncalls) |
273 | void event_active (struct event *ev, int res, short ncalls) |
252 | { |
274 | { |
… | |
… | |
328 | static void |
350 | static void |
329 | x_loopexit_cb (int revents, void *base) |
351 | x_loopexit_cb (int revents, void *base) |
330 | { |
352 | { |
331 | dLOOPbase; |
353 | dLOOPbase; |
332 | |
354 | |
333 | ev_unloop (EV_A_ EVUNLOOP_ONCE); |
355 | ev_unloop (EV_A_ EVUNLOOP_ONE); |
334 | } |
356 | } |
335 | |
357 | |
336 | int event_base_loopexit (struct event_base *base, struct timeval *tv) |
358 | int event_base_loopexit (struct event_base *base, struct timeval *tv) |
337 | { |
359 | { |
338 | ev_tstamp after = tv_get (tv); |
360 | ev_tstamp after = tv_get (tv); |
… | |
… | |
353 | static void |
375 | static void |
354 | x_once_cb (int revents, void *arg) |
376 | x_once_cb (int revents, void *arg) |
355 | { |
377 | { |
356 | struct x_once *once = (struct x_once *)arg; |
378 | struct x_once *once = (struct x_once *)arg; |
357 | |
379 | |
358 | once->cb (once->fd, revents, once->arg); |
380 | once->cb (once->fd, (short)revents, once->arg); |
359 | free (once); |
381 | free (once); |
360 | } |
382 | } |
361 | |
383 | |
362 | int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) |
384 | int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) |
363 | { |
385 | { |