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

Comparing libev/event.c (file contents):
Revision 1.3 by root, Fri Nov 2 11:02:23 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_is_active (&ev->sig))
112 {
113 ev_signal_stop (&ev->sig);
114 --x_actives;
115 }
116
117 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->io))
118 {
119 ev_io_stop (&ev->io);
120 --x_actives;
121 }
122
123 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 124 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
124
125 if (revents & EV_TIMEOUT)
126 --x_actives;
127 125
128 ev->ev_res = revents; 126 ev->ev_res = revents;
129 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 127 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
130} 128}
131 129
132static void 130static void
133x_cb_io (struct ev_io *w, int revents) 131x_cb_sig (EV_P_ struct ev_signal *w, int revents)
134{ 132{
135 x_cb ((struct event *)(((char *)w) - offsetof (struct event, io)), revents); 133 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
136} 134}
137 135
138static 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
139x_cb_to (struct ev_timer *w, int revents) 148x_cb_to (EV_P_ struct ev_timer *w, int revents)
140{ 149{
141 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
142} 151}
143 152
144static void
145x_cb_sig (struct ev_signal *w, int revents)
146{
147 x_cb ((struct event *)(((char *)w) - offsetof (struct event, sig)), revents);
148}
149
150void 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)
151{ 154{
155 if (events & EV_SIGNAL)
156 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
157 else
152 ev_watcher_init (&ev->io, x_cb_io); 158 ev_watcher_init (&ev->iosig.io, x_cb_io);
159
153 ev_watcher_init (&ev->to, x_cb_to); 160 ev_watcher_init (&ev->to, x_cb_to);
154 ev_watcher_init (&ev->sig, x_cb_sig);
155 161
156 ev->ev_base = x_cur; 162 ev->ev_base = x_cur;
157 ev->ev_fd = fd; 163 ev->ev_fd = fd;
158 ev->ev_events = events; 164 ev->ev_events = events;
159 ev->ev_pri = 0; 165 ev->ev_pri = 0;
… …
162 ev->ev_res = 0; 168 ev->ev_res = 0;
163} 169}
164 170
165int 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)
166{ 172{
167 event_base_once (x_cur, fd, events, cb, arg, tv); 173 return event_base_once (x_cur, fd, events, cb, arg, tv);
168} 174}
169 175
170int event_add (struct event *ev, struct timeval *tv) 176int event_add (struct event *ev, struct timeval *tv)
171{ 177{
178 dLOOPev;
179
180 /* disable all watchers */
181 event_del (ev);
182
183 if (ev->ev_events & EV_SIGNAL)
184 {
185 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
186 ev_signal_start (EV_A_ &ev->iosig.sig);
187 }
188 else if (ev->ev_events & (EV_READ | EV_WRITE))
189 {
190 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
191 ev_io_start (EV_A_ &ev->iosig.io);
192 }
193
172 if (tv) 194 if (tv)
173 { 195 {
174 if (ev_is_active (&ev->to))
175 {
176 ev_timer_stop (&ev->to);
177 --x_actives;
178 }
179
180 ev_timer_set (&ev->to, tv_get (tv), 0.); 196 ev_timer_set (&ev->to, tv_get (tv), 0.);
181 ev_timer_start (&ev->to); 197 ev_timer_start (EV_A_ &ev->to);
182 ++x_actives;
183 }
184
185 if (ev->ev_events & (EV_READ | EV_WRITE))
186 { 198 }
187 if (ev_is_active (&ev->io))
188 {
189 ev_io_stop (&ev->io);
190 --x_actives;
191 }
192 199
193 ev_io_set (&ev->io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 200 return 0;
194 ev_io_start (&ev->io); 201}
195 ++x_actives; 202
196 } 203int event_del (struct event *ev)
204{
205 dLOOPev;
197 206
198 if (ev->ev_events & EV_SIGNAL) 207 if (ev->ev_events & EV_SIGNAL)
199 { 208 {
209 /* sig */
210 if (ev_is_active (&ev->iosig.sig))
211 ev_signal_stop (EV_A_ &ev->iosig.sig);
212 }
213 else
214 {
215 /* io */
200 if (ev_is_active (&ev->sig)) 216 if (ev_is_active (&ev->iosig.io))
201 {
202 ev_signal_stop (&ev->sig);
203 --x_actives;
204 }
205
206 ev_signal_set (&ev->sig, ev->ev_fd);
207 ev_signal_start (&ev->sig);
208 ++x_actives;
209 }
210
211 return 0;
212}
213
214int event_del (struct event *ev)
215{
216 if (ev_is_active (&ev->io))
217 {
218 ev_io_stop (&ev->io); 217 ev_io_stop (EV_A_ &ev->iosig.io);
219 --x_actives;
220 } 218 }
221 219
222 if (ev_is_active (&ev->to)) 220 if (ev_is_active (&ev->to))
223 {
224 ev_timer_stop (&ev->to); 221 ev_timer_stop (EV_A_ &ev->to);
225 --x_actives;
226 }
227
228 if (ev_is_active (&ev->sig))
229 {
230 ev_signal_stop (&ev->sig);
231 --x_actives;
232 }
233 222
234 return 0; 223 return 0;
235} 224}
236 225
237int event_pending (struct event *ev, short events, struct timeval *tv) 226int event_pending (struct event *ev, short events, struct timeval *tv)
238{ 227{
228 dLOOPev;
229
239 short revents; 230 short revents = 0;
240 231
232 if (ev->ev_events & EV_SIGNAL)
233 {
234 /* sig */
235 if (ev->iosig.sig.pending)
236 revents |= EV_SIGNAL;
237 }
238 else
239 {
240 /* io */
241 if (ev->io.pending) 241 if (ev->iosig.io.pending)
242 revents |= ev->ev_events & (EV_READ | EV_WRITE); 242 revents |= ev->ev_events & (EV_READ | EV_WRITE);
243 }
243 244
244 if (ev->to.pending) 245 if (ev->to.pending)
245 { 246 {
246 revents |= EV_TIMEOUT; 247 revents |= EV_TIMEOUT;
247 248
248 if (tv) 249 if (tv)
249 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 :) */
250 } 251 }
251
252 if (ev->sig.pending)
253 revents |= EV_SIGNAL;
254 252
255 return events & revents; 253 return events & revents;
256} 254}
257 255
258int event_priority_init (int npri) 256int event_priority_init (int npri)
… …
274 return 0; 272 return 0;
275} 273}
276 274
277int event_base_loop (struct event_base *base, int flags) 275int event_base_loop (struct event_base *base, int flags)
278{ 276{
279 do 277 dLOOPbase;
280 { 278
281 ev_loop (flags | EVLOOP_ONESHOT); 279 ev_loop (EV_A_ flags);
282 }
283 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
284 280
285 return 0; 281 return 0;
286} 282}
287 283
288int event_base_dispatch (struct event_base *base) 284int event_base_dispatch (struct event_base *base)
289{ 285{
290 return event_base_loop (base, 0); 286 return event_base_loop (base, 0);
291} 287}
292 288
293static void 289static void
294x_loopexit_cb (int revents, void *arg) 290x_loopexit_cb (EV_P_ int revents, void *arg)
295{ 291{
296 ev_loop_done = 2; 292 ev_unloop (EV_A_ 2);
297} 293}
298 294
299int event_base_loopexit (struct event_base *base, struct timeval *tv) 295int event_base_loopexit (struct event_base *base, struct timeval *tv)
300{ 296{
297 dLOOPbase;
301 ev_tstamp after = tv_get (tv); 298 ev_tstamp after = tv_get (tv);
302 299
303 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;
304} 303}
305 304
306struct x_once 305struct x_once
307{ 306{
308 int fd; 307 int fd;
… …
319 free (once); 318 free (once);
320} 319}
321 320
322int 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)
323{ 322{
323 dLOOPbase;
324 struct x_once *once = malloc (sizeof (struct x_once)); 324 struct x_once *once = malloc (sizeof (struct x_once));
325 325
326 if (!once) 326 if (!once)
327 return -1; 327 return -1;
328 328
329 once->fd = fd; 329 once->fd = fd;
330 once->cb = cb; 330 once->cb = cb;
331 once->arg = arg; 331 once->arg = arg;
332 332
333 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);
334 334
335 return 0; 335 return 0;
336} 336}
337 337
338int event_base_priority_init (struct event_base *base, int npri) 338int event_base_priority_init (struct event_base *base, int npri)
339{ 339{
340 return 0; 340 dLOOPbase;
341}
342 341
342 return 0;
343}
344

Diff Legend

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