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

Diff Legend

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