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

Comparing libev/event.c (file contents):
Revision 1.5 by root, Sat Nov 3 19:41:56 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{
85 /* nop */ 101 dLOOPbase;
102
103#if EV_MULTIPLICITY
104 ev_loop_delete (loop);
105#endif
86} 106}
87 107
88int event_dispatch (void) 108int event_dispatch (void)
89{ 109{
90 return event_base_dispatch (x_cur); 110 return event_base_dispatch (x_cur);
… …
108} 128}
109 129
110static void 130static void
111x_cb (struct event *ev, int revents) 131x_cb (struct event *ev, int revents)
112{ 132{
113 if (ev->ev_events & EV_SIGNAL)
114 {
115 /* sig */
116 if (ev_is_active (&ev->iosig.sig))
117 {
118 ev_signal_stop (&ev->iosig.sig);
119 --x_actives;
120 }
121 }
122 else
123 {
124 /* io */
125 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->iosig.io))
126 {
127 ev_io_stop (&ev->iosig.io);
128 --x_actives;
129 }
130 }
131
132 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 133 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
133
134 if (revents & EV_TIMEOUT)
135 --x_actives;
136 134
137 ev->ev_res = revents; 135 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 136 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
139} 137}
140 138
141static void 139static void
142x_cb_io (struct ev_io *w, int revents) 140x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 141{
144 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);
145} 143}
146 144
147static 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
148x_cb_to (struct ev_timer *w, int revents) 157x_cb_to (EV_P_ struct ev_timer *w, int revents)
149{ 158{
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 159 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
151} 160}
152 161
153static void
154x_cb_sig (struct ev_signal *w, int revents)
155{
156 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
157}
158
159void 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)
160{ 163{
164 if (!ev->initialised)
165 {
166 ev->initialised = 1;
167
161 if (events & EV_SIGNAL) 168 if (events & EV_SIGNAL)
162 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 169 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
163 else 170 else
164 ev_watcher_init (&ev->iosig.io, x_cb_io); 171 ev_watcher_init (&ev->iosig.io, x_cb_io);
165 172
166 ev_watcher_init (&ev->to, x_cb_to); 173 ev_watcher_init (&ev->to, x_cb_to);
174 }
167 175
168 ev->ev_base = x_cur; 176 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
169 ev->ev_fd = fd; 177 ev->ev_fd = fd;
170 ev->ev_events = events; 178 ev->ev_events = events;
171 ev->ev_pri = 0; 179 ev->ev_pri = 0;
172 ev->ev_callback = cb; 180 ev->ev_callback = cb;
173 ev->ev_arg = arg; 181 ev->ev_arg = arg;
… …
179 return event_base_once (x_cur, fd, events, cb, arg, tv); 187 return event_base_once (x_cur, fd, events, cb, arg, tv);
180} 188}
181 189
182int event_add (struct event *ev, struct timeval *tv) 190int event_add (struct event *ev, struct timeval *tv)
183{ 191{
192 dLOOPev;
193
184 /* disable all watchers */ 194 /* disable all watchers */
185 event_del (ev); 195 event_del (ev);
186 196
187 if (ev->ev_events & EV_SIGNAL) 197 if (ev->ev_events & EV_SIGNAL)
188 { 198 {
189 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 199 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
190 ev_signal_start (&ev->iosig.sig); 200 ev_signal_start (EV_A_ &ev->iosig.sig);
191 ++x_actives;
192 } 201 }
193 else if (ev->ev_events & (EV_READ | EV_WRITE)) 202 else if (ev->ev_events & (EV_READ | EV_WRITE))
194 { 203 {
195 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));
196 ev_io_start (&ev->iosig.io); 205 ev_io_start (EV_A_ &ev->iosig.io);
197 ++x_actives;
198 } 206 }
199 207
200 if (tv) 208 if (tv)
201 { 209 {
202 ev_timer_set (&ev->to, tv_get (tv), 0.); 210 ev_timer_set (&ev->to, tv_get (tv), 0.);
203 ev_timer_start (&ev->to); 211 ev_timer_start (EV_A_ &ev->to);
204 ++x_actives;
205 } 212 }
206 213
207 return 0; 214 return 0;
208} 215}
209 216
210int event_del (struct event *ev) 217int event_del (struct event *ev)
211{ 218{
219 dLOOPev;
220
212 if (ev->ev_events & EV_SIGNAL) 221 if (ev->ev_events & EV_SIGNAL)
213 { 222 {
214 /* sig */ 223 /* sig */
215 if (ev_is_active (&ev->iosig.sig)) 224 if (ev_is_active (&ev->iosig.sig))
216 {
217 ev_signal_stop (&ev->iosig.sig); 225 ev_signal_stop (EV_A_ &ev->iosig.sig);
218 --x_actives;
219 }
220 } 226 }
221 else 227 else
222 { 228 {
223 /* io */ 229 /* io */
224 if (ev_is_active (&ev->iosig.io)) 230 if (ev_is_active (&ev->iosig.io))
225 {
226 ev_io_stop (&ev->iosig.io); 231 ev_io_stop (EV_A_ &ev->iosig.io);
227 --x_actives;
228 }
229 } 232 }
230 233
231 if (ev_is_active (&ev->to)) 234 if (ev_is_active (&ev->to))
232 {
233 ev_timer_stop (&ev->to); 235 ev_timer_stop (EV_A_ &ev->to);
234 --x_actives;
235 }
236 236
237 return 0; 237 return 0;
238} 238}
239 239
240int event_pending (struct event *ev, short events, struct timeval *tv) 240int event_pending (struct event *ev, short events, struct timeval *tv)
241{ 241{
242 dLOOPev;
243
242 short revents = 0; 244 short revents = 0;
243 245
244 if (ev->ev_events & EV_SIGNAL) 246 if (ev->ev_events & EV_SIGNAL)
245 { 247 {
246 /* sig */ 248 /* sig */
… …
257 if (ev->to.pending) 259 if (ev->to.pending)
258 { 260 {
259 revents |= EV_TIMEOUT; 261 revents |= EV_TIMEOUT;
260 262
261 if (tv) 263 if (tv)
262 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 :) */
263 } 265 }
264 266
265 return events & revents; 267 return events & revents;
266} 268}
267 269
… …
284 return 0; 286 return 0;
285} 287}
286 288
287int event_base_loop (struct event_base *base, int flags) 289int event_base_loop (struct event_base *base, int flags)
288{ 290{
289 do 291 dLOOPbase;
290 { 292
291 ev_loop (flags | EVLOOP_ONESHOT); 293 ev_loop (EV_A_ flags);
292 }
293 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
294 294
295 return 0; 295 return 0;
296} 296}
297 297
298int event_base_dispatch (struct event_base *base) 298int event_base_dispatch (struct event_base *base)
299{ 299{
300 return event_base_loop (base, 0); 300 return event_base_loop (base, 0);
301} 301}
302 302
303static void 303static void
304x_loopexit_cb (int revents, void *arg) 304x_loopexit_cb (int revents, void *base)
305{ 305{
306 ev_loop_done = 2; 306 dLOOPbase;
307
308 ev_unloop (EV_A_ EVUNLOOP_ONCE);
307} 309}
308 310
309int event_base_loopexit (struct event_base *base, struct timeval *tv) 311int event_base_loopexit (struct event_base *base, struct timeval *tv)
310{ 312{
313 dLOOPbase;
311 ev_tstamp after = tv_get (tv); 314 ev_tstamp after = tv_get (tv);
312 315
313 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);
314 317
315 return -1; 318 return -1;
316} 319}
317 320
318struct x_once 321struct x_once
… …
331 free (once); 334 free (once);
332} 335}
333 336
334int 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)
335{ 338{
339 dLOOPbase;
336 struct x_once *once = malloc (sizeof (struct x_once)); 340 struct x_once *once = malloc (sizeof (struct x_once));
337 341
338 if (!once) 342 if (!once)
339 return -1; 343 return -1;
340 344
341 once->fd = fd; 345 once->fd = fd;
342 once->cb = cb; 346 once->cb = cb;
343 once->arg = arg; 347 once->arg = arg;
344 348
345 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);
346 350
347 return 0; 351 return 0;
348} 352}
349 353
350int event_base_priority_init (struct event_base *base, int npri) 354int event_base_priority_init (struct event_base *base, int npri)
351{ 355{
352 return 0; 356 dLOOPbase;
353}
354 357
358 return 0;
359}
360

Diff Legend

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