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

Comparing libev/ev.c (file contents):
Revision 1.129 by root, Fri Nov 23 05:00:44 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
… …
458 } 462 }
459#endif 463#endif
460 464
461 anfd->reify = 0; 465 anfd->reify = 0;
462 466
463 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
464 anfd->events = events; 468 anfd->events = events;
465 } 469 }
466 470
467 fdchangecnt = 0; 471 fdchangecnt = 0;
468} 472}
… …
526 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
527 return; 531 return;
528 } 532 }
529} 533}
530 534
531/* 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 */
532static void 536static void
533fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
534{ 538{
535 int fd; 539 int fd;
536 540
… …
727 int pid, status; 731 int pid, status;
728 732
729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
730 { 734 {
731 /* 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 */
732 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
733 738
734 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
735 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 */
736 } 741 }
737} 742}
738 743
739#endif 744#endif
740 745
… …
781} 786}
782 787
783unsigned int 788unsigned int
784ev_supported_backends (void) 789ev_supported_backends (void)
785{ 790{
786}
787
788unsigned int
789ev_recommended_backends (void)
790{
791 unsigned int flags; 791 unsigned int flags = 0;
792 792
793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; 794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL; 795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL; 796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
… …
798 798
799 return flags; 799 return flags;
800} 800}
801 801
802unsigned int 802unsigned int
803ev_backend (EV_P) 803ev_recommended_backends (void)
804{ 804{
805 unsigned int flags = ev_recommended_backends (); 805 unsigned int flags = ev_supported_backends ();
806 806
807#ifndef __NetBSD__ 807#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */ 808 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */ 809 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE; 810 flags &= ~EVBACKEND_KQUEUE;
… …
815#endif 815#endif
816 816
817 return flags; 817 return flags;
818} 818}
819 819
820unsigned int
821ev_backend (EV_P)
822{
823 return backend;
824}
825
820static void 826static void
821loop_init (EV_P_ unsigned int flags) 827loop_init (EV_P_ unsigned int flags)
822{ 828{
823 if (!method) 829 if (!backend)
824 { 830 {
825#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
826 { 832 {
827 struct timespec ts; 833 struct timespec ts;
828 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
841 flags = atoi (getenv ("LIBEV_FLAGS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
842 848
843 if (!(flags & 0x0000ffffUL)) 849 if (!(flags & 0x0000ffffUL))
844 flags |= ev_recommended_backends (); 850 flags |= ev_recommended_backends ();
845 851
846 method = 0; 852 backend = 0;
847#if EV_USE_PORT 853#if EV_USE_PORT
848 if (!method && (flags & EVBACKEND_PORT )) method = port_init (EV_A_ flags); 854 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
849#endif 855#endif
850#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
851 if (!method && (flags & EVBACKEND_KQUEUE)) method = kqueue_init (EV_A_ flags); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
852#endif 858#endif
853#if EV_USE_EPOLL 859#if EV_USE_EPOLL
854 if (!method && (flags & EVBACKEND_EPOLL )) method = epoll_init (EV_A_ flags); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
855#endif 861#endif
856#if EV_USE_POLL 862#if EV_USE_POLL
857 if (!method && (flags & EVBACKEND_POLL )) method = poll_init (EV_A_ flags); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
858#endif 864#endif
859#if EV_USE_SELECT 865#if EV_USE_SELECT
860 if (!method && (flags & EVBACKEND_SELECT)) method = select_init (EV_A_ flags); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
861#endif 867#endif
862 868
863 ev_init (&sigev, sigcb); 869 ev_init (&sigev, sigcb);
864 ev_set_priority (&sigev, EV_MAXPRI); 870 ev_set_priority (&sigev, EV_MAXPRI);
865 } 871 }
… …
869loop_destroy (EV_P) 875loop_destroy (EV_P)
870{ 876{
871 int i; 877 int i;
872 878
873#if EV_USE_PORT 879#if EV_USE_PORT
874 if (method == EVBACKEND_PORT ) port_destroy (EV_A); 880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
875#endif 881#endif
876#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
877 if (method == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
878#endif 884#endif
879#if EV_USE_EPOLL 885#if EV_USE_EPOLL
880 if (method == EVBACKEND_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
881#endif 887#endif
882#if EV_USE_POLL 888#if EV_USE_POLL
883 if (method == EVBACKEND_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
884#endif 890#endif
885#if EV_USE_SELECT 891#if EV_USE_SELECT
886 if (method == EVBACKEND_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
887#endif 893#endif
888 894
889 for (i = NUMPRI; i--; ) 895 for (i = NUMPRI; i--; )
890 array_free (pending, [i]); 896 array_free (pending, [i]);
891 897
… …
897#endif 903#endif
898 array_free (idle, EMPTY0); 904 array_free (idle, EMPTY0);
899 array_free (prepare, EMPTY0); 905 array_free (prepare, EMPTY0);
900 array_free (check, EMPTY0); 906 array_free (check, EMPTY0);
901 907
902 method = 0; 908 backend = 0;
903} 909}
904 910
905static void 911static void
906loop_fork (EV_P) 912loop_fork (EV_P)
907{ 913{
908#if EV_USE_PORT 914#if EV_USE_PORT
909 if (method == EVBACKEND_PORT ) port_fork (EV_A); 915 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
910#endif 916#endif
911#if EV_USE_KQUEUE 917#if EV_USE_KQUEUE
912 if (method == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 918 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
913#endif 919#endif
914#if EV_USE_EPOLL 920#if EV_USE_EPOLL
915 if (method == EVBACKEND_EPOLL ) epoll_fork (EV_A); 921 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
916#endif 922#endif
917 923
918 if (ev_is_active (&sigev)) 924 if (ev_is_active (&sigev))
919 { 925 {
920 /* default loop */ 926 /* default loop */
… …
941 947
942 memset (loop, 0, sizeof (struct ev_loop)); 948 memset (loop, 0, sizeof (struct ev_loop));
943 949
944 loop_init (EV_A_ flags); 950 loop_init (EV_A_ flags);
945 951
946 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
947 return loop; 953 return loop;
948 954
949 return 0; 955 return 0;
950} 956}
951 957
… …
984 ev_default_loop_ptr = 1; 990 ev_default_loop_ptr = 1;
985#endif 991#endif
986 992
987 loop_init (EV_A_ flags); 993 loop_init (EV_A_ flags);
988 994
989 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
990 { 996 {
991 siginit (EV_A); 997 siginit (EV_A);
992 998
993#ifndef _WIN32 999#ifndef _WIN32
994 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
… …
1030{ 1036{
1031#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
1032 struct ev_loop *loop = ev_default_loop_ptr; 1038 struct ev_loop *loop = ev_default_loop_ptr;
1033#endif 1039#endif
1034 1040
1035 if (method) 1041 if (backend)
1036 postfork = 1; 1042 postfork = 1;
1037} 1043}
1038 1044
1039/*****************************************************************************/ 1045/*****************************************************************************/
1040 1046
… …
1272 { 1278 {
1273 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
1274 1280
1275 if (timercnt) 1281 if (timercnt)
1276 { 1282 {
1277 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1278 if (block > to) block = to; 1284 if (block > to) block = to;
1279 } 1285 }
1280 1286
1281#if EV_PERIODICS 1287#if EV_PERIODICS
1282 if (periodiccnt) 1288 if (periodiccnt)
1283 { 1289 {
1284 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;
1285 if (block > to) block = to; 1291 if (block > to) block = to;
1286 } 1292 }
1287#endif 1293#endif
1288 1294
1289 if (expect_false (block < 0.)) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1290 } 1296 }
1291 1297
1292 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1293 1299
1294 /* update ev_rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1295 time_update (EV_A); 1301 time_update (EV_A);
1296 1302
1297 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */

Diff Legend

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