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

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

Diff Legend

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