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.13 by root, Sun Nov 4 18:29:44 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) 142x_cb_sig (EV_P_ struct ev_signal *w, int revents)
141{ 143{
142 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents); 144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
143} 145}
144 146
145static void 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
146x_cb_to (struct ev_timer *w, int revents) 159x_cb_to (EV_P_ struct ev_timer *w, int revents)
147{ 160{
148 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 161 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
149} 162}
150 163
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) 164void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
158{ 165{
166 if (!ev->initialised)
167 {
168 ev->initialised = 1;
169
159 if (events & EV_SIGNAL) 170 if (events & EV_SIGNAL)
160 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 171 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
161 else 172 else
162 ev_watcher_init (&ev->iosig.io, x_cb_io); 173 ev_watcher_init (&ev->iosig.io, x_cb_io);
163 174
164 ev_watcher_init (&ev->to, x_cb_to); 175 ev_watcher_init (&ev->to, x_cb_to);
176 }
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 dLOOPev;
195
182 /* disable all watchers */ 196 /* disable all watchers */
183 event_del (ev); 197 event_del (ev);
184 198
185 if (ev->ev_events & EV_SIGNAL) 199 if (ev->ev_events & EV_SIGNAL)
186 { 200 {
187 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 201 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
188 ev_signal_start (&ev->iosig.sig); 202 ev_signal_start (EV_A_ &ev->iosig.sig);
189 ++x_actives;
190 } 203 }
191 else if (ev->ev_events & (EV_READ | EV_WRITE)) 204 else if (ev->ev_events & (EV_READ | EV_WRITE))
192 { 205 {
193 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 206 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
194 ev_io_start (&ev->iosig.io); 207 ev_io_start (EV_A_ &ev->iosig.io);
195 ++x_actives;
196 } 208 }
197 209
198 if (tv) 210 if (tv)
199 { 211 {
200 ev_timer_set (&ev->to, tv_get (tv), 0.); 212 ev_timer_set (&ev->to, tv_get (tv), 0.);
201 ev_timer_start (&ev->to); 213 ev_timer_start (EV_A_ &ev->to);
202 ++x_actives;
203 } 214 }
204 215
205 return 0; 216 return 0;
206} 217}
207 218
208int event_del (struct event *ev) 219int event_del (struct event *ev)
209{ 220{
221 dLOOPev;
222
210 if (ev->ev_events & EV_SIGNAL) 223 if (ev->ev_events & EV_SIGNAL)
211 { 224 {
212 /* sig */ 225 /* sig */
213 if (ev_is_active (&ev->iosig.sig)) 226 if (ev_is_active (&ev->iosig.sig))
214 {
215 ev_signal_stop (&ev->iosig.sig); 227 ev_signal_stop (EV_A_ &ev->iosig.sig);
216 --x_actives;
217 }
218 } 228 }
219 else 229 else
220 { 230 {
221 /* io */ 231 /* io */
222 if (ev_is_active (&ev->iosig.io)) 232 if (ev_is_active (&ev->iosig.io))
223 {
224 ev_io_stop (&ev->iosig.io); 233 ev_io_stop (EV_A_ &ev->iosig.io);
225 --x_actives;
226 }
227 } 234 }
228 235
229 if (ev_is_active (&ev->to)) 236 if (ev_is_active (&ev->to))
230 {
231 ev_timer_stop (&ev->to); 237 ev_timer_stop (EV_A_ &ev->to);
232 --x_actives;
233 }
234 238
235 return 0; 239 return 0;
236} 240}
237 241
238int event_pending (struct event *ev, short events, struct timeval *tv) 242int event_pending (struct event *ev, short events, struct timeval *tv)
239{ 243{
244 dLOOPev;
245
240 short revents; 246 short revents = 0;
241 247
242 if (ev->ev_events & EV_SIGNAL) 248 if (ev->ev_events & EV_SIGNAL)
243 { 249 {
244 /* sig */ 250 /* sig */
245 if (ev->iosig.sig.pending) 251 if (ev->iosig.sig.pending)
… …
255 if (ev->to.pending) 261 if (ev->to.pending)
256 { 262 {
257 revents |= EV_TIMEOUT; 263 revents |= EV_TIMEOUT;
258 264
259 if (tv) 265 if (tv)
260 tv_set (tv, ev_now); /* not sure if this is right :) */ 266 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
261 } 267 }
262 268
263 return events & revents; 269 return events & revents;
264} 270}
265 271
… …
282 return 0; 288 return 0;
283} 289}
284 290
285int event_base_loop (struct event_base *base, int flags) 291int event_base_loop (struct event_base *base, int flags)
286{ 292{
287 do 293 dLOOPbase;
288 { 294
289 ev_loop (flags | EVLOOP_ONESHOT); 295 ev_loop (EV_A_ flags);
290 }
291 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
292 296
293 return 0; 297 return 0;
294} 298}
295 299
296int event_base_dispatch (struct event_base *base) 300int event_base_dispatch (struct event_base *base)
297{ 301{
298 return event_base_loop (base, 0); 302 return event_base_loop (base, 0);
299} 303}
300 304
301static void 305static void
302x_loopexit_cb (int revents, void *arg) 306x_loopexit_cb (int revents, void *base)
303{ 307{
304 ev_loop_done = 2; 308 dLOOPbase;
309
310 ev_unloop (EV_A_ EVUNLOOP_ONCE);
305} 311}
306 312
307int event_base_loopexit (struct event_base *base, struct timeval *tv) 313int event_base_loopexit (struct event_base *base, struct timeval *tv)
308{ 314{
315 dLOOPbase;
309 ev_tstamp after = tv_get (tv); 316 ev_tstamp after = tv_get (tv);
310 317
311 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 318 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
319
320 return -1;
312} 321}
313 322
314struct x_once 323struct x_once
315{ 324{
316 int fd; 325 int fd;
… …
327 free (once); 336 free (once);
328} 337}
329 338
330int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 339int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
331{ 340{
341 dLOOPbase;
332 struct x_once *once = malloc (sizeof (struct x_once)); 342 struct x_once *once = malloc (sizeof (struct x_once));
333 343
334 if (!once) 344 if (!once)
335 return -1; 345 return -1;
336 346
337 once->fd = fd; 347 once->fd = fd;
338 once->cb = cb; 348 once->cb = cb;
339 once->arg = arg; 349 once->arg = arg;
340 350
341 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 351 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
342 352
343 return 0; 353 return 0;
344} 354}
345 355
346int event_base_priority_init (struct event_base *base, int npri) 356int event_base_priority_init (struct event_base *base, int npri)
347{ 357{
348 return 0; 358 /*dLOOPbase;*/
349}
350 359
360 return 0;
361}
362

Diff Legend

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