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

Comparing libev/event.c (file contents):
Revision 1.8 by root, Sat Nov 3 22:10:39 2007 UTC vs.
Revision 1.10 by root, Sun Nov 4 15:58:50 2007 UTC

… …
30 */ 30 */
31 31
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 36
36#include "event.h" 37#include "event.h"
37 38
38#ifdef EV_MULTIPLICITY 39#if EV_MULTIPLICITY
39# define dLOOPev struct ev_loop *loop = ev->ev_base->loop 40# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
40# define dLOOPbase struct ev_loop *loop = base->loop 41# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
41#else 42#else
42# define dLOOPev 43# define dLOOPev
43# define dLOOPbase 44# define dLOOPbase
44#endif 45#endif
45 46
47/* never accessed, will always be cast from/to ev_loop */
46struct event_base 48struct event_base
47{ 49{
48#ifdef EV_MULTIPLICITY
49 struct ev_loop *loop;
50#endif
51 int dummy; 50 int dummy;
52}; 51};
53 52
54static struct event_base x_base, *x_cur; 53static struct event_base *x_cur;
55 54
56static void 55static void
57tv_set (struct timeval *tv, ev_tstamp at) 56tv_set (struct timeval *tv, ev_tstamp at)
58{ 57{
59 tv->tv_sec = (long)at; 58 tv->tv_sec = (long)at;
… …
81 return "libev"; 80 return "libev";
82} 81}
83 82
84void *event_init (void) 83void *event_init (void)
85{ 84{
86 if (!x_cur && ev_init (0)) 85#if EV_MULTIPLICITY
87 return x_cur = &x_base; 86 if (x_cur)
87 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
88 else
89 x_cur = ev_default_loop (EVMETHOD_AUTO);
90#else
91 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
88 92
93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
94#endif
95
89 return 0; 96 return x_cur;
90} 97}
91 98
92void event_base_free (struct event_base *base) 99void event_base_free (struct event_base *base)
93{ 100{
94 dLOOPbase; 101 dLOOPbase;
95 102
96 /* nop */ 103#if EV_MULTIPLICITY
104 ev_loop_delete (loop);
105#endif
97} 106}
98 107
99int event_dispatch (void) 108int event_dispatch (void)
100{ 109{
101 return event_base_dispatch (x_cur); 110 return event_base_dispatch (x_cur);
… …
137x_cb_io (EV_P_ struct ev_io *w, int revents) 146x_cb_io (EV_P_ struct ev_io *w, int revents)
138{ 147{
139 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 148 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
140 149
141 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 150 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
142 ev_io_stop (w); 151 ev_io_stop (EV_A_ w);
143 152
144 x_cb (ev, revents); 153 x_cb (ev, revents);
145} 154}
146 155
147static void 156static void
… …
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 159 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
151} 160}
152 161
153void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 162void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
154{ 163{
164 if (!ev->initialised)
165 {
166 ev->initialised = 1;
167
155 if (events & EV_SIGNAL) 168 if (events & EV_SIGNAL)
156 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 169 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
157 else 170 else
158 ev_watcher_init (&ev->iosig.io, x_cb_io); 171 ev_watcher_init (&ev->iosig.io, x_cb_io);
159 172
160 ev_watcher_init (&ev->to, x_cb_to); 173 ev_watcher_init (&ev->to, x_cb_to);
174 }
161 175
162 ev->ev_base = x_cur; 176 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
163 ev->ev_fd = fd; 177 ev->ev_fd = fd;
164 ev->ev_events = events; 178 ev->ev_events = events;
165 ev->ev_pri = 0; 179 ev->ev_pri = 0;
166 ev->ev_callback = cb; 180 ev->ev_callback = cb;
167 ev->ev_arg = arg; 181 ev->ev_arg = arg;
… …
285{ 299{
286 return event_base_loop (base, 0); 300 return event_base_loop (base, 0);
287} 301}
288 302
289static void 303static void
290x_loopexit_cb (EV_P_ int revents, void *arg) 304x_loopexit_cb (int revents, void *base)
291{ 305{
306 dLOOPbase;
307
292 ev_unloop (EV_A_ 2); 308 ev_unloop (EV_A_ EVUNLOOP_ONCE);
293} 309}
294 310
295int event_base_loopexit (struct event_base *base, struct timeval *tv) 311int event_base_loopexit (struct event_base *base, struct timeval *tv)
296{ 312{
297 dLOOPbase; 313 dLOOPbase;

Diff Legend

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