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

Comparing libev/ev.c (file contents):
Revision 1.15 by root, Wed Oct 31 11:56:34 2007 UTC vs.
Revision 1.42 by root, Fri Nov 2 20:05:05 2007 UTC

1/*
2 * libev event processing core, watcher management
3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions are
9 * met:
10 *
11 * * Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer.
13 *
14 * * Redistributions in binary form must reproduce the above
15 * copyright notice, this list of conditions and the following
16 * disclaimer in the documentation and/or other materials provided
17 * with the distribution.
18 *
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */
31#if EV_USE_CONFIG_H
32# include "config.h"
33#endif
34
1#include <math.h> 35#include <math.h>
2#include <stdlib.h> 36#include <stdlib.h>
3#include <unistd.h> 37#include <unistd.h>
4#include <fcntl.h> 38#include <fcntl.h>
5#include <signal.h> 39#include <signal.h>
40#include <stddef.h>
6 41
7#include <stdio.h> 42#include <stdio.h>
8 43
9#include <assert.h> 44#include <assert.h>
10#include <errno.h> 45#include <errno.h>
46#include <sys/types.h>
47#include <sys/wait.h>
11#include <sys/time.h> 48#include <sys/time.h>
12#include <time.h> 49#include <time.h>
13 50
14#define HAVE_EPOLL 1 51/**/
15 52
16#ifndef HAVE_MONOTONIC 53#ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1
55#endif
56
57#ifndef EV_USE_SELECT
58# define EV_USE_SELECT 1
59#endif
60
61#ifndef EV_USE_POLL
62# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
63#endif
64
65#ifndef EV_USE_EPOLL
66# define EV_USE_EPOLL 0
67#endif
68
69#ifndef EV_USE_REALTIME
70# define EV_USE_REALTIME 1
71#endif
72
73/**/
74
17# ifdef CLOCK_MONOTONIC 75#ifndef CLOCK_MONOTONIC
76# undef EV_USE_MONOTONIC
18# define HAVE_MONOTONIC 1 77# define EV_USE_MONOTONIC 0
19# endif 78#endif
20#endif
21 79
22#ifndef HAVE_SELECT
23# define HAVE_SELECT 1
24#endif
25
26#ifndef HAVE_EPOLL
27# define HAVE_EPOLL 0
28#endif
29
30#ifndef HAVE_REALTIME 80#ifndef CLOCK_REALTIME
31# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 81# undef EV_USE_REALTIME
82# define EV_USE_REALTIME 0
32#endif 83#endif
84
85/**/
33 86
34#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 87#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
35#define MAX_BLOCKTIME 60. 88#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
89#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
90/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
36 91
37#include "ev.h" 92#include "ev.h"
93
94#if __GNUC__ >= 3
95# define expect(expr,value) __builtin_expect ((expr),(value))
96# define inline inline
97#else
98# define expect(expr,value) (expr)
99# define inline static
100#endif
101
102#define expect_false(expr) expect ((expr) != 0, 0)
103#define expect_true(expr) expect ((expr) != 0, 1)
104
105#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
106#define ABSPRI(w) ((w)->priority - EV_MINPRI)
38 107
39typedef struct ev_watcher *W; 108typedef struct ev_watcher *W;
40typedef struct ev_watcher_list *WL; 109typedef struct ev_watcher_list *WL;
41typedef struct ev_watcher_time *WT; 110typedef struct ev_watcher_time *WT;
42 111
43static ev_tstamp now, diff; /* monotonic clock */ 112static ev_tstamp now_floor, now, diff; /* monotonic clock */
44ev_tstamp ev_now; 113ev_tstamp ev_now;
45int ev_method; 114int ev_method;
46 115
47static int have_monotonic; /* runtime */ 116static int have_monotonic; /* runtime */
48 117
… …
53/*****************************************************************************/ 122/*****************************************************************************/
54 123
55ev_tstamp 124ev_tstamp
56ev_time (void) 125ev_time (void)
57{ 126{
58#if HAVE_REALTIME 127#if EV_USE_REALTIME
59 struct timespec ts; 128 struct timespec ts;
60 clock_gettime (CLOCK_REALTIME, &ts); 129 clock_gettime (CLOCK_REALTIME, &ts);
61 return ts.tv_sec + ts.tv_nsec * 1e-9; 130 return ts.tv_sec + ts.tv_nsec * 1e-9;
62#else 131#else
63 struct timeval tv; 132 struct timeval tv;
… …
67} 136}
68 137
69static ev_tstamp 138static ev_tstamp
70get_clock (void) 139get_clock (void)
71{ 140{
72#if HAVE_MONOTONIC 141#if EV_USE_MONOTONIC
73 if (have_monotonic) 142 if (expect_true (have_monotonic))
74 { 143 {
75 struct timespec ts; 144 struct timespec ts;
76 clock_gettime (CLOCK_MONOTONIC, &ts); 145 clock_gettime (CLOCK_MONOTONIC, &ts);
77 return ts.tv_sec + ts.tv_nsec * 1e-9; 146 return ts.tv_sec + ts.tv_nsec * 1e-9;
78 } 147 }
79#endif 148#endif
80 149
81 return ev_time (); 150 return ev_time ();
82} 151}
83 152
153#define array_roundsize(base,n) ((n) | 4 & ~3)
154
84#define array_needsize(base,cur,cnt,init) \ 155#define array_needsize(base,cur,cnt,init) \
85 if ((cnt) > cur) \ 156 if (expect_false ((cnt) > cur)) \
86 { \ 157 { \
87 int newcnt = cur ? cur << 1 : 16; \ 158 int newcnt = cur; \
159 do \
160 { \
161 newcnt = array_roundsize (base, newcnt << 1); \
162 } \
163 while ((cnt) > newcnt); \
164 \
88 base = realloc (base, sizeof (*base) * (newcnt)); \ 165 base = realloc (base, sizeof (*base) * (newcnt)); \
89 init (base + cur, newcnt - cur); \ 166 init (base + cur, newcnt - cur); \
90 cur = newcnt; \ 167 cur = newcnt; \
91 } 168 }
92 169
93/*****************************************************************************/ 170/*****************************************************************************/
94 171
95typedef struct 172typedef struct
96{ 173{
97 struct ev_io *head; 174 struct ev_io *head;
98 unsigned char wev, rev; /* want, received event set */ 175 unsigned char events;
176 unsigned char reify;
99} ANFD; 177} ANFD;
100 178
101static ANFD *anfds; 179static ANFD *anfds;
102static int anfdmax; 180static int anfdmax;
103 181
104static int *fdchanges;
105static int fdchangemax, fdchangecnt;
106
107static void 182static void
108anfds_init (ANFD *base, int count) 183anfds_init (ANFD *base, int count)
109{ 184{
110 while (count--) 185 while (count--)
111 { 186 {
112 base->head = 0; 187 base->head = 0;
113 base->wev = base->rev = EV_NONE; 188 base->events = EV_NONE;
189 base->reify = 0;
190
114 ++base; 191 ++base;
115 } 192 }
116} 193}
117 194
118typedef struct 195typedef struct
119{ 196{
120 W w; 197 W w;
121 int events; 198 int events;
122} ANPENDING; 199} ANPENDING;
123 200
124static ANPENDING *pendings; 201static ANPENDING *pendings [NUMPRI];
125static int pendingmax, pendingcnt; 202static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
126 203
127static void 204static void
128event (W w, int events) 205event (W w, int events)
129{ 206{
207 if (w->pending)
208 {
209 pendings [ABSPRI (w)][w->pending - 1].events |= events;
210 return;
211 }
212
130 w->pending = ++pendingcnt; 213 w->pending = ++pendingcnt [ABSPRI (w)];
131 array_needsize (pendings, pendingmax, pendingcnt, ); 214 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
132 pendings [pendingcnt - 1].w = w; 215 pendings [ABSPRI (w)][w->pending - 1].w = w;
133 pendings [pendingcnt - 1].events = events; 216 pendings [ABSPRI (w)][w->pending - 1].events = events;
217}
218
219static void
220queue_events (W *events, int eventcnt, int type)
221{
222 int i;
223
224 for (i = 0; i < eventcnt; ++i)
225 event (events [i], type);
134} 226}
135 227
136static void 228static void
137fd_event (int fd, int events) 229fd_event (int fd, int events)
138{ 230{
… …
146 if (ev) 238 if (ev)
147 event ((W)w, ev); 239 event ((W)w, ev);
148 } 240 }
149} 241}
150 242
243/*****************************************************************************/
244
245static int *fdchanges;
246static int fdchangemax, fdchangecnt;
247
151static void 248static void
152queue_events (W *events, int eventcnt, int type) 249fd_reify (void)
153{ 250{
154 int i; 251 int i;
155 252
156 for (i = 0; i < eventcnt; ++i) 253 for (i = 0; i < fdchangecnt; ++i)
157 event (events [i], type); 254 {
255 int fd = fdchanges [i];
256 ANFD *anfd = anfds + fd;
257 struct ev_io *w;
258
259 int events = 0;
260
261 for (w = anfd->head; w; w = w->next)
262 events |= w->events;
263
264 anfd->reify = 0;
265
266 if (anfd->events != events)
267 {
268 method_modify (fd, anfd->events, events);
269 anfd->events = events;
270 }
271 }
272
273 fdchangecnt = 0;
274}
275
276static void
277fd_change (int fd)
278{
279 if (anfds [fd].reify || fdchangecnt < 0)
280 return;
281
282 anfds [fd].reify = 1;
283
284 ++fdchangecnt;
285 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
286 fdchanges [fdchangecnt - 1] = fd;
287}
288
289static void
290fd_kill (int fd)
291{
292 struct ev_io *w;
293
294 printf ("killing fd %d\n", fd);//D
295 while ((w = anfds [fd].head))
296 {
297 ev_io_stop (w);
298 event ((W)w, EV_ERROR | EV_READ | EV_WRITE);
299 }
300}
301
302/* called on EBADF to verify fds */
303static void
304fd_ebadf (void)
305{
306 int fd;
307
308 for (fd = 0; fd < anfdmax; ++fd)
309 if (anfds [fd].events)
310 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
311 fd_kill (fd);
312}
313
314/* called on ENOMEM in select/poll to kill some fds and retry */
315static void
316fd_enomem (void)
317{
318 int fd = anfdmax;
319
320 while (fd--)
321 if (anfds [fd].events)
322 {
323 close (fd);
324 fd_kill (fd);
325 return;
326 }
158} 327}
159 328
160/*****************************************************************************/ 329/*****************************************************************************/
161 330
162static struct ev_timer **timers; 331static struct ev_timer **timers;
… …
209/*****************************************************************************/ 378/*****************************************************************************/
210 379
211typedef struct 380typedef struct
212{ 381{
213 struct ev_signal *head; 382 struct ev_signal *head;
214 sig_atomic_t gotsig; 383 sig_atomic_t volatile gotsig;
215} ANSIG; 384} ANSIG;
216 385
217static ANSIG *signals; 386static ANSIG *signals;
218static int signalmax; 387static int signalmax;
219 388
220static int sigpipe [2]; 389static int sigpipe [2];
221static sig_atomic_t gotsig; 390static sig_atomic_t volatile gotsig;
222static struct ev_io sigev; 391static struct ev_io sigev;
223 392
224static void 393static void
225signals_init (ANSIG *base, int count) 394signals_init (ANSIG *base, int count)
226{ 395{
227 while (count--) 396 while (count--)
228 { 397 {
229 base->head = 0; 398 base->head = 0;
230 base->gotsig = 0; 399 base->gotsig = 0;
400
231 ++base; 401 ++base;
232 } 402 }
233} 403}
234 404
235static void 405static void
… …
238 signals [signum - 1].gotsig = 1; 408 signals [signum - 1].gotsig = 1;
239 409
240 if (!gotsig) 410 if (!gotsig)
241 { 411 {
242 gotsig = 1; 412 gotsig = 1;
243 write (sigpipe [1], &gotsig, 1); 413 write (sigpipe [1], &signum, 1);
244 } 414 }
245} 415}
246 416
247static void 417static void
248sigcb (struct ev_io *iow, int revents) 418sigcb (struct ev_io *iow, int revents)
249{ 419{
250 struct ev_signal *w; 420 struct ev_signal *w;
251 int sig; 421 int signum;
252 422
423 read (sigpipe [0], &revents, 1);
253 gotsig = 0; 424 gotsig = 0;
254 read (sigpipe [0], &revents, 1);
255 425
256 for (sig = signalmax; sig--; ) 426 for (signum = signalmax; signum--; )
257 if (signals [sig].gotsig) 427 if (signals [signum].gotsig)
258 { 428 {
259 signals [sig].gotsig = 0; 429 signals [signum].gotsig = 0;
260 430
261 for (w = signals [sig].head; w; w = w->next) 431 for (w = signals [signum].head; w; w = w->next)
262 event ((W)w, EV_SIGNAL); 432 event ((W)w, EV_SIGNAL);
263 } 433 }
264} 434}
265 435
266static void 436static void
… …
271 441
272 /* rather than sort out wether we really need nb, set it */ 442 /* rather than sort out wether we really need nb, set it */
273 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 443 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
274 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 444 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
275 445
276 evio_set (&sigev, sigpipe [0], EV_READ); 446 ev_io_set (&sigev, sigpipe [0], EV_READ);
277 evio_start (&sigev); 447 ev_io_start (&sigev);
278} 448}
279 449
280/*****************************************************************************/ 450/*****************************************************************************/
281 451
282static struct ev_idle **idles; 452static struct ev_idle **idles;
283static int idlemax, idlecnt; 453static int idlemax, idlecnt;
284 454
455static struct ev_prepare **prepares;
456static int preparemax, preparecnt;
457
285static struct ev_check **checks; 458static struct ev_check **checks;
286static int checkmax, checkcnt; 459static int checkmax, checkcnt;
287 460
288/*****************************************************************************/ 461/*****************************************************************************/
289 462
463static struct ev_child *childs [PID_HASHSIZE];
464static struct ev_signal childev;
465
466#ifndef WCONTINUED
467# define WCONTINUED 0
468#endif
469
470static void
471childcb (struct ev_signal *sw, int revents)
472{
473 struct ev_child *w;
474 int pid, status;
475
476 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
477 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
478 if (w->pid == pid || !w->pid)
479 {
480 w->status = status;
481 event ((W)w, EV_CHILD);
482 }
483}
484
485/*****************************************************************************/
486
290#if HAVE_EPOLL 487#if EV_USE_EPOLL
291# include "ev_epoll.c" 488# include "ev_epoll.c"
292#endif 489#endif
490#if EV_USE_POLL
491# include "ev_poll.c"
492#endif
293#if HAVE_SELECT 493#if EV_USE_SELECT
294# include "ev_select.c" 494# include "ev_select.c"
295#endif 495#endif
296 496
497int
498ev_version_major (void)
499{
500 return EV_VERSION_MAJOR;
501}
502
503int
504ev_version_minor (void)
505{
506 return EV_VERSION_MINOR;
507}
508
509/* return true if we are running with elevated privileges and ignore env variables */
510static int
511enable_secure ()
512{
513 return getuid () != geteuid ()
514 || getgid () != getegid ();
515}
516
297int ev_init (int flags) 517int ev_init (int methods)
298{ 518{
299#if HAVE_MONOTONIC
300 {
301 struct timespec ts;
302 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
303 have_monotonic = 1;
304 }
305#endif
306
307 ev_now = ev_time ();
308 now = get_clock ();
309 diff = ev_now - now;
310
311 if (pipe (sigpipe))
312 return 0;
313
314 ev_method = EVMETHOD_NONE;
315#if HAVE_EPOLL
316 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
317#endif
318#if HAVE_SELECT
319 if (ev_method == EVMETHOD_NONE) select_init (flags);
320#endif
321
322 if (ev_method) 519 if (!ev_method)
520 {
521#if EV_USE_MONOTONIC
323 { 522 {
523 struct timespec ts;
524 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
525 have_monotonic = 1;
526 }
527#endif
528
529 ev_now = ev_time ();
530 now = get_clock ();
531 now_floor = now;
532 diff = ev_now - now;
533
534 if (pipe (sigpipe))
535 return 0;
536
537 if (methods == EVMETHOD_AUTO)
538 if (!enable_secure () && getenv ("LIBEV_METHODS"))
539 methods = atoi (getenv ("LIBEV_METHODS"));
540 else
541 methods = EVMETHOD_ANY;
542
543 ev_method = 0;
544#if EV_USE_EPOLL
545 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
546#endif
547#if EV_USE_POLL
548 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
549#endif
550#if EV_USE_SELECT
551 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
552#endif
553
554 if (ev_method)
555 {
324 evw_init (&sigev, sigcb); 556 ev_watcher_init (&sigev, sigcb);
325 siginit (); 557 siginit ();
558
559 ev_signal_init (&childev, childcb, SIGCHLD);
560 ev_signal_start (&childev);
561 }
326 } 562 }
327 563
328 return ev_method; 564 return ev_method;
329} 565}
330 566
331/*****************************************************************************/ 567/*****************************************************************************/
332 568
333void ev_prefork (void) 569void
570ev_fork_prepare (void)
334{ 571{
335 /* nop */ 572 /* nop */
336} 573}
337 574
575void
338void ev_postfork_parent (void) 576ev_fork_parent (void)
339{ 577{
340 /* nop */ 578 /* nop */
341} 579}
342 580
581void
343void ev_postfork_child (void) 582ev_fork_child (void)
344{ 583{
345#if HAVE_EPOLL 584#if EV_USE_EPOLL
346 if (ev_method == EVMETHOD_EPOLL) 585 if (ev_method == EVMETHOD_EPOLL)
347 epoll_postfork_child (); 586 epoll_postfork_child ();
348#endif 587#endif
349 588
350 evio_stop (&sigev); 589 ev_io_stop (&sigev);
351 close (sigpipe [0]); 590 close (sigpipe [0]);
352 close (sigpipe [1]); 591 close (sigpipe [1]);
353 pipe (sigpipe); 592 pipe (sigpipe);
354 siginit (); 593 siginit ();
355} 594}
356 595
357/*****************************************************************************/ 596/*****************************************************************************/
358 597
359static void 598static void
360fd_reify (void) 599call_pending (void)
361{ 600{
362 int i; 601 int pri;
363 602
364 for (i = 0; i < fdchangecnt; ++i) 603 for (pri = NUMPRI; pri--; )
365 { 604 while (pendingcnt [pri])
366 int fd = fdchanges [i];
367 ANFD *anfd = anfds + fd;
368 struct ev_io *w;
369
370 int wev = 0;
371
372 for (w = anfd->head; w; w = w->next)
373 wev |= w->events;
374
375 if (anfd->wev != wev)
376 { 605 {
377 method_modify (fd, anfd->wev, wev); 606 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
378 anfd->wev = wev;
379 }
380 }
381 607
382 fdchangecnt = 0;
383}
384
385static void
386call_pending ()
387{
388 int i;
389
390 for (i = 0; i < pendingcnt; ++i)
391 {
392 ANPENDING *p = pendings + i;
393
394 if (p->w) 608 if (p->w)
395 { 609 {
396 p->w->pending = 0; 610 p->w->pending = 0;
397 p->w->cb (p->w, p->events); 611 p->w->cb (p->w, p->events);
398 } 612 }
399 } 613 }
400
401 pendingcnt = 0;
402} 614}
403 615
404static void 616static void
405timers_reify () 617timers_reify (void)
406{ 618{
407 while (timercnt && timers [0]->at <= now) 619 while (timercnt && timers [0]->at <= now)
408 { 620 {
409 struct ev_timer *w = timers [0]; 621 struct ev_timer *w = timers [0];
410 622
411 /* first reschedule or stop timer */ 623 /* first reschedule or stop timer */
412 if (w->repeat) 624 if (w->repeat)
413 { 625 {
626 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
414 w->at = now + w->repeat; 627 w->at = now + w->repeat;
415 assert (("timer timeout in the past, negative repeat?", w->at > now));
416 downheap ((WT *)timers, timercnt, 0); 628 downheap ((WT *)timers, timercnt, 0);
417 } 629 }
418 else 630 else
419 evtimer_stop (w); /* nonrepeating: stop timer */ 631 ev_timer_stop (w); /* nonrepeating: stop timer */
420 632
421 event ((W)w, EV_TIMEOUT); 633 event ((W)w, EV_TIMEOUT);
422 } 634 }
423} 635}
424 636
425static void 637static void
426periodics_reify () 638periodics_reify (void)
427{ 639{
428 while (periodiccnt && periodics [0]->at <= ev_now) 640 while (periodiccnt && periodics [0]->at <= ev_now)
429 { 641 {
430 struct ev_periodic *w = periodics [0]; 642 struct ev_periodic *w = periodics [0];
431 643
432 /* first reschedule or stop timer */ 644 /* first reschedule or stop timer */
433 if (w->interval) 645 if (w->interval)
434 { 646 {
435 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 647 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
436 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 648 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
437 downheap ((WT *)periodics, periodiccnt, 0); 649 downheap ((WT *)periodics, periodiccnt, 0);
438 } 650 }
439 else 651 else
440 evperiodic_stop (w); /* nonrepeating: stop timer */ 652 ev_periodic_stop (w); /* nonrepeating: stop timer */
441 653
442 event ((W)w, EV_TIMEOUT); 654 event ((W)w, EV_PERIODIC);
443 } 655 }
444} 656}
445 657
446static void 658static void
447periodics_reschedule (ev_tstamp diff) 659periodics_reschedule (ev_tstamp diff)
… …
457 { 669 {
458 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 670 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
459 671
460 if (fabs (diff) >= 1e-4) 672 if (fabs (diff) >= 1e-4)
461 { 673 {
462 evperiodic_stop (w); 674 ev_periodic_stop (w);
463 evperiodic_start (w); 675 ev_periodic_start (w);
464 676
465 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 677 i = 0; /* restart loop, inefficient, but time jumps should be rare */
466 } 678 }
467 } 679 }
468 } 680 }
469} 681}
470 682
471static void 683static int
684time_update_monotonic (void)
685{
686 now = get_clock ();
687
688 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
689 {
690 ev_now = now + diff;
691 return 0;
692 }
693 else
694 {
695 now_floor = now;
696 ev_now = ev_time ();
697 return 1;
698 }
699}
700
701static void
472time_update () 702time_update (void)
473{ 703{
474 int i; 704 int i;
475 705
476 ev_now = ev_time (); 706#if EV_USE_MONOTONIC
477
478 if (have_monotonic) 707 if (expect_true (have_monotonic))
479 { 708 {
709 if (time_update_monotonic ())
710 {
480 ev_tstamp odiff = diff; 711 ev_tstamp odiff = diff;
481 712
482 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 713 for (i = 4; --i; ) /* loop a few times, before making important decisions */
483 { 714 {
484 now = get_clock ();
485 diff = ev_now - now; 715 diff = ev_now - now;
486 716
487 if (fabs (odiff - diff) < MIN_TIMEJUMP) 717 if (fabs (odiff - diff) < MIN_TIMEJUMP)
488 return; /* all is well */ 718 return; /* all is well */
489 719
490 ev_now = ev_time (); 720 ev_now = ev_time ();
721 now = get_clock ();
722 now_floor = now;
491 } 723 }
492 724
493 periodics_reschedule (diff - odiff); 725 periodics_reschedule (diff - odiff);
494 /* no timer adjustment, as the monotonic clock doesn't jump */ 726 /* no timer adjustment, as the monotonic clock doesn't jump */
727 }
495 } 728 }
496 else 729 else
730#endif
497 { 731 {
732 ev_now = ev_time ();
733
498 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 734 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
499 { 735 {
500 periodics_reschedule (ev_now - now); 736 periodics_reschedule (ev_now - now);
501 737
502 /* adjust timers. this is easy, as the offset is the same for all */ 738 /* adjust timers. this is easy, as the offset is the same for all */
503 for (i = 0; i < timercnt; ++i) 739 for (i = 0; i < timercnt; ++i)
… …
511int ev_loop_done; 747int ev_loop_done;
512 748
513void ev_loop (int flags) 749void ev_loop (int flags)
514{ 750{
515 double block; 751 double block;
516 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 752 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
517
518 if (checkcnt)
519 {
520 queue_events ((W *)checks, checkcnt, EV_CHECK);
521 call_pending ();
522 }
523 753
524 do 754 do
525 { 755 {
756 /* queue check watchers (and execute them) */
757 if (expect_false (preparecnt))
758 {
759 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
760 call_pending ();
761 }
762
526 /* update fd-related kernel structures */ 763 /* update fd-related kernel structures */
527 fd_reify (); 764 fd_reify ();
528 765
529 /* calculate blocking time */ 766 /* calculate blocking time */
530 767
531 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 768 /* we only need this for !monotonic clockor timers, but as we basically
769 always have timers, we just calculate it always */
770#if EV_USE_MONOTONIC
771 if (expect_true (have_monotonic))
772 time_update_monotonic ();
773 else
774#endif
775 {
532 ev_now = ev_time (); 776 ev_now = ev_time ();
777 now = ev_now;
778 }
533 779
534 if (flags & EVLOOP_NONBLOCK || idlecnt) 780 if (flags & EVLOOP_NONBLOCK || idlecnt)
535 block = 0.; 781 block = 0.;
536 else 782 else
537 { 783 {
538 block = MAX_BLOCKTIME; 784 block = MAX_BLOCKTIME;
539 785
540 if (timercnt) 786 if (timercnt)
541 { 787 {
542 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 788 ev_tstamp to = timers [0]->at - now + method_fudge;
543 if (block > to) block = to; 789 if (block > to) block = to;
544 } 790 }
545 791
546 if (periodiccnt) 792 if (periodiccnt)
547 { 793 {
… …
556 802
557 /* update ev_now, do magic */ 803 /* update ev_now, do magic */
558 time_update (); 804 time_update ();
559 805
560 /* queue pending timers and reschedule them */ 806 /* queue pending timers and reschedule them */
807 timers_reify (); /* relative timers called last */
561 periodics_reify (); /* absolute timers first */ 808 periodics_reify (); /* absolute timers called first */
562 timers_reify (); /* relative timers second */
563 809
564 /* queue idle watchers unless io or timers are pending */ 810 /* queue idle watchers unless io or timers are pending */
565 if (!pendingcnt) 811 if (!pendingcnt)
566 queue_events ((W *)idles, idlecnt, EV_IDLE); 812 queue_events ((W *)idles, idlecnt, EV_IDLE);
567 813
568 /* queue check and possibly idle watchers */ 814 /* queue check watchers, to be executed first */
815 if (checkcnt)
569 queue_events ((W *)checks, checkcnt, EV_CHECK); 816 queue_events ((W *)checks, checkcnt, EV_CHECK);
570 817
571 call_pending (); 818 call_pending ();
572 } 819 }
573 while (!ev_loop_done); 820 while (!ev_loop_done);
574 821
… …
599 head = &(*head)->next; 846 head = &(*head)->next;
600 } 847 }
601} 848}
602 849
603static void 850static void
851ev_clear_pending (W w)
852{
853 if (w->pending)
854 {
855 pendings [ABSPRI (w)][w->pending - 1].w = 0;
856 w->pending = 0;
857 }
858}
859
860static void
604ev_start (W w, int active) 861ev_start (W w, int active)
605{ 862{
606 w->pending = 0;
607 w->active = active; 863 w->active = active;
608} 864}
609 865
610static void 866static void
611ev_stop (W w) 867ev_stop (W w)
612{ 868{
613 if (w->pending)
614 pendings [w->pending - 1].w = 0;
615
616 w->active = 0; 869 w->active = 0;
617} 870}
618 871
619/*****************************************************************************/ 872/*****************************************************************************/
620 873
621void 874void
622evio_start (struct ev_io *w) 875ev_io_start (struct ev_io *w)
623{ 876{
877 int fd = w->fd;
878
624 if (ev_is_active (w)) 879 if (ev_is_active (w))
625 return; 880 return;
626 881
627 int fd = w->fd; 882 assert (("ev_io_start called with negative fd", fd >= 0));
628 883
629 ev_start ((W)w, 1); 884 ev_start ((W)w, 1);
630 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 885 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
631 wlist_add ((WL *)&anfds[fd].head, (WL)w); 886 wlist_add ((WL *)&anfds[fd].head, (WL)w);
632 887
633 ++fdchangecnt; 888 fd_change (fd);
634 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
635 fdchanges [fdchangecnt - 1] = fd;
636} 889}
637 890
638void 891void
639evio_stop (struct ev_io *w) 892ev_io_stop (struct ev_io *w)
640{ 893{
894 ev_clear_pending ((W)w);
641 if (!ev_is_active (w)) 895 if (!ev_is_active (w))
642 return; 896 return;
643 897
644 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 898 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
645 ev_stop ((W)w); 899 ev_stop ((W)w);
646 900
647 ++fdchangecnt; 901 fd_change (w->fd);
648 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
649 fdchanges [fdchangecnt - 1] = w->fd;
650} 902}
651 903
652
653void 904void
654evtimer_start (struct ev_timer *w) 905ev_timer_start (struct ev_timer *w)
655{ 906{
656 if (ev_is_active (w)) 907 if (ev_is_active (w))
657 return; 908 return;
658 909
659 w->at += now; 910 w->at += now;
660 911
661 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 912 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
662 913
663 ev_start ((W)w, ++timercnt); 914 ev_start ((W)w, ++timercnt);
664 array_needsize (timers, timermax, timercnt, ); 915 array_needsize (timers, timermax, timercnt, );
665 timers [timercnt - 1] = w; 916 timers [timercnt - 1] = w;
666 upheap ((WT *)timers, timercnt - 1); 917 upheap ((WT *)timers, timercnt - 1);
667} 918}
668 919
669void 920void
670evtimer_stop (struct ev_timer *w) 921ev_timer_stop (struct ev_timer *w)
671{ 922{
923 ev_clear_pending ((W)w);
672 if (!ev_is_active (w)) 924 if (!ev_is_active (w))
673 return; 925 return;
674 926
675 if (w->active < timercnt--) 927 if (w->active < timercnt--)
676 { 928 {
… …
682 934
683 ev_stop ((W)w); 935 ev_stop ((W)w);
684} 936}
685 937
686void 938void
687evtimer_again (struct ev_timer *w) 939ev_timer_again (struct ev_timer *w)
688{ 940{
689 if (ev_is_active (w)) 941 if (ev_is_active (w))
690 { 942 {
691 if (w->repeat) 943 if (w->repeat)
692 { 944 {
693 w->at = now + w->repeat; 945 w->at = now + w->repeat;
694 downheap ((WT *)timers, timercnt, w->active - 1); 946 downheap ((WT *)timers, timercnt, w->active - 1);
695 } 947 }
696 else 948 else
697 evtimer_stop (w); 949 ev_timer_stop (w);
698 } 950 }
699 else if (w->repeat) 951 else if (w->repeat)
700 evtimer_start (w); 952 ev_timer_start (w);
701} 953}
702 954
703void 955void
704evperiodic_start (struct ev_periodic *w) 956ev_periodic_start (struct ev_periodic *w)
705{ 957{
706 if (ev_is_active (w)) 958 if (ev_is_active (w))
707 return; 959 return;
708 960
709 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 961 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
710 962
711 /* this formula differs from the one in periodic_reify because we do not always round up */ 963 /* this formula differs from the one in periodic_reify because we do not always round up */
712 if (w->interval) 964 if (w->interval)
713 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 965 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
714 966
… …
717 periodics [periodiccnt - 1] = w; 969 periodics [periodiccnt - 1] = w;
718 upheap ((WT *)periodics, periodiccnt - 1); 970 upheap ((WT *)periodics, periodiccnt - 1);
719} 971}
720 972
721void 973void
722evperiodic_stop (struct ev_periodic *w) 974ev_periodic_stop (struct ev_periodic *w)
723{ 975{
976 ev_clear_pending ((W)w);
724 if (!ev_is_active (w)) 977 if (!ev_is_active (w))
725 return; 978 return;
726 979
727 if (w->active < periodiccnt--) 980 if (w->active < periodiccnt--)
728 { 981 {
… …
732 985
733 ev_stop ((W)w); 986 ev_stop ((W)w);
734} 987}
735 988
736void 989void
737evsignal_start (struct ev_signal *w) 990ev_signal_start (struct ev_signal *w)
738{ 991{
739 if (ev_is_active (w)) 992 if (ev_is_active (w))
740 return; 993 return;
994
995 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
741 996
742 ev_start ((W)w, 1); 997 ev_start ((W)w, 1);
743 array_needsize (signals, signalmax, w->signum, signals_init); 998 array_needsize (signals, signalmax, w->signum, signals_init);
744 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 999 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
745 1000
… …
752 sigaction (w->signum, &sa, 0); 1007 sigaction (w->signum, &sa, 0);
753 } 1008 }
754} 1009}
755 1010
756void 1011void
757evsignal_stop (struct ev_signal *w) 1012ev_signal_stop (struct ev_signal *w)
758{ 1013{
1014 ev_clear_pending ((W)w);
759 if (!ev_is_active (w)) 1015 if (!ev_is_active (w))
760 return; 1016 return;
761 1017
762 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1018 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
763 ev_stop ((W)w); 1019 ev_stop ((W)w);
764 1020
765 if (!signals [w->signum - 1].head) 1021 if (!signals [w->signum - 1].head)
766 signal (w->signum, SIG_DFL); 1022 signal (w->signum, SIG_DFL);
767} 1023}
768 1024
1025void
769void evidle_start (struct ev_idle *w) 1026ev_idle_start (struct ev_idle *w)
770{ 1027{
771 if (ev_is_active (w)) 1028 if (ev_is_active (w))
772 return; 1029 return;
773 1030
774 ev_start ((W)w, ++idlecnt); 1031 ev_start ((W)w, ++idlecnt);
775 array_needsize (idles, idlemax, idlecnt, ); 1032 array_needsize (idles, idlemax, idlecnt, );
776 idles [idlecnt - 1] = w; 1033 idles [idlecnt - 1] = w;
777} 1034}
778 1035
1036void
779void evidle_stop (struct ev_idle *w) 1037ev_idle_stop (struct ev_idle *w)
780{ 1038{
1039 ev_clear_pending ((W)w);
1040 if (ev_is_active (w))
1041 return;
1042
781 idles [w->active - 1] = idles [--idlecnt]; 1043 idles [w->active - 1] = idles [--idlecnt];
782 ev_stop ((W)w); 1044 ev_stop ((W)w);
783} 1045}
784 1046
1047void
1048ev_prepare_start (struct ev_prepare *w)
1049{
1050 if (ev_is_active (w))
1051 return;
1052
1053 ev_start ((W)w, ++preparecnt);
1054 array_needsize (prepares, preparemax, preparecnt, );
1055 prepares [preparecnt - 1] = w;
1056}
1057
1058void
1059ev_prepare_stop (struct ev_prepare *w)
1060{
1061 ev_clear_pending ((W)w);
1062 if (ev_is_active (w))
1063 return;
1064
1065 prepares [w->active - 1] = prepares [--preparecnt];
1066 ev_stop ((W)w);
1067}
1068
1069void
785void evcheck_start (struct ev_check *w) 1070ev_check_start (struct ev_check *w)
786{ 1071{
787 if (ev_is_active (w)) 1072 if (ev_is_active (w))
788 return; 1073 return;
789 1074
790 ev_start ((W)w, ++checkcnt); 1075 ev_start ((W)w, ++checkcnt);
791 array_needsize (checks, checkmax, checkcnt, ); 1076 array_needsize (checks, checkmax, checkcnt, );
792 checks [checkcnt - 1] = w; 1077 checks [checkcnt - 1] = w;
793} 1078}
794 1079
1080void
795void evcheck_stop (struct ev_check *w) 1081ev_check_stop (struct ev_check *w)
796{ 1082{
1083 ev_clear_pending ((W)w);
1084 if (ev_is_active (w))
1085 return;
1086
797 checks [w->active - 1] = checks [--checkcnt]; 1087 checks [w->active - 1] = checks [--checkcnt];
798 ev_stop ((W)w); 1088 ev_stop ((W)w);
799} 1089}
800 1090
1091void
1092ev_child_start (struct ev_child *w)
1093{
1094 if (ev_is_active (w))
1095 return;
1096
1097 ev_start ((W)w, 1);
1098 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1099}
1100
1101void
1102ev_child_stop (struct ev_child *w)
1103{
1104 ev_clear_pending ((W)w);
1105 if (ev_is_active (w))
1106 return;
1107
1108 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1109 ev_stop ((W)w);
1110}
1111
1112/*****************************************************************************/
1113
1114struct ev_once
1115{
1116 struct ev_io io;
1117 struct ev_timer to;
1118 void (*cb)(int revents, void *arg);
1119 void *arg;
1120};
1121
1122static void
1123once_cb (struct ev_once *once, int revents)
1124{
1125 void (*cb)(int revents, void *arg) = once->cb;
1126 void *arg = once->arg;
1127
1128 ev_io_stop (&once->io);
1129 ev_timer_stop (&once->to);
1130 free (once);
1131
1132 cb (revents, arg);
1133}
1134
1135static void
1136once_cb_io (struct ev_io *w, int revents)
1137{
1138 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1139}
1140
1141static void
1142once_cb_to (struct ev_timer *w, int revents)
1143{
1144 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1145}
1146
1147void
1148ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1149{
1150 struct ev_once *once = malloc (sizeof (struct ev_once));
1151
1152 if (!once)
1153 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1154 else
1155 {
1156 once->cb = cb;
1157 once->arg = arg;
1158
1159 ev_watcher_init (&once->io, once_cb_io);
1160 if (fd >= 0)
1161 {
1162 ev_io_set (&once->io, fd, events);
1163 ev_io_start (&once->io);
1164 }
1165
1166 ev_watcher_init (&once->to, once_cb_to);
1167 if (timeout >= 0.)
1168 {
1169 ev_timer_set (&once->to, timeout, 0.);
1170 ev_timer_start (&once->to);
1171 }
1172 }
1173}
1174
801/*****************************************************************************/ 1175/*****************************************************************************/
802 1176
803#if 0 1177#if 0
804 1178
805struct ev_io wio; 1179struct ev_io wio;
… …
812 1186
813static void 1187static void
814ocb (struct ev_timer *w, int revents) 1188ocb (struct ev_timer *w, int revents)
815{ 1189{
816 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); 1190 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
817 evtimer_stop (w); 1191 ev_timer_stop (w);
818 evtimer_start (w); 1192 ev_timer_start (w);
819} 1193}
820 1194
821static void 1195static void
822scb (struct ev_signal *w, int revents) 1196scb (struct ev_signal *w, int revents)
823{ 1197{
824 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1198 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
825 evio_stop (&wio); 1199 ev_io_stop (&wio);
826 evio_start (&wio); 1200 ev_io_start (&wio);
827} 1201}
828 1202
829static void 1203static void
830gcb (struct ev_signal *w, int revents) 1204gcb (struct ev_signal *w, int revents)
831{ 1205{
… …
835 1209
836int main (void) 1210int main (void)
837{ 1211{
838 ev_init (0); 1212 ev_init (0);
839 1213
840 evio_init (&wio, sin_cb, 0, EV_READ); 1214 ev_io_init (&wio, sin_cb, 0, EV_READ);
841 evio_start (&wio); 1215 ev_io_start (&wio);
842 1216
843 struct ev_timer t[10000]; 1217 struct ev_timer t[10000];
844 1218
845#if 0 1219#if 0
846 int i; 1220 int i;
847 for (i = 0; i < 10000; ++i) 1221 for (i = 0; i < 10000; ++i)
848 { 1222 {
849 struct ev_timer *w = t + i; 1223 struct ev_timer *w = t + i;
850 evw_init (w, ocb, i); 1224 ev_watcher_init (w, ocb, i);
851 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1225 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
852 evtimer_start (w); 1226 ev_timer_start (w);
853 if (drand48 () < 0.5) 1227 if (drand48 () < 0.5)
854 evtimer_stop (w); 1228 ev_timer_stop (w);
855 } 1229 }
856#endif 1230#endif
857 1231
858 struct ev_timer t1; 1232 struct ev_timer t1;
859 evtimer_init (&t1, ocb, 5, 10); 1233 ev_timer_init (&t1, ocb, 5, 10);
860 evtimer_start (&t1); 1234 ev_timer_start (&t1);
861 1235
862 struct ev_signal sig; 1236 struct ev_signal sig;
863 evsignal_init (&sig, scb, SIGQUIT); 1237 ev_signal_init (&sig, scb, SIGQUIT);
864 evsignal_start (&sig); 1238 ev_signal_start (&sig);
865 1239
866 struct ev_check cw; 1240 struct ev_check cw;
867 evcheck_init (&cw, gcb); 1241 ev_check_init (&cw, gcb);
868 evcheck_start (&cw); 1242 ev_check_start (&cw);
869 1243
870 struct ev_idle iw; 1244 struct ev_idle iw;
871 evidle_init (&iw, gcb); 1245 ev_idle_init (&iw, gcb);
872 evidle_start (&iw); 1246 ev_idle_start (&iw);
873 1247
874 ev_loop (0); 1248 ev_loop (0);
875 1249
876 return 0; 1250 return 0;
877} 1251}

Diff Legend

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