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

Diff Legend

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