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

Comparing libev/event.c (file contents):
Revision 1.2 by root, Thu Nov 1 18:13:44 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_is_active (&ev->sig))
112 {
113 ev_signal_stop (&ev->sig);
114 --x_actives;
115 }
116
117 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->io))
118 {
119 ev_io_stop (&ev->io);
120 --x_actives;
121 }
122
123 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 135 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
124
125 if (revents & EV_TIMEOUT)
126 --x_actives;
127 136
128 ev->ev_res = revents; 137 ev->ev_res = revents;
129 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
130} 139}
131 140
132static void 141static void
133x_cb_io (struct ev_io *w, int revents)
134{
135 x_cb ((struct event *)(((char *)w) - offsetof (struct event, io)), revents);
136}
137
138static void
139x_cb_to (struct ev_timer *w, int revents)
140{
141 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
142}
143
144static void
145x_cb_sig (struct ev_signal *w, int revents) 142x_cb_sig (EV_P_ struct ev_signal *w, int revents)
146{ 143{
147 x_cb ((struct event *)(((char *)w) - offsetof (struct event, sig)), revents); 144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
145}
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);
148} 166}
149 167
150void 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)
151{ 169{
170 printf ("event set %p\n", ev);//D
171 if (events & EV_SIGNAL)
172 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
173 else
152 ev_watcher_init (&ev->io, x_cb_io); 174 ev_watcher_init (&ev->iosig.io, x_cb_io);
175
153 ev_watcher_init (&ev->to, x_cb_to); 176 ev_watcher_init (&ev->to, x_cb_to);
154 ev_watcher_init (&ev->sig, x_cb_sig);
155 177
156 ev->ev_base = x_cur; 178 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
157 ev->ev_fd = fd; 179 ev->ev_fd = fd;
158 ev->ev_events = events; 180 ev->ev_events = events;
159 ev->ev_pri = 0; 181 ev->ev_pri = 0;
160 ev->ev_callback = cb; 182 ev->ev_callback = cb;
161 ev->ev_arg = arg; 183 ev->ev_arg = arg;
162 ev->ev_res = 0; 184 ev->ev_res = 0;
163} 185}
164 186
165int 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)
166{ 188{
167 event_base_once (x_cur, fd, events, cb, arg, tv); 189 return event_base_once (x_cur, fd, events, cb, arg, tv);
168} 190}
169 191
170int event_add (struct event *ev, struct timeval *tv) 192int event_add (struct event *ev, struct timeval *tv)
171{ 193{
194 printf ("event add %p %p\n", ev, &ev->to);//D
195 dLOOPev;
196
197 /* disable all watchers */
198 event_del (ev);
199
200 if (ev->ev_events & EV_SIGNAL)
201 {
202 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
203 ev_signal_start (EV_A_ &ev->iosig.sig);
204 }
205 else if (ev->ev_events & (EV_READ | EV_WRITE))
206 {
207 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
208 ev_io_start (EV_A_ &ev->iosig.io);
209 }
210
172 if (tv) 211 if (tv)
173 { 212 {
174 if (ev_is_active (&ev->to))
175 {
176 ev_timer_stop (&ev->to);
177 --x_actives;
178 }
179
180 ev_timer_set (&ev->to, tv_get (tv), 0.); 213 ev_timer_set (&ev->to, tv_get (tv), 0.);
181 ev_timer_start (&ev->to); 214 ev_timer_start (EV_A_ &ev->to);
182 ++x_actives;
183 }
184
185 if (ev->ev_events & (EV_READ | EV_WRITE))
186 { 215 }
187 if (ev_is_active (&ev->io))
188 {
189 ev_io_stop (&ev->io);
190 --x_actives;
191 }
192 216
193 ev_io_set (&ev->io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 217 return 0;
194 ev_io_start (&ev->io); 218}
195 ++x_actives; 219
196 } 220int event_del (struct event *ev)
221{
222 printf ("event del %p\n", ev);//D
223 dLOOPev;
197 224
198 if (ev->ev_events & EV_SIGNAL) 225 if (ev->ev_events & EV_SIGNAL)
199 { 226 {
227 /* sig */
228 if (ev_is_active (&ev->iosig.sig))
229 ev_signal_stop (EV_A_ &ev->iosig.sig);
230 }
231 else
232 {
233 /* io */
200 if (ev_is_active (&ev->sig)) 234 if (ev_is_active (&ev->iosig.io))
201 {
202 ev_signal_stop (&ev->sig); 235 ev_io_stop (EV_A_ &ev->iosig.io);
203 --x_actives;
204 }
205
206 ev_signal_set (&ev->sig, ev->ev_fd);
207 ev_signal_start (&ev->sig);
208 ++x_actives;
209 }
210
211 return 0;
212}
213
214int event_del (struct event *ev)
215{
216 if (ev_is_active (&ev->io))
217 { 236 }
218 ev_io_stop (&ev->io);
219 --x_actives;
220 }
221 237
238 printf ("to %p %d\n", &ev->to, ev->to.active);//D
222 if (ev_is_active (&ev->to)) 239 if (ev_is_active (&ev->to))
223 {
224 ev_timer_stop (&ev->to); 240 ev_timer_stop (EV_A_ &ev->to);
225 --x_actives;
226 }
227 241
228 if (ev_is_active (&ev->sig))
229 {
230 ev_signal_stop (&ev->sig);
231 --x_actives;
232 }
233
234 return 0; 242 return 0;
235}
236
237void event_active (struct event *ev, int fd, short events)
238{
239 /* unclear what this does, likely internal-use */
240} 243}
241 244
242int event_pending (struct event *ev, short events, struct timeval *tv) 245int event_pending (struct event *ev, short events, struct timeval *tv)
243{ 246{
247 dLOOPev;
248
244 short revents; 249 short revents = 0;
245 250
246 if (ev->io.pending) 251 if (ev->ev_events & EV_SIGNAL)
252 {
253 /* sig */
254 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
255 revents |= EV_SIGNAL;
256 }
257 else
258 {
259 /* io */
260 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
247 revents |= ev->ev_events & (EV_READ | EV_WRITE); 261 revents |= ev->ev_events & (EV_READ | EV_WRITE);
262 }
248 263
249 if (ev->to.pending) 264 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
250 { 265 {
251 revents |= EV_TIMEOUT; 266 revents |= EV_TIMEOUT;
252 267
253 if (tv) 268 if (tv)
254 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 :) */
255 } 270 }
256
257 if (ev->sig.pending)
258 revents |= EV_SIGNAL;
259 271
260 return events & revents; 272 return events & revents;
261} 273}
262 274
263int event_priority_init (int npri) 275int event_priority_init (int npri)
… …
279 return 0; 291 return 0;
280} 292}
281 293
282int event_base_loop (struct event_base *base, int flags) 294int event_base_loop (struct event_base *base, int flags)
283{ 295{
284 do 296 dLOOPbase;
285 { 297
286 ev_loop (flags | EVLOOP_ONESHOT); 298 ev_loop (EV_A_ flags);
287 }
288 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
289 299
290 return 0; 300 return 0;
291} 301}
292 302
293int event_base_dispatch (struct event_base *base) 303int event_base_dispatch (struct event_base *base)
294{ 304{
295 return event_base_loop (base, 0); 305 return event_base_loop (base, 0);
296} 306}
297 307
298static void 308static void
299x_loopexit_cb (int revents, void *arg) 309x_loopexit_cb (int revents, void *base)
300{ 310{
301 ev_loop_done = 2; 311 dLOOPbase;
312
313 ev_unloop (EV_A_ EVUNLOOP_ONCE);
302} 314}
303 315
304int event_base_loopexit (struct event_base *base, struct timeval *tv) 316int event_base_loopexit (struct event_base *base, struct timeval *tv)
305{ 317{
318 dLOOPbase;
306 ev_tstamp after = tv_get (tv); 319 ev_tstamp after = tv_get (tv);
307 320
308 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;
309} 324}
310 325
311struct x_once 326struct x_once
312{ 327{
313 int fd; 328 int fd;
… …
324 free (once); 339 free (once);
325} 340}
326 341
327int 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)
328{ 343{
344 dLOOPbase;
329 struct x_once *once = malloc (sizeof (struct x_once)); 345 struct x_once *once = malloc (sizeof (struct x_once));
330 346
331 if (!once) 347 if (!once)
332 return -1; 348 return -1;
333 349
334 once->fd = fd; 350 once->fd = fd;
335 once->cb = cb; 351 once->cb = cb;
336 once->arg = arg; 352 once->arg = arg;
337 353
338 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);
339 355
340 return 0; 356 return 0;
341} 357}
342 358
343int event_base_priority_init (struct event_base *base, int npri) 359int event_base_priority_init (struct event_base *base, int npri)
344{ 360{
345 return 0; 361 /*dLOOPbase;*/
346}
347 362
363 return 0;
364}
365

Diff Legend

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