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.135 by root, Sat Nov 24 06:23:27 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
… …
393 { 397 {
394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
395 return; 399 return;
396 } 400 }
397 401
402 if (expect_false (!w_->cb))
403 return;
404
398 w_->pending = ++pendingcnt [ABSPRI (w_)]; 405 w_->pending = ++pendingcnt [ABSPRI (w_)];
399 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);
400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 407 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 408 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
402} 409}
… …
458 } 465 }
459#endif 466#endif
460 467
461 anfd->reify = 0; 468 anfd->reify = 0;
462 469
463 method_modify (EV_A_ fd, anfd->events, events); 470 backend_modify (EV_A_ fd, anfd->events, events);
464 anfd->events = events; 471 anfd->events = events;
465 } 472 }
466 473
467 fdchangecnt = 0; 474 fdchangecnt = 0;
468} 475}
… …
526 fd_kill (EV_A_ fd); 533 fd_kill (EV_A_ fd);
527 return; 534 return;
528 } 535 }
529} 536}
530 537
531/* 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 */
532static void 539static void
533fd_rearm_all (EV_P) 540fd_rearm_all (EV_P)
534{ 541{
535 int fd; 542 int fd;
536 543
… …
727 int pid, status; 734 int pid, status;
728 735
729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 736 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
730 { 737 {
731 /* 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 */
732 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 740 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
733 741
734 child_reap (EV_A_ sw, pid, pid, status); 742 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 */ 743 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
736 } 744 }
737} 745}
738 746
739#endif 747#endif
740 748
… …
781} 789}
782 790
783unsigned int 791unsigned int
784ev_supported_backends (void) 792ev_supported_backends (void)
785{ 793{
786}
787
788unsigned int
789ev_recommended_backends (void)
790{
791 unsigned int flags; 794 unsigned int flags = 0;
792 795
793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 796 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; 797 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL; 798 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL; 799 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
… …
798 801
799 return flags; 802 return flags;
800} 803}
801 804
802unsigned int 805unsigned int
803ev_backend (EV_P) 806ev_recommended_backends (void)
804{ 807{
805 unsigned int flags = ev_recommended_backends (); 808 unsigned int flags = ev_supported_backends ();
806 809
807#ifndef __NetBSD__ 810#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */ 811 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */ 812 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE; 813 flags &= ~EVBACKEND_KQUEUE;
… …
815#endif 818#endif
816 819
817 return flags; 820 return flags;
818} 821}
819 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;
835}
836
820static void 837static void
821loop_init (EV_P_ unsigned int flags) 838loop_init (EV_P_ unsigned int flags)
822{ 839{
823 if (!method) 840 if (!backend)
824 { 841 {
825#if EV_USE_MONOTONIC 842#if EV_USE_MONOTONIC
826 { 843 {
827 struct timespec ts; 844 struct timespec ts;
828 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 845 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
841 flags = atoi (getenv ("LIBEV_FLAGS")); 858 flags = atoi (getenv ("LIBEV_FLAGS"));
842 859
843 if (!(flags & 0x0000ffffUL)) 860 if (!(flags & 0x0000ffffUL))
844 flags |= ev_recommended_backends (); 861 flags |= ev_recommended_backends ();
845 862
846 method = 0; 863 backend = 0;
847#if EV_USE_PORT 864#if EV_USE_PORT
848 if (!method && (flags & EVBACKEND_PORT )) method = port_init (EV_A_ flags); 865 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
849#endif 866#endif
850#if EV_USE_KQUEUE 867#if EV_USE_KQUEUE
851 if (!method && (flags & EVBACKEND_KQUEUE)) method = kqueue_init (EV_A_ flags); 868 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
852#endif 869#endif
853#if EV_USE_EPOLL 870#if EV_USE_EPOLL
854 if (!method && (flags & EVBACKEND_EPOLL )) method = epoll_init (EV_A_ flags); 871 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
855#endif 872#endif
856#if EV_USE_POLL 873#if EV_USE_POLL
857 if (!method && (flags & EVBACKEND_POLL )) method = poll_init (EV_A_ flags); 874 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
858#endif 875#endif
859#if EV_USE_SELECT 876#if EV_USE_SELECT
860 if (!method && (flags & EVBACKEND_SELECT)) method = select_init (EV_A_ flags); 877 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
861#endif 878#endif
862 879
863 ev_init (&sigev, sigcb); 880 ev_init (&sigev, sigcb);
864 ev_set_priority (&sigev, EV_MAXPRI); 881 ev_set_priority (&sigev, EV_MAXPRI);
865 } 882 }
… …
869loop_destroy (EV_P) 886loop_destroy (EV_P)
870{ 887{
871 int i; 888 int i;
872 889
873#if EV_USE_PORT 890#if EV_USE_PORT
874 if (method == EVBACKEND_PORT ) port_destroy (EV_A); 891 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
875#endif 892#endif
876#if EV_USE_KQUEUE 893#if EV_USE_KQUEUE
877 if (method == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 894 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
878#endif 895#endif
879#if EV_USE_EPOLL 896#if EV_USE_EPOLL
880 if (method == EVBACKEND_EPOLL ) epoll_destroy (EV_A); 897 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
881#endif 898#endif
882#if EV_USE_POLL 899#if EV_USE_POLL
883 if (method == EVBACKEND_POLL ) poll_destroy (EV_A); 900 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
884#endif 901#endif
885#if EV_USE_SELECT 902#if EV_USE_SELECT
886 if (method == EVBACKEND_SELECT) select_destroy (EV_A); 903 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
887#endif 904#endif
888 905
889 for (i = NUMPRI; i--; ) 906 for (i = NUMPRI; i--; )
890 array_free (pending, [i]); 907 array_free (pending, [i]);
891 908
… …
897#endif 914#endif
898 array_free (idle, EMPTY0); 915 array_free (idle, EMPTY0);
899 array_free (prepare, EMPTY0); 916 array_free (prepare, EMPTY0);
900 array_free (check, EMPTY0); 917 array_free (check, EMPTY0);
901 918
902 method = 0; 919 backend = 0;
903} 920}
904 921
905static void 922static void
906loop_fork (EV_P) 923loop_fork (EV_P)
907{ 924{
908#if EV_USE_PORT 925#if EV_USE_PORT
909 if (method == EVBACKEND_PORT ) port_fork (EV_A); 926 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
910#endif 927#endif
911#if EV_USE_KQUEUE 928#if EV_USE_KQUEUE
912 if (method == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 929 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
913#endif 930#endif
914#if EV_USE_EPOLL 931#if EV_USE_EPOLL
915 if (method == EVBACKEND_EPOLL ) epoll_fork (EV_A); 932 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
916#endif 933#endif
917 934
918 if (ev_is_active (&sigev)) 935 if (ev_is_active (&sigev))
919 { 936 {
920 /* default loop */ 937 /* default loop */
… …
941 958
942 memset (loop, 0, sizeof (struct ev_loop)); 959 memset (loop, 0, sizeof (struct ev_loop));
943 960
944 loop_init (EV_A_ flags); 961 loop_init (EV_A_ flags);
945 962
946 if (ev_method (EV_A)) 963 if (ev_backend (EV_A))
947 return loop; 964 return loop;
948 965
949 return 0; 966 return 0;
950} 967}
951 968
… …
984 ev_default_loop_ptr = 1; 1001 ev_default_loop_ptr = 1;
985#endif 1002#endif
986 1003
987 loop_init (EV_A_ flags); 1004 loop_init (EV_A_ flags);
988 1005
989 if (ev_method (EV_A)) 1006 if (ev_backend (EV_A))
990 { 1007 {
991 siginit (EV_A); 1008 siginit (EV_A);
992 1009
993#ifndef _WIN32 1010#ifndef _WIN32
994 ev_signal_init (&childev, childcb, SIGCHLD); 1011 ev_signal_init (&childev, childcb, SIGCHLD);
… …
1030{ 1047{
1031#if EV_MULTIPLICITY 1048#if EV_MULTIPLICITY
1032 struct ev_loop *loop = ev_default_loop_ptr; 1049 struct ev_loop *loop = ev_default_loop_ptr;
1033#endif 1050#endif
1034 1051
1035 if (method) 1052 if (backend)
1036 postfork = 1; 1053 postfork = 1;
1037} 1054}
1038 1055
1039/*****************************************************************************/ 1056/*****************************************************************************/
1040 1057
… …
1231static int loop_done; 1248static int loop_done;
1232 1249
1233void 1250void
1234ev_loop (EV_P_ int flags) 1251ev_loop (EV_P_ int flags)
1235{ 1252{
1236 double block;
1237 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1253 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1254 ? EVUNLOOP_ONE
1255 : EVUNLOOP_CANCEL;
1238 1256
1239 while (activecnt) 1257 while (activecnt)
1240 { 1258 {
1241 /* queue check watchers (and execute them) */ 1259 /* queue check watchers (and execute them) */
1242 if (expect_false (preparecnt)) 1260 if (expect_false (preparecnt))
… …
1251 1269
1252 /* update fd-related kernel structures */ 1270 /* update fd-related kernel structures */
1253 fd_reify (EV_A); 1271 fd_reify (EV_A);
1254 1272
1255 /* calculate blocking time */ 1273 /* calculate blocking time */
1274 {
1275 double block;
1256 1276
1257 /* we only need this for !monotonic clock or timers, but as we basically 1277 if (flags & EVLOOP_NONBLOCK || idlecnt)
1258 always have timers, we just calculate it always */ 1278 block = 0.; /* do not block at all */
1279 else
1280 {
1281 /* update time to cancel out callback processing overhead */
1259#if EV_USE_MONOTONIC 1282#if EV_USE_MONOTONIC
1260 if (expect_true (have_monotonic)) 1283 if (expect_true (have_monotonic))
1261 time_update_monotonic (EV_A); 1284 time_update_monotonic (EV_A);
1262 else 1285 else
1263#endif 1286#endif
1264 { 1287 {
1265 ev_rt_now = ev_time (); 1288 ev_rt_now = ev_time ();
1266 mn_now = ev_rt_now; 1289 mn_now = ev_rt_now;
1267 } 1290 }
1268 1291
1269 if (flags & EVLOOP_NONBLOCK || idlecnt)
1270 block = 0.;
1271 else
1272 {
1273 block = MAX_BLOCKTIME; 1292 block = MAX_BLOCKTIME;
1274 1293
1275 if (timercnt) 1294 if (timercnt)
1276 { 1295 {
1277 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1296 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1278 if (block > to) block = to; 1297 if (block > to) block = to;
1279 } 1298 }
1280 1299
1281#if EV_PERIODICS 1300#if EV_PERIODICS
1282 if (periodiccnt) 1301 if (periodiccnt)
1283 { 1302 {
1284 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1303 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1285 if (block > to) block = to; 1304 if (block > to) block = to;
1286 } 1305 }
1287#endif 1306#endif
1288 1307
1289 if (expect_false (block < 0.)) block = 0.; 1308 if (expect_false (block < 0.)) block = 0.;
1290 } 1309 }
1291 1310
1292 method_poll (EV_A_ block); 1311 backend_poll (EV_A_ block);
1312 }
1293 1313
1294 /* update ev_rt_now, do magic */ 1314 /* update ev_rt_now, do magic */
1295 time_update (EV_A); 1315 time_update (EV_A);
1296 1316
1297 /* queue pending timers and reschedule them */ 1317 /* queue pending timers and reschedule them */
… …
1312 1332
1313 if (expect_false (loop_done)) 1333 if (expect_false (loop_done))
1314 break; 1334 break;
1315 } 1335 }
1316 1336
1317 if (loop_done != 2) 1337 if (loop_done == EVUNLOOP_ONE)
1318 loop_done = 0; 1338 loop_done = EVUNLOOP_CANCEL;
1319} 1339}
1320 1340
1321void 1341void
1322ev_unloop (EV_P_ int how) 1342ev_unloop (EV_P_ int how)
1323{ 1343{
… …
1653 1673
1654 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1674 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1655 ev_stop (EV_A_ (W)w); 1675 ev_stop (EV_A_ (W)w);
1656} 1676}
1657 1677
1678#if EV_MULTIPLICITY
1679static void
1680embed_cb (EV_P_ struct ev_io *io, int revents)
1681{
1682 struct ev_embed *w = (struct ev_embed *)(((char *)io) - offsetof (struct ev_embed, io));
1683
1684 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1685 ev_loop (w->loop, EVLOOP_NONBLOCK);
1686}
1687
1688void
1689ev_embed_start (EV_P_ struct ev_embed *w)
1690{
1691 if (expect_false (ev_is_active (w)))
1692 return;
1693
1694 {
1695 struct ev_loop *loop = w->loop;
1696 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1697 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1698 }
1699
1700 ev_io_start (EV_A_ &w->io);
1701 ev_start (EV_A_ (W)w, 1);
1702}
1703
1704void
1705ev_embed_stop (EV_P_ struct ev_embed *w)
1706{
1707 ev_clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w)))
1709 return;
1710
1711 ev_io_stop (EV_A_ &w->io);
1712 ev_stop (EV_A_ (W)w);
1713}
1714#endif
1715
1658/*****************************************************************************/ 1716/*****************************************************************************/
1659 1717
1660struct ev_once 1718struct ev_once
1661{ 1719{
1662 struct ev_io io; 1720 struct ev_io io;

Diff Legend

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