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.8 by root, Sat Nov 3 22:10:39 2007 UTC

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

Diff Legend

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