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

Comparing libev/ev.c (file contents):
Revision 1.126 by root, Sun Nov 18 01:25:23 2007 UTC vs.
Revision 1.130 by root, Fri Nov 23 05:13:48 2007 UTC

… …
50# ifndef EV_USE_REALTIME 50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0 51# define EV_USE_REALTIME 0
52# endif 52# endif
53# endif 53# endif
54 54
55# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 55# ifndef EV_USE_SELECT
56# if HAVE_SELECT && HAVE_SYS_SELECT_H
56# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
57# else 58# else
58# define EV_USE_SELECT 0 59# define EV_USE_SELECT 0
60# endif
59# endif 61# endif
60 62
61# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 63# ifndef EV_USE_POLL
64# if HAVE_POLL && HAVE_POLL_H
62# define EV_USE_POLL 1 65# define EV_USE_POLL 1
63# else 66# else
64# define EV_USE_POLL 0 67# define EV_USE_POLL 0
68# endif
65# endif 69# endif
66 70
67# 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
68# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
69# else 74# else
70# define EV_USE_EPOLL 0 75# define EV_USE_EPOLL 0
76# endif
71# endif 77# endif
72 78
79# ifndef EV_USE_KQUEUE
73# 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
74# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
75# else 82# else
76# define EV_USE_KQUEUE 0 83# define EV_USE_KQUEUE 0
84# endif
77# endif 85# endif
78 86
79# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
80# define EV_USE_PORT 1 89# define EV_USE_PORT 1
81# else 90# else
82# define EV_USE_PORT 0 91# define EV_USE_PORT 0
92# endif
83# endif 93# endif
84 94
85#endif 95#endif
86 96
87#include <math.h> 97#include <math.h>
… …
143#ifndef EV_USE_PORT 153#ifndef EV_USE_PORT
144# define EV_USE_PORT 0 154# define EV_USE_PORT 0
145#endif 155#endif
146 156
147/**/ 157/**/
148
149/* darwin simply cannot be helped */
150#ifdef __APPLE__
151# undef EV_USE_POLL
152# undef EV_USE_KQUEUE
153#endif
154 158
155#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
156# undef EV_USE_MONOTONIC 160# undef EV_USE_MONOTONIC
157# define EV_USE_MONOTONIC 0 161# define EV_USE_MONOTONIC 0
158#endif 162#endif
… …
454 } 458 }
455#endif 459#endif
456 460
457 anfd->reify = 0; 461 anfd->reify = 0;
458 462
459 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
460 anfd->events = events; 464 anfd->events = events;
461 } 465 }
462 466
463 fdchangecnt = 0; 467 fdchangecnt = 0;
464} 468}
… …
522 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
523 return; 527 return;
524 } 528 }
525} 529}
526 530
527/* 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 */
528static void 532static void
529fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
530{ 534{
531 int fd; 535 int fd;
532 536
… …
775 || getgid () != getegid (); 779 || getgid () != getegid ();
776#endif 780#endif
777} 781}
778 782
779unsigned int 783unsigned int
780ev_method (EV_P) 784ev_supported_backends (void)
781{ 785{
782 return method; 786 unsigned int flags = 0;
787
788 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
789 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
790 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
791 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
792 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
793
794 return flags;
795}
796
797unsigned int
798ev_recommended_backends (void)
799{
800 unsigned int flags = ev_recommended_backends ();
801
802#ifndef __NetBSD__
803 /* kqueue is borked on everything but netbsd apparently */
804 /* it usually doesn't work correctly on anything but sockets and pipes */
805 flags &= ~EVBACKEND_KQUEUE;
806#endif
807#ifdef __APPLE__
808 // flags &= ~EVBACKEND_KQUEUE; for documentation
809 flags &= ~EVBACKEND_POLL;
810#endif
811
812 return flags;
813}
814
815unsigned int
816ev_backend (EV_P)
817{
818 return backend;
783} 819}
784 820
785static void 821static void
786loop_init (EV_P_ unsigned int flags) 822loop_init (EV_P_ unsigned int flags)
787{ 823{
788 if (!method) 824 if (!backend)
789 { 825 {
790#if EV_USE_MONOTONIC 826#if EV_USE_MONOTONIC
791 { 827 {
792 struct timespec ts; 828 struct timespec ts;
793 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 829 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
798 ev_rt_now = ev_time (); 834 ev_rt_now = ev_time ();
799 mn_now = get_clock (); 835 mn_now = get_clock ();
800 now_floor = mn_now; 836 now_floor = mn_now;
801 rtmn_diff = ev_rt_now - mn_now; 837 rtmn_diff = ev_rt_now - mn_now;
802 838
803 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 839 if (!(flags & EVFLAG_NOENV)
840 && !enable_secure ()
841 && getenv ("LIBEV_FLAGS"))
804 flags = atoi (getenv ("LIBEV_FLAGS")); 842 flags = atoi (getenv ("LIBEV_FLAGS"));
805 843
806 if (!(flags & 0x0000ffff)) 844 if (!(flags & 0x0000ffffUL))
807 flags |= 0x0000ffff; 845 flags |= ev_recommended_backends ();
808 846
809 method = 0; 847 backend = 0;
810#if EV_USE_PORT 848#if EV_USE_PORT
811 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 849 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
812#endif 850#endif
813#if EV_USE_KQUEUE 851#if EV_USE_KQUEUE
814 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 852 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
815#endif 853#endif
816#if EV_USE_EPOLL 854#if EV_USE_EPOLL
817 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 855 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
818#endif 856#endif
819#if EV_USE_POLL 857#if EV_USE_POLL
820 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 858 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
821#endif 859#endif
822#if EV_USE_SELECT 860#if EV_USE_SELECT
823 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 861 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
824#endif 862#endif
825 863
826 ev_init (&sigev, sigcb); 864 ev_init (&sigev, sigcb);
827 ev_set_priority (&sigev, EV_MAXPRI); 865 ev_set_priority (&sigev, EV_MAXPRI);
828 } 866 }
… …
832loop_destroy (EV_P) 870loop_destroy (EV_P)
833{ 871{
834 int i; 872 int i;
835 873
836#if EV_USE_PORT 874#if EV_USE_PORT
837 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 875 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
838#endif 876#endif
839#if EV_USE_KQUEUE 877#if EV_USE_KQUEUE
840 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 878 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
841#endif 879#endif
842#if EV_USE_EPOLL 880#if EV_USE_EPOLL
843 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 881 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
844#endif 882#endif
845#if EV_USE_POLL 883#if EV_USE_POLL
846 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 884 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
847#endif 885#endif
848#if EV_USE_SELECT 886#if EV_USE_SELECT
849 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 887 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
850#endif 888#endif
851 889
852 for (i = NUMPRI; i--; ) 890 for (i = NUMPRI; i--; )
853 array_free (pending, [i]); 891 array_free (pending, [i]);
854 892
… …
860#endif 898#endif
861 array_free (idle, EMPTY0); 899 array_free (idle, EMPTY0);
862 array_free (prepare, EMPTY0); 900 array_free (prepare, EMPTY0);
863 array_free (check, EMPTY0); 901 array_free (check, EMPTY0);
864 902
865 method = 0; 903 backend = 0;
866} 904}
867 905
868static void 906static void
869loop_fork (EV_P) 907loop_fork (EV_P)
870{ 908{
871#if EV_USE_PORT 909#if EV_USE_PORT
872 if (method == EVMETHOD_PORT ) port_fork (EV_A); 910 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
873#endif 911#endif
874#if EV_USE_KQUEUE 912#if EV_USE_KQUEUE
875 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 913 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
876#endif 914#endif
877#if EV_USE_EPOLL 915#if EV_USE_EPOLL
878 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 916 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
879#endif 917#endif
880 918
881 if (ev_is_active (&sigev)) 919 if (ev_is_active (&sigev))
882 { 920 {
883 /* default loop */ 921 /* default loop */
… …
904 942
905 memset (loop, 0, sizeof (struct ev_loop)); 943 memset (loop, 0, sizeof (struct ev_loop));
906 944
907 loop_init (EV_A_ flags); 945 loop_init (EV_A_ flags);
908 946
909 if (ev_method (EV_A)) 947 if (ev_backend (EV_A))
910 return loop; 948 return loop;
911 949
912 return 0; 950 return 0;
913} 951}
914 952
… …
947 ev_default_loop_ptr = 1; 985 ev_default_loop_ptr = 1;
948#endif 986#endif
949 987
950 loop_init (EV_A_ flags); 988 loop_init (EV_A_ flags);
951 989
952 if (ev_method (EV_A)) 990 if (ev_backend (EV_A))
953 { 991 {
954 siginit (EV_A); 992 siginit (EV_A);
955 993
956#ifndef _WIN32 994#ifndef _WIN32
957 ev_signal_init (&childev, childcb, SIGCHLD); 995 ev_signal_init (&childev, childcb, SIGCHLD);
… …
993{ 1031{
994#if EV_MULTIPLICITY 1032#if EV_MULTIPLICITY
995 struct ev_loop *loop = ev_default_loop_ptr; 1033 struct ev_loop *loop = ev_default_loop_ptr;
996#endif 1034#endif
997 1035
998 if (method) 1036 if (backend)
999 postfork = 1; 1037 postfork = 1;
1000} 1038}
1001 1039
1002/*****************************************************************************/ 1040/*****************************************************************************/
1003 1041
… …
1235 { 1273 {
1236 block = MAX_BLOCKTIME; 1274 block = MAX_BLOCKTIME;
1237 1275
1238 if (timercnt) 1276 if (timercnt)
1239 { 1277 {
1240 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1278 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1241 if (block > to) block = to; 1279 if (block > to) block = to;
1242 } 1280 }
1243 1281
1244#if EV_PERIODICS 1282#if EV_PERIODICS
1245 if (periodiccnt) 1283 if (periodiccnt)
1246 { 1284 {
1247 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1285 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1248 if (block > to) block = to; 1286 if (block > to) block = to;
1249 } 1287 }
1250#endif 1288#endif
1251 1289
1252 if (expect_false (block < 0.)) block = 0.; 1290 if (expect_false (block < 0.)) block = 0.;
1253 } 1291 }
1254 1292
1255 method_poll (EV_A_ block); 1293 backend_poll (EV_A_ block);
1256 1294
1257 /* update ev_rt_now, do magic */ 1295 /* update ev_rt_now, do magic */
1258 time_update (EV_A); 1296 time_update (EV_A);
1259 1297
1260 /* queue pending timers and reschedule them */ 1298 /* queue pending timers and reschedule them */

Diff Legend

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