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

Comparing libev/event.c (file contents):
Revision 1.6 by root, Sat Nov 3 20:24:42 2007 UTC vs.
Revision 1.26 by root, Mon Nov 12 00:31:08 2007 UTC

… …
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <stddef.h> 32#include <stddef.h>
33#include <stdlib.h> 33#include <stdlib.h>
34#include <assert.h>
35
36#ifndef WIN32
34#include <sys/time.h> 37# include <sys/time.h>
38#endif
35 39
40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
36#include "event.h" 43# include "event.h"
44#endif
37 45
46#if EV_MULTIPLICITY
47# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
49#else
50# define dLOOPev
51# define dLOOPbase
52#endif
53
54/* never accessed, will always be cast from/to ev_loop */
38struct event_base 55struct event_base
39{ 56{
40 int dummy; 57 int dummy;
41}; 58};
42 59
43static int x_actives;
44
45static struct event_base x_base, *x_cur; 60static struct event_base *x_cur;
46 61
47static void 62static void
48tv_set (struct timeval *tv, ev_tstamp at) 63tv_set (struct timeval *tv, ev_tstamp at)
49{ 64{
50 tv->tv_sec = (long)at; 65 tv->tv_sec = (long)at;
… …
72 return "libev"; 87 return "libev";
73} 88}
74 89
75void *event_init (void) 90void *event_init (void)
76{ 91{
77 if (!x_cur && ev_init (0)) 92#if EV_MULTIPLICITY
78 return x_cur = &x_base; 93 if (x_cur)
94 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
95 else
96 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
97#else
98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
79 99
100 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
101#endif
102
80 return 0; 103 return x_cur;
81} 104}
82 105
83void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
84{ 107{
85 /* nop */ 108 dLOOPbase;
109
110#if EV_MULTIPLICITY
111 if (ev_default_loop (EVMETHOD_AUTO) != loop)
112 ev_loop_destroy (loop);
113#endif
86} 114}
87 115
88int event_dispatch (void) 116int event_dispatch (void)
89{ 117{
90 return event_base_dispatch (x_cur); 118 return event_base_dispatch (x_cur);
… …
108} 136}
109 137
110static void 138static void
111x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
112{ 140{
141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
142
143 ev->ev_res = revents;
144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
145}
146
147static void
148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
149{
150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
151
152 if (revents & EV_ERROR)
153 event_del (ev);
154
155 x_cb (ev, revents);
156}
157
158static void
159x_cb_io (EV_P_ struct ev_io *w, int revents)
160{
161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
162
163 if (revents & EV_ERROR)
164 event_del (ev);
165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 ev_io_stop (EV_A_ w);
167
168 x_cb (ev, revents);
169}
170
171static void
172x_cb_to (EV_P_ struct ev_timer *w, int revents)
173{
174 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
175
176 event_del (ev);
177
178 x_cb (ev, revents);
179}
180
181void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
182{
113 if (ev->ev_events & EV_SIGNAL) 183 if (events & EV_SIGNAL)
114 { 184 ev_init (&ev->iosig.sig, x_cb_sig);
115 /* sig */
116 if (ev_is_active (&ev->iosig.sig))
117 {
118 ev_signal_stop (&ev->iosig.sig);
119 --x_actives;
120 }
121 }
122 else 185 else
123 {
124 /* io */
125 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->iosig.io))
126 {
127 ev_io_stop (&ev->iosig.io);
128 --x_actives;
129 }
130 }
131
132 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
133
134 if (revents & EV_TIMEOUT)
135 --x_actives;
136
137 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
139}
140
141static void
142x_cb_io (struct ev_io *w, int revents)
143{
144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents);
145}
146
147static void
148x_cb_to (struct ev_timer *w, int revents)
149{
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
151}
152
153static void
154x_cb_sig (struct ev_signal *w, int revents)
155{
156 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
157}
158
159void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
160{
161 if (events & EV_SIGNAL)
162 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
163 else
164 ev_watcher_init (&ev->iosig.io, x_cb_io); 186 ev_init (&ev->iosig.io, x_cb_io);
165 187
166 ev_watcher_init (&ev->to, x_cb_to); 188 ev_init (&ev->to, x_cb_to);
167 189
168 ev->ev_base = x_cur; 190 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
169 ev->ev_fd = fd; 191 ev->ev_fd = fd;
170 ev->ev_events = events; 192 ev->ev_events = events;
171 ev->ev_pri = 0; 193 ev->ev_pri = 0;
172 ev->ev_callback = cb; 194 ev->ev_callback = cb;
173 ev->ev_arg = arg; 195 ev->ev_arg = arg;
… …
179 return event_base_once (x_cur, fd, events, cb, arg, tv); 201 return event_base_once (x_cur, fd, events, cb, arg, tv);
180} 202}
181 203
182int event_add (struct event *ev, struct timeval *tv) 204int event_add (struct event *ev, struct timeval *tv)
183{ 205{
206 dLOOPev;
207
184 /* disable all watchers */ 208 /* disable all watchers */
185 event_del (ev); 209 event_del (ev);
186 210
187 if (ev->ev_events & EV_SIGNAL) 211 if (ev->ev_events & EV_SIGNAL)
188 { 212 {
189 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 213 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
190 ev_signal_start (&ev->iosig.sig); 214 ev_signal_start (EV_A_ &ev->iosig.sig);
191 ++x_actives;
192 } 215 }
193 else if (ev->ev_events & (EV_READ | EV_WRITE)) 216 else if (ev->ev_events & (EV_READ | EV_WRITE))
194 { 217 {
195 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 218 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
196 ev_io_start (&ev->iosig.io); 219 ev_io_start (EV_A_ &ev->iosig.io);
197 ++x_actives;
198 } 220 }
199 221
200 if (tv) 222 if (tv)
201 { 223 {
202 ev_timer_set (&ev->to, tv_get (tv), 0.); 224 ev_timer_set (&ev->to, tv_get (tv), 0.);
203 ev_timer_start (&ev->to); 225 ev_timer_start (EV_A_ &ev->to);
204 ++x_actives;
205 } 226 }
206 227
207 return 0; 228 return 0;
208} 229}
209 230
210int event_del (struct event *ev) 231int event_del (struct event *ev)
211{ 232{
233 dLOOPev;
234
212 if (ev->ev_events & EV_SIGNAL) 235 if (ev->ev_events & EV_SIGNAL)
213 { 236 {
214 /* sig */ 237 /* sig */
215 if (ev_is_active (&ev->iosig.sig)) 238 if (ev_is_active (&ev->iosig.sig))
216 {
217 ev_signal_stop (&ev->iosig.sig); 239 ev_signal_stop (EV_A_ &ev->iosig.sig);
218 --x_actives;
219 }
220 } 240 }
221 else 241 else if (ev->ev_events & (EV_READ | EV_WRITE))
222 { 242 {
223 /* io */ 243 /* io */
224 if (ev_is_active (&ev->iosig.io)) 244 if (ev_is_active (&ev->iosig.io))
225 {
226 ev_io_stop (&ev->iosig.io); 245 ev_io_stop (EV_A_ &ev->iosig.io);
227 --x_actives;
228 }
229 } 246 }
230 247
231 if (ev_is_active (&ev->to)) 248 if (ev_is_active (&ev->to))
232 {
233 ev_timer_stop (&ev->to); 249 ev_timer_stop (EV_A_ &ev->to);
234 --x_actives;
235 }
236 250
237 return 0; 251 return 0;
252}
253
254void event_active (struct event *ev, int res, short ncalls)
255{
256 dLOOPev;
257
258 if (res & EV_TIMEOUT)
259 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
260
261 if (res & EV_SIGNAL)
262 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
263
264 if (res & (EV_READ | EV_WRITE))
265 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
238} 266}
239 267
240int event_pending (struct event *ev, short events, struct timeval *tv) 268int event_pending (struct event *ev, short events, struct timeval *tv)
241{ 269{
242 short revents = 0; 270 short revents = 0;
271 dLOOPev;
272
243 273
244 if (ev->ev_events & EV_SIGNAL) 274 if (ev->ev_events & EV_SIGNAL)
245 { 275 {
246 /* sig */ 276 /* sig */
247 if (ev->iosig.sig.pending) 277 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
248 revents |= EV_SIGNAL; 278 revents |= EV_SIGNAL;
249 } 279 }
250 else 280 else if (ev->ev_events & (EV_READ | EV_WRITE))
251 { 281 {
252 /* io */ 282 /* io */
253 if (ev->iosig.io.pending) 283 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
254 revents |= ev->ev_events & (EV_READ | EV_WRITE); 284 revents |= ev->ev_events & (EV_READ | EV_WRITE);
255 } 285 }
256 286
257 if (ev->to.pending) 287 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
258 { 288 {
259 revents |= EV_TIMEOUT; 289 revents |= EV_TIMEOUT;
260 290
261 if (tv) 291 if (tv)
262 tv_set (tv, ev_now); /* not sure if this is right :) */ 292 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
263 } 293 }
264 294
265 return events & revents; 295 return events & revents;
266} 296}
267 297
… …
284 return 0; 314 return 0;
285} 315}
286 316
287int event_base_loop (struct event_base *base, int flags) 317int event_base_loop (struct event_base *base, int flags)
288{ 318{
289 do 319 dLOOPbase;
290 { 320
291 ev_loop (flags | EVLOOP_ONESHOT); 321 ev_loop (EV_A_ flags);
292 }
293 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
294 322
295 return 0; 323 return 0;
296} 324}
297 325
298int event_base_dispatch (struct event_base *base) 326int event_base_dispatch (struct event_base *base)
299{ 327{
300 return event_base_loop (base, 0); 328 return event_base_loop (base, 0);
301} 329}
302 330
303static void 331static void
304x_loopexit_cb (int revents, void *arg) 332x_loopexit_cb (int revents, void *base)
305{ 333{
306 ev_loop_done = 2; 334 dLOOPbase;
335
336 ev_unloop (EV_A_ EVUNLOOP_ONCE);
307} 337}
308 338
309int event_base_loopexit (struct event_base *base, struct timeval *tv) 339int event_base_loopexit (struct event_base *base, struct timeval *tv)
310{ 340{
311 ev_tstamp after = tv_get (tv); 341 ev_tstamp after = tv_get (tv);
342 dLOOPbase;
312 343
313 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 344 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
314 345
315 return -1; 346 return -1;
316} 347}
317 348
318struct x_once 349struct x_once
… …
323}; 354};
324 355
325static void 356static void
326x_once_cb (int revents, void *arg) 357x_once_cb (int revents, void *arg)
327{ 358{
328 struct x_once *once = arg; 359 struct x_once *once = (struct x_once *)arg;
329 360
330 once->cb (once->fd, revents, once->arg); 361 once->cb (once->fd, (short)revents, once->arg);
331 free (once); 362 free (once);
332} 363}
333 364
334int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 365int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
335{ 366{
336 struct x_once *once = malloc (sizeof (struct x_once)); 367 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
368 dLOOPbase;
337 369
338 if (!once) 370 if (!once)
339 return -1; 371 return -1;
340 372
341 once->fd = fd; 373 once->fd = fd;
342 once->cb = cb; 374 once->cb = cb;
343 once->arg = arg; 375 once->arg = arg;
344 376
345 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 377 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
346 378
347 return 0; 379 return 0;
348} 380}
349 381
350int event_base_priority_init (struct event_base *base, int npri) 382int event_base_priority_init (struct event_base *base, int npri)
351{ 383{
352 return 0; 384 /*dLOOPbase;*/
353}
354 385
386 return 0;
387}
388

Diff Legend

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