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

Comparing libev/event.c (file contents):
Revision 1.2 by root, Thu Nov 1 18:13:44 2007 UTC vs.
Revision 1.26 by root, Mon Nov 12 00:31:08 2007 UTC

… …
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <stddef.h> 32#include <stddef.h>
33#include <stdlib.h> 33#include <stdlib.h>
34#include <assert.h>
35
36#ifndef WIN32
34#include <sys/time.h> 37# include <sys/time.h>
38#endif
35 39
40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
36#include "event.h" 43# include "event.h"
44#endif
37 45
46#if EV_MULTIPLICITY
47# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
49#else
50# define dLOOPev
51# define dLOOPbase
52#endif
53
54/* never accessed, will always be cast from/to ev_loop */
38struct event_base 55struct event_base
39{ 56{
40 int dummy; 57 int dummy;
41}; 58};
42 59
43static int x_actives;
44
45static struct event_base x_base, *x_cur; 60static struct event_base *x_cur;
46 61
47static void 62static void
48tv_set (struct timeval *tv, ev_tstamp at) 63tv_set (struct timeval *tv, ev_tstamp at)
49{ 64{
50 tv->tv_sec = (long)at; 65 tv->tv_sec = (long)at;
… …
72 return "libev"; 87 return "libev";
73} 88}
74 89
75void *event_init (void) 90void *event_init (void)
76{ 91{
77 if (ev_init (0)) 92#if EV_MULTIPLICITY
78 return x_cur = &x_base; 93 if (x_cur)
94 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
95 else
96 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
97#else
98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
79 99
100 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
101#endif
102
80 return 0; 103 return x_cur;
81} 104}
82 105
83void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
84{ 107{
108 dLOOPbase;
109
110#if EV_MULTIPLICITY
111 if (ev_default_loop (EVMETHOD_AUTO) != loop)
112 ev_loop_destroy (loop);
113#endif
114}
115
116int event_dispatch (void)
117{
118 return event_base_dispatch (x_cur);
119}
120
121#ifdef EV_STANDALONE
122void event_set_log_callback (event_log_cb cb)
123{
85 /* nop */ 124 /* nop */
86} 125}
87 126#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 127
98int event_loop (int flags) 128int event_loop (int flags)
99{ 129{
100 return event_base_loop (x_cur, flags); 130 return event_base_loop (x_cur, flags);
101} 131}
102 132
103int event_loopexit (struct timeval *tv) 133int event_loopexit (struct timeval *tv)
104{ 134{
105 event_base_loopexit (x_cur, tv); 135 return event_base_loopexit (x_cur, tv);
106} 136}
107 137
108static void 138static void
109x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
110{ 140{
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; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
124 142
125 if (revents & EV_TIMEOUT)
126 --x_actives;
127
128 ev->ev_res = revents; 143 ev->ev_res = revents;
129 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
130} 145}
131 146
132static void 147static void
133x_cb_io (struct ev_io *w, int revents)
134{
135 x_cb ((struct event *)(((char *)w) - offsetof (struct event, io)), revents);
136}
137
138static void
139x_cb_to (struct ev_timer *w, int revents)
140{
141 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
142}
143
144static void
145x_cb_sig (struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
146{ 149{
150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
151
152 if (revents & EV_ERROR)
153 event_del (ev);
154
155 x_cb (ev, revents);
156}
157
158static void
159x_cb_io (EV_P_ struct ev_io *w, int revents)
160{
147 x_cb ((struct event *)(((char *)w) - offsetof (struct event, sig)), revents); 161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
162
163 if (revents & EV_ERROR)
164 event_del (ev);
165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 ev_io_stop (EV_A_ w);
167
168 x_cb (ev, revents);
169}
170
171static void
172x_cb_to (EV_P_ struct ev_timer *w, int revents)
173{
174 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
175
176 event_del (ev);
177
178 x_cb (ev, revents);
148} 179}
149 180
150void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 181void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
151{ 182{
183 if (events & EV_SIGNAL)
184 ev_init (&ev->iosig.sig, x_cb_sig);
185 else
152 ev_watcher_init (&ev->io, x_cb_io); 186 ev_init (&ev->iosig.io, x_cb_io);
187
153 ev_watcher_init (&ev->to, x_cb_to); 188 ev_init (&ev->to, x_cb_to);
154 ev_watcher_init (&ev->sig, x_cb_sig);
155 189
156 ev->ev_base = x_cur; 190 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
157 ev->ev_fd = fd; 191 ev->ev_fd = fd;
158 ev->ev_events = events; 192 ev->ev_events = events;
159 ev->ev_pri = 0; 193 ev->ev_pri = 0;
160 ev->ev_callback = cb; 194 ev->ev_callback = cb;
161 ev->ev_arg = arg; 195 ev->ev_arg = arg;
162 ev->ev_res = 0; 196 ev->ev_res = 0;
163} 197}
164 198
165int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 199int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
166{ 200{
167 event_base_once (x_cur, fd, events, cb, arg, tv); 201 return event_base_once (x_cur, fd, events, cb, arg, tv);
168} 202}
169 203
170int event_add (struct event *ev, struct timeval *tv) 204int event_add (struct event *ev, struct timeval *tv)
171{ 205{
206 dLOOPev;
207
208 /* disable all watchers */
209 event_del (ev);
210
211 if (ev->ev_events & EV_SIGNAL)
212 {
213 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
214 ev_signal_start (EV_A_ &ev->iosig.sig);
215 }
216 else if (ev->ev_events & (EV_READ | EV_WRITE))
217 {
218 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
219 ev_io_start (EV_A_ &ev->iosig.io);
220 }
221
172 if (tv) 222 if (tv)
173 { 223 {
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.); 224 ev_timer_set (&ev->to, tv_get (tv), 0.);
181 ev_timer_start (&ev->to); 225 ev_timer_start (EV_A_ &ev->to);
182 ++x_actives;
183 }
184
185 if (ev->ev_events & (EV_READ | EV_WRITE))
186 { 226 }
187 if (ev_is_active (&ev->io))
188 {
189 ev_io_stop (&ev->io);
190 --x_actives;
191 }
192 227
193 ev_io_set (&ev->io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 228 return 0;
194 ev_io_start (&ev->io); 229}
195 ++x_actives; 230
196 } 231int event_del (struct event *ev)
232{
233 dLOOPev;
197 234
198 if (ev->ev_events & EV_SIGNAL) 235 if (ev->ev_events & EV_SIGNAL)
199 { 236 {
237 /* sig */
238 if (ev_is_active (&ev->iosig.sig))
239 ev_signal_stop (EV_A_ &ev->iosig.sig);
240 }
241 else if (ev->ev_events & (EV_READ | EV_WRITE))
242 {
243 /* io */
200 if (ev_is_active (&ev->sig)) 244 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); 245 ev_io_stop (EV_A_ &ev->iosig.io);
219 --x_actives;
220 } 246 }
221 247
222 if (ev_is_active (&ev->to)) 248 if (ev_is_active (&ev->to))
223 {
224 ev_timer_stop (&ev->to); 249 ev_timer_stop (EV_A_ &ev->to);
225 --x_actives;
226 }
227 250
228 if (ev_is_active (&ev->sig))
229 {
230 ev_signal_stop (&ev->sig);
231 --x_actives;
232 }
233
234 return 0; 251 return 0;
235} 252}
236 253
237void event_active (struct event *ev, int fd, short events) 254void event_active (struct event *ev, int res, short ncalls)
238{ 255{
239 /* unclear what this does, likely internal-use */ 256 dLOOPev;
257
258 if (res & EV_TIMEOUT)
259 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
260
261 if (res & EV_SIGNAL)
262 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
263
264 if (res & (EV_READ | EV_WRITE))
265 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
240} 266}
241 267
242int event_pending (struct event *ev, short events, struct timeval *tv) 268int event_pending (struct event *ev, short events, struct timeval *tv)
243{ 269{
244 short revents; 270 short revents = 0;
271 dLOOPev;
245 272
246 if (ev->io.pending) 273
274 if (ev->ev_events & EV_SIGNAL)
275 {
276 /* sig */
277 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
278 revents |= EV_SIGNAL;
279 }
280 else if (ev->ev_events & (EV_READ | EV_WRITE))
281 {
282 /* io */
283 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
247 revents |= ev->ev_events & (EV_READ | EV_WRITE); 284 revents |= ev->ev_events & (EV_READ | EV_WRITE);
285 }
248 286
249 if (ev->to.pending) 287 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
250 { 288 {
251 revents |= EV_TIMEOUT; 289 revents |= EV_TIMEOUT;
252 290
253 if (tv) 291 if (tv)
254 tv_set (tv, ev_now); /* not sure if this is right :) */ 292 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
255 } 293 }
256
257 if (ev->sig.pending)
258 revents |= EV_SIGNAL;
259 294
260 return events & revents; 295 return events & revents;
261} 296}
262 297
263int event_priority_init (int npri) 298int event_priority_init (int npri)
… …
279 return 0; 314 return 0;
280} 315}
281 316
282int event_base_loop (struct event_base *base, int flags) 317int event_base_loop (struct event_base *base, int flags)
283{ 318{
284 do 319 dLOOPbase;
285 { 320
286 ev_loop (flags | EVLOOP_ONESHOT); 321 ev_loop (EV_A_ flags);
287 }
288 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
289 322
290 return 0; 323 return 0;
291} 324}
292 325
293int event_base_dispatch (struct event_base *base) 326int event_base_dispatch (struct event_base *base)
294{ 327{
295 return event_base_loop (base, 0); 328 return event_base_loop (base, 0);
296} 329}
297 330
298static void 331static void
299x_loopexit_cb (int revents, void *arg) 332x_loopexit_cb (int revents, void *base)
300{ 333{
301 ev_loop_done = 2; 334 dLOOPbase;
335
336 ev_unloop (EV_A_ EVUNLOOP_ONCE);
302} 337}
303 338
304int event_base_loopexit (struct event_base *base, struct timeval *tv) 339int event_base_loopexit (struct event_base *base, struct timeval *tv)
305{ 340{
306 ev_tstamp after = tv_get (tv); 341 ev_tstamp after = tv_get (tv);
342 dLOOPbase;
307 343
308 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 344 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
345
346 return -1;
309} 347}
310 348
311struct x_once 349struct x_once
312{ 350{
313 int fd; 351 int fd;
… …
316}; 354};
317 355
318static void 356static void
319x_once_cb (int revents, void *arg) 357x_once_cb (int revents, void *arg)
320{ 358{
321 struct x_once *once = arg; 359 struct x_once *once = (struct x_once *)arg;
322 360
323 once->cb (once->fd, revents, once->arg); 361 once->cb (once->fd, (short)revents, once->arg);
324 free (once); 362 free (once);
325} 363}
326 364
327int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 365int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
328{ 366{
329 struct x_once *once = malloc (sizeof (struct x_once)); 367 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
368 dLOOPbase;
330 369
331 if (!once) 370 if (!once)
332 return -1; 371 return -1;
333 372
334 once->fd = fd; 373 once->fd = fd;
335 once->cb = cb; 374 once->cb = cb;
336 once->arg = arg; 375 once->arg = arg;
337 376
338 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 377 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
339 378
340 return 0; 379 return 0;
341} 380}
342 381
343int event_base_priority_init (struct event_base *base, int npri) 382int event_base_priority_init (struct event_base *base, int npri)
344{ 383{
345 return 0; 384 /*dLOOPbase;*/
346}
347 385
386 return 0;
387}
388

Diff Legend

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