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

Comparing libev/ev.c (file contents):
Revision 1.123 by root, Sat Nov 17 02:23:54 2007 UTC vs.
Revision 1.132 by root, Fri Nov 23 10:36:30 2007 UTC

… …
41# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif 42# endif
43# ifndef EV_USE_REALTIME 43# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif 45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
46# endif 53# endif
47 54
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 55# ifndef EV_USE_SELECT
56# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
50# endif 61# endif
51 62
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 63# ifndef EV_USE_POLL
64# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
54# endif 69# endif
55 70
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 71# ifndef EV_USE_EPOLL
72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
58# endif 77# endif
59 78
79# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
62# endif 85# endif
63 86
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
65# define EV_USE_PORT 1 89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
66# endif 93# endif
67 94
68#endif 95#endif
69 96
70#include <math.h> 97#include <math.h>
… …
126#ifndef EV_USE_PORT 153#ifndef EV_USE_PORT
127# define EV_USE_PORT 0 154# define EV_USE_PORT 0
128#endif 155#endif
129 156
130/**/ 157/**/
131
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
137 158
138#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
139# undef EV_USE_MONOTONIC 160# undef EV_USE_MONOTONIC
140# define EV_USE_MONOTONIC 0 161# define EV_USE_MONOTONIC 0
141#endif 162#endif
… …
437 } 458 }
438#endif 459#endif
439 460
440 anfd->reify = 0; 461 anfd->reify = 0;
441 462
442 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
443 anfd->events = events; 464 anfd->events = events;
444 } 465 }
445 466
446 fdchangecnt = 0; 467 fdchangecnt = 0;
447} 468}
… …
505 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
506 return; 527 return;
507 } 528 }
508} 529}
509 530
510/* usually called after fork if method needs to re-arm all fds from scratch */ 531/* usually called after fork if backend needs to re-arm all fds from scratch */
511static void 532static void
512fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
513{ 534{
514 int fd; 535 int fd;
515 536
… …
706 int pid, status; 727 int pid, status;
707 728
708 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
709 { 730 {
710 /* make sure we are called again until all childs have been reaped */ 731 /* make sure we are called again until all childs have been reaped */
732 /* we need to do it this way so that the callback gets called before we continue */
711 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 733 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
712 734
713 child_reap (EV_A_ sw, pid, pid, status); 735 child_reap (EV_A_ sw, pid, pid, status);
714 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 736 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
715 } 737 }
716} 738}
717 739
718#endif 740#endif
719 741
… …
758 || getgid () != getegid (); 780 || getgid () != getegid ();
759#endif 781#endif
760} 782}
761 783
762unsigned int 784unsigned int
763ev_method (EV_P) 785ev_supported_backends (void)
764{ 786{
765 return method; 787 unsigned int flags = 0;
788
789 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
790 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
791 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
792 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
793 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
794
795 return flags;
796}
797
798unsigned int
799ev_recommended_backends (void)
800{
801 unsigned int flags = ev_supported_backends ();
802
803#ifndef __NetBSD__
804 /* kqueue is borked on everything but netbsd apparently */
805 /* it usually doesn't work correctly on anything but sockets and pipes */
806 flags &= ~EVBACKEND_KQUEUE;
807#endif
808#ifdef __APPLE__
809 // flags &= ~EVBACKEND_KQUEUE; for documentation
810 flags &= ~EVBACKEND_POLL;
811#endif
812
813 return flags;
814}
815
816unsigned int
817ev_backend (EV_P)
818{
819 return backend;
766} 820}
767 821
768static void 822static void
769loop_init (EV_P_ unsigned int flags) 823loop_init (EV_P_ unsigned int flags)
770{ 824{
771 if (!method) 825 if (!backend)
772 { 826 {
773#if EV_USE_MONOTONIC 827#if EV_USE_MONOTONIC
774 { 828 {
775 struct timespec ts; 829 struct timespec ts;
776 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 830 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
781 ev_rt_now = ev_time (); 835 ev_rt_now = ev_time ();
782 mn_now = get_clock (); 836 mn_now = get_clock ();
783 now_floor = mn_now; 837 now_floor = mn_now;
784 rtmn_diff = ev_rt_now - mn_now; 838 rtmn_diff = ev_rt_now - mn_now;
785 839
786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 840 if (!(flags & EVFLAG_NOENV)
841 && !enable_secure ()
842 && getenv ("LIBEV_FLAGS"))
787 flags = atoi (getenv ("LIBEV_FLAGS")); 843 flags = atoi (getenv ("LIBEV_FLAGS"));
788 844
789 if (!(flags & 0x0000ffff)) 845 if (!(flags & 0x0000ffffUL))
790 flags |= 0x0000ffff; 846 flags |= ev_recommended_backends ();
791 847
792 method = 0; 848 backend = 0;
793#if EV_USE_PORT 849#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 850 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
795#endif 851#endif
796#if EV_USE_KQUEUE 852#if EV_USE_KQUEUE
797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 853 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
798#endif 854#endif
799#if EV_USE_EPOLL 855#if EV_USE_EPOLL
800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 856 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
801#endif 857#endif
802#if EV_USE_POLL 858#if EV_USE_POLL
803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 859 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
804#endif 860#endif
805#if EV_USE_SELECT 861#if EV_USE_SELECT
806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 862 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
807#endif 863#endif
808 864
809 ev_init (&sigev, sigcb); 865 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI); 866 ev_set_priority (&sigev, EV_MAXPRI);
811 } 867 }
812} 868}
813 869
814void 870static void
815loop_destroy (EV_P) 871loop_destroy (EV_P)
816{ 872{
817 int i; 873 int i;
818 874
819#if EV_USE_PORT 875#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 876 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
821#endif 877#endif
822#if EV_USE_KQUEUE 878#if EV_USE_KQUEUE
823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 879 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
824#endif 880#endif
825#if EV_USE_EPOLL 881#if EV_USE_EPOLL
826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 882 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
827#endif 883#endif
828#if EV_USE_POLL 884#if EV_USE_POLL
829 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 885 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
830#endif 886#endif
831#if EV_USE_SELECT 887#if EV_USE_SELECT
832 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 888 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
833#endif 889#endif
834 890
835 for (i = NUMPRI; i--; ) 891 for (i = NUMPRI; i--; )
836 array_free (pending, [i]); 892 array_free (pending, [i]);
837 893
… …
843#endif 899#endif
844 array_free (idle, EMPTY0); 900 array_free (idle, EMPTY0);
845 array_free (prepare, EMPTY0); 901 array_free (prepare, EMPTY0);
846 array_free (check, EMPTY0); 902 array_free (check, EMPTY0);
847 903
848 method = 0; 904 backend = 0;
849} 905}
850 906
851static void 907static void
852loop_fork (EV_P) 908loop_fork (EV_P)
853{ 909{
854#if EV_USE_PORT 910#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A); 911 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
856#endif 912#endif
857#if EV_USE_KQUEUE 913#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 914 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
859#endif 915#endif
860#if EV_USE_EPOLL 916#if EV_USE_EPOLL
861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 917 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
862#endif 918#endif
863 919
864 if (ev_is_active (&sigev)) 920 if (ev_is_active (&sigev))
865 { 921 {
866 /* default loop */ 922 /* default loop */
… …
887 943
888 memset (loop, 0, sizeof (struct ev_loop)); 944 memset (loop, 0, sizeof (struct ev_loop));
889 945
890 loop_init (EV_A_ flags); 946 loop_init (EV_A_ flags);
891 947
892 if (ev_method (EV_A)) 948 if (ev_backend (EV_A))
893 return loop; 949 return loop;
894 950
895 return 0; 951 return 0;
896} 952}
897 953
… …
910 966
911#endif 967#endif
912 968
913#if EV_MULTIPLICITY 969#if EV_MULTIPLICITY
914struct ev_loop * 970struct ev_loop *
915ev_default_loop_ (unsigned int flags) 971ev_default_loop_init (unsigned int flags)
916#else 972#else
917int 973int
918ev_default_loop (unsigned int flags) 974ev_default_loop (unsigned int flags)
919#endif 975#endif
920{ 976{
… …
930 ev_default_loop_ptr = 1; 986 ev_default_loop_ptr = 1;
931#endif 987#endif
932 988
933 loop_init (EV_A_ flags); 989 loop_init (EV_A_ flags);
934 990
935 if (ev_method (EV_A)) 991 if (ev_backend (EV_A))
936 { 992 {
937 siginit (EV_A); 993 siginit (EV_A);
938 994
939#ifndef _WIN32 995#ifndef _WIN32
940 ev_signal_init (&childev, childcb, SIGCHLD); 996 ev_signal_init (&childev, childcb, SIGCHLD);
… …
976{ 1032{
977#if EV_MULTIPLICITY 1033#if EV_MULTIPLICITY
978 struct ev_loop *loop = ev_default_loop_ptr; 1034 struct ev_loop *loop = ev_default_loop_ptr;
979#endif 1035#endif
980 1036
981 if (method) 1037 if (backend)
982 postfork = 1; 1038 postfork = 1;
983} 1039}
984 1040
985/*****************************************************************************/ 1041/*****************************************************************************/
986 1042
… …
1218 { 1274 {
1219 block = MAX_BLOCKTIME; 1275 block = MAX_BLOCKTIME;
1220 1276
1221 if (timercnt) 1277 if (timercnt)
1222 { 1278 {
1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1279 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1224 if (block > to) block = to; 1280 if (block > to) block = to;
1225 } 1281 }
1226 1282
1227#if EV_PERIODICS 1283#if EV_PERIODICS
1228 if (periodiccnt) 1284 if (periodiccnt)
1229 { 1285 {
1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1286 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1231 if (block > to) block = to; 1287 if (block > to) block = to;
1232 } 1288 }
1233#endif 1289#endif
1234 1290
1235 if (expect_false (block < 0.)) block = 0.; 1291 if (expect_false (block < 0.)) block = 0.;
1236 } 1292 }
1237 1293
1238 method_poll (EV_A_ block); 1294 backend_poll (EV_A_ block);
1239 1295
1240 /* update ev_rt_now, do magic */ 1296 /* update ev_rt_now, do magic */
1241 time_update (EV_A); 1297 time_update (EV_A);
1242 1298
1243 /* queue pending timers and reschedule them */ 1299 /* queue pending timers and reschedule them */

Diff Legend

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