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

Comparing libev/ev.c (file contents):
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC vs.
Revision 1.286 by root, Wed Apr 15 19:37:15 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 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 modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
58# endif 70# endif
59# else 71# else
60# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
62# endif 74# endif
… …
164# endif 176# endif
165#endif 177#endif
166 178
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
168 180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
188
169#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
172# else 192# else
173# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
174# endif 194# endif
175#endif 195#endif
176 196
177#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 199#endif
180 200
181#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 202# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 203# define EV_USE_NANOSLEEP 1
… …
300 320
301#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
302# include <winsock.h> 322# include <winsock.h>
303#endif 323#endif
304 324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
305#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
306/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
307# include <stdint.h> 336# include <stdint.h>
308# ifdef __cplusplus 337# ifdef __cplusplus
309extern "C" { 338extern "C" {
… …
368typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
369 398
370#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
372 401
373#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
374/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
375/* giving it a reasonably high chance of working on typical architetcures */ 404/* giving it a reasonably high chance of working on typical architetcures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif
407
408#if EV_USE_MONOTONIC
376static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
377#endif 410#endif
378 411
379#ifdef _WIN32 412#ifdef _WIN32
380# include "ev_win32.c" 413# include "ev_win32.c"
… …
524 557
525ev_tstamp 558ev_tstamp
526ev_time (void) 559ev_time (void)
527{ 560{
528#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
529 struct timespec ts; 564 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 567 }
568#endif
569
533 struct timeval tv; 570 struct timeval tv;
534 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 573}
538 574
539ev_tstamp inline_size 575inline_size ev_tstamp
540get_clock (void) 576get_clock (void)
541{ 577{
542#if EV_USE_MONOTONIC 578#if EV_USE_MONOTONIC
543 if (expect_true (have_monotonic)) 579 if (expect_true (have_monotonic))
544 { 580 {
… …
589 625
590/*****************************************************************************/ 626/*****************************************************************************/
591 627
592#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
593 629
594int inline_size 630inline_size int
595array_nextsize (int elem, int cur, int cnt) 631array_nextsize (int elem, int cur, int cnt)
596{ 632{
597 int ncur = cur + 1; 633 int ncur = cur + 1;
598 634
599 do 635 do
… …
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 676 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 677 }
642#endif 678#endif
643 679
644#define array_free(stem, idx) \ 680#define array_free(stem, idx) \
645 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
646 682
647/*****************************************************************************/ 683/*****************************************************************************/
648 684
649void noinline 685void noinline
650ev_feed_event (EV_P_ void *w, int revents) 686ev_feed_event (EV_P_ void *w, int revents)
… …
661 pendings [pri][w_->pending - 1].w = w_; 697 pendings [pri][w_->pending - 1].w = w_;
662 pendings [pri][w_->pending - 1].events = revents; 698 pendings [pri][w_->pending - 1].events = revents;
663 } 699 }
664} 700}
665 701
666void inline_speed 702inline_speed void
703feed_reverse (EV_P_ W w)
704{
705 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
706 rfeeds [rfeedcnt++] = w;
707}
708
709inline_size void
710feed_reverse_done (EV_P_ int revents)
711{
712 do
713 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
714 while (rfeedcnt);
715}
716
717inline_speed void
667queue_events (EV_P_ W *events, int eventcnt, int type) 718queue_events (EV_P_ W *events, int eventcnt, int type)
668{ 719{
669 int i; 720 int i;
670 721
671 for (i = 0; i < eventcnt; ++i) 722 for (i = 0; i < eventcnt; ++i)
672 ev_feed_event (EV_A_ events [i], type); 723 ev_feed_event (EV_A_ events [i], type);
673} 724}
674 725
675/*****************************************************************************/ 726/*****************************************************************************/
676 727
677void inline_speed 728inline_speed void
678fd_event (EV_P_ int fd, int revents) 729fd_event (EV_P_ int fd, int revents)
679{ 730{
680 ANFD *anfd = anfds + fd; 731 ANFD *anfd = anfds + fd;
681 ev_io *w; 732 ev_io *w;
682 733
… …
694{ 745{
695 if (fd >= 0 && fd < anfdmax) 746 if (fd >= 0 && fd < anfdmax)
696 fd_event (EV_A_ fd, revents); 747 fd_event (EV_A_ fd, revents);
697} 748}
698 749
699void inline_size 750inline_size void
700fd_reify (EV_P) 751fd_reify (EV_P)
701{ 752{
702 int i; 753 int i;
703 754
704 for (i = 0; i < fdchangecnt; ++i) 755 for (i = 0; i < fdchangecnt; ++i)
… …
719 #ifdef EV_FD_TO_WIN32_HANDLE 770 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else 772 #else
722 anfd->handle = _get_osfhandle (fd); 773 anfd->handle = _get_osfhandle (fd);
723 #endif 774 #endif
724 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
725 } 776 }
726#endif 777#endif
727 778
728 { 779 {
729 unsigned char o_events = anfd->events; 780 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 781 unsigned char o_reify = anfd->reify;
731 782
732 anfd->reify = 0; 783 anfd->reify = 0;
733 anfd->events = events; 784 anfd->events = events;
734 785
735 if (o_events != events || o_reify & EV_IOFDSET) 786 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 787 backend_modify (EV_A_ fd, o_events, events);
737 } 788 }
738 } 789 }
739 790
740 fdchangecnt = 0; 791 fdchangecnt = 0;
741} 792}
742 793
743void inline_size 794inline_size void
744fd_change (EV_P_ int fd, int flags) 795fd_change (EV_P_ int fd, int flags)
745{ 796{
746 unsigned char reify = anfds [fd].reify; 797 unsigned char reify = anfds [fd].reify;
747 anfds [fd].reify |= flags; 798 anfds [fd].reify |= flags;
748 799
… …
752 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
753 fdchanges [fdchangecnt - 1] = fd; 804 fdchanges [fdchangecnt - 1] = fd;
754 } 805 }
755} 806}
756 807
757void inline_speed 808inline_speed void
758fd_kill (EV_P_ int fd) 809fd_kill (EV_P_ int fd)
759{ 810{
760 ev_io *w; 811 ev_io *w;
761 812
762 while ((w = (ev_io *)anfds [fd].head)) 813 while ((w = (ev_io *)anfds [fd].head))
… …
764 ev_io_stop (EV_A_ w); 815 ev_io_stop (EV_A_ w);
765 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
766 } 817 }
767} 818}
768 819
769int inline_size 820inline_size int
770fd_valid (int fd) 821fd_valid (int fd)
771{ 822{
772#ifdef _WIN32 823#ifdef _WIN32
773 return _get_osfhandle (fd) != -1; 824 return _get_osfhandle (fd) != -1;
774#else 825#else
… …
811 for (fd = 0; fd < anfdmax; ++fd) 862 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 863 if (anfds [fd].events)
813 { 864 {
814 anfds [fd].events = 0; 865 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 866 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 867 fd_change (EV_A_ fd, EV__IOFDSET | 1);
817 } 868 }
818} 869}
819 870
820/*****************************************************************************/ 871/*****************************************************************************/
821 872
… …
837#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 888#define HEAP0 (DHEAP - 1) /* index of first element in heap */
838#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 889#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
839#define UPHEAP_DONE(p,k) ((p) == (k)) 890#define UPHEAP_DONE(p,k) ((p) == (k))
840 891
841/* away from the root */ 892/* away from the root */
842void inline_speed 893inline_speed void
843downheap (ANHE *heap, int N, int k) 894downheap (ANHE *heap, int N, int k)
844{ 895{
845 ANHE he = heap [k]; 896 ANHE he = heap [k];
846 ANHE *E = heap + N + HEAP0; 897 ANHE *E = heap + N + HEAP0;
847 898
… …
887#define HEAP0 1 938#define HEAP0 1
888#define HPARENT(k) ((k) >> 1) 939#define HPARENT(k) ((k) >> 1)
889#define UPHEAP_DONE(p,k) (!(p)) 940#define UPHEAP_DONE(p,k) (!(p))
890 941
891/* away from the root */ 942/* away from the root */
892void inline_speed 943inline_speed void
893downheap (ANHE *heap, int N, int k) 944downheap (ANHE *heap, int N, int k)
894{ 945{
895 ANHE he = heap [k]; 946 ANHE he = heap [k];
896 947
897 for (;;) 948 for (;;)
… …
917 ev_active (ANHE_w (he)) = k; 968 ev_active (ANHE_w (he)) = k;
918} 969}
919#endif 970#endif
920 971
921/* towards the root */ 972/* towards the root */
922void inline_speed 973inline_speed void
923upheap (ANHE *heap, int k) 974upheap (ANHE *heap, int k)
924{ 975{
925 ANHE he = heap [k]; 976 ANHE he = heap [k];
926 977
927 for (;;) 978 for (;;)
… …
938 989
939 heap [k] = he; 990 heap [k] = he;
940 ev_active (ANHE_w (he)) = k; 991 ev_active (ANHE_w (he)) = k;
941} 992}
942 993
943void inline_size 994inline_size void
944adjustheap (ANHE *heap, int N, int k) 995adjustheap (ANHE *heap, int N, int k)
945{ 996{
946 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
947 upheap (heap, k); 998 upheap (heap, k);
948 else 999 else
949 downheap (heap, N, k); 1000 downheap (heap, N, k);
950} 1001}
951 1002
952/* rebuild the heap: this function is used only once and executed rarely */ 1003/* rebuild the heap: this function is used only once and executed rarely */
953void inline_size 1004inline_size void
954reheap (ANHE *heap, int N) 1005reheap (ANHE *heap, int N)
955{ 1006{
956 int i; 1007 int i;
957 1008
958 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1009 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
974 1025
975static EV_ATOMIC_T gotsig; 1026static EV_ATOMIC_T gotsig;
976 1027
977/*****************************************************************************/ 1028/*****************************************************************************/
978 1029
979void inline_speed 1030inline_speed void
980fd_intern (int fd) 1031fd_intern (int fd)
981{ 1032{
982#ifdef _WIN32 1033#ifdef _WIN32
983 unsigned long arg = 1; 1034 unsigned long arg = 1;
984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1014 ev_io_start (EV_A_ &pipeev); 1065 ev_io_start (EV_A_ &pipeev);
1015 ev_unref (EV_A); /* watcher should not keep loop alive */ 1066 ev_unref (EV_A); /* watcher should not keep loop alive */
1016 } 1067 }
1017} 1068}
1018 1069
1019void inline_size 1070inline_size void
1020evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1071evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1021{ 1072{
1022 if (!*flag) 1073 if (!*flag)
1023 { 1074 {
1024 int old_errno = errno; /* save errno because write might clobber it */ 1075 int old_errno = errno; /* save errno because write might clobber it */
… …
1102ev_feed_signal_event (EV_P_ int signum) 1153ev_feed_signal_event (EV_P_ int signum)
1103{ 1154{
1104 WL w; 1155 WL w;
1105 1156
1106#if EV_MULTIPLICITY 1157#if EV_MULTIPLICITY
1107 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1108#endif 1159#endif
1109 1160
1110 --signum; 1161 --signum;
1111 1162
1112 if (signum < 0 || signum >= signalmax) 1163 if (signum < 0 || signum >= signalmax)
… …
1128 1179
1129#ifndef WIFCONTINUED 1180#ifndef WIFCONTINUED
1130# define WIFCONTINUED(status) 0 1181# define WIFCONTINUED(status) 0
1131#endif 1182#endif
1132 1183
1133void inline_speed 1184inline_speed void
1134child_reap (EV_P_ int chain, int pid, int status) 1185child_reap (EV_P_ int chain, int pid, int status)
1135{ 1186{
1136 ev_child *w; 1187 ev_child *w;
1137 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1138 1189
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1292 /* kqueue is borked on everything but netbsd apparently */
1242 /* it usually doesn't work correctly on anything but sockets and pipes */ 1293 /* it usually doesn't work correctly on anything but sockets and pipes */
1243 flags &= ~EVBACKEND_KQUEUE; 1294 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1295#endif
1245#ifdef __APPLE__ 1296#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1297 /* only select works correctly on that "unix-certified" platform */
1247 flags &= ~EVBACKEND_POLL; 1298 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1299 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1248#endif 1300#endif
1249 1301
1250 return flags; 1302 return flags;
1251} 1303}
1252 1304
… …
1289static void noinline 1341static void noinline
1290loop_init (EV_P_ unsigned int flags) 1342loop_init (EV_P_ unsigned int flags)
1291{ 1343{
1292 if (!backend) 1344 if (!backend)
1293 { 1345 {
1346#if EV_USE_REALTIME
1347 if (!have_realtime)
1348 {
1349 struct timespec ts;
1350
1351 if (!clock_gettime (CLOCK_REALTIME, &ts))
1352 have_realtime = 1;
1353 }
1354#endif
1355
1294#if EV_USE_MONOTONIC 1356#if EV_USE_MONOTONIC
1357 if (!have_monotonic)
1295 { 1358 {
1296 struct timespec ts; 1359 struct timespec ts;
1360
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1362 have_monotonic = 1;
1299 } 1363 }
1300#endif 1364#endif
1301 1365
1302 ev_rt_now = ev_time (); 1366 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1367 mn_now = get_clock ();
1304 now_floor = mn_now; 1368 now_floor = mn_now;
… …
1403 } 1467 }
1404 1468
1405 ev_free (anfds); anfdmax = 0; 1469 ev_free (anfds); anfdmax = 0;
1406 1470
1407 /* have to use the microsoft-never-gets-it-right macro */ 1471 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY);
1408 array_free (fdchange, EMPTY); 1473 array_free (fdchange, EMPTY);
1409 array_free (timer, EMPTY); 1474 array_free (timer, EMPTY);
1410#if EV_PERIODIC_ENABLE 1475#if EV_PERIODIC_ENABLE
1411 array_free (periodic, EMPTY); 1476 array_free (periodic, EMPTY);
1412#endif 1477#endif
… …
1421 1486
1422 backend = 0; 1487 backend = 0;
1423} 1488}
1424 1489
1425#if EV_USE_INOTIFY 1490#if EV_USE_INOTIFY
1426void inline_size infy_fork (EV_P); 1491inline_size void infy_fork (EV_P);
1427#endif 1492#endif
1428 1493
1429void inline_size 1494inline_size void
1430loop_fork (EV_P) 1495loop_fork (EV_P)
1431{ 1496{
1432#if EV_USE_PORT 1497#if EV_USE_PORT
1433 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1498 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1434#endif 1499#endif
… …
1505 1570
1506#if EV_VERIFY 1571#if EV_VERIFY
1507static void noinline 1572static void noinline
1508verify_watcher (EV_P_ W w) 1573verify_watcher (EV_P_ W w)
1509{ 1574{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1575 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1576
1512 if (w->pending) 1577 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1578 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514} 1579}
1515 1580
1516static void noinline 1581static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1582verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1583{
1519 int i; 1584 int i;
1520 1585
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1586 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1587 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1588 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1524 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1589 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1525 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1590 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526 1591
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1592 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1593 }
1529} 1594}
1530 1595
1531static void noinline 1596static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1597array_verify (EV_P_ W *ws, int cnt)
1533{ 1598{
1534 while (cnt--) 1599 while (cnt--)
1535 { 1600 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1601 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1602 verify_watcher (EV_A_ ws [cnt]);
1538 } 1603 }
1539} 1604}
1540#endif 1605#endif
1541 1606
… …
1548 1613
1549 assert (activecnt >= -1); 1614 assert (activecnt >= -1);
1550 1615
1551 assert (fdchangemax >= fdchangecnt); 1616 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1617 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1618 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1619
1555 assert (anfdmax >= 0); 1620 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1621 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1622 for (w = anfds [i].head; w; w = w->next)
1558 { 1623 {
1559 verify_watcher (EV_A_ (W)w); 1624 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1625 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1561 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1626 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1627 }
1563 1628
1564 assert (timermax >= timercnt); 1629 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1630 verify_heap (EV_A_ timers, timercnt);
1566 1631
… …
1671ev_invoke (EV_P_ void *w, int revents) 1736ev_invoke (EV_P_ void *w, int revents)
1672{ 1737{
1673 EV_CB_INVOKE ((W)w, revents); 1738 EV_CB_INVOKE ((W)w, revents);
1674} 1739}
1675 1740
1676void inline_speed 1741inline_speed void
1677call_pending (EV_P) 1742call_pending (EV_P)
1678{ 1743{
1679 int pri; 1744 int pri;
1680 1745
1681 for (pri = NUMPRI; pri--; ) 1746 for (pri = NUMPRI; pri--; )
… …
1683 { 1748 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 1750
1686 if (expect_true (p->w)) 1751 if (expect_true (p->w))
1687 { 1752 {
1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1689 1754
1690 p->w->pending = 0; 1755 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 1756 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 1757 EV_FREQUENT_CHECK;
1693 } 1758 }
1694 } 1759 }
1695} 1760}
1696 1761
1697#if EV_IDLE_ENABLE 1762#if EV_IDLE_ENABLE
1698void inline_size 1763inline_size void
1699idle_reify (EV_P) 1764idle_reify (EV_P)
1700{ 1765{
1701 if (expect_false (idleall)) 1766 if (expect_false (idleall))
1702 { 1767 {
1703 int pri; 1768 int pri;
… …
1715 } 1780 }
1716 } 1781 }
1717} 1782}
1718#endif 1783#endif
1719 1784
1720void inline_size 1785inline_size void
1721timers_reify (EV_P) 1786timers_reify (EV_P)
1722{ 1787{
1723 EV_FREQUENT_CHECK; 1788 EV_FREQUENT_CHECK;
1724 1789
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1790 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 1791 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1792 do
1728
1729 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1730
1731 /* first reschedule or stop timer */
1732 if (w->repeat)
1733 { 1793 {
1794 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1795
1796 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1797
1798 /* first reschedule or stop timer */
1799 if (w->repeat)
1800 {
1734 ev_at (w) += w->repeat; 1801 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 1802 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 1803 ev_at (w) = mn_now;
1737 1804
1738 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1805 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1739 1806
1740 ANHE_at_cache (timers [HEAP0]); 1807 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 1808 downheap (timers, timercnt, HEAP0);
1809 }
1810 else
1811 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1812
1813 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w);
1742 } 1815 }
1743 else 1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1744 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1745 1817
1746 EV_FREQUENT_CHECK;
1747 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1818 feed_reverse_done (EV_A_ EV_TIMEOUT);
1748 } 1819 }
1749} 1820}
1750 1821
1751#if EV_PERIODIC_ENABLE 1822#if EV_PERIODIC_ENABLE
1752void inline_size 1823inline_size void
1753periodics_reify (EV_P) 1824periodics_reify (EV_P)
1754{ 1825{
1755 EV_FREQUENT_CHECK; 1826 EV_FREQUENT_CHECK;
1756 1827
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1828 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 1829 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1830 int feed_count = 0;
1760 1831
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1832 do
1762
1763 /* first reschedule or stop timer */
1764 if (w->reschedule_cb)
1765 { 1833 {
1834 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1835
1836 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1837
1838 /* first reschedule or stop timer */
1839 if (w->reschedule_cb)
1840 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1841 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 1842
1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1843 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1769 1844
1770 ANHE_at_cache (periodics [HEAP0]); 1845 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 1846 downheap (periodics, periodiccnt, HEAP0);
1847 }
1848 else if (w->interval)
1849 {
1850 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1851 /* if next trigger time is not sufficiently in the future, put it there */
1852 /* this might happen because of floating point inexactness */
1853 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1854 {
1855 ev_at (w) += w->interval;
1856
1857 /* if interval is unreasonably low we might still have a time in the past */
1858 /* so correct this. this will make the periodic very inexact, but the user */
1859 /* has effectively asked to get triggered more often than possible */
1860 if (ev_at (w) < ev_rt_now)
1861 ev_at (w) = ev_rt_now;
1862 }
1863
1864 ANHE_at_cache (periodics [HEAP0]);
1865 downheap (periodics, periodiccnt, HEAP0);
1866 }
1867 else
1868 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1869
1870 EV_FREQUENT_CHECK;
1871 feed_reverse (EV_A_ (W)w);
1772 } 1872 }
1773 else if (w->interval) 1873 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1774 {
1775 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1776 /* if next trigger time is not sufficiently in the future, put it there */
1777 /* this might happen because of floating point inexactness */
1778 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1779 {
1780 ev_at (w) += w->interval;
1781 1874
1782 /* if interval is unreasonably low we might still have a time in the past */
1783 /* so correct this. this will make the periodic very inexact, but the user */
1784 /* has effectively asked to get triggered more often than possible */
1785 if (ev_at (w) < ev_rt_now)
1786 ev_at (w) = ev_rt_now;
1787 }
1788
1789 ANHE_at_cache (periodics [HEAP0]);
1790 downheap (periodics, periodiccnt, HEAP0);
1791 }
1792 else
1793 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1794
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1875 feed_reverse_done (EV_A_ EV_PERIODIC);
1797 } 1876 }
1798} 1877}
1799 1878
1800static void noinline 1879static void noinline
1801periodics_reschedule (EV_P) 1880periodics_reschedule (EV_P)
… …
1817 1896
1818 reheap (periodics, periodiccnt); 1897 reheap (periodics, periodiccnt);
1819} 1898}
1820#endif 1899#endif
1821 1900
1822void inline_speed 1901static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust)
1903{
1904 int i;
1905
1906 for (i = 0; i < timercnt; ++i)
1907 {
1908 ANHE *he = timers + i + HEAP0;
1909 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he);
1911 }
1912}
1913
1914inline_speed void
1823time_update (EV_P_ ev_tstamp max_block) 1915time_update (EV_P_ ev_tstamp max_block)
1824{ 1916{
1825 int i; 1917 int i;
1826 1918
1827#if EV_USE_MONOTONIC 1919#if EV_USE_MONOTONIC
… …
1860 ev_rt_now = ev_time (); 1952 ev_rt_now = ev_time ();
1861 mn_now = get_clock (); 1953 mn_now = get_clock ();
1862 now_floor = mn_now; 1954 now_floor = mn_now;
1863 } 1955 }
1864 1956
1957 /* no timer adjustment, as the monotonic clock doesn't jump */
1958 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865# if EV_PERIODIC_ENABLE 1959# if EV_PERIODIC_ENABLE
1866 periodics_reschedule (EV_A); 1960 periodics_reschedule (EV_A);
1867# endif 1961# endif
1868 /* no timer adjustment, as the monotonic clock doesn't jump */
1869 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870 } 1962 }
1871 else 1963 else
1872#endif 1964#endif
1873 { 1965 {
1874 ev_rt_now = ev_time (); 1966 ev_rt_now = ev_time ();
1875 1967
1876 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 1968 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1877 { 1969 {
1970 /* adjust timers. this is easy, as the offset is the same for all of them */
1971 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1878#if EV_PERIODIC_ENABLE 1972#if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 1973 periodics_reschedule (EV_A);
1880#endif 1974#endif
1881 /* adjust timers. this is easy, as the offset is the same for all of them */
1882 for (i = 0; i < timercnt; ++i)
1883 {
1884 ANHE *he = timers + i + HEAP0;
1885 ANHE_w (*he)->at += ev_rt_now - mn_now;
1886 ANHE_at_cache (*he);
1887 }
1888 } 1975 }
1889 1976
1890 mn_now = ev_rt_now; 1977 mn_now = ev_rt_now;
1891 } 1978 }
1892}
1893
1894void
1895ev_ref (EV_P)
1896{
1897 ++activecnt;
1898}
1899
1900void
1901ev_unref (EV_P)
1902{
1903 --activecnt;
1904}
1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910} 1979}
1911 1980
1912static int loop_done; 1981static int loop_done;
1913 1982
1914void 1983void
… …
1948 { 2017 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 2019 call_pending (EV_A);
1951 } 2020 }
1952 2021
1953 if (expect_false (!activecnt))
1954 break;
1955
1956 /* we might have forked, so reify kernel state if necessary */ 2022 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2023 if (expect_false (postfork))
1958 loop_fork (EV_A); 2024 loop_fork (EV_A);
1959 2025
1960 /* update fd-related kernel structures */ 2026 /* update fd-related kernel structures */
… …
1967 2033
1968 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1969 { 2035 {
1970 /* update time to cancel out callback processing overhead */ 2036 /* update time to cancel out callback processing overhead */
1971 time_update (EV_A_ 1e100); 2037 time_update (EV_A_ 1e100);
1972
1973 waittime = MAX_BLOCKTIME;
1974 2038
1975 if (timercnt) 2039 if (timercnt)
1976 { 2040 {
1977 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1978 if (waittime > to) waittime = to; 2042 if (waittime > to) waittime = to;
… …
2039ev_unloop (EV_P_ int how) 2103ev_unloop (EV_P_ int how)
2040{ 2104{
2041 loop_done = how; 2105 loop_done = how;
2042} 2106}
2043 2107
2108void
2109ev_ref (EV_P)
2110{
2111 ++activecnt;
2112}
2113
2114void
2115ev_unref (EV_P)
2116{
2117 --activecnt;
2118}
2119
2120void
2121ev_now_update (EV_P)
2122{
2123 time_update (EV_A_ 1e100);
2124}
2125
2126void
2127ev_suspend (EV_P)
2128{
2129 ev_now_update (EV_A);
2130}
2131
2132void
2133ev_resume (EV_P)
2134{
2135 ev_tstamp mn_prev = mn_now;
2136
2137 ev_now_update (EV_A);
2138 timers_reschedule (EV_A_ mn_now - mn_prev);
2139#if EV_PERIODIC_ENABLE
2140 periodics_reschedule (EV_A);
2141#endif
2142}
2143
2044/*****************************************************************************/ 2144/*****************************************************************************/
2045 2145
2046void inline_size 2146inline_size void
2047wlist_add (WL *head, WL elem) 2147wlist_add (WL *head, WL elem)
2048{ 2148{
2049 elem->next = *head; 2149 elem->next = *head;
2050 *head = elem; 2150 *head = elem;
2051} 2151}
2052 2152
2053void inline_size 2153inline_size void
2054wlist_del (WL *head, WL elem) 2154wlist_del (WL *head, WL elem)
2055{ 2155{
2056 while (*head) 2156 while (*head)
2057 { 2157 {
2058 if (*head == elem) 2158 if (*head == elem)
… …
2063 2163
2064 head = &(*head)->next; 2164 head = &(*head)->next;
2065 } 2165 }
2066} 2166}
2067 2167
2068void inline_speed 2168inline_speed void
2069clear_pending (EV_P_ W w) 2169clear_pending (EV_P_ W w)
2070{ 2170{
2071 if (w->pending) 2171 if (w->pending)
2072 { 2172 {
2073 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2173 pendings [ABSPRI (w)][w->pending - 1].w = 0;
… …
2090 } 2190 }
2091 else 2191 else
2092 return 0; 2192 return 0;
2093} 2193}
2094 2194
2095void inline_size 2195inline_size void
2096pri_adjust (EV_P_ W w) 2196pri_adjust (EV_P_ W w)
2097{ 2197{
2098 int pri = w->priority; 2198 int pri = w->priority;
2099 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2199 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2100 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2200 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2101 w->priority = pri; 2201 w->priority = pri;
2102} 2202}
2103 2203
2104void inline_speed 2204inline_speed void
2105ev_start (EV_P_ W w, int active) 2205ev_start (EV_P_ W w, int active)
2106{ 2206{
2107 pri_adjust (EV_A_ w); 2207 pri_adjust (EV_A_ w);
2108 w->active = active; 2208 w->active = active;
2109 ev_ref (EV_A); 2209 ev_ref (EV_A);
2110} 2210}
2111 2211
2112void inline_size 2212inline_size void
2113ev_stop (EV_P_ W w) 2213ev_stop (EV_P_ W w)
2114{ 2214{
2115 ev_unref (EV_A); 2215 ev_unref (EV_A);
2116 w->active = 0; 2216 w->active = 0;
2117} 2217}
… …
2124 int fd = w->fd; 2224 int fd = w->fd;
2125 2225
2126 if (expect_false (ev_is_active (w))) 2226 if (expect_false (ev_is_active (w)))
2127 return; 2227 return;
2128 2228
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2229 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2230 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2131 2231
2132 EV_FREQUENT_CHECK; 2232 EV_FREQUENT_CHECK;
2133 2233
2134 ev_start (EV_A_ (W)w, 1); 2234 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2235 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2236 wlist_add (&anfds[fd].head, (WL)w);
2137 2237
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2238 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2139 w->events &= ~EV_IOFDSET; 2239 w->events &= ~EV__IOFDSET;
2140 2240
2141 EV_FREQUENT_CHECK; 2241 EV_FREQUENT_CHECK;
2142} 2242}
2143 2243
2144void noinline 2244void noinline
… …
2146{ 2246{
2147 clear_pending (EV_A_ (W)w); 2247 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2248 if (expect_false (!ev_is_active (w)))
2149 return; 2249 return;
2150 2250
2151 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2251 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2152 2252
2153 EV_FREQUENT_CHECK; 2253 EV_FREQUENT_CHECK;
2154 2254
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2255 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2256 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2266 if (expect_false (ev_is_active (w)))
2167 return; 2267 return;
2168 2268
2169 ev_at (w) += mn_now; 2269 ev_at (w) += mn_now;
2170 2270
2171 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2271 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2172 2272
2173 EV_FREQUENT_CHECK; 2273 EV_FREQUENT_CHECK;
2174 2274
2175 ++timercnt; 2275 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2276 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2279 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2280 upheap (timers, ev_active (w));
2181 2281
2182 EV_FREQUENT_CHECK; 2282 EV_FREQUENT_CHECK;
2183 2283
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2284 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2285}
2186 2286
2187void noinline 2287void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2288ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2289{
… …
2194 EV_FREQUENT_CHECK; 2294 EV_FREQUENT_CHECK;
2195 2295
2196 { 2296 {
2197 int active = ev_active (w); 2297 int active = ev_active (w);
2198 2298
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2299 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2300
2201 --timercnt; 2301 --timercnt;
2202 2302
2203 if (expect_true (active < timercnt + HEAP0)) 2303 if (expect_true (active < timercnt + HEAP0))
2204 { 2304 {
… …
2248 2348
2249 if (w->reschedule_cb) 2349 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2350 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2351 else if (w->interval)
2252 { 2352 {
2253 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2353 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2254 /* this formula differs from the one in periodic_reify because we do not always round up */ 2354 /* this formula differs from the one in periodic_reify because we do not always round up */
2255 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2355 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2256 } 2356 }
2257 else 2357 else
2258 ev_at (w) = w->offset; 2358 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2366 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2367 upheap (periodics, ev_active (w));
2268 2368
2269 EV_FREQUENT_CHECK; 2369 EV_FREQUENT_CHECK;
2270 2370
2271 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2371 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2272} 2372}
2273 2373
2274void noinline 2374void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2375ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2376{
… …
2281 EV_FREQUENT_CHECK; 2381 EV_FREQUENT_CHECK;
2282 2382
2283 { 2383 {
2284 int active = ev_active (w); 2384 int active = ev_active (w);
2285 2385
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2386 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2387
2288 --periodiccnt; 2388 --periodiccnt;
2289 2389
2290 if (expect_true (active < periodiccnt + HEAP0)) 2390 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2391 {
… …
2314 2414
2315void noinline 2415void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2416ev_signal_start (EV_P_ ev_signal *w)
2317{ 2417{
2318#if EV_MULTIPLICITY 2418#if EV_MULTIPLICITY
2319 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2419 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2320#endif 2420#endif
2321 if (expect_false (ev_is_active (w))) 2421 if (expect_false (ev_is_active (w)))
2322 return; 2422 return;
2323 2423
2324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2424 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2325 2425
2326 evpipe_init (EV_A); 2426 evpipe_init (EV_A);
2327 2427
2328 EV_FREQUENT_CHECK; 2428 EV_FREQUENT_CHECK;
2329 2429
… …
2380 2480
2381void 2481void
2382ev_child_start (EV_P_ ev_child *w) 2482ev_child_start (EV_P_ ev_child *w)
2383{ 2483{
2384#if EV_MULTIPLICITY 2484#if EV_MULTIPLICITY
2385 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2485 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2386#endif 2486#endif
2387 if (expect_false (ev_is_active (w))) 2487 if (expect_false (ev_is_active (w)))
2388 return; 2488 return;
2389 2489
2390 EV_FREQUENT_CHECK; 2490 EV_FREQUENT_CHECK;
… …
2449 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2549 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2450 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2550 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2451 2551
2452 char *pend = strrchr (path, '/'); 2552 char *pend = strrchr (path, '/');
2453 2553
2454 if (!pend) 2554 if (!pend || pend == path)
2455 break; /* whoops, no '/', complain to your admin */ 2555 break;
2456 2556
2457 *pend = 0; 2557 *pend = 0;
2458 w->wd = inotify_add_watch (fs_fd, path, mask); 2558 w->wd = inotify_add_watch (fs_fd, path, mask);
2459 } 2559 }
2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2560 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2461 } 2561 }
2462 } 2562 }
2463 else 2563
2564 if (w->wd >= 0)
2464 { 2565 {
2465 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2566 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2466 2567
2467 /* now local changes will be tracked by inotify, but remote changes won't */ 2568 /* now local changes will be tracked by inotify, but remote changes won't */
2468 /* unless the filesystem it known to be local, we therefore still poll */ 2569 /* unless the filesystem it known to be local, we therefore still poll */
… …
2518 2619
2519 if (w->wd == wd || wd == -1) 2620 if (w->wd == wd || wd == -1)
2520 { 2621 {
2521 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2622 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2522 { 2623 {
2624 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2523 w->wd = -1; 2625 w->wd = -1;
2524 infy_add (EV_A_ w); /* re-add, no matter what */ 2626 infy_add (EV_A_ w); /* re-add, no matter what */
2525 } 2627 }
2526 2628
2527 stat_timer_cb (EV_A_ &w->timer, 0); 2629 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2540 2642
2541 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2643 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2542 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2644 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2543} 2645}
2544 2646
2545void inline_size 2647inline_size void
2546check_2625 (EV_P) 2648check_2625 (EV_P)
2547{ 2649{
2548 /* kernels < 2.6.25 are borked 2650 /* kernels < 2.6.25 are borked
2549 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2651 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2550 */ 2652 */
… …
2563 return; 2665 return;
2564 2666
2565 fs_2625 = 1; 2667 fs_2625 = 1;
2566} 2668}
2567 2669
2568void inline_size 2670inline_size void
2569infy_init (EV_P) 2671infy_init (EV_P)
2570{ 2672{
2571 if (fs_fd != -2) 2673 if (fs_fd != -2)
2572 return; 2674 return;
2573 2675
… …
2583 ev_set_priority (&fs_w, EV_MAXPRI); 2685 ev_set_priority (&fs_w, EV_MAXPRI);
2584 ev_io_start (EV_A_ &fs_w); 2686 ev_io_start (EV_A_ &fs_w);
2585 } 2687 }
2586} 2688}
2587 2689
2588void inline_size 2690inline_size void
2589infy_fork (EV_P) 2691infy_fork (EV_P)
2590{ 2692{
2591 int slot; 2693 int slot;
2592 2694
2593 if (fs_fd < 0) 2695 if (fs_fd < 0)
… …
2874static void 2976static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2977embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{ 2978{
2877 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2979 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2878 2980
2981 ev_embed_stop (EV_A_ w);
2982
2879 { 2983 {
2880 struct ev_loop *loop = w->other; 2984 struct ev_loop *loop = w->other;
2881 2985
2882 ev_loop_fork (EV_A); 2986 ev_loop_fork (EV_A);
2987 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2883 } 2988 }
2989
2990 ev_embed_start (EV_A_ w);
2884} 2991}
2885 2992
2886#if 0 2993#if 0
2887static void 2994static void
2888embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2995embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2897 if (expect_false (ev_is_active (w))) 3004 if (expect_false (ev_is_active (w)))
2898 return; 3005 return;
2899 3006
2900 { 3007 {
2901 struct ev_loop *loop = w->other; 3008 struct ev_loop *loop = w->other;
2902 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3009 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2903 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3010 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2904 } 3011 }
2905 3012
2906 EV_FREQUENT_CHECK; 3013 EV_FREQUENT_CHECK;
2907 3014
… …
3090 ev_timer_set (&once->to, timeout, 0.); 3197 ev_timer_set (&once->to, timeout, 0.);
3091 ev_timer_start (EV_A_ &once->to); 3198 ev_timer_start (EV_A_ &once->to);
3092 } 3199 }
3093} 3200}
3094 3201
3202/*****************************************************************************/
3203
3204#if 0
3205void
3206ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3207{
3208 int i, j;
3209 ev_watcher_list *wl, *wn;
3210
3211 if (types & (EV_IO | EV_EMBED))
3212 for (i = 0; i < anfdmax; ++i)
3213 for (wl = anfds [i].head; wl; )
3214 {
3215 wn = wl->next;
3216
3217#if EV_EMBED_ENABLE
3218 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3219 {
3220 if (types & EV_EMBED)
3221 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3222 }
3223 else
3224#endif
3225#if EV_USE_INOTIFY
3226 if (ev_cb ((ev_io *)wl) == infy_cb)
3227 ;
3228 else
3229#endif
3230 if ((ev_io *)wl != &pipeev)
3231 if (types & EV_IO)
3232 cb (EV_A_ EV_IO, wl);
3233
3234 wl = wn;
3235 }
3236
3237 if (types & (EV_TIMER | EV_STAT))
3238 for (i = timercnt + HEAP0; i-- > HEAP0; )
3239#if EV_STAT_ENABLE
3240 /*TODO: timer is not always active*/
3241 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3242 {
3243 if (types & EV_STAT)
3244 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3245 }
3246 else
3247#endif
3248 if (types & EV_TIMER)
3249 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3250
3251#if EV_PERIODIC_ENABLE
3252 if (types & EV_PERIODIC)
3253 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3254 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3255#endif
3256
3257#if EV_IDLE_ENABLE
3258 if (types & EV_IDLE)
3259 for (j = NUMPRI; i--; )
3260 for (i = idlecnt [j]; i--; )
3261 cb (EV_A_ EV_IDLE, idles [j][i]);
3262#endif
3263
3264#if EV_FORK_ENABLE
3265 if (types & EV_FORK)
3266 for (i = forkcnt; i--; )
3267 if (ev_cb (forks [i]) != embed_fork_cb)
3268 cb (EV_A_ EV_FORK, forks [i]);
3269#endif
3270
3271#if EV_ASYNC_ENABLE
3272 if (types & EV_ASYNC)
3273 for (i = asynccnt; i--; )
3274 cb (EV_A_ EV_ASYNC, asyncs [i]);
3275#endif
3276
3277 if (types & EV_PREPARE)
3278 for (i = preparecnt; i--; )
3279#if EV_EMBED_ENABLE
3280 if (ev_cb (prepares [i]) != embed_prepare_cb)
3281#endif
3282 cb (EV_A_ EV_PREPARE, prepares [i]);
3283
3284 if (types & EV_CHECK)
3285 for (i = checkcnt; i--; )
3286 cb (EV_A_ EV_CHECK, checks [i]);
3287
3288 if (types & EV_SIGNAL)
3289 for (i = 0; i < signalmax; ++i)
3290 for (wl = signals [i].head; wl; )
3291 {
3292 wn = wl->next;
3293 cb (EV_A_ EV_SIGNAL, wl);
3294 wl = wn;
3295 }
3296
3297 if (types & EV_CHILD)
3298 for (i = EV_PID_HASHSIZE; i--; )
3299 for (wl = childs [i]; wl; )
3300 {
3301 wn = wl->next;
3302 cb (EV_A_ EV_CHILD, wl);
3303 wl = wn;
3304 }
3305/* EV_STAT 0x00001000 /* stat data changed */
3306/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3307}
3308#endif
3309
3095#if EV_MULTIPLICITY 3310#if EV_MULTIPLICITY
3096 #include "ev_wrap.h" 3311 #include "ev_wrap.h"
3097#endif 3312#endif
3098 3313
3099#ifdef __cplusplus 3314#ifdef __cplusplus

Diff Legend

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