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

Diff Legend

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