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

Comparing libev/ev.c (file contents):
Revision 1.158 by root, Thu Nov 29 17:28:13 2007 UTC vs.
Revision 1.205 by root, Sun Jan 20 15:37:03 2008 UTC

2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
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 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
51# ifndef EV_USE_MONOTONIC 59# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 60# define EV_USE_MONOTONIC 0
53# endif 61# endif
54# ifndef EV_USE_REALTIME 62# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 63# define EV_USE_REALTIME 0
64# endif
65# endif
66
67# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1
70# else
71# define EV_USE_NANOSLEEP 0
56# endif 72# endif
57# endif 73# endif
58 74
59# ifndef EV_USE_SELECT 75# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 76# if HAVE_SELECT && HAVE_SYS_SELECT_H
146 162
147#ifndef EV_USE_REALTIME 163#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 164# define EV_USE_REALTIME 0
149#endif 165#endif
150 166
167#ifndef EV_USE_NANOSLEEP
168# define EV_USE_NANOSLEEP 0
169#endif
170
151#ifndef EV_USE_SELECT 171#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 172# define EV_USE_SELECT 1
153#endif 173#endif
154 174
155#ifndef EV_USE_POLL 175#ifndef EV_USE_POLL
202#ifndef CLOCK_REALTIME 222#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 223# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 224# define EV_USE_REALTIME 0
205#endif 225#endif
206 226
227#if !EV_STAT_ENABLE
228# undef EV_USE_INOTIFY
229# define EV_USE_INOTIFY 0
230#endif
231
232#if !EV_USE_NANOSLEEP
233# ifndef _WIN32
234# include <sys/select.h>
235# endif
236#endif
237
238#if EV_USE_INOTIFY
239# include <sys/inotify.h>
240#endif
241
207#if EV_SELECT_IS_WINSOCKET 242#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 243# include <winsock.h>
209#endif 244#endif
210 245
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
219/**/ 246/**/
247
248/*
249 * This is used to avoid floating point rounding problems.
250 * It is added to ev_rt_now when scheduling periodics
251 * to ensure progress, time-wise, even when rounding
252 * errors are against us.
253 * This value is good at least till the year 4000.
254 * Better solutions welcome.
255 */
256#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 257
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 258#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 259#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 260/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 261
225#if __GNUC__ >= 3 262#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 263# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 264# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 265#else
236# define expect(expr,value) (expr) 266# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 267# define noinline
268# if __STDC_VERSION__ < 199901L
269# define inline
270# endif
240#endif 271#endif
241 272
242#define expect_false(expr) expect ((expr) != 0, 0) 273#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 274#define expect_true(expr) expect ((expr) != 0, 1)
275#define inline_size static inline
276
277#if EV_MINIMAL
278# define inline_speed static noinline
279#else
280# define inline_speed static inline
281#endif
244 282
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 283#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 284#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 285
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 286#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 287#define EMPTY2(a,b) /* used to suppress some warnings */
250 288
251typedef ev_watcher *W; 289typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
254 292
293#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */
255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
256 298
257#ifdef _WIN32 299#ifdef _WIN32
258# include "ev_win32.c" 300# include "ev_win32.c"
259#endif 301#endif
260 302
396{ 438{
397 return ev_rt_now; 439 return ev_rt_now;
398} 440}
399#endif 441#endif
400 442
401#define array_roundsize(type,n) (((n) | 4) & ~3) 443void
444ev_sleep (ev_tstamp delay)
445{
446 if (delay > 0.)
447 {
448#if EV_USE_NANOSLEEP
449 struct timespec ts;
450
451 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453
454 nanosleep (&ts, 0);
455#elif defined(_WIN32)
456 Sleep (delay * 1e3);
457#else
458 struct timeval tv;
459
460 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
462
463 select (0, 0, 0, 0, &tv);
464#endif
465 }
466}
467
468/*****************************************************************************/
469
470int inline_size
471array_nextsize (int elem, int cur, int cnt)
472{
473 int ncur = cur + 1;
474
475 do
476 ncur <<= 1;
477 while (cnt > ncur);
478
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096)
481 {
482 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
484 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem;
486 }
487
488 return ncur;
489}
490
491static noinline void *
492array_realloc (int elem, void *base, int *cur, int cnt)
493{
494 *cur = array_nextsize (elem, *cur, cnt);
495 return ev_realloc (base, elem * *cur);
496}
402 497
403#define array_needsize(type,base,cur,cnt,init) \ 498#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 499 if (expect_false ((cnt) > (cur))) \
405 { \ 500 { \
406 int newcnt = cur; \ 501 int ocur_ = (cur); \
407 do \ 502 (base) = (type *)array_realloc \
408 { \ 503 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 504 init ((base) + (ocur_), (cur) - ocur_); \
410 } \
411 while ((cnt) > newcnt); \
412 \
413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
414 init (base + cur, newcnt - cur); \
415 cur = newcnt; \
416 } 505 }
417 506
507#if 0
418#define array_slim(type,stem) \ 508#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 509 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 510 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 511 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 512 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 513 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 514 }
515#endif
425 516
426#define array_free(stem, idx) \ 517#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 518 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 519
429/*****************************************************************************/ 520/*****************************************************************************/
430 521
431void noinline 522void noinline
432ev_feed_event (EV_P_ void *w, int revents) 523ev_feed_event (EV_P_ void *w, int revents)
433{ 524{
434 W w_ = (W)w; 525 W w_ = (W)w;
526 int pri = ABSPRI (w_);
435 527
436 if (expect_false (w_->pending)) 528 if (expect_false (w_->pending))
529 pendings [pri][w_->pending - 1].events |= revents;
530 else
437 { 531 {
532 w_->pending = ++pendingcnt [pri];
533 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
534 pendings [pri][w_->pending - 1].w = w_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 535 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 536 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446} 537}
447 538
448void inline_size 539void inline_speed
449queue_events (EV_P_ W *events, int eventcnt, int type) 540queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 541{
451 int i; 542 int i;
452 543
453 for (i = 0; i < eventcnt; ++i) 544 for (i = 0; i < eventcnt; ++i)
485} 576}
486 577
487void 578void
488ev_feed_fd_event (EV_P_ int fd, int revents) 579ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 580{
581 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 582 fd_event (EV_A_ fd, revents);
491} 583}
492 584
493void inline_size 585void inline_size
494fd_reify (EV_P) 586fd_reify (EV_P)
495{ 587{
499 { 591 {
500 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
501 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
502 ev_io *w; 594 ev_io *w;
503 595
504 int events = 0; 596 unsigned char events = 0;
505 597
506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 598 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
507 events |= w->events; 599 events |= (unsigned char)w->events;
508 600
509#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
510 if (events) 602 if (events)
511 { 603 {
512 unsigned long argp; 604 unsigned long argp;
605 #ifdef EV_FD_TO_WIN32_HANDLE
606 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
607 #else
513 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 610 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 } 611 }
516#endif 612#endif
517 613
614 {
615 unsigned char o_events = anfd->events;
616 unsigned char o_reify = anfd->reify;
617
518 anfd->reify = 0; 618 anfd->reify = 0;
519
520 backend_modify (EV_A_ fd, anfd->events, events);
521 anfd->events = events; 619 anfd->events = events;
620
621 if (o_events != events || o_reify & EV_IOFDSET)
622 backend_modify (EV_A_ fd, o_events, events);
623 }
522 } 624 }
523 625
524 fdchangecnt = 0; 626 fdchangecnt = 0;
525} 627}
526 628
527void inline_size 629void inline_size
528fd_change (EV_P_ int fd) 630fd_change (EV_P_ int fd, int flags)
529{ 631{
530 if (expect_false (anfds [fd].reify)) 632 unsigned char reify = anfds [fd].reify;
531 return;
532
533 anfds [fd].reify = 1; 633 anfds [fd].reify |= flags;
534 634
635 if (expect_true (!reify))
636 {
535 ++fdchangecnt; 637 ++fdchangecnt;
536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 638 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
537 fdchanges [fdchangecnt - 1] = fd; 639 fdchanges [fdchangecnt - 1] = fd;
640 }
538} 641}
539 642
540void inline_speed 643void inline_speed
541fd_kill (EV_P_ int fd) 644fd_kill (EV_P_ int fd)
542{ 645{
593 696
594 for (fd = 0; fd < anfdmax; ++fd) 697 for (fd = 0; fd < anfdmax; ++fd)
595 if (anfds [fd].events) 698 if (anfds [fd].events)
596 { 699 {
597 anfds [fd].events = 0; 700 anfds [fd].events = 0;
598 fd_change (EV_A_ fd); 701 fd_change (EV_A_ fd, EV_IOFDSET | 1);
599 } 702 }
600} 703}
601 704
602/*****************************************************************************/ 705/*****************************************************************************/
603 706
604void inline_speed 707void inline_speed
605upheap (WT *heap, int k) 708upheap (WT *heap, int k)
606{ 709{
607 WT w = heap [k]; 710 WT w = heap [k];
608 711
609 while (k && heap [k >> 1]->at > w->at) 712 while (k)
610 { 713 {
714 int p = (k - 1) >> 1;
715
716 if (heap [p]->at <= w->at)
717 break;
718
611 heap [k] = heap [k >> 1]; 719 heap [k] = heap [p];
612 ((W)heap [k])->active = k + 1; 720 ((W)heap [k])->active = k + 1;
613 k >>= 1; 721 k = p;
614 } 722 }
615 723
616 heap [k] = w; 724 heap [k] = w;
617 ((W)heap [k])->active = k + 1; 725 ((W)heap [k])->active = k + 1;
618
619} 726}
620 727
621void inline_speed 728void inline_speed
622downheap (WT *heap, int N, int k) 729downheap (WT *heap, int N, int k)
623{ 730{
624 WT w = heap [k]; 731 WT w = heap [k];
625 732
626 while (k < (N >> 1)) 733 for (;;)
627 { 734 {
628 int j = k << 1; 735 int c = (k << 1) + 1;
629 736
630 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 737 if (c >= N)
631 ++j;
632
633 if (w->at <= heap [j]->at)
634 break; 738 break;
635 739
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0;
742
743 if (w->at <= heap [c]->at)
744 break;
745
636 heap [k] = heap [j]; 746 heap [k] = heap [c];
637 ((W)heap [k])->active = k + 1; 747 ((W)heap [k])->active = k + 1;
748
638 k = j; 749 k = c;
639 } 750 }
640 751
641 heap [k] = w; 752 heap [k] = w;
642 ((W)heap [k])->active = k + 1; 753 ((W)heap [k])->active = k + 1;
643} 754}
725 for (signum = signalmax; signum--; ) 836 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig) 837 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1); 838 ev_feed_signal_event (EV_A_ signum + 1);
728} 839}
729 840
730void inline_size 841void inline_speed
731fd_intern (int fd) 842fd_intern (int fd)
732{ 843{
733#ifdef _WIN32 844#ifdef _WIN32
734 int arg = 1; 845 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 846 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
750 ev_unref (EV_A); /* child watcher should not keep loop alive */ 861 ev_unref (EV_A); /* child watcher should not keep loop alive */
751} 862}
752 863
753/*****************************************************************************/ 864/*****************************************************************************/
754 865
755static ev_child *childs [EV_PID_HASHSIZE]; 866static WL childs [EV_PID_HASHSIZE];
756 867
757#ifndef _WIN32 868#ifndef _WIN32
758 869
759static ev_signal childev; 870static ev_signal childev;
760 871
764 ev_child *w; 875 ev_child *w;
765 876
766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 877 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
767 if (w->pid == pid || !w->pid) 878 if (w->pid == pid || !w->pid)
768 { 879 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 880 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
770 w->rpid = pid; 881 w->rpid = pid;
771 w->rstatus = status; 882 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 883 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 884 }
774} 885}
775 886
776#ifndef WCONTINUED 887#ifndef WCONTINUED
875} 986}
876 987
877unsigned int 988unsigned int
878ev_embeddable_backends (void) 989ev_embeddable_backends (void)
879{ 990{
880 return EVBACKEND_EPOLL 991 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
881 | EVBACKEND_KQUEUE 992
882 | EVBACKEND_PORT; 993 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
994 /* please fix it and tell me how to detect the fix */
995 flags &= ~EVBACKEND_EPOLL;
996
997 return flags;
883} 998}
884 999
885unsigned int 1000unsigned int
886ev_backend (EV_P) 1001ev_backend (EV_P)
887{ 1002{
888 return backend; 1003 return backend;
1004}
1005
1006unsigned int
1007ev_loop_count (EV_P)
1008{
1009 return loop_count;
1010}
1011
1012void
1013ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1014{
1015 io_blocktime = interval;
1016}
1017
1018void
1019ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1020{
1021 timeout_blocktime = interval;
889} 1022}
890 1023
891static void noinline 1024static void noinline
892loop_init (EV_P_ unsigned int flags) 1025loop_init (EV_P_ unsigned int flags)
893{ 1026{
904 ev_rt_now = ev_time (); 1037 ev_rt_now = ev_time ();
905 mn_now = get_clock (); 1038 mn_now = get_clock ();
906 now_floor = mn_now; 1039 now_floor = mn_now;
907 rtmn_diff = ev_rt_now - mn_now; 1040 rtmn_diff = ev_rt_now - mn_now;
908 1041
1042 io_blocktime = 0.;
1043 timeout_blocktime = 0.;
1044
909 /* pid check not overridable via env */ 1045 /* pid check not overridable via env */
910#ifndef _WIN32 1046#ifndef _WIN32
911 if (flags & EVFLAG_FORKCHECK) 1047 if (flags & EVFLAG_FORKCHECK)
912 curpid = getpid (); 1048 curpid = getpid ();
913#endif 1049#endif
975#if EV_USE_SELECT 1111#if EV_USE_SELECT
976 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1112 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
977#endif 1113#endif
978 1114
979 for (i = NUMPRI; i--; ) 1115 for (i = NUMPRI; i--; )
1116 {
980 array_free (pending, [i]); 1117 array_free (pending, [i]);
1118#if EV_IDLE_ENABLE
1119 array_free (idle, [i]);
1120#endif
1121 }
1122
1123 ev_free (anfds); anfdmax = 0;
981 1124
982 /* have to use the microsoft-never-gets-it-right macro */ 1125 /* have to use the microsoft-never-gets-it-right macro */
983 array_free (fdchange, EMPTY0); 1126 array_free (fdchange, EMPTY);
984 array_free (timer, EMPTY0); 1127 array_free (timer, EMPTY);
985#if EV_PERIODIC_ENABLE 1128#if EV_PERIODIC_ENABLE
986 array_free (periodic, EMPTY0); 1129 array_free (periodic, EMPTY);
987#endif 1130#endif
1131#if EV_FORK_ENABLE
988 array_free (idle, EMPTY0); 1132 array_free (fork, EMPTY);
1133#endif
989 array_free (prepare, EMPTY0); 1134 array_free (prepare, EMPTY);
990 array_free (check, EMPTY0); 1135 array_free (check, EMPTY);
991 1136
992 backend = 0; 1137 backend = 0;
993} 1138}
994 1139
995void inline_size infy_fork (EV_P); 1140void inline_size infy_fork (EV_P);
1021 1166
1022 while (pipe (sigpipe)) 1167 while (pipe (sigpipe))
1023 syserr ("(libev) error creating pipe"); 1168 syserr ("(libev) error creating pipe");
1024 1169
1025 siginit (EV_A); 1170 siginit (EV_A);
1171 sigcb (EV_A_ &sigev, EV_READ);
1026 } 1172 }
1027 1173
1028 postfork = 0; 1174 postfork = 0;
1029} 1175}
1030 1176
1052} 1198}
1053 1199
1054void 1200void
1055ev_loop_fork (EV_P) 1201ev_loop_fork (EV_P)
1056{ 1202{
1057 postfork = 1; 1203 postfork = 1; /* must be in line with ev_default_fork */
1058} 1204}
1059 1205
1060#endif 1206#endif
1061 1207
1062#if EV_MULTIPLICITY 1208#if EV_MULTIPLICITY
1126#if EV_MULTIPLICITY 1272#if EV_MULTIPLICITY
1127 struct ev_loop *loop = ev_default_loop_ptr; 1273 struct ev_loop *loop = ev_default_loop_ptr;
1128#endif 1274#endif
1129 1275
1130 if (backend) 1276 if (backend)
1131 postfork = 1; 1277 postfork = 1; /* must be in line with ev_loop_fork */
1132} 1278}
1133 1279
1134/*****************************************************************************/ 1280/*****************************************************************************/
1135 1281
1136int inline_size 1282void
1137any_pending (EV_P) 1283ev_invoke (EV_P_ void *w, int revents)
1138{ 1284{
1139 int pri; 1285 EV_CB_INVOKE ((W)w, revents);
1140
1141 for (pri = NUMPRI; pri--; )
1142 if (pendingcnt [pri])
1143 return 1;
1144
1145 return 0;
1146} 1286}
1147 1287
1148void inline_speed 1288void inline_speed
1149call_pending (EV_P) 1289call_pending (EV_P)
1150{ 1290{
1168void inline_size 1308void inline_size
1169timers_reify (EV_P) 1309timers_reify (EV_P)
1170{ 1310{
1171 while (timercnt && ((WT)timers [0])->at <= mn_now) 1311 while (timercnt && ((WT)timers [0])->at <= mn_now)
1172 { 1312 {
1173 ev_timer *w = timers [0]; 1313 ev_timer *w = (ev_timer *)timers [0];
1174 1314
1175 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1315 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1176 1316
1177 /* first reschedule or stop timer */ 1317 /* first reschedule or stop timer */
1178 if (w->repeat) 1318 if (w->repeat)
1181 1321
1182 ((WT)w)->at += w->repeat; 1322 ((WT)w)->at += w->repeat;
1183 if (((WT)w)->at < mn_now) 1323 if (((WT)w)->at < mn_now)
1184 ((WT)w)->at = mn_now; 1324 ((WT)w)->at = mn_now;
1185 1325
1186 downheap ((WT *)timers, timercnt, 0); 1326 downheap (timers, timercnt, 0);
1187 } 1327 }
1188 else 1328 else
1189 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1329 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1190 1330
1191 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1331 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1196void inline_size 1336void inline_size
1197periodics_reify (EV_P) 1337periodics_reify (EV_P)
1198{ 1338{
1199 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1339 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1200 { 1340 {
1201 ev_periodic *w = periodics [0]; 1341 ev_periodic *w = (ev_periodic *)periodics [0];
1202 1342
1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1343 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1204 1344
1205 /* first reschedule or stop timer */ 1345 /* first reschedule or stop timer */
1206 if (w->reschedule_cb) 1346 if (w->reschedule_cb)
1207 { 1347 {
1208 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1348 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1209 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1349 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1350 downheap (periodics, periodiccnt, 0);
1211 } 1351 }
1212 else if (w->interval) 1352 else if (w->interval)
1213 { 1353 {
1214 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1354 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1355 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1215 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1356 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1216 downheap ((WT *)periodics, periodiccnt, 0); 1357 downheap (periodics, periodiccnt, 0);
1217 } 1358 }
1218 else 1359 else
1219 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1360 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1220 1361
1221 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1362 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1228 int i; 1369 int i;
1229 1370
1230 /* adjust periodics after time jump */ 1371 /* adjust periodics after time jump */
1231 for (i = 0; i < periodiccnt; ++i) 1372 for (i = 0; i < periodiccnt; ++i)
1232 { 1373 {
1233 ev_periodic *w = periodics [i]; 1374 ev_periodic *w = (ev_periodic *)periodics [i];
1234 1375
1235 if (w->reschedule_cb) 1376 if (w->reschedule_cb)
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1377 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1237 else if (w->interval) 1378 else if (w->interval)
1238 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1379 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1239 } 1380 }
1240 1381
1241 /* now rebuild the heap */ 1382 /* now rebuild the heap */
1242 for (i = periodiccnt >> 1; i--; ) 1383 for (i = periodiccnt >> 1; i--; )
1243 downheap ((WT *)periodics, periodiccnt, i); 1384 downheap (periodics, periodiccnt, i);
1244} 1385}
1245#endif 1386#endif
1246 1387
1388#if EV_IDLE_ENABLE
1247int inline_size 1389void inline_size
1248time_update_monotonic (EV_P) 1390idle_reify (EV_P)
1249{ 1391{
1392 if (expect_false (idleall))
1393 {
1394 int pri;
1395
1396 for (pri = NUMPRI; pri--; )
1397 {
1398 if (pendingcnt [pri])
1399 break;
1400
1401 if (idlecnt [pri])
1402 {
1403 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1404 break;
1405 }
1406 }
1407 }
1408}
1409#endif
1410
1411void inline_speed
1412time_update (EV_P_ ev_tstamp max_block)
1413{
1414 int i;
1415
1416#if EV_USE_MONOTONIC
1417 if (expect_true (have_monotonic))
1418 {
1419 ev_tstamp odiff = rtmn_diff;
1420
1250 mn_now = get_clock (); 1421 mn_now = get_clock ();
1251 1422
1423 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1424 /* interpolate in the meantime */
1252 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1425 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1253 { 1426 {
1254 ev_rt_now = rtmn_diff + mn_now; 1427 ev_rt_now = rtmn_diff + mn_now;
1255 return 0; 1428 return;
1256 } 1429 }
1257 else 1430
1258 {
1259 now_floor = mn_now; 1431 now_floor = mn_now;
1260 ev_rt_now = ev_time (); 1432 ev_rt_now = ev_time ();
1261 return 1;
1262 }
1263}
1264 1433
1265void inline_size 1434 /* loop a few times, before making important decisions.
1266time_update (EV_P) 1435 * on the choice of "4": one iteration isn't enough,
1267{ 1436 * in case we get preempted during the calls to
1268 int i; 1437 * ev_time and get_clock. a second call is almost guaranteed
1269 1438 * to succeed in that case, though. and looping a few more times
1270#if EV_USE_MONOTONIC 1439 * doesn't hurt either as we only do this on time-jumps or
1271 if (expect_true (have_monotonic)) 1440 * in the unlikely event of having been preempted here.
1272 { 1441 */
1273 if (time_update_monotonic (EV_A)) 1442 for (i = 4; --i; )
1274 { 1443 {
1275 ev_tstamp odiff = rtmn_diff;
1276
1277 /* loop a few times, before making important decisions.
1278 * on the choice of "4": one iteration isn't enough,
1279 * in case we get preempted during the calls to
1280 * ev_time and get_clock. a second call is almost guaranteed
1281 * to succeed in that case, though. and looping a few more times
1282 * doesn't hurt either as we only do this on time-jumps or
1283 * in the unlikely event of having been preempted here.
1284 */
1285 for (i = 4; --i; )
1286 {
1287 rtmn_diff = ev_rt_now - mn_now; 1444 rtmn_diff = ev_rt_now - mn_now;
1288 1445
1289 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1446 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1290 return; /* all is well */ 1447 return; /* all is well */
1291 1448
1292 ev_rt_now = ev_time (); 1449 ev_rt_now = ev_time ();
1293 mn_now = get_clock (); 1450 mn_now = get_clock ();
1294 now_floor = mn_now; 1451 now_floor = mn_now;
1295 } 1452 }
1296 1453
1297# if EV_PERIODIC_ENABLE 1454# if EV_PERIODIC_ENABLE
1298 periodics_reschedule (EV_A); 1455 periodics_reschedule (EV_A);
1299# endif 1456# endif
1300 /* no timer adjustment, as the monotonic clock doesn't jump */ 1457 /* no timer adjustment, as the monotonic clock doesn't jump */
1301 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1458 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1302 }
1303 } 1459 }
1304 else 1460 else
1305#endif 1461#endif
1306 { 1462 {
1307 ev_rt_now = ev_time (); 1463 ev_rt_now = ev_time ();
1308 1464
1309 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1465 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1310 { 1466 {
1311#if EV_PERIODIC_ENABLE 1467#if EV_PERIODIC_ENABLE
1312 periodics_reschedule (EV_A); 1468 periodics_reschedule (EV_A);
1313#endif 1469#endif
1314
1315 /* adjust timers. this is easy, as the offset is the same for all of them */ 1470 /* adjust timers. this is easy, as the offset is the same for all of them */
1316 for (i = 0; i < timercnt; ++i) 1471 for (i = 0; i < timercnt; ++i)
1317 ((WT)timers [i])->at += ev_rt_now - mn_now; 1472 ((WT)timers [i])->at += ev_rt_now - mn_now;
1318 } 1473 }
1319 1474
1342 ? EVUNLOOP_ONE 1497 ? EVUNLOOP_ONE
1343 : EVUNLOOP_CANCEL; 1498 : EVUNLOOP_CANCEL;
1344 1499
1345 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1500 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346 1501
1347 while (activecnt) 1502 do
1348 { 1503 {
1349#ifndef _WIN32 1504#ifndef _WIN32
1350 if (expect_false (curpid)) /* penalise the forking check even more */ 1505 if (expect_false (curpid)) /* penalise the forking check even more */
1351 if (expect_false (getpid () != curpid)) 1506 if (expect_false (getpid () != curpid))
1352 { 1507 {
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1518 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A); 1519 call_pending (EV_A);
1365 } 1520 }
1366#endif 1521#endif
1367 1522
1368 /* queue check watchers (and execute them) */ 1523 /* queue prepare watchers (and execute them) */
1369 if (expect_false (preparecnt)) 1524 if (expect_false (preparecnt))
1370 { 1525 {
1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1526 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1372 call_pending (EV_A); 1527 call_pending (EV_A);
1373 } 1528 }
1374 1529
1530 if (expect_false (!activecnt))
1531 break;
1532
1375 /* we might have forked, so reify kernel state if necessary */ 1533 /* we might have forked, so reify kernel state if necessary */
1376 if (expect_false (postfork)) 1534 if (expect_false (postfork))
1377 loop_fork (EV_A); 1535 loop_fork (EV_A);
1378 1536
1379 /* update fd-related kernel structures */ 1537 /* update fd-related kernel structures */
1380 fd_reify (EV_A); 1538 fd_reify (EV_A);
1381 1539
1382 /* calculate blocking time */ 1540 /* calculate blocking time */
1383 { 1541 {
1384 ev_tstamp block; 1542 ev_tstamp waittime = 0.;
1543 ev_tstamp sleeptime = 0.;
1385 1544
1386 if (flags & EVLOOP_NONBLOCK || idlecnt) 1545 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1387 block = 0.; /* do not block at all */
1388 else
1389 { 1546 {
1390 /* update time to cancel out callback processing overhead */ 1547 /* update time to cancel out callback processing overhead */
1391#if EV_USE_MONOTONIC
1392 if (expect_true (have_monotonic))
1393 time_update_monotonic (EV_A); 1548 time_update (EV_A_ 1e100);
1394 else
1395#endif
1396 {
1397 ev_rt_now = ev_time ();
1398 mn_now = ev_rt_now;
1399 }
1400 1549
1401 block = MAX_BLOCKTIME; 1550 waittime = MAX_BLOCKTIME;
1402 1551
1403 if (timercnt) 1552 if (timercnt)
1404 { 1553 {
1405 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1554 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1406 if (block > to) block = to; 1555 if (waittime > to) waittime = to;
1407 } 1556 }
1408 1557
1409#if EV_PERIODIC_ENABLE 1558#if EV_PERIODIC_ENABLE
1410 if (periodiccnt) 1559 if (periodiccnt)
1411 { 1560 {
1412 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1561 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1413 if (block > to) block = to; 1562 if (waittime > to) waittime = to;
1414 } 1563 }
1415#endif 1564#endif
1416 1565
1417 if (expect_false (block < 0.)) block = 0.; 1566 if (expect_false (waittime < timeout_blocktime))
1567 waittime = timeout_blocktime;
1568
1569 sleeptime = waittime - backend_fudge;
1570
1571 if (expect_true (sleeptime > io_blocktime))
1572 sleeptime = io_blocktime;
1573
1574 if (sleeptime)
1575 {
1576 ev_sleep (sleeptime);
1577 waittime -= sleeptime;
1578 }
1418 } 1579 }
1419 1580
1581 ++loop_count;
1420 backend_poll (EV_A_ block); 1582 backend_poll (EV_A_ waittime);
1583
1584 /* update ev_rt_now, do magic */
1585 time_update (EV_A_ waittime + sleeptime);
1421 } 1586 }
1422
1423 /* update ev_rt_now, do magic */
1424 time_update (EV_A);
1425 1587
1426 /* queue pending timers and reschedule them */ 1588 /* queue pending timers and reschedule them */
1427 timers_reify (EV_A); /* relative timers called last */ 1589 timers_reify (EV_A); /* relative timers called last */
1428#if EV_PERIODIC_ENABLE 1590#if EV_PERIODIC_ENABLE
1429 periodics_reify (EV_A); /* absolute timers called first */ 1591 periodics_reify (EV_A); /* absolute timers called first */
1430#endif 1592#endif
1431 1593
1594#if EV_IDLE_ENABLE
1432 /* queue idle watchers unless other events are pending */ 1595 /* queue idle watchers unless other events are pending */
1433 if (idlecnt && !any_pending (EV_A)) 1596 idle_reify (EV_A);
1434 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1597#endif
1435 1598
1436 /* queue check watchers, to be executed first */ 1599 /* queue check watchers, to be executed first */
1437 if (expect_false (checkcnt)) 1600 if (expect_false (checkcnt))
1438 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1601 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1439 1602
1440 call_pending (EV_A); 1603 call_pending (EV_A);
1441 1604
1442 if (expect_false (loop_done))
1443 break;
1444 } 1605 }
1606 while (expect_true (activecnt && !loop_done));
1445 1607
1446 if (loop_done == EVUNLOOP_ONE) 1608 if (loop_done == EVUNLOOP_ONE)
1447 loop_done = EVUNLOOP_CANCEL; 1609 loop_done = EVUNLOOP_CANCEL;
1448} 1610}
1449 1611
1476 head = &(*head)->next; 1638 head = &(*head)->next;
1477 } 1639 }
1478} 1640}
1479 1641
1480void inline_speed 1642void inline_speed
1481ev_clear_pending (EV_P_ W w) 1643clear_pending (EV_P_ W w)
1482{ 1644{
1483 if (w->pending) 1645 if (w->pending)
1484 { 1646 {
1485 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1647 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1486 w->pending = 0; 1648 w->pending = 0;
1487 } 1649 }
1488} 1650}
1489 1651
1652int
1653ev_clear_pending (EV_P_ void *w)
1654{
1655 W w_ = (W)w;
1656 int pending = w_->pending;
1657
1658 if (expect_true (pending))
1659 {
1660 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1661 w_->pending = 0;
1662 p->w = 0;
1663 return p->events;
1664 }
1665 else
1666 return 0;
1667}
1668
1669void inline_size
1670pri_adjust (EV_P_ W w)
1671{
1672 int pri = w->priority;
1673 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1674 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1675 w->priority = pri;
1676}
1677
1490void inline_speed 1678void inline_speed
1491ev_start (EV_P_ W w, int active) 1679ev_start (EV_P_ W w, int active)
1492{ 1680{
1493 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1681 pri_adjust (EV_A_ w);
1494 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1495
1496 w->active = active; 1682 w->active = active;
1497 ev_ref (EV_A); 1683 ev_ref (EV_A);
1498} 1684}
1499 1685
1500void inline_size 1686void inline_size
1504 w->active = 0; 1690 w->active = 0;
1505} 1691}
1506 1692
1507/*****************************************************************************/ 1693/*****************************************************************************/
1508 1694
1509void 1695void noinline
1510ev_io_start (EV_P_ ev_io *w) 1696ev_io_start (EV_P_ ev_io *w)
1511{ 1697{
1512 int fd = w->fd; 1698 int fd = w->fd;
1513 1699
1514 if (expect_false (ev_is_active (w))) 1700 if (expect_false (ev_is_active (w)))
1516 1702
1517 assert (("ev_io_start called with negative fd", fd >= 0)); 1703 assert (("ev_io_start called with negative fd", fd >= 0));
1518 1704
1519 ev_start (EV_A_ (W)w, 1); 1705 ev_start (EV_A_ (W)w, 1);
1520 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1706 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1521 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1707 wlist_add (&anfds[fd].head, (WL)w);
1522 1708
1523 fd_change (EV_A_ fd); 1709 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1710 w->events &= ~EV_IOFDSET;
1524} 1711}
1525 1712
1526void 1713void noinline
1527ev_io_stop (EV_P_ ev_io *w) 1714ev_io_stop (EV_P_ ev_io *w)
1528{ 1715{
1529 ev_clear_pending (EV_A_ (W)w); 1716 clear_pending (EV_A_ (W)w);
1530 if (expect_false (!ev_is_active (w))) 1717 if (expect_false (!ev_is_active (w)))
1531 return; 1718 return;
1532 1719
1533 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1720 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1534 1721
1535 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1722 wlist_del (&anfds[w->fd].head, (WL)w);
1536 ev_stop (EV_A_ (W)w); 1723 ev_stop (EV_A_ (W)w);
1537 1724
1538 fd_change (EV_A_ w->fd); 1725 fd_change (EV_A_ w->fd, 1);
1539} 1726}
1540 1727
1541void 1728void noinline
1542ev_timer_start (EV_P_ ev_timer *w) 1729ev_timer_start (EV_P_ ev_timer *w)
1543{ 1730{
1544 if (expect_false (ev_is_active (w))) 1731 if (expect_false (ev_is_active (w)))
1545 return; 1732 return;
1546 1733
1547 ((WT)w)->at += mn_now; 1734 ((WT)w)->at += mn_now;
1548 1735
1549 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1736 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1550 1737
1551 ev_start (EV_A_ (W)w, ++timercnt); 1738 ev_start (EV_A_ (W)w, ++timercnt);
1552 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1739 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1553 timers [timercnt - 1] = w; 1740 timers [timercnt - 1] = (WT)w;
1554 upheap ((WT *)timers, timercnt - 1); 1741 upheap (timers, timercnt - 1);
1555 1742
1556 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1743 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1557} 1744}
1558 1745
1559void 1746void noinline
1560ev_timer_stop (EV_P_ ev_timer *w) 1747ev_timer_stop (EV_P_ ev_timer *w)
1561{ 1748{
1562 ev_clear_pending (EV_A_ (W)w); 1749 clear_pending (EV_A_ (W)w);
1563 if (expect_false (!ev_is_active (w))) 1750 if (expect_false (!ev_is_active (w)))
1564 return; 1751 return;
1565 1752
1566 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1753 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1567 1754
1568 { 1755 {
1569 int active = ((W)w)->active; 1756 int active = ((W)w)->active;
1570 1757
1571 if (expect_true (--active < --timercnt)) 1758 if (expect_true (--active < --timercnt))
1572 { 1759 {
1573 timers [active] = timers [timercnt]; 1760 timers [active] = timers [timercnt];
1574 adjustheap ((WT *)timers, timercnt, active); 1761 adjustheap (timers, timercnt, active);
1575 } 1762 }
1576 } 1763 }
1577 1764
1578 ((WT)w)->at -= mn_now; 1765 ((WT)w)->at -= mn_now;
1579 1766
1580 ev_stop (EV_A_ (W)w); 1767 ev_stop (EV_A_ (W)w);
1581} 1768}
1582 1769
1583void 1770void noinline
1584ev_timer_again (EV_P_ ev_timer *w) 1771ev_timer_again (EV_P_ ev_timer *w)
1585{ 1772{
1586 if (ev_is_active (w)) 1773 if (ev_is_active (w))
1587 { 1774 {
1588 if (w->repeat) 1775 if (w->repeat)
1589 { 1776 {
1590 ((WT)w)->at = mn_now + w->repeat; 1777 ((WT)w)->at = mn_now + w->repeat;
1591 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1778 adjustheap (timers, timercnt, ((W)w)->active - 1);
1592 } 1779 }
1593 else 1780 else
1594 ev_timer_stop (EV_A_ w); 1781 ev_timer_stop (EV_A_ w);
1595 } 1782 }
1596 else if (w->repeat) 1783 else if (w->repeat)
1599 ev_timer_start (EV_A_ w); 1786 ev_timer_start (EV_A_ w);
1600 } 1787 }
1601} 1788}
1602 1789
1603#if EV_PERIODIC_ENABLE 1790#if EV_PERIODIC_ENABLE
1604void 1791void noinline
1605ev_periodic_start (EV_P_ ev_periodic *w) 1792ev_periodic_start (EV_P_ ev_periodic *w)
1606{ 1793{
1607 if (expect_false (ev_is_active (w))) 1794 if (expect_false (ev_is_active (w)))
1608 return; 1795 return;
1609 1796
1611 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1798 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1612 else if (w->interval) 1799 else if (w->interval)
1613 { 1800 {
1614 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1801 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1615 /* this formula differs from the one in periodic_reify because we do not always round up */ 1802 /* this formula differs from the one in periodic_reify because we do not always round up */
1616 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1803 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1617 } 1804 }
1805 else
1806 ((WT)w)->at = w->offset;
1618 1807
1619 ev_start (EV_A_ (W)w, ++periodiccnt); 1808 ev_start (EV_A_ (W)w, ++periodiccnt);
1620 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1809 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1621 periodics [periodiccnt - 1] = w; 1810 periodics [periodiccnt - 1] = (WT)w;
1622 upheap ((WT *)periodics, periodiccnt - 1); 1811 upheap (periodics, periodiccnt - 1);
1623 1812
1624 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1813 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1625} 1814}
1626 1815
1627void 1816void noinline
1628ev_periodic_stop (EV_P_ ev_periodic *w) 1817ev_periodic_stop (EV_P_ ev_periodic *w)
1629{ 1818{
1630 ev_clear_pending (EV_A_ (W)w); 1819 clear_pending (EV_A_ (W)w);
1631 if (expect_false (!ev_is_active (w))) 1820 if (expect_false (!ev_is_active (w)))
1632 return; 1821 return;
1633 1822
1634 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1823 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1635 1824
1636 { 1825 {
1637 int active = ((W)w)->active; 1826 int active = ((W)w)->active;
1638 1827
1639 if (expect_true (--active < --periodiccnt)) 1828 if (expect_true (--active < --periodiccnt))
1640 { 1829 {
1641 periodics [active] = periodics [periodiccnt]; 1830 periodics [active] = periodics [periodiccnt];
1642 adjustheap ((WT *)periodics, periodiccnt, active); 1831 adjustheap (periodics, periodiccnt, active);
1643 } 1832 }
1644 } 1833 }
1645 1834
1646 ev_stop (EV_A_ (W)w); 1835 ev_stop (EV_A_ (W)w);
1647} 1836}
1648 1837
1649void 1838void noinline
1650ev_periodic_again (EV_P_ ev_periodic *w) 1839ev_periodic_again (EV_P_ ev_periodic *w)
1651{ 1840{
1652 /* TODO: use adjustheap and recalculation */ 1841 /* TODO: use adjustheap and recalculation */
1653 ev_periodic_stop (EV_A_ w); 1842 ev_periodic_stop (EV_A_ w);
1654 ev_periodic_start (EV_A_ w); 1843 ev_periodic_start (EV_A_ w);
1657 1846
1658#ifndef SA_RESTART 1847#ifndef SA_RESTART
1659# define SA_RESTART 0 1848# define SA_RESTART 0
1660#endif 1849#endif
1661 1850
1662void 1851void noinline
1663ev_signal_start (EV_P_ ev_signal *w) 1852ev_signal_start (EV_P_ ev_signal *w)
1664{ 1853{
1665#if EV_MULTIPLICITY 1854#if EV_MULTIPLICITY
1666 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1855 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1667#endif 1856#endif
1668 if (expect_false (ev_is_active (w))) 1857 if (expect_false (ev_is_active (w)))
1669 return; 1858 return;
1670 1859
1671 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1860 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1672 1861
1862 {
1863#ifndef _WIN32
1864 sigset_t full, prev;
1865 sigfillset (&full);
1866 sigprocmask (SIG_SETMASK, &full, &prev);
1867#endif
1868
1869 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1870
1871#ifndef _WIN32
1872 sigprocmask (SIG_SETMASK, &prev, 0);
1873#endif
1874 }
1875
1673 ev_start (EV_A_ (W)w, 1); 1876 ev_start (EV_A_ (W)w, 1);
1674 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1675 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1877 wlist_add (&signals [w->signum - 1].head, (WL)w);
1676 1878
1677 if (!((WL)w)->next) 1879 if (!((WL)w)->next)
1678 { 1880 {
1679#if _WIN32 1881#if _WIN32
1680 signal (w->signum, sighandler); 1882 signal (w->signum, sighandler);
1686 sigaction (w->signum, &sa, 0); 1888 sigaction (w->signum, &sa, 0);
1687#endif 1889#endif
1688 } 1890 }
1689} 1891}
1690 1892
1691void 1893void noinline
1692ev_signal_stop (EV_P_ ev_signal *w) 1894ev_signal_stop (EV_P_ ev_signal *w)
1693{ 1895{
1694 ev_clear_pending (EV_A_ (W)w); 1896 clear_pending (EV_A_ (W)w);
1695 if (expect_false (!ev_is_active (w))) 1897 if (expect_false (!ev_is_active (w)))
1696 return; 1898 return;
1697 1899
1698 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1900 wlist_del (&signals [w->signum - 1].head, (WL)w);
1699 ev_stop (EV_A_ (W)w); 1901 ev_stop (EV_A_ (W)w);
1700 1902
1701 if (!signals [w->signum - 1].head) 1903 if (!signals [w->signum - 1].head)
1702 signal (w->signum, SIG_DFL); 1904 signal (w->signum, SIG_DFL);
1703} 1905}
1710#endif 1912#endif
1711 if (expect_false (ev_is_active (w))) 1913 if (expect_false (ev_is_active (w)))
1712 return; 1914 return;
1713 1915
1714 ev_start (EV_A_ (W)w, 1); 1916 ev_start (EV_A_ (W)w, 1);
1715 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1917 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1716} 1918}
1717 1919
1718void 1920void
1719ev_child_stop (EV_P_ ev_child *w) 1921ev_child_stop (EV_P_ ev_child *w)
1720{ 1922{
1721 ev_clear_pending (EV_A_ (W)w); 1923 clear_pending (EV_A_ (W)w);
1722 if (expect_false (!ev_is_active (w))) 1924 if (expect_false (!ev_is_active (w)))
1723 return; 1925 return;
1724 1926
1725 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1927 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1726 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1727} 1929}
1728 1930
1729#if EV_STAT_ENABLE 1931#if EV_STAT_ENABLE
1730 1932
1962} 2164}
1963 2165
1964void 2166void
1965ev_stat_stop (EV_P_ ev_stat *w) 2167ev_stat_stop (EV_P_ ev_stat *w)
1966{ 2168{
1967 ev_clear_pending (EV_A_ (W)w); 2169 clear_pending (EV_A_ (W)w);
1968 if (expect_false (!ev_is_active (w))) 2170 if (expect_false (!ev_is_active (w)))
1969 return; 2171 return;
1970 2172
1971#if EV_USE_INOTIFY 2173#if EV_USE_INOTIFY
1972 infy_del (EV_A_ w); 2174 infy_del (EV_A_ w);
1975 2177
1976 ev_stop (EV_A_ (W)w); 2178 ev_stop (EV_A_ (W)w);
1977} 2179}
1978#endif 2180#endif
1979 2181
2182#if EV_IDLE_ENABLE
1980void 2183void
1981ev_idle_start (EV_P_ ev_idle *w) 2184ev_idle_start (EV_P_ ev_idle *w)
1982{ 2185{
1983 if (expect_false (ev_is_active (w))) 2186 if (expect_false (ev_is_active (w)))
1984 return; 2187 return;
1985 2188
2189 pri_adjust (EV_A_ (W)w);
2190
2191 {
2192 int active = ++idlecnt [ABSPRI (w)];
2193
2194 ++idleall;
1986 ev_start (EV_A_ (W)w, ++idlecnt); 2195 ev_start (EV_A_ (W)w, active);
2196
1987 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2197 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1988 idles [idlecnt - 1] = w; 2198 idles [ABSPRI (w)][active - 1] = w;
2199 }
1989} 2200}
1990 2201
1991void 2202void
1992ev_idle_stop (EV_P_ ev_idle *w) 2203ev_idle_stop (EV_P_ ev_idle *w)
1993{ 2204{
1994 ev_clear_pending (EV_A_ (W)w); 2205 clear_pending (EV_A_ (W)w);
1995 if (expect_false (!ev_is_active (w))) 2206 if (expect_false (!ev_is_active (w)))
1996 return; 2207 return;
1997 2208
1998 { 2209 {
1999 int active = ((W)w)->active; 2210 int active = ((W)w)->active;
2000 idles [active - 1] = idles [--idlecnt]; 2211
2212 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2001 ((W)idles [active - 1])->active = active; 2213 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2214
2215 ev_stop (EV_A_ (W)w);
2216 --idleall;
2002 } 2217 }
2003
2004 ev_stop (EV_A_ (W)w);
2005} 2218}
2219#endif
2006 2220
2007void 2221void
2008ev_prepare_start (EV_P_ ev_prepare *w) 2222ev_prepare_start (EV_P_ ev_prepare *w)
2009{ 2223{
2010 if (expect_false (ev_is_active (w))) 2224 if (expect_false (ev_is_active (w)))
2016} 2230}
2017 2231
2018void 2232void
2019ev_prepare_stop (EV_P_ ev_prepare *w) 2233ev_prepare_stop (EV_P_ ev_prepare *w)
2020{ 2234{
2021 ev_clear_pending (EV_A_ (W)w); 2235 clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w))) 2236 if (expect_false (!ev_is_active (w)))
2023 return; 2237 return;
2024 2238
2025 { 2239 {
2026 int active = ((W)w)->active; 2240 int active = ((W)w)->active;
2043} 2257}
2044 2258
2045void 2259void
2046ev_check_stop (EV_P_ ev_check *w) 2260ev_check_stop (EV_P_ ev_check *w)
2047{ 2261{
2048 ev_clear_pending (EV_A_ (W)w); 2262 clear_pending (EV_A_ (W)w);
2049 if (expect_false (!ev_is_active (w))) 2263 if (expect_false (!ev_is_active (w)))
2050 return; 2264 return;
2051 2265
2052 { 2266 {
2053 int active = ((W)w)->active; 2267 int active = ((W)w)->active;
2060 2274
2061#if EV_EMBED_ENABLE 2275#if EV_EMBED_ENABLE
2062void noinline 2276void noinline
2063ev_embed_sweep (EV_P_ ev_embed *w) 2277ev_embed_sweep (EV_P_ ev_embed *w)
2064{ 2278{
2065 ev_loop (w->loop, EVLOOP_NONBLOCK); 2279 ev_loop (w->other, EVLOOP_NONBLOCK);
2066} 2280}
2067 2281
2068static void 2282static void
2069embed_cb (EV_P_ ev_io *io, int revents) 2283embed_io_cb (EV_P_ ev_io *io, int revents)
2070{ 2284{
2071 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2285 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2072 2286
2073 if (ev_cb (w)) 2287 if (ev_cb (w))
2074 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2288 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2075 else 2289 else
2076 ev_embed_sweep (loop, w); 2290 ev_loop (w->other, EVLOOP_NONBLOCK);
2077} 2291}
2292
2293static void
2294embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2295{
2296 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2297
2298 {
2299 struct ev_loop *loop = w->other;
2300
2301 while (fdchangecnt)
2302 {
2303 fd_reify (EV_A);
2304 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2305 }
2306 }
2307}
2308
2309#if 0
2310static void
2311embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2312{
2313 ev_idle_stop (EV_A_ idle);
2314}
2315#endif
2078 2316
2079void 2317void
2080ev_embed_start (EV_P_ ev_embed *w) 2318ev_embed_start (EV_P_ ev_embed *w)
2081{ 2319{
2082 if (expect_false (ev_is_active (w))) 2320 if (expect_false (ev_is_active (w)))
2083 return; 2321 return;
2084 2322
2085 { 2323 {
2086 struct ev_loop *loop = w->loop; 2324 struct ev_loop *loop = w->other;
2087 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2325 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2088 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2326 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2089 } 2327 }
2090 2328
2091 ev_set_priority (&w->io, ev_priority (w)); 2329 ev_set_priority (&w->io, ev_priority (w));
2092 ev_io_start (EV_A_ &w->io); 2330 ev_io_start (EV_A_ &w->io);
2093 2331
2332 ev_prepare_init (&w->prepare, embed_prepare_cb);
2333 ev_set_priority (&w->prepare, EV_MINPRI);
2334 ev_prepare_start (EV_A_ &w->prepare);
2335
2336 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2337
2094 ev_start (EV_A_ (W)w, 1); 2338 ev_start (EV_A_ (W)w, 1);
2095} 2339}
2096 2340
2097void 2341void
2098ev_embed_stop (EV_P_ ev_embed *w) 2342ev_embed_stop (EV_P_ ev_embed *w)
2099{ 2343{
2100 ev_clear_pending (EV_A_ (W)w); 2344 clear_pending (EV_A_ (W)w);
2101 if (expect_false (!ev_is_active (w))) 2345 if (expect_false (!ev_is_active (w)))
2102 return; 2346 return;
2103 2347
2104 ev_io_stop (EV_A_ &w->io); 2348 ev_io_stop (EV_A_ &w->io);
2349 ev_prepare_stop (EV_A_ &w->prepare);
2105 2350
2106 ev_stop (EV_A_ (W)w); 2351 ev_stop (EV_A_ (W)w);
2107} 2352}
2108#endif 2353#endif
2109 2354
2120} 2365}
2121 2366
2122void 2367void
2123ev_fork_stop (EV_P_ ev_fork *w) 2368ev_fork_stop (EV_P_ ev_fork *w)
2124{ 2369{
2125 ev_clear_pending (EV_A_ (W)w); 2370 clear_pending (EV_A_ (W)w);
2126 if (expect_false (!ev_is_active (w))) 2371 if (expect_false (!ev_is_active (w)))
2127 return; 2372 return;
2128 2373
2129 { 2374 {
2130 int active = ((W)w)->active; 2375 int active = ((W)w)->active;
2198 ev_timer_set (&once->to, timeout, 0.); 2443 ev_timer_set (&once->to, timeout, 0.);
2199 ev_timer_start (EV_A_ &once->to); 2444 ev_timer_start (EV_A_ &once->to);
2200 } 2445 }
2201} 2446}
2202 2447
2448#if EV_MULTIPLICITY
2449 #include "ev_wrap.h"
2450#endif
2451
2203#ifdef __cplusplus 2452#ifdef __cplusplus
2204} 2453}
2205#endif 2454#endif
2206 2455

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines