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

Comparing libev/ev.c (file contents):
Revision 1.125 by root, Sat Nov 17 02:28:43 2007 UTC vs.
Revision 1.133 by root, Fri Nov 23 11:32:22 2007 UTC

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

Diff Legend

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