… | |
… | |
156 | } |
156 | } |
157 | |
157 | |
158 | static void |
158 | static void |
159 | x_cb_to (EV_P_ struct ev_timer *w, int revents) |
159 | x_cb_to (EV_P_ struct ev_timer *w, int revents) |
160 | { |
160 | { |
161 | 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); |
162 | } |
166 | } |
163 | |
167 | |
164 | 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) |
165 | { |
169 | { |
166 | if (!ev->initialised) |
|
|
167 | { |
|
|
168 | ev->initialised = 1; |
|
|
169 | |
|
|
170 | if (events & EV_SIGNAL) |
170 | if (events & EV_SIGNAL) |
171 | ev_watcher_init (&ev->iosig.sig, x_cb_sig); |
171 | ev_watcher_init (&ev->iosig.sig, x_cb_sig); |
172 | else |
172 | else |
173 | ev_watcher_init (&ev->iosig.io, x_cb_io); |
173 | ev_watcher_init (&ev->iosig.io, x_cb_io); |
174 | |
174 | |
175 | ev_watcher_init (&ev->to, x_cb_to); |
175 | ev_watcher_init (&ev->to, x_cb_to); |
176 | } |
|
|
177 | |
176 | |
178 | 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 */ |
179 | ev->ev_fd = fd; |
178 | ev->ev_fd = fd; |
180 | ev->ev_events = events; |
179 | ev->ev_events = events; |
181 | ev->ev_pri = 0; |
180 | ev->ev_pri = 0; |
… | |
… | |
246 | short revents = 0; |
245 | short revents = 0; |
247 | |
246 | |
248 | if (ev->ev_events & EV_SIGNAL) |
247 | if (ev->ev_events & EV_SIGNAL) |
249 | { |
248 | { |
250 | /* sig */ |
249 | /* sig */ |
251 | if (ev->iosig.sig.pending) |
250 | if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) |
252 | revents |= EV_SIGNAL; |
251 | revents |= EV_SIGNAL; |
253 | } |
252 | } |
254 | else |
253 | else |
255 | { |
254 | { |
256 | /* io */ |
255 | /* io */ |
257 | if (ev->iosig.io.pending) |
256 | if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io)) |
258 | revents |= ev->ev_events & (EV_READ | EV_WRITE); |
257 | revents |= ev->ev_events & (EV_READ | EV_WRITE); |
259 | } |
258 | } |
260 | |
259 | |
261 | if (ev->to.pending) |
260 | if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) |
262 | { |
261 | { |
263 | revents |= EV_TIMEOUT; |
262 | revents |= EV_TIMEOUT; |
264 | |
263 | |
265 | if (tv) |
264 | if (tv) |
266 | 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 :) */ |