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

Comparing libev/ev.c (file contents):
Revision 1.270 by root, Thu Oct 30 13:07:10 2008 UTC vs.
Revision 1.285 by root, Wed Apr 15 19:35:53 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
… …
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
291# include <sys/utsname.h> 311# include <sys/utsname.h>
312# include <sys/statfs.h>
292# include <sys/inotify.h> 313# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 315# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 316# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 317# define EV_USE_INOTIFY 0
297# endif 318# endif
298#endif 319#endif
299 320
300#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
301# include <winsock.h> 322# include <winsock.h>
323#endif
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
302#endif 332#endif
303 333
304#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
305/* 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 */
306# include <stdint.h> 336# include <stdint.h>
… …
367typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
368 398
369#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
371 401
372#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
373/* 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 */
374/* 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
375static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
376#endif 410#endif
377 411
378#ifdef _WIN32 412#ifdef _WIN32
379# include "ev_win32.c" 413# include "ev_win32.c"
… …
523 557
524ev_tstamp 558ev_tstamp
525ev_time (void) 559ev_time (void)
526{ 560{
527#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
528 struct timespec ts; 564 struct timespec ts;
529 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
530 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
531#else 567 }
568#endif
569
532 struct timeval tv; 570 struct timeval tv;
533 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
534 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
535#endif
536} 573}
537 574
538ev_tstamp inline_size 575inline_size ev_tstamp
539get_clock (void) 576get_clock (void)
540{ 577{
541#if EV_USE_MONOTONIC 578#if EV_USE_MONOTONIC
542 if (expect_true (have_monotonic)) 579 if (expect_true (have_monotonic))
543 { 580 {
… …
588 625
589/*****************************************************************************/ 626/*****************************************************************************/
590 627
591#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 */
592 629
593int inline_size 630inline_size int
594array_nextsize (int elem, int cur, int cnt) 631array_nextsize (int elem, int cur, int cnt)
595{ 632{
596 int ncur = cur + 1; 633 int ncur = cur + 1;
597 634
598 do 635 do
… …
639 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 676 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
640 } 677 }
641#endif 678#endif
642 679
643#define array_free(stem, idx) \ 680#define array_free(stem, idx) \
644 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
645 682
646/*****************************************************************************/ 683/*****************************************************************************/
647 684
648void noinline 685void noinline
649ev_feed_event (EV_P_ void *w, int revents) 686ev_feed_event (EV_P_ void *w, int revents)
… …
660 pendings [pri][w_->pending - 1].w = w_; 697 pendings [pri][w_->pending - 1].w = w_;
661 pendings [pri][w_->pending - 1].events = revents; 698 pendings [pri][w_->pending - 1].events = revents;
662 } 699 }
663} 700}
664 701
665void 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
666queue_events (EV_P_ W *events, int eventcnt, int type) 718queue_events (EV_P_ W *events, int eventcnt, int type)
667{ 719{
668 int i; 720 int i;
669 721
670 for (i = 0; i < eventcnt; ++i) 722 for (i = 0; i < eventcnt; ++i)
671 ev_feed_event (EV_A_ events [i], type); 723 ev_feed_event (EV_A_ events [i], type);
672} 724}
673 725
674/*****************************************************************************/ 726/*****************************************************************************/
675 727
676void inline_speed 728inline_speed void
677fd_event (EV_P_ int fd, int revents) 729fd_event (EV_P_ int fd, int revents)
678{ 730{
679 ANFD *anfd = anfds + fd; 731 ANFD *anfd = anfds + fd;
680 ev_io *w; 732 ev_io *w;
681 733
… …
693{ 745{
694 if (fd >= 0 && fd < anfdmax) 746 if (fd >= 0 && fd < anfdmax)
695 fd_event (EV_A_ fd, revents); 747 fd_event (EV_A_ fd, revents);
696} 748}
697 749
698void inline_size 750inline_size void
699fd_reify (EV_P) 751fd_reify (EV_P)
700{ 752{
701 int i; 753 int i;
702 754
703 for (i = 0; i < fdchangecnt; ++i) 755 for (i = 0; i < fdchangecnt; ++i)
… …
718 #ifdef EV_FD_TO_WIN32_HANDLE 770 #ifdef EV_FD_TO_WIN32_HANDLE
719 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
720 #else 772 #else
721 anfd->handle = _get_osfhandle (fd); 773 anfd->handle = _get_osfhandle (fd);
722 #endif 774 #endif
723 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));
724 } 776 }
725#endif 777#endif
726 778
727 { 779 {
728 unsigned char o_events = anfd->events; 780 unsigned char o_events = anfd->events;
729 unsigned char o_reify = anfd->reify; 781 unsigned char o_reify = anfd->reify;
730 782
731 anfd->reify = 0; 783 anfd->reify = 0;
732 anfd->events = events; 784 anfd->events = events;
733 785
734 if (o_events != events || o_reify & EV_IOFDSET) 786 if (o_events != events || o_reify & EV__IOFDSET)
735 backend_modify (EV_A_ fd, o_events, events); 787 backend_modify (EV_A_ fd, o_events, events);
736 } 788 }
737 } 789 }
738 790
739 fdchangecnt = 0; 791 fdchangecnt = 0;
740} 792}
741 793
742void inline_size 794inline_size void
743fd_change (EV_P_ int fd, int flags) 795fd_change (EV_P_ int fd, int flags)
744{ 796{
745 unsigned char reify = anfds [fd].reify; 797 unsigned char reify = anfds [fd].reify;
746 anfds [fd].reify |= flags; 798 anfds [fd].reify |= flags;
747 799
… …
751 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
752 fdchanges [fdchangecnt - 1] = fd; 804 fdchanges [fdchangecnt - 1] = fd;
753 } 805 }
754} 806}
755 807
756void inline_speed 808inline_speed void
757fd_kill (EV_P_ int fd) 809fd_kill (EV_P_ int fd)
758{ 810{
759 ev_io *w; 811 ev_io *w;
760 812
761 while ((w = (ev_io *)anfds [fd].head)) 813 while ((w = (ev_io *)anfds [fd].head))
… …
763 ev_io_stop (EV_A_ w); 815 ev_io_stop (EV_A_ w);
764 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);
765 } 817 }
766} 818}
767 819
768int inline_size 820inline_size int
769fd_valid (int fd) 821fd_valid (int fd)
770{ 822{
771#ifdef _WIN32 823#ifdef _WIN32
772 return _get_osfhandle (fd) != -1; 824 return _get_osfhandle (fd) != -1;
773#else 825#else
… …
810 for (fd = 0; fd < anfdmax; ++fd) 862 for (fd = 0; fd < anfdmax; ++fd)
811 if (anfds [fd].events) 863 if (anfds [fd].events)
812 { 864 {
813 anfds [fd].events = 0; 865 anfds [fd].events = 0;
814 anfds [fd].emask = 0; 866 anfds [fd].emask = 0;
815 fd_change (EV_A_ fd, EV_IOFDSET | 1); 867 fd_change (EV_A_ fd, EV__IOFDSET | 1);
816 } 868 }
817} 869}
818 870
819/*****************************************************************************/ 871/*****************************************************************************/
820 872
… …
836#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 888#define HEAP0 (DHEAP - 1) /* index of first element in heap */
837#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 889#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
838#define UPHEAP_DONE(p,k) ((p) == (k)) 890#define UPHEAP_DONE(p,k) ((p) == (k))
839 891
840/* away from the root */ 892/* away from the root */
841void inline_speed 893inline_speed void
842downheap (ANHE *heap, int N, int k) 894downheap (ANHE *heap, int N, int k)
843{ 895{
844 ANHE he = heap [k]; 896 ANHE he = heap [k];
845 ANHE *E = heap + N + HEAP0; 897 ANHE *E = heap + N + HEAP0;
846 898
… …
886#define HEAP0 1 938#define HEAP0 1
887#define HPARENT(k) ((k) >> 1) 939#define HPARENT(k) ((k) >> 1)
888#define UPHEAP_DONE(p,k) (!(p)) 940#define UPHEAP_DONE(p,k) (!(p))
889 941
890/* away from the root */ 942/* away from the root */
891void inline_speed 943inline_speed void
892downheap (ANHE *heap, int N, int k) 944downheap (ANHE *heap, int N, int k)
893{ 945{
894 ANHE he = heap [k]; 946 ANHE he = heap [k];
895 947
896 for (;;) 948 for (;;)
… …
916 ev_active (ANHE_w (he)) = k; 968 ev_active (ANHE_w (he)) = k;
917} 969}
918#endif 970#endif
919 971
920/* towards the root */ 972/* towards the root */
921void inline_speed 973inline_speed void
922upheap (ANHE *heap, int k) 974upheap (ANHE *heap, int k)
923{ 975{
924 ANHE he = heap [k]; 976 ANHE he = heap [k];
925 977
926 for (;;) 978 for (;;)
… …
937 989
938 heap [k] = he; 990 heap [k] = he;
939 ev_active (ANHE_w (he)) = k; 991 ev_active (ANHE_w (he)) = k;
940} 992}
941 993
942void inline_size 994inline_size void
943adjustheap (ANHE *heap, int N, int k) 995adjustheap (ANHE *heap, int N, int k)
944{ 996{
945 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]))
946 upheap (heap, k); 998 upheap (heap, k);
947 else 999 else
948 downheap (heap, N, k); 1000 downheap (heap, N, k);
949} 1001}
950 1002
951/* 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 */
952void inline_size 1004inline_size void
953reheap (ANHE *heap, int N) 1005reheap (ANHE *heap, int N)
954{ 1006{
955 int i; 1007 int i;
956 1008
957 /* 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 */
… …
973 1025
974static EV_ATOMIC_T gotsig; 1026static EV_ATOMIC_T gotsig;
975 1027
976/*****************************************************************************/ 1028/*****************************************************************************/
977 1029
978void inline_speed 1030inline_speed void
979fd_intern (int fd) 1031fd_intern (int fd)
980{ 1032{
981#ifdef _WIN32 1033#ifdef _WIN32
982 unsigned long arg = 1; 1034 unsigned long arg = 1;
983 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1013 ev_io_start (EV_A_ &pipeev); 1065 ev_io_start (EV_A_ &pipeev);
1014 ev_unref (EV_A); /* watcher should not keep loop alive */ 1066 ev_unref (EV_A); /* watcher should not keep loop alive */
1015 } 1067 }
1016} 1068}
1017 1069
1018void inline_size 1070inline_size void
1019evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1071evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1020{ 1072{
1021 if (!*flag) 1073 if (!*flag)
1022 { 1074 {
1023 int old_errno = errno; /* save errno because write might clobber it */ 1075 int old_errno = errno; /* save errno because write might clobber it */
… …
1101ev_feed_signal_event (EV_P_ int signum) 1153ev_feed_signal_event (EV_P_ int signum)
1102{ 1154{
1103 WL w; 1155 WL w;
1104 1156
1105#if EV_MULTIPLICITY 1157#if EV_MULTIPLICITY
1106 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));
1107#endif 1159#endif
1108 1160
1109 --signum; 1161 --signum;
1110 1162
1111 if (signum < 0 || signum >= signalmax) 1163 if (signum < 0 || signum >= signalmax)
… …
1127 1179
1128#ifndef WIFCONTINUED 1180#ifndef WIFCONTINUED
1129# define WIFCONTINUED(status) 0 1181# define WIFCONTINUED(status) 0
1130#endif 1182#endif
1131 1183
1132void inline_speed 1184inline_speed void
1133child_reap (EV_P_ int chain, int pid, int status) 1185child_reap (EV_P_ int chain, int pid, int status)
1134{ 1186{
1135 ev_child *w; 1187 ev_child *w;
1136 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1137 1189
… …
1240 /* kqueue is borked on everything but netbsd apparently */ 1292 /* kqueue is borked on everything but netbsd apparently */
1241 /* 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 */
1242 flags &= ~EVBACKEND_KQUEUE; 1294 flags &= ~EVBACKEND_KQUEUE;
1243#endif 1295#endif
1244#ifdef __APPLE__ 1296#ifdef __APPLE__
1245 // flags &= ~EVBACKEND_KQUEUE; for documentation 1297 /* only select works correctly on that "unix-certified" platform */
1246 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 */
1247#endif 1300#endif
1248 1301
1249 return flags; 1302 return flags;
1250} 1303}
1251 1304
… …
1288static void noinline 1341static void noinline
1289loop_init (EV_P_ unsigned int flags) 1342loop_init (EV_P_ unsigned int flags)
1290{ 1343{
1291 if (!backend) 1344 if (!backend)
1292 { 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
1293#if EV_USE_MONOTONIC 1356#if EV_USE_MONOTONIC
1357 if (!have_monotonic)
1294 { 1358 {
1295 struct timespec ts; 1359 struct timespec ts;
1360
1296 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1297 have_monotonic = 1; 1362 have_monotonic = 1;
1298 } 1363 }
1299#endif 1364#endif
1300 1365
1301 ev_rt_now = ev_time (); 1366 ev_rt_now = ev_time ();
1302 mn_now = get_clock (); 1367 mn_now = get_clock ();
1303 now_floor = mn_now; 1368 now_floor = mn_now;
… …
1402 } 1467 }
1403 1468
1404 ev_free (anfds); anfdmax = 0; 1469 ev_free (anfds); anfdmax = 0;
1405 1470
1406 /* 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);
1407 array_free (fdchange, EMPTY); 1473 array_free (fdchange, EMPTY);
1408 array_free (timer, EMPTY); 1474 array_free (timer, EMPTY);
1409#if EV_PERIODIC_ENABLE 1475#if EV_PERIODIC_ENABLE
1410 array_free (periodic, EMPTY); 1476 array_free (periodic, EMPTY);
1411#endif 1477#endif
… …
1420 1486
1421 backend = 0; 1487 backend = 0;
1422} 1488}
1423 1489
1424#if EV_USE_INOTIFY 1490#if EV_USE_INOTIFY
1425void inline_size infy_fork (EV_P); 1491inline_size void infy_fork (EV_P);
1426#endif 1492#endif
1427 1493
1428void inline_size 1494inline_size void
1429loop_fork (EV_P) 1495loop_fork (EV_P)
1430{ 1496{
1431#if EV_USE_PORT 1497#if EV_USE_PORT
1432 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1498 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1433#endif 1499#endif
… …
1504 1570
1505#if EV_VERIFY 1571#if EV_VERIFY
1506static void noinline 1572static void noinline
1507verify_watcher (EV_P_ W w) 1573verify_watcher (EV_P_ W w)
1508{ 1574{
1509 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1575 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1510 1576
1511 if (w->pending) 1577 if (w->pending)
1512 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));
1513} 1579}
1514 1580
1515static void noinline 1581static void noinline
1516verify_heap (EV_P_ ANHE *heap, int N) 1582verify_heap (EV_P_ ANHE *heap, int N)
1517{ 1583{
1518 int i; 1584 int i;
1519 1585
1520 for (i = HEAP0; i < N + HEAP0; ++i) 1586 for (i = HEAP0; i < N + HEAP0; ++i)
1521 { 1587 {
1522 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));
1523 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])));
1524 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]))));
1525 1591
1526 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1592 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1527 } 1593 }
1528} 1594}
1529 1595
1530static void noinline 1596static void noinline
1531array_verify (EV_P_ W *ws, int cnt) 1597array_verify (EV_P_ W *ws, int cnt)
1532{ 1598{
1533 while (cnt--) 1599 while (cnt--)
1534 { 1600 {
1535 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1601 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1536 verify_watcher (EV_A_ ws [cnt]); 1602 verify_watcher (EV_A_ ws [cnt]);
1537 } 1603 }
1538} 1604}
1539#endif 1605#endif
1540 1606
… …
1547 1613
1548 assert (activecnt >= -1); 1614 assert (activecnt >= -1);
1549 1615
1550 assert (fdchangemax >= fdchangecnt); 1616 assert (fdchangemax >= fdchangecnt);
1551 for (i = 0; i < fdchangecnt; ++i) 1617 for (i = 0; i < fdchangecnt; ++i)
1552 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1618 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1553 1619
1554 assert (anfdmax >= 0); 1620 assert (anfdmax >= 0);
1555 for (i = 0; i < anfdmax; ++i) 1621 for (i = 0; i < anfdmax; ++i)
1556 for (w = anfds [i].head; w; w = w->next) 1622 for (w = anfds [i].head; w; w = w->next)
1557 { 1623 {
1558 verify_watcher (EV_A_ (W)w); 1624 verify_watcher (EV_A_ (W)w);
1559 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1625 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1560 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));
1561 } 1627 }
1562 1628
1563 assert (timermax >= timercnt); 1629 assert (timermax >= timercnt);
1564 verify_heap (EV_A_ timers, timercnt); 1630 verify_heap (EV_A_ timers, timercnt);
1565 1631
… …
1670ev_invoke (EV_P_ void *w, int revents) 1736ev_invoke (EV_P_ void *w, int revents)
1671{ 1737{
1672 EV_CB_INVOKE ((W)w, revents); 1738 EV_CB_INVOKE ((W)w, revents);
1673} 1739}
1674 1740
1675void inline_speed 1741inline_speed void
1676call_pending (EV_P) 1742call_pending (EV_P)
1677{ 1743{
1678 int pri; 1744 int pri;
1679 1745
1680 for (pri = NUMPRI; pri--; ) 1746 for (pri = NUMPRI; pri--; )
… …
1682 { 1748 {
1683 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1684 1750
1685 if (expect_true (p->w)) 1751 if (expect_true (p->w))
1686 { 1752 {
1687 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1688 1754
1689 p->w->pending = 0; 1755 p->w->pending = 0;
1690 EV_CB_INVOKE (p->w, p->events); 1756 EV_CB_INVOKE (p->w, p->events);
1691 EV_FREQUENT_CHECK; 1757 EV_FREQUENT_CHECK;
1692 } 1758 }
1693 } 1759 }
1694} 1760}
1695 1761
1696#if EV_IDLE_ENABLE 1762#if EV_IDLE_ENABLE
1697void inline_size 1763inline_size void
1698idle_reify (EV_P) 1764idle_reify (EV_P)
1699{ 1765{
1700 if (expect_false (idleall)) 1766 if (expect_false (idleall))
1701 { 1767 {
1702 int pri; 1768 int pri;
… …
1714 } 1780 }
1715 } 1781 }
1716} 1782}
1717#endif 1783#endif
1718 1784
1719void inline_size 1785inline_size void
1720timers_reify (EV_P) 1786timers_reify (EV_P)
1721{ 1787{
1722 EV_FREQUENT_CHECK; 1788 EV_FREQUENT_CHECK;
1723 1789
1724 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1790 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1725 { 1791 {
1726 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1792 do
1727
1728 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1729
1730 /* first reschedule or stop timer */
1731 if (w->repeat)
1732 { 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 {
1733 ev_at (w) += w->repeat; 1801 ev_at (w) += w->repeat;
1734 if (ev_at (w) < mn_now) 1802 if (ev_at (w) < mn_now)
1735 ev_at (w) = mn_now; 1803 ev_at (w) = mn_now;
1736 1804
1737 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.));
1738 1806
1739 ANHE_at_cache (timers [HEAP0]); 1807 ANHE_at_cache (timers [HEAP0]);
1740 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);
1741 } 1815 }
1742 else 1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1743 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1744 1817
1745 EV_FREQUENT_CHECK;
1746 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1818 feed_reverse_done (EV_A_ EV_TIMEOUT);
1747 } 1819 }
1748} 1820}
1749 1821
1750#if EV_PERIODIC_ENABLE 1822#if EV_PERIODIC_ENABLE
1751void inline_size 1823inline_size void
1752periodics_reify (EV_P) 1824periodics_reify (EV_P)
1753{ 1825{
1754 EV_FREQUENT_CHECK; 1826 EV_FREQUENT_CHECK;
1755 1827
1756 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1828 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1757 { 1829 {
1758 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1830 int feed_count = 0;
1759 1831
1760 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1832 do
1761
1762 /* first reschedule or stop timer */
1763 if (w->reschedule_cb)
1764 { 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 {
1765 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1841 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1766 1842
1767 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));
1768 1844
1769 ANHE_at_cache (periodics [HEAP0]); 1845 ANHE_at_cache (periodics [HEAP0]);
1770 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);
1771 } 1872 }
1772 else if (w->interval) 1873 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1773 {
1774 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1775 /* if next trigger time is not sufficiently in the future, put it there */
1776 /* this might happen because of floating point inexactness */
1777 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1778 {
1779 ev_at (w) += w->interval;
1780 1874
1781 /* if interval is unreasonably low we might still have a time in the past */
1782 /* so correct this. this will make the periodic very inexact, but the user */
1783 /* has effectively asked to get triggered more often than possible */
1784 if (ev_at (w) < ev_rt_now)
1785 ev_at (w) = ev_rt_now;
1786 }
1787
1788 ANHE_at_cache (periodics [HEAP0]);
1789 downheap (periodics, periodiccnt, HEAP0);
1790 }
1791 else
1792 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1793
1794 EV_FREQUENT_CHECK;
1795 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1875 feed_reverse_done (EV_A_ EV_PERIODIC);
1796 } 1876 }
1797} 1877}
1798 1878
1799static void noinline 1879static void noinline
1800periodics_reschedule (EV_P) 1880periodics_reschedule (EV_P)
… …
1816 1896
1817 reheap (periodics, periodiccnt); 1897 reheap (periodics, periodiccnt);
1818} 1898}
1819#endif 1899#endif
1820 1900
1821void 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
1822time_update (EV_P_ ev_tstamp max_block) 1915time_update (EV_P_ ev_tstamp max_block)
1823{ 1916{
1824 int i; 1917 int i;
1825 1918
1826#if EV_USE_MONOTONIC 1919#if EV_USE_MONOTONIC
… …
1859 ev_rt_now = ev_time (); 1952 ev_rt_now = ev_time ();
1860 mn_now = get_clock (); 1953 mn_now = get_clock ();
1861 now_floor = mn_now; 1954 now_floor = mn_now;
1862 } 1955 }
1863 1956
1957 /* no timer adjustment, as the monotonic clock doesn't jump */
1958 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1864# if EV_PERIODIC_ENABLE 1959# if EV_PERIODIC_ENABLE
1865 periodics_reschedule (EV_A); 1960 periodics_reschedule (EV_A);
1866# endif 1961# endif
1867 /* no timer adjustment, as the monotonic clock doesn't jump */
1868 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1869 } 1962 }
1870 else 1963 else
1871#endif 1964#endif
1872 { 1965 {
1873 ev_rt_now = ev_time (); 1966 ev_rt_now = ev_time ();
1874 1967
1875 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))
1876 { 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);
1877#if EV_PERIODIC_ENABLE 1972#if EV_PERIODIC_ENABLE
1878 periodics_reschedule (EV_A); 1973 periodics_reschedule (EV_A);
1879#endif 1974#endif
1880 /* adjust timers. this is easy, as the offset is the same for all of them */
1881 for (i = 0; i < timercnt; ++i)
1882 {
1883 ANHE *he = timers + i + HEAP0;
1884 ANHE_w (*he)->at += ev_rt_now - mn_now;
1885 ANHE_at_cache (*he);
1886 }
1887 } 1975 }
1888 1976
1889 mn_now = ev_rt_now; 1977 mn_now = ev_rt_now;
1890 } 1978 }
1891}
1892
1893void
1894ev_ref (EV_P)
1895{
1896 ++activecnt;
1897}
1898
1899void
1900ev_unref (EV_P)
1901{
1902 --activecnt;
1903}
1904
1905void
1906ev_now_update (EV_P)
1907{
1908 time_update (EV_A_ 1e100);
1909} 1979}
1910 1980
1911static int loop_done; 1981static int loop_done;
1912 1982
1913void 1983void
… …
1947 { 2017 {
1948 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1949 call_pending (EV_A); 2019 call_pending (EV_A);
1950 } 2020 }
1951 2021
1952 if (expect_false (!activecnt))
1953 break;
1954
1955 /* we might have forked, so reify kernel state if necessary */ 2022 /* we might have forked, so reify kernel state if necessary */
1956 if (expect_false (postfork)) 2023 if (expect_false (postfork))
1957 loop_fork (EV_A); 2024 loop_fork (EV_A);
1958 2025
1959 /* update fd-related kernel structures */ 2026 /* update fd-related kernel structures */
… …
1966 2033
1967 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1968 { 2035 {
1969 /* update time to cancel out callback processing overhead */ 2036 /* update time to cancel out callback processing overhead */
1970 time_update (EV_A_ 1e100); 2037 time_update (EV_A_ 1e100);
1971
1972 waittime = MAX_BLOCKTIME;
1973 2038
1974 if (timercnt) 2039 if (timercnt)
1975 { 2040 {
1976 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1977 if (waittime > to) waittime = to; 2042 if (waittime > to) waittime = to;
… …
2038ev_unloop (EV_P_ int how) 2103ev_unloop (EV_P_ int how)
2039{ 2104{
2040 loop_done = how; 2105 loop_done = how;
2041} 2106}
2042 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 printf ("update %f\n", mn_now - mn_prev);//D
2139 timers_reschedule (EV_A_ mn_now - mn_prev);
2140 periodics_reschedule (EV_A);
2141}
2142
2043/*****************************************************************************/ 2143/*****************************************************************************/
2044 2144
2045void inline_size 2145inline_size void
2046wlist_add (WL *head, WL elem) 2146wlist_add (WL *head, WL elem)
2047{ 2147{
2048 elem->next = *head; 2148 elem->next = *head;
2049 *head = elem; 2149 *head = elem;
2050} 2150}
2051 2151
2052void inline_size 2152inline_size void
2053wlist_del (WL *head, WL elem) 2153wlist_del (WL *head, WL elem)
2054{ 2154{
2055 while (*head) 2155 while (*head)
2056 { 2156 {
2057 if (*head == elem) 2157 if (*head == elem)
… …
2062 2162
2063 head = &(*head)->next; 2163 head = &(*head)->next;
2064 } 2164 }
2065} 2165}
2066 2166
2067void inline_speed 2167inline_speed void
2068clear_pending (EV_P_ W w) 2168clear_pending (EV_P_ W w)
2069{ 2169{
2070 if (w->pending) 2170 if (w->pending)
2071 { 2171 {
2072 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2172 pendings [ABSPRI (w)][w->pending - 1].w = 0;
… …
2089 } 2189 }
2090 else 2190 else
2091 return 0; 2191 return 0;
2092} 2192}
2093 2193
2094void inline_size 2194inline_size void
2095pri_adjust (EV_P_ W w) 2195pri_adjust (EV_P_ W w)
2096{ 2196{
2097 int pri = w->priority; 2197 int pri = w->priority;
2098 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2198 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2099 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2199 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2100 w->priority = pri; 2200 w->priority = pri;
2101} 2201}
2102 2202
2103void inline_speed 2203inline_speed void
2104ev_start (EV_P_ W w, int active) 2204ev_start (EV_P_ W w, int active)
2105{ 2205{
2106 pri_adjust (EV_A_ w); 2206 pri_adjust (EV_A_ w);
2107 w->active = active; 2207 w->active = active;
2108 ev_ref (EV_A); 2208 ev_ref (EV_A);
2109} 2209}
2110 2210
2111void inline_size 2211inline_size void
2112ev_stop (EV_P_ W w) 2212ev_stop (EV_P_ W w)
2113{ 2213{
2114 ev_unref (EV_A); 2214 ev_unref (EV_A);
2115 w->active = 0; 2215 w->active = 0;
2116} 2216}
… …
2123 int fd = w->fd; 2223 int fd = w->fd;
2124 2224
2125 if (expect_false (ev_is_active (w))) 2225 if (expect_false (ev_is_active (w)))
2126 return; 2226 return;
2127 2227
2128 assert (("ev_io_start called with negative fd", fd >= 0)); 2228 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2129 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2229 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2130 2230
2131 EV_FREQUENT_CHECK; 2231 EV_FREQUENT_CHECK;
2132 2232
2133 ev_start (EV_A_ (W)w, 1); 2233 ev_start (EV_A_ (W)w, 1);
2134 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2234 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2135 wlist_add (&anfds[fd].head, (WL)w); 2235 wlist_add (&anfds[fd].head, (WL)w);
2136 2236
2137 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2237 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2138 w->events &= ~EV_IOFDSET; 2238 w->events &= ~EV__IOFDSET;
2139 2239
2140 EV_FREQUENT_CHECK; 2240 EV_FREQUENT_CHECK;
2141} 2241}
2142 2242
2143void noinline 2243void noinline
… …
2145{ 2245{
2146 clear_pending (EV_A_ (W)w); 2246 clear_pending (EV_A_ (W)w);
2147 if (expect_false (!ev_is_active (w))) 2247 if (expect_false (!ev_is_active (w)))
2148 return; 2248 return;
2149 2249
2150 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2250 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2151 2251
2152 EV_FREQUENT_CHECK; 2252 EV_FREQUENT_CHECK;
2153 2253
2154 wlist_del (&anfds[w->fd].head, (WL)w); 2254 wlist_del (&anfds[w->fd].head, (WL)w);
2155 ev_stop (EV_A_ (W)w); 2255 ev_stop (EV_A_ (W)w);
… …
2165 if (expect_false (ev_is_active (w))) 2265 if (expect_false (ev_is_active (w)))
2166 return; 2266 return;
2167 2267
2168 ev_at (w) += mn_now; 2268 ev_at (w) += mn_now;
2169 2269
2170 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2270 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2171 2271
2172 EV_FREQUENT_CHECK; 2272 EV_FREQUENT_CHECK;
2173 2273
2174 ++timercnt; 2274 ++timercnt;
2175 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2275 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2178 ANHE_at_cache (timers [ev_active (w)]); 2278 ANHE_at_cache (timers [ev_active (w)]);
2179 upheap (timers, ev_active (w)); 2279 upheap (timers, ev_active (w));
2180 2280
2181 EV_FREQUENT_CHECK; 2281 EV_FREQUENT_CHECK;
2182 2282
2183 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2283 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2184} 2284}
2185 2285
2186void noinline 2286void noinline
2187ev_timer_stop (EV_P_ ev_timer *w) 2287ev_timer_stop (EV_P_ ev_timer *w)
2188{ 2288{
… …
2193 EV_FREQUENT_CHECK; 2293 EV_FREQUENT_CHECK;
2194 2294
2195 { 2295 {
2196 int active = ev_active (w); 2296 int active = ev_active (w);
2197 2297
2198 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2298 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2199 2299
2200 --timercnt; 2300 --timercnt;
2201 2301
2202 if (expect_true (active < timercnt + HEAP0)) 2302 if (expect_true (active < timercnt + HEAP0))
2203 { 2303 {
… …
2247 2347
2248 if (w->reschedule_cb) 2348 if (w->reschedule_cb)
2249 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2349 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2250 else if (w->interval) 2350 else if (w->interval)
2251 { 2351 {
2252 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2352 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2253 /* this formula differs from the one in periodic_reify because we do not always round up */ 2353 /* this formula differs from the one in periodic_reify because we do not always round up */
2254 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2354 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2255 } 2355 }
2256 else 2356 else
2257 ev_at (w) = w->offset; 2357 ev_at (w) = w->offset;
… …
2265 ANHE_at_cache (periodics [ev_active (w)]); 2365 ANHE_at_cache (periodics [ev_active (w)]);
2266 upheap (periodics, ev_active (w)); 2366 upheap (periodics, ev_active (w));
2267 2367
2268 EV_FREQUENT_CHECK; 2368 EV_FREQUENT_CHECK;
2269 2369
2270 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2370 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2271} 2371}
2272 2372
2273void noinline 2373void noinline
2274ev_periodic_stop (EV_P_ ev_periodic *w) 2374ev_periodic_stop (EV_P_ ev_periodic *w)
2275{ 2375{
… …
2280 EV_FREQUENT_CHECK; 2380 EV_FREQUENT_CHECK;
2281 2381
2282 { 2382 {
2283 int active = ev_active (w); 2383 int active = ev_active (w);
2284 2384
2285 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2385 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2286 2386
2287 --periodiccnt; 2387 --periodiccnt;
2288 2388
2289 if (expect_true (active < periodiccnt + HEAP0)) 2389 if (expect_true (active < periodiccnt + HEAP0))
2290 { 2390 {
… …
2313 2413
2314void noinline 2414void noinline
2315ev_signal_start (EV_P_ ev_signal *w) 2415ev_signal_start (EV_P_ ev_signal *w)
2316{ 2416{
2317#if EV_MULTIPLICITY 2417#if EV_MULTIPLICITY
2318 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2418 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2319#endif 2419#endif
2320 if (expect_false (ev_is_active (w))) 2420 if (expect_false (ev_is_active (w)))
2321 return; 2421 return;
2322 2422
2323 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2423 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2324 2424
2325 evpipe_init (EV_A); 2425 evpipe_init (EV_A);
2326 2426
2327 EV_FREQUENT_CHECK; 2427 EV_FREQUENT_CHECK;
2328 2428
… …
2379 2479
2380void 2480void
2381ev_child_start (EV_P_ ev_child *w) 2481ev_child_start (EV_P_ ev_child *w)
2382{ 2482{
2383#if EV_MULTIPLICITY 2483#if EV_MULTIPLICITY
2384 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2484 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2385#endif 2485#endif
2386 if (expect_false (ev_is_active (w))) 2486 if (expect_false (ev_is_active (w)))
2387 return; 2487 return;
2388 2488
2389 EV_FREQUENT_CHECK; 2489 EV_FREQUENT_CHECK;
… …
2414# ifdef _WIN32 2514# ifdef _WIN32
2415# undef lstat 2515# undef lstat
2416# define lstat(a,b) _stati64 (a,b) 2516# define lstat(a,b) _stati64 (a,b)
2417# endif 2517# endif
2418 2518
2419#define DEF_STAT_INTERVAL 5.0074891 2519#define DEF_STAT_INTERVAL 5.0074891
2520#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2420#define MIN_STAT_INTERVAL 0.1074891 2521#define MIN_STAT_INTERVAL 0.1074891
2421 2522
2422static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2523static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2423 2524
2424#if EV_USE_INOTIFY 2525#if EV_USE_INOTIFY
2425# define EV_INOTIFY_BUFSIZE 8192 2526# define EV_INOTIFY_BUFSIZE 8192
… …
2429{ 2530{
2430 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2531 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2431 2532
2432 if (w->wd < 0) 2533 if (w->wd < 0)
2433 { 2534 {
2535 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2434 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2536 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2435 2537
2436 /* monitor some parent directory for speedup hints */ 2538 /* monitor some parent directory for speedup hints */
2437 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2539 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2438 /* but an efficiency issue only */ 2540 /* but an efficiency issue only */
2439 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2541 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2440 { 2542 {
2441 char path [4096]; 2543 char path [4096];
2442 strcpy (path, w->path); 2544 strcpy (path, w->path);
… …
2446 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2548 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2447 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2549 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2448 2550
2449 char *pend = strrchr (path, '/'); 2551 char *pend = strrchr (path, '/');
2450 2552
2451 if (!pend) 2553 if (!pend || pend == path)
2452 break; /* whoops, no '/', complain to your admin */ 2554 break;
2453 2555
2454 *pend = 0; 2556 *pend = 0;
2455 w->wd = inotify_add_watch (fs_fd, path, mask); 2557 w->wd = inotify_add_watch (fs_fd, path, mask);
2456 } 2558 }
2457 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2559 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2458 } 2560 }
2459 } 2561 }
2460 else
2461 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2462 2562
2463 if (w->wd >= 0) 2563 if (w->wd >= 0)
2564 {
2464 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2565 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2566
2567 /* now local changes will be tracked by inotify, but remote changes won't */
2568 /* unless the filesystem it known to be local, we therefore still poll */
2569 /* also do poll on <2.6.25, but with normal frequency */
2570 struct statfs sfs;
2571
2572 if (fs_2625 && !statfs (w->path, &sfs))
2573 if (sfs.f_type == 0x1373 /* devfs */
2574 || sfs.f_type == 0xEF53 /* ext2/3 */
2575 || sfs.f_type == 0x3153464a /* jfs */
2576 || sfs.f_type == 0x52654973 /* reiser3 */
2577 || sfs.f_type == 0x01021994 /* tempfs */
2578 || sfs.f_type == 0x58465342 /* xfs */)
2579 return;
2580
2581 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2582 ev_timer_again (EV_A_ &w->timer);
2583 }
2465} 2584}
2466 2585
2467static void noinline 2586static void noinline
2468infy_del (EV_P_ ev_stat *w) 2587infy_del (EV_P_ ev_stat *w)
2469{ 2588{
… …
2499 2618
2500 if (w->wd == wd || wd == -1) 2619 if (w->wd == wd || wd == -1)
2501 { 2620 {
2502 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2621 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2503 { 2622 {
2623 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2504 w->wd = -1; 2624 w->wd = -1;
2505 infy_add (EV_A_ w); /* re-add, no matter what */ 2625 infy_add (EV_A_ w); /* re-add, no matter what */
2506 } 2626 }
2507 2627
2508 stat_timer_cb (EV_A_ &w->timer, 0); 2628 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2521 2641
2522 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2642 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2523 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2643 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2524} 2644}
2525 2645
2526void inline_size 2646inline_size void
2527infy_init (EV_P) 2647check_2625 (EV_P)
2528{ 2648{
2529 if (fs_fd != -2)
2530 return;
2531
2532 /* kernels < 2.6.25 are borked 2649 /* kernels < 2.6.25 are borked
2533 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2650 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2534 */ 2651 */
2535 {
2536 struct utsname buf; 2652 struct utsname buf;
2537 int major, minor, micro; 2653 int major, minor, micro;
2538 2654
2539 fs_fd = -1;
2540
2541 if (uname (&buf)) 2655 if (uname (&buf))
2542 return; 2656 return;
2543 2657
2544 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2658 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2545 return; 2659 return;
2546 2660
2547 if (major < 2 2661 if (major < 2
2548 || (major == 2 && minor < 6) 2662 || (major == 2 && minor < 6)
2549 || (major == 2 && minor == 6 && micro < 25)) 2663 || (major == 2 && minor == 6 && micro < 25))
2550 return; 2664 return;
2551 } 2665
2666 fs_2625 = 1;
2667}
2668
2669inline_size void
2670infy_init (EV_P)
2671{
2672 if (fs_fd != -2)
2673 return;
2674
2675 fs_fd = -1;
2676
2677 check_2625 (EV_A);
2552 2678
2553 fs_fd = inotify_init (); 2679 fs_fd = inotify_init ();
2554 2680
2555 if (fs_fd >= 0) 2681 if (fs_fd >= 0)
2556 { 2682 {
… …
2558 ev_set_priority (&fs_w, EV_MAXPRI); 2684 ev_set_priority (&fs_w, EV_MAXPRI);
2559 ev_io_start (EV_A_ &fs_w); 2685 ev_io_start (EV_A_ &fs_w);
2560 } 2686 }
2561} 2687}
2562 2688
2563void inline_size 2689inline_size void
2564infy_fork (EV_P) 2690infy_fork (EV_P)
2565{ 2691{
2566 int slot; 2692 int slot;
2567 2693
2568 if (fs_fd < 0) 2694 if (fs_fd < 0)
… …
2584 w->wd = -1; 2710 w->wd = -1;
2585 2711
2586 if (fs_fd >= 0) 2712 if (fs_fd >= 0)
2587 infy_add (EV_A_ w); /* re-add, no matter what */ 2713 infy_add (EV_A_ w); /* re-add, no matter what */
2588 else 2714 else
2589 ev_timer_start (EV_A_ &w->timer); 2715 ev_timer_again (EV_A_ &w->timer);
2590 } 2716 }
2591 } 2717 }
2592} 2718}
2593 2719
2594#endif 2720#endif
… …
2649ev_stat_start (EV_P_ ev_stat *w) 2775ev_stat_start (EV_P_ ev_stat *w)
2650{ 2776{
2651 if (expect_false (ev_is_active (w))) 2777 if (expect_false (ev_is_active (w)))
2652 return; 2778 return;
2653 2779
2654 /* since we use memcmp, we need to clear any padding data etc. */
2655 memset (&w->prev, 0, sizeof (ev_statdata));
2656 memset (&w->attr, 0, sizeof (ev_statdata));
2657
2658 ev_stat_stat (EV_A_ w); 2780 ev_stat_stat (EV_A_ w);
2659 2781
2782 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2660 if (w->interval < MIN_STAT_INTERVAL) 2783 w->interval = MIN_STAT_INTERVAL;
2661 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2662 2784
2663 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2785 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2664 ev_set_priority (&w->timer, ev_priority (w)); 2786 ev_set_priority (&w->timer, ev_priority (w));
2665 2787
2666#if EV_USE_INOTIFY 2788#if EV_USE_INOTIFY
2667 infy_init (EV_A); 2789 infy_init (EV_A);
2668 2790
2669 if (fs_fd >= 0) 2791 if (fs_fd >= 0)
2670 infy_add (EV_A_ w); 2792 infy_add (EV_A_ w);
2671 else 2793 else
2672#endif 2794#endif
2673 ev_timer_start (EV_A_ &w->timer); 2795 ev_timer_again (EV_A_ &w->timer);
2674 2796
2675 ev_start (EV_A_ (W)w, 1); 2797 ev_start (EV_A_ (W)w, 1);
2676 2798
2677 EV_FREQUENT_CHECK; 2799 EV_FREQUENT_CHECK;
2678} 2800}
… …
2853static void 2975static void
2854embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2976embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2855{ 2977{
2856 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2978 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2857 2979
2980 ev_embed_stop (EV_A_ w);
2981
2858 { 2982 {
2859 struct ev_loop *loop = w->other; 2983 struct ev_loop *loop = w->other;
2860 2984
2861 ev_loop_fork (EV_A); 2985 ev_loop_fork (EV_A);
2986 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2862 } 2987 }
2988
2989 ev_embed_start (EV_A_ w);
2863} 2990}
2864 2991
2865#if 0 2992#if 0
2866static void 2993static void
2867embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2994embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2876 if (expect_false (ev_is_active (w))) 3003 if (expect_false (ev_is_active (w)))
2877 return; 3004 return;
2878 3005
2879 { 3006 {
2880 struct ev_loop *loop = w->other; 3007 struct ev_loop *loop = w->other;
2881 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3008 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2882 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3009 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2883 } 3010 }
2884 3011
2885 EV_FREQUENT_CHECK; 3012 EV_FREQUENT_CHECK;
2886 3013
… …
3069 ev_timer_set (&once->to, timeout, 0.); 3196 ev_timer_set (&once->to, timeout, 0.);
3070 ev_timer_start (EV_A_ &once->to); 3197 ev_timer_start (EV_A_ &once->to);
3071 } 3198 }
3072} 3199}
3073 3200
3201/*****************************************************************************/
3202
3203#if 0
3204void
3205ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3206{
3207 int i, j;
3208 ev_watcher_list *wl, *wn;
3209
3210 if (types & (EV_IO | EV_EMBED))
3211 for (i = 0; i < anfdmax; ++i)
3212 for (wl = anfds [i].head; wl; )
3213 {
3214 wn = wl->next;
3215
3216#if EV_EMBED_ENABLE
3217 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3218 {
3219 if (types & EV_EMBED)
3220 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3221 }
3222 else
3223#endif
3224#if EV_USE_INOTIFY
3225 if (ev_cb ((ev_io *)wl) == infy_cb)
3226 ;
3227 else
3228#endif
3229 if ((ev_io *)wl != &pipeev)
3230 if (types & EV_IO)
3231 cb (EV_A_ EV_IO, wl);
3232
3233 wl = wn;
3234 }
3235
3236 if (types & (EV_TIMER | EV_STAT))
3237 for (i = timercnt + HEAP0; i-- > HEAP0; )
3238#if EV_STAT_ENABLE
3239 /*TODO: timer is not always active*/
3240 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3241 {
3242 if (types & EV_STAT)
3243 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3244 }
3245 else
3246#endif
3247 if (types & EV_TIMER)
3248 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3249
3250#if EV_PERIODIC_ENABLE
3251 if (types & EV_PERIODIC)
3252 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3253 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3254#endif
3255
3256#if EV_IDLE_ENABLE
3257 if (types & EV_IDLE)
3258 for (j = NUMPRI; i--; )
3259 for (i = idlecnt [j]; i--; )
3260 cb (EV_A_ EV_IDLE, idles [j][i]);
3261#endif
3262
3263#if EV_FORK_ENABLE
3264 if (types & EV_FORK)
3265 for (i = forkcnt; i--; )
3266 if (ev_cb (forks [i]) != embed_fork_cb)
3267 cb (EV_A_ EV_FORK, forks [i]);
3268#endif
3269
3270#if EV_ASYNC_ENABLE
3271 if (types & EV_ASYNC)
3272 for (i = asynccnt; i--; )
3273 cb (EV_A_ EV_ASYNC, asyncs [i]);
3274#endif
3275
3276 if (types & EV_PREPARE)
3277 for (i = preparecnt; i--; )
3278#if EV_EMBED_ENABLE
3279 if (ev_cb (prepares [i]) != embed_prepare_cb)
3280#endif
3281 cb (EV_A_ EV_PREPARE, prepares [i]);
3282
3283 if (types & EV_CHECK)
3284 for (i = checkcnt; i--; )
3285 cb (EV_A_ EV_CHECK, checks [i]);
3286
3287 if (types & EV_SIGNAL)
3288 for (i = 0; i < signalmax; ++i)
3289 for (wl = signals [i].head; wl; )
3290 {
3291 wn = wl->next;
3292 cb (EV_A_ EV_SIGNAL, wl);
3293 wl = wn;
3294 }
3295
3296 if (types & EV_CHILD)
3297 for (i = EV_PID_HASHSIZE; i--; )
3298 for (wl = childs [i]; wl; )
3299 {
3300 wn = wl->next;
3301 cb (EV_A_ EV_CHILD, wl);
3302 wl = wn;
3303 }
3304/* EV_STAT 0x00001000 /* stat data changed */
3305/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3306}
3307#endif
3308
3074#if EV_MULTIPLICITY 3309#if EV_MULTIPLICITY
3075 #include "ev_wrap.h" 3310 #include "ev_wrap.h"
3076#endif 3311#endif
3077 3312
3078#ifdef __cplusplus 3313#ifdef __cplusplus

Diff Legend

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