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

Comparing libev/ev.c (file contents):
Revision 1.127 by root, Sun Nov 18 02:17:57 2007 UTC vs.
Revision 1.134 by root, Fri Nov 23 19:13:33 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
… …
399 { 397 {
400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
401 return; 399 return;
402 } 400 }
403 401
402 if (expect_false (!w_->cb))
403 return;
404
404 w_->pending = ++pendingcnt [ABSPRI (w_)]; 405 w_->pending = ++pendingcnt [ABSPRI (w_)];
405 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2); 406 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 407 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 408 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
408} 409}
… …
464 } 465 }
465#endif 466#endif
466 467
467 anfd->reify = 0; 468 anfd->reify = 0;
468 469
469 method_modify (EV_A_ fd, anfd->events, events); 470 backend_modify (EV_A_ fd, anfd->events, events);
470 anfd->events = events; 471 anfd->events = events;
471 } 472 }
472 473
473 fdchangecnt = 0; 474 fdchangecnt = 0;
474} 475}
… …
532 fd_kill (EV_A_ fd); 533 fd_kill (EV_A_ fd);
533 return; 534 return;
534 } 535 }
535} 536}
536 537
537/* usually called after fork if method needs to re-arm all fds from scratch */ 538/* usually called after fork if backend needs to re-arm all fds from scratch */
538static void 539static void
539fd_rearm_all (EV_P) 540fd_rearm_all (EV_P)
540{ 541{
541 int fd; 542 int fd;
542 543
… …
733 int pid, status; 734 int pid, status;
734 735
735 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 736 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
736 { 737 {
737 /* make sure we are called again until all childs have been reaped */ 738 /* make sure we are called again until all childs have been reaped */
739 /* 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); 740 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
739 741
740 child_reap (EV_A_ sw, pid, pid, status); 742 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 */ 743 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
742 } 744 }
743} 745}
744 746
745#endif 747#endif
746 748
… …
785 || getgid () != getegid (); 787 || getgid () != getegid ();
786#endif 788#endif
787} 789}
788 790
789unsigned int 791unsigned int
790ev_method (EV_P) 792ev_supported_backends (void)
791{ 793{
792 return method; 794 unsigned int flags = 0;
795
796 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
797 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
798 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
799 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
800 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
801
802 return flags;
803}
804
805unsigned int
806ev_recommended_backends (void)
807{
808 unsigned int flags = ev_supported_backends ();
809
810#ifndef __NetBSD__
811 /* kqueue is borked on everything but netbsd apparently */
812 /* it usually doesn't work correctly on anything but sockets and pipes */
813 flags &= ~EVBACKEND_KQUEUE;
814#endif
815#ifdef __APPLE__
816 // flags &= ~EVBACKEND_KQUEUE; for documentation
817 flags &= ~EVBACKEND_POLL;
818#endif
819
820 return flags;
821}
822
823unsigned int
824ev_embeddable_backends (void)
825{
826 return EVBACKEND_EPOLL
827 | EVBACKEND_KQUEUE
828 | EVBACKEND_PORT;
829}
830
831unsigned int
832ev_backend (EV_P)
833{
834 return backend;
793} 835}
794 836
795static void 837static void
796loop_init (EV_P_ unsigned int flags) 838loop_init (EV_P_ unsigned int flags)
797{ 839{
798 if (!method) 840 if (!backend)
799 { 841 {
800#if EV_USE_MONOTONIC 842#if EV_USE_MONOTONIC
801 { 843 {
802 struct timespec ts; 844 struct timespec ts;
803 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 845 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
808 ev_rt_now = ev_time (); 850 ev_rt_now = ev_time ();
809 mn_now = get_clock (); 851 mn_now = get_clock ();
810 now_floor = mn_now; 852 now_floor = mn_now;
811 rtmn_diff = ev_rt_now - mn_now; 853 rtmn_diff = ev_rt_now - mn_now;
812 854
813 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 855 if (!(flags & EVFLAG_NOENV)
856 && !enable_secure ()
857 && getenv ("LIBEV_FLAGS"))
814 flags = atoi (getenv ("LIBEV_FLAGS")); 858 flags = atoi (getenv ("LIBEV_FLAGS"));
815 859
816 if (!(flags & 0x0000ffff)) 860 if (!(flags & 0x0000ffffUL))
817 flags |= 0x0000ffff; 861 flags |= ev_recommended_backends ();
818 862
819 method = 0; 863 backend = 0;
820#if EV_USE_PORT 864#if EV_USE_PORT
821 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 865 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
822#endif 866#endif
823#if EV_USE_KQUEUE 867#if EV_USE_KQUEUE
824 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 868 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
825#endif 869#endif
826#if EV_USE_EPOLL 870#if EV_USE_EPOLL
827 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 871 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
828#endif 872#endif
829#if EV_USE_POLL 873#if EV_USE_POLL
830 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 874 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
831#endif 875#endif
832#if EV_USE_SELECT 876#if EV_USE_SELECT
833 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 877 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
834#endif 878#endif
835 879
836 ev_init (&sigev, sigcb); 880 ev_init (&sigev, sigcb);
837 ev_set_priority (&sigev, EV_MAXPRI); 881 ev_set_priority (&sigev, EV_MAXPRI);
838 } 882 }
… …
842loop_destroy (EV_P) 886loop_destroy (EV_P)
843{ 887{
844 int i; 888 int i;
845 889
846#if EV_USE_PORT 890#if EV_USE_PORT
847 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 891 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
848#endif 892#endif
849#if EV_USE_KQUEUE 893#if EV_USE_KQUEUE
850 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 894 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
851#endif 895#endif
852#if EV_USE_EPOLL 896#if EV_USE_EPOLL
853 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 897 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
854#endif 898#endif
855#if EV_USE_POLL 899#if EV_USE_POLL
856 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 900 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
857#endif 901#endif
858#if EV_USE_SELECT 902#if EV_USE_SELECT
859 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 903 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
860#endif 904#endif
861 905
862 for (i = NUMPRI; i--; ) 906 for (i = NUMPRI; i--; )
863 array_free (pending, [i]); 907 array_free (pending, [i]);
864 908
… …
870#endif 914#endif
871 array_free (idle, EMPTY0); 915 array_free (idle, EMPTY0);
872 array_free (prepare, EMPTY0); 916 array_free (prepare, EMPTY0);
873 array_free (check, EMPTY0); 917 array_free (check, EMPTY0);
874 918
875 method = 0; 919 backend = 0;
876} 920}
877 921
878static void 922static void
879loop_fork (EV_P) 923loop_fork (EV_P)
880{ 924{
881#if EV_USE_PORT 925#if EV_USE_PORT
882 if (method == EVMETHOD_PORT ) port_fork (EV_A); 926 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
883#endif 927#endif
884#if EV_USE_KQUEUE 928#if EV_USE_KQUEUE
885 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 929 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
886#endif 930#endif
887#if EV_USE_EPOLL 931#if EV_USE_EPOLL
888 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 932 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
889#endif 933#endif
890 934
891 if (ev_is_active (&sigev)) 935 if (ev_is_active (&sigev))
892 { 936 {
893 /* default loop */ 937 /* default loop */
… …
914 958
915 memset (loop, 0, sizeof (struct ev_loop)); 959 memset (loop, 0, sizeof (struct ev_loop));
916 960
917 loop_init (EV_A_ flags); 961 loop_init (EV_A_ flags);
918 962
919 if (ev_method (EV_A)) 963 if (ev_backend (EV_A))
920 return loop; 964 return loop;
921 965
922 return 0; 966 return 0;
923} 967}
924 968
… …
957 ev_default_loop_ptr = 1; 1001 ev_default_loop_ptr = 1;
958#endif 1002#endif
959 1003
960 loop_init (EV_A_ flags); 1004 loop_init (EV_A_ flags);
961 1005
962 if (ev_method (EV_A)) 1006 if (ev_backend (EV_A))
963 { 1007 {
964 siginit (EV_A); 1008 siginit (EV_A);
965 1009
966#ifndef _WIN32 1010#ifndef _WIN32
967 ev_signal_init (&childev, childcb, SIGCHLD); 1011 ev_signal_init (&childev, childcb, SIGCHLD);
… …
1003{ 1047{
1004#if EV_MULTIPLICITY 1048#if EV_MULTIPLICITY
1005 struct ev_loop *loop = ev_default_loop_ptr; 1049 struct ev_loop *loop = ev_default_loop_ptr;
1006#endif 1050#endif
1007 1051
1008 if (method) 1052 if (backend)
1009 postfork = 1; 1053 postfork = 1;
1010} 1054}
1011 1055
1012/*****************************************************************************/ 1056/*****************************************************************************/
1013 1057
… …
1245 { 1289 {
1246 block = MAX_BLOCKTIME; 1290 block = MAX_BLOCKTIME;
1247 1291
1248 if (timercnt) 1292 if (timercnt)
1249 { 1293 {
1250 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1294 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1251 if (block > to) block = to; 1295 if (block > to) block = to;
1252 } 1296 }
1253 1297
1254#if EV_PERIODICS 1298#if EV_PERIODICS
1255 if (periodiccnt) 1299 if (periodiccnt)
1256 { 1300 {
1257 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1301 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1258 if (block > to) block = to; 1302 if (block > to) block = to;
1259 } 1303 }
1260#endif 1304#endif
1261 1305
1262 if (expect_false (block < 0.)) block = 0.; 1306 if (expect_false (block < 0.)) block = 0.;
1263 } 1307 }
1264 1308
1265 method_poll (EV_A_ block); 1309 backend_poll (EV_A_ block);
1266 1310
1267 /* update ev_rt_now, do magic */ 1311 /* update ev_rt_now, do magic */
1268 time_update (EV_A); 1312 time_update (EV_A);
1269 1313
1270 /* queue pending timers and reschedule them */ 1314 /* queue pending timers and reschedule them */
… …
1626 1670
1627 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1671 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1628 ev_stop (EV_A_ (W)w); 1672 ev_stop (EV_A_ (W)w);
1629} 1673}
1630 1674
1675#if EV_MULTIPLICITY
1676static void
1677embed_cb (EV_P_ struct ev_io *io, int revents)
1678{
1679 struct ev_embed *w = (struct ev_embed *)(((char *)io) - offsetof (struct ev_embed, io));
1680
1681 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1682 ev_loop (w->loop, EVLOOP_NONBLOCK);
1683}
1684
1685void
1686ev_embed_start (EV_P_ struct ev_embed *w)
1687{
1688 if (expect_false (ev_is_active (w)))
1689 return;
1690
1691 {
1692 struct ev_loop *loop = w->loop;
1693 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1694 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1695 }
1696
1697 ev_io_start (EV_A_ &w->io);
1698 ev_start (EV_A_ (W)w, 1);
1699}
1700
1701void
1702ev_embed_stop (EV_P_ struct ev_embed *w)
1703{
1704 ev_clear_pending (EV_A_ (W)w);
1705 if (expect_false (!ev_is_active (w)))
1706 return;
1707
1708 ev_io_stop (EV_A_ &w->io);
1709 ev_stop (EV_A_ (W)w);
1710}
1711#endif
1712
1631/*****************************************************************************/ 1713/*****************************************************************************/
1632 1714
1633struct ev_once 1715struct ev_once
1634{ 1716{
1635 struct ev_io io; 1717 struct ev_io io;

Diff Legend

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