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

Comparing libev/ev.c (file contents):
Revision 1.128 by root, Thu Nov 22 12:28:27 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
… …
154# define EV_USE_PORT 0 158# define EV_USE_PORT 0
155#endif 159#endif
156 160
157/**/ 161/**/
158 162
159/* darwin simply cannot be helped */
160#ifdef __APPLE__
161# undef EV_USE_POLL
162# undef EV_USE_KQUEUE
163#endif
164
165#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
166# undef EV_USE_MONOTONIC 164# undef EV_USE_MONOTONIC
167# define EV_USE_MONOTONIC 0 165# define EV_USE_MONOTONIC 0
168#endif 166#endif
169 167
… …
464 } 462 }
465#endif 463#endif
466 464
467 anfd->reify = 0; 465 anfd->reify = 0;
468 466
469 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
470 anfd->events = events; 468 anfd->events = events;
471 } 469 }
472 470
473 fdchangecnt = 0; 471 fdchangecnt = 0;
474} 472}
… …
532 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
533 return; 531 return;
534 } 532 }
535} 533}
536 534
537/* 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 */
538static void 536static void
539fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
540{ 538{
541 int fd; 539 int fd;
542 540
… …
733 int pid, status; 731 int pid, status;
734 732
735 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
736 { 734 {
737 /* 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 */
738 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
739 738
740 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
741 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 */
742 } 741 }
743} 742}
744 743
745#endif 744#endif
746 745
… …
785 || getgid () != getegid (); 784 || getgid () != getegid ();
786#endif 785#endif
787} 786}
788 787
789unsigned int 788unsigned int
790ev_method (EV_P) 789ev_supported_backends (void)
791{ 790{
792 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;
793} 824}
794 825
795static void 826static void
796loop_init (EV_P_ unsigned int flags) 827loop_init (EV_P_ unsigned int flags)
797{ 828{
798 if (!method) 829 if (!backend)
799 { 830 {
800#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
801 { 832 {
802 struct timespec ts; 833 struct timespec ts;
803 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
813 if (!(flags & EVFLAG_NOENV) 844 if (!(flags & EVFLAG_NOENV)
814 && !enable_secure () 845 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS")) 846 && getenv ("LIBEV_FLAGS"))
816 flags = atoi (getenv ("LIBEV_FLAGS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
817 848
818 if (!(flags & EVMETHOD_ALL)) 849 if (!(flags & 0x0000ffffUL))
819 { 850 flags |= ev_recommended_backends ();
820 flags |= EVMETHOD_ALL;
821#if EV_USE_KQUEUE && !defined (__NetBSD__)
822 /* kqueue is borked on everything but netbsd apparently */
823 /* it usually doesn't work correctly on anything but sockets and pipes */
824 flags &= ~EVMETHOD_KQUEUE;
825#endif
826 }
827 851
828 method = 0; 852 backend = 0;
829#if EV_USE_PORT 853#if EV_USE_PORT
830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 854 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
831#endif 855#endif
832#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
833 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
834#endif 858#endif
835#if EV_USE_EPOLL 859#if EV_USE_EPOLL
836 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
837#endif 861#endif
838#if EV_USE_POLL 862#if EV_USE_POLL
839 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
840#endif 864#endif
841#if EV_USE_SELECT 865#if EV_USE_SELECT
842 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
843#endif 867#endif
844 868
845 ev_init (&sigev, sigcb); 869 ev_init (&sigev, sigcb);
846 ev_set_priority (&sigev, EV_MAXPRI); 870 ev_set_priority (&sigev, EV_MAXPRI);
847 } 871 }
… …
851loop_destroy (EV_P) 875loop_destroy (EV_P)
852{ 876{
853 int i; 877 int i;
854 878
855#if EV_USE_PORT 879#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
857#endif 881#endif
858#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
859 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
860#endif 884#endif
861#if EV_USE_EPOLL 885#if EV_USE_EPOLL
862 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
863#endif 887#endif
864#if EV_USE_POLL 888#if EV_USE_POLL
865 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
866#endif 890#endif
867#if EV_USE_SELECT 891#if EV_USE_SELECT
868 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
869#endif 893#endif
870 894
871 for (i = NUMPRI; i--; ) 895 for (i = NUMPRI; i--; )
872 array_free (pending, [i]); 896 array_free (pending, [i]);
873 897
… …
879#endif 903#endif
880 array_free (idle, EMPTY0); 904 array_free (idle, EMPTY0);
881 array_free (prepare, EMPTY0); 905 array_free (prepare, EMPTY0);
882 array_free (check, EMPTY0); 906 array_free (check, EMPTY0);
883 907
884 method = 0; 908 backend = 0;
885} 909}
886 910
887static void 911static void
888loop_fork (EV_P) 912loop_fork (EV_P)
889{ 913{
890#if EV_USE_PORT 914#if EV_USE_PORT
891 if (method == EVMETHOD_PORT ) port_fork (EV_A); 915 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
892#endif 916#endif
893#if EV_USE_KQUEUE 917#if EV_USE_KQUEUE
894 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 918 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
895#endif 919#endif
896#if EV_USE_EPOLL 920#if EV_USE_EPOLL
897 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 921 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
898#endif 922#endif
899 923
900 if (ev_is_active (&sigev)) 924 if (ev_is_active (&sigev))
901 { 925 {
902 /* default loop */ 926 /* default loop */
… …
923 947
924 memset (loop, 0, sizeof (struct ev_loop)); 948 memset (loop, 0, sizeof (struct ev_loop));
925 949
926 loop_init (EV_A_ flags); 950 loop_init (EV_A_ flags);
927 951
928 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
929 return loop; 953 return loop;
930 954
931 return 0; 955 return 0;
932} 956}
933 957
… …
966 ev_default_loop_ptr = 1; 990 ev_default_loop_ptr = 1;
967#endif 991#endif
968 992
969 loop_init (EV_A_ flags); 993 loop_init (EV_A_ flags);
970 994
971 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
972 { 996 {
973 siginit (EV_A); 997 siginit (EV_A);
974 998
975#ifndef _WIN32 999#ifndef _WIN32
976 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
… …
1012{ 1036{
1013#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
1014 struct ev_loop *loop = ev_default_loop_ptr; 1038 struct ev_loop *loop = ev_default_loop_ptr;
1015#endif 1039#endif
1016 1040
1017 if (method) 1041 if (backend)
1018 postfork = 1; 1042 postfork = 1;
1019} 1043}
1020 1044
1021/*****************************************************************************/ 1045/*****************************************************************************/
1022 1046
… …
1254 { 1278 {
1255 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
1256 1280
1257 if (timercnt) 1281 if (timercnt)
1258 { 1282 {
1259 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1260 if (block > to) block = to; 1284 if (block > to) block = to;
1261 } 1285 }
1262 1286
1263#if EV_PERIODICS 1287#if EV_PERIODICS
1264 if (periodiccnt) 1288 if (periodiccnt)
1265 { 1289 {
1266 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;
1267 if (block > to) block = to; 1291 if (block > to) block = to;
1268 } 1292 }
1269#endif 1293#endif
1270 1294
1271 if (expect_false (block < 0.)) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1272 } 1296 }
1273 1297
1274 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1275 1299
1276 /* update ev_rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1277 time_update (EV_A); 1301 time_update (EV_A);
1278 1302
1279 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */

Diff Legend

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