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

Comparing libev/event.c (file contents):
Revision 1.4 by root, Fri Nov 2 13:08:51 2007 UTC vs.
Revision 1.9 by root, Sun Nov 4 00:24:17 2007 UTC

… …
33#include <stdlib.h> 33#include <stdlib.h>
34#include <sys/time.h> 34#include <sys/time.h>
35 35
36#include "event.h" 36#include "event.h"
37 37
38#if EV_MULTIPLICITY
39# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
40# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
41#else
42# define dLOOPev
43# define dLOOPbase
44#endif
45
46/* never accessed, will always be cast from/to ev_loop */
38struct event_base 47struct event_base
39{ 48{
40 int dummy; 49 int dummy;
41}; 50};
42
43static int x_actives;
44 51
45static struct event_base x_base, *x_cur; 52static struct event_base x_base, *x_cur;
46 53
47static void 54static void
48tv_set (struct timeval *tv, ev_tstamp at) 55tv_set (struct timeval *tv, ev_tstamp at)
… …
72 return "libev"; 79 return "libev";
73} 80}
74 81
75void *event_init (void) 82void *event_init (void)
76{ 83{
77 if (ev_init (0)) 84#if EV_MULTIPLICITY
85 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
86#else
78 return x_cur = &x_base; 87 x_cur = &x_base;
88#endif
79 89
80 return 0; 90 return x_cur;
81} 91}
82 92
83void event_base_free (struct event_base *base) 93void event_base_free (struct event_base *base)
84{ 94{
95 dLOOPbase;
96
97#if EV_MULTIPLICITY
98 ev_loop_delete (loop);
99#endif
100}
101
102int event_dispatch (void)
103{
104 return event_base_dispatch (x_cur);
105}
106
107#ifdef EV_STANDALONE
108void event_set_log_callback (event_log_cb cb)
109{
85 /* nop */ 110 /* nop */
86} 111}
87 112#endif
88int event_dispatch (void)
89{
90 return event_base_dispatch (x_cur);
91}
92
93void event_set_log_callback (event_log_cb cb)
94{
95 /* nop */
96}
97 113
98int event_loop (int flags) 114int event_loop (int flags)
99{ 115{
100 return event_base_loop (x_cur, flags); 116 return event_base_loop (x_cur, flags);
101} 117}
102 118
103int event_loopexit (struct timeval *tv) 119int event_loopexit (struct timeval *tv)
104{ 120{
105 event_base_loopexit (x_cur, tv); 121 return event_base_loopexit (x_cur, tv);
106} 122}
107 123
108static void 124static void
109x_cb (struct event *ev, int revents) 125x_cb (struct event *ev, int revents)
110{ 126{
111 if (ev->ev_events & EV_SIGNAL)
112 {
113 /* sig */
114 if (ev_is_active (&ev->iosig.sig))
115 {
116 ev_signal_stop (&ev->iosig.sig);
117 --x_actives;
118 }
119 }
120 else
121 {
122 /* io */
123 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->iosig.io))
124 {
125 ev_io_stop (&ev->iosig.io);
126 --x_actives;
127 }
128 }
129
130 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 127 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
131
132 if (revents & EV_TIMEOUT)
133 --x_actives;
134 128
135 ev->ev_res = revents; 129 ev->ev_res = revents;
136 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 130 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
137} 131}
138 132
139static void 133static void
140x_cb_io (struct ev_io *w, int revents) 134x_cb_sig (EV_P_ struct ev_signal *w, int revents)
141{ 135{
142 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents); 136 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
143} 137}
144 138
145static void 139static void
140x_cb_io (EV_P_ struct ev_io *w, int revents)
141{
142 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
143
144 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
145 ev_io_stop (EV_A_ w);
146
147 x_cb (ev, revents);
148}
149
150static void
146x_cb_to (struct ev_timer *w, int revents) 151x_cb_to (EV_P_ struct ev_timer *w, int revents)
147{ 152{
148 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 153 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
149} 154}
150 155
151static void
152x_cb_sig (struct ev_signal *w, int revents)
153{
154 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
155}
156
157void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 156void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
158{ 157{
158 if (!ev->initialised)
159 {
160 ev->initialised = 1;
161
159 if (events & EV_SIGNAL) 162 if (events & EV_SIGNAL)
160 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 163 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
161 else 164 else
162 ev_watcher_init (&ev->iosig.io, x_cb_io); 165 ev_watcher_init (&ev->iosig.io, x_cb_io);
163 166
164 ev_watcher_init (&ev->to, x_cb_to); 167 ev_watcher_init (&ev->to, x_cb_to);
168 }
165 169
166 ev->ev_base = x_cur; 170 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
167 ev->ev_fd = fd; 171 ev->ev_fd = fd;
168 ev->ev_events = events; 172 ev->ev_events = events;
169 ev->ev_pri = 0; 173 ev->ev_pri = 0;
170 ev->ev_callback = cb; 174 ev->ev_callback = cb;
171 ev->ev_arg = arg; 175 ev->ev_arg = arg;
172 ev->ev_res = 0; 176 ev->ev_res = 0;
173} 177}
174 178
175int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 179int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
176{ 180{
177 event_base_once (x_cur, fd, events, cb, arg, tv); 181 return event_base_once (x_cur, fd, events, cb, arg, tv);
178} 182}
179 183
180int event_add (struct event *ev, struct timeval *tv) 184int event_add (struct event *ev, struct timeval *tv)
181{ 185{
186 dLOOPev;
187
182 /* disable all watchers */ 188 /* disable all watchers */
183 event_del (ev); 189 event_del (ev);
184 190
185 if (ev->ev_events & EV_SIGNAL) 191 if (ev->ev_events & EV_SIGNAL)
186 { 192 {
187 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 193 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
188 ev_signal_start (&ev->iosig.sig); 194 ev_signal_start (EV_A_ &ev->iosig.sig);
189 ++x_actives;
190 } 195 }
191 else if (ev->ev_events & (EV_READ | EV_WRITE)) 196 else if (ev->ev_events & (EV_READ | EV_WRITE))
192 { 197 {
193 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 198 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
194 ev_io_start (&ev->iosig.io); 199 ev_io_start (EV_A_ &ev->iosig.io);
195 ++x_actives;
196 } 200 }
197 201
198 if (tv) 202 if (tv)
199 { 203 {
200 ev_timer_set (&ev->to, tv_get (tv), 0.); 204 ev_timer_set (&ev->to, tv_get (tv), 0.);
201 ev_timer_start (&ev->to); 205 ev_timer_start (EV_A_ &ev->to);
202 ++x_actives;
203 } 206 }
204 207
205 return 0; 208 return 0;
206} 209}
207 210
208int event_del (struct event *ev) 211int event_del (struct event *ev)
209{ 212{
213 dLOOPev;
214
210 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
211 { 216 {
212 /* sig */ 217 /* sig */
213 if (ev_is_active (&ev->iosig.sig)) 218 if (ev_is_active (&ev->iosig.sig))
214 {
215 ev_signal_stop (&ev->iosig.sig); 219 ev_signal_stop (EV_A_ &ev->iosig.sig);
216 --x_actives;
217 }
218 } 220 }
219 else 221 else
220 { 222 {
221 /* io */ 223 /* io */
222 if (ev_is_active (&ev->iosig.io)) 224 if (ev_is_active (&ev->iosig.io))
223 {
224 ev_io_stop (&ev->iosig.io); 225 ev_io_stop (EV_A_ &ev->iosig.io);
225 --x_actives;
226 }
227 } 226 }
228 227
229 if (ev_is_active (&ev->to)) 228 if (ev_is_active (&ev->to))
230 {
231 ev_timer_stop (&ev->to); 229 ev_timer_stop (EV_A_ &ev->to);
232 --x_actives;
233 }
234 230
235 return 0; 231 return 0;
236} 232}
237 233
238int event_pending (struct event *ev, short events, struct timeval *tv) 234int event_pending (struct event *ev, short events, struct timeval *tv)
239{ 235{
236 dLOOPev;
237
240 short revents; 238 short revents = 0;
241 239
242 if (ev->ev_events & EV_SIGNAL) 240 if (ev->ev_events & EV_SIGNAL)
243 { 241 {
244 /* sig */ 242 /* sig */
245 if (ev->iosig.sig.pending) 243 if (ev->iosig.sig.pending)
… …
255 if (ev->to.pending) 253 if (ev->to.pending)
256 { 254 {
257 revents |= EV_TIMEOUT; 255 revents |= EV_TIMEOUT;
258 256
259 if (tv) 257 if (tv)
260 tv_set (tv, ev_now); /* not sure if this is right :) */ 258 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
261 } 259 }
262 260
263 return events & revents; 261 return events & revents;
264} 262}
265 263
… …
282 return 0; 280 return 0;
283} 281}
284 282
285int event_base_loop (struct event_base *base, int flags) 283int event_base_loop (struct event_base *base, int flags)
286{ 284{
287 do 285 dLOOPbase;
288 { 286
289 ev_loop (flags | EVLOOP_ONESHOT); 287 ev_loop (EV_A_ flags);
290 }
291 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
292 288
293 return 0; 289 return 0;
294} 290}
295 291
296int event_base_dispatch (struct event_base *base) 292int event_base_dispatch (struct event_base *base)
297{ 293{
298 return event_base_loop (base, 0); 294 return event_base_loop (base, 0);
299} 295}
300 296
301static void 297static void
302x_loopexit_cb (int revents, void *arg) 298x_loopexit_cb (int revents, void *base)
303{ 299{
304 ev_loop_done = 2; 300 dLOOPbase;
301
302 ev_unloop (EV_A_ EVUNLOOP_ONCE);
305} 303}
306 304
307int event_base_loopexit (struct event_base *base, struct timeval *tv) 305int event_base_loopexit (struct event_base *base, struct timeval *tv)
308{ 306{
307 dLOOPbase;
309 ev_tstamp after = tv_get (tv); 308 ev_tstamp after = tv_get (tv);
310 309
311 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 310 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
311
312 return -1;
312} 313}
313 314
314struct x_once 315struct x_once
315{ 316{
316 int fd; 317 int fd;
… …
327 free (once); 328 free (once);
328} 329}
329 330
330int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 331int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
331{ 332{
333 dLOOPbase;
332 struct x_once *once = malloc (sizeof (struct x_once)); 334 struct x_once *once = malloc (sizeof (struct x_once));
333 335
334 if (!once) 336 if (!once)
335 return -1; 337 return -1;
336 338
337 once->fd = fd; 339 once->fd = fd;
338 once->cb = cb; 340 once->cb = cb;
339 once->arg = arg; 341 once->arg = arg;
340 342
341 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 343 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
342 344
343 return 0; 345 return 0;
344} 346}
345 347
346int event_base_priority_init (struct event_base *base, int npri) 348int event_base_priority_init (struct event_base *base, int npri)
347{ 349{
348 return 0; 350 dLOOPbase;
349}
350 351
352 return 0;
353}
354

Diff Legend

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