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

Comparing libev/ev.c (file contents):
Revision 1.208 by root, Fri Feb 1 13:22:48 2008 UTC vs.
Revision 1.220 by root, Sun Apr 6 09:53:17 2008 UTC

… …
39 39
40#ifdef __cplusplus 40#ifdef __cplusplus
41extern "C" { 41extern "C" {
42#endif 42#endif
43 43
44/* this big block deduces configuration from config.h */
44#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
45# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
46# include EV_CONFIG_H 47# include EV_CONFIG_H
47# else 48# else
48# include "config.h" 49# include "config.h"
… …
118# else 119# else
119# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
120# endif 121# endif
121# endif 122# endif
122 123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
123#endif 132#endif
124 133
125#include <math.h> 134#include <math.h>
126#include <stdlib.h> 135#include <stdlib.h>
127#include <fcntl.h> 136#include <fcntl.h>
… …
152# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
153# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
154# endif 163# endif
155#endif 164#endif
156 165
157/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
158 167
159#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
160# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
161#endif 170#endif
162 171
… …
179# define EV_USE_POLL 1 188# define EV_USE_POLL 1
180# endif 189# endif
181#endif 190#endif
182 191
183#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
184# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
185#endif 198#endif
186 199
187#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
188# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
189#endif 202#endif
… …
191#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
192# define EV_USE_PORT 0 205# define EV_USE_PORT 0
193#endif 206#endif
194 207
195#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
196# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
197#endif 214#endif
198 215
199#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
200# if EV_MINIMAL 217# if EV_MINIMAL
201# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
210# else 227# else
211# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
212# endif 229# endif
213#endif 230#endif
214 231
215/**/ 232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
216 241
217#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
218# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
219# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
220#endif 245#endif
… …
239# include <sys/inotify.h> 264# include <sys/inotify.h>
240#endif 265#endif
241 266
242#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
243# include <winsock.h> 268# include <winsock.h>
269#endif
270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273int eventfd (unsigned int initval, int flags);
244#endif 274#endif
245 275
246/**/ 276/**/
247 277
248/* 278/*
… …
451 ts.tv_sec = (time_t)delay; 481 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 482 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 483
454 nanosleep (&ts, 0); 484 nanosleep (&ts, 0);
455#elif defined(_WIN32) 485#elif defined(_WIN32)
456 Sleep (delay * 1e3); 486 Sleep ((unsigned long)(delay * 1e3));
457#else 487#else
458 struct timeval tv; 488 struct timeval tv;
459 489
460 tv.tv_sec = (time_t)delay; 490 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 491 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
802static void noinline 832static void noinline
803evpipe_init (EV_P) 833evpipe_init (EV_P)
804{ 834{
805 if (!ev_is_active (&pipeev)) 835 if (!ev_is_active (&pipeev))
806 { 836 {
837#if EV_USE_EVENTFD
838 if ((evfd = eventfd (0, 0)) >= 0)
839 {
840 evpipe [0] = -1;
841 fd_intern (evfd);
842 ev_io_set (&pipeev, evfd, EV_READ);
843 }
844 else
845#endif
846 {
807 while (pipe (evpipe)) 847 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 848 syserr ("(libev) error creating signal/async pipe");
809 849
810 fd_intern (evpipe [0]); 850 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 851 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 852 ev_io_set (&pipeev, evpipe [0], EV_READ);
853 }
854
814 ev_io_start (EV_A_ &pipeev); 855 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* child watcher should not keep loop alive */ 856 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 857 }
817} 858}
818 859
819void inline_size 860void inline_size
820evpipe_write (EV_P_ int sig, int async) 861evpipe_write (EV_P_ EV_ATOMIC_T *flag)
821{ 862{
822 if (!(gotasync || gotsig)) 863 if (!*flag)
823 { 864 {
824 int old_errno = errno; 865 int old_errno = errno; /* save errno because write might clobber it */
825 866
826 if (sig) gotsig = 1; 867 *flag = 1;
827 if (async) gotasync = 1;
828 868
869#if EV_USE_EVENTFD
870 if (evfd >= 0)
871 {
872 uint64_t counter = 1;
873 write (evfd, &counter, sizeof (uint64_t));
874 }
875 else
876#endif
829 write (evpipe [1], &old_errno, 1); 877 write (evpipe [1], &old_errno, 1);
878
830 errno = old_errno; 879 errno = old_errno;
831 } 880 }
832} 881}
833 882
834static void 883static void
835pipecb (EV_P_ ev_io *iow, int revents) 884pipecb (EV_P_ ev_io *iow, int revents)
836{ 885{
886#if EV_USE_EVENTFD
887 if (evfd >= 0)
837 { 888 {
838 int dummy; 889 uint64_t counter = 1;
890 read (evfd, &counter, sizeof (uint64_t));
891 }
892 else
893#endif
894 {
895 char dummy;
839 read (evpipe [0], &dummy, 1); 896 read (evpipe [0], &dummy, 1);
840 } 897 }
841 898
842 if (gotsig) 899 if (gotsig && ev_is_default_loop (EV_A))
843 { 900 {
844 int signum; 901 int signum;
845 gotsig = 0; 902 gotsig = 0;
846 903
847 for (signum = signalmax; signum--; ) 904 for (signum = signalmax; signum--; )
848 if (signals [signum].gotsig) 905 if (signals [signum].gotsig)
849 ev_feed_signal_event (EV_A_ signum + 1); 906 ev_feed_signal_event (EV_A_ signum + 1);
850 } 907 }
851 908
909#if EV_ASYNC_ENABLE
852 if (gotasync) 910 if (gotasync)
853 { 911 {
854 int i; 912 int i;
855 gotasync = 0; 913 gotasync = 0;
856 914
… …
859 { 917 {
860 asyncs [i]->sent = 0; 918 asyncs [i]->sent = 0;
861 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 919 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
862 } 920 }
863 } 921 }
922#endif
864} 923}
865 924
866/*****************************************************************************/ 925/*****************************************************************************/
867 926
868static void 927static void
869sighandler (int signum) 928ev_sighandler (int signum)
870{ 929{
871#if EV_MULTIPLICITY 930#if EV_MULTIPLICITY
872 struct ev_loop *loop = &default_loop_struct; 931 struct ev_loop *loop = &default_loop_struct;
873#endif 932#endif
874 933
875#if _WIN32 934#if _WIN32
876 signal (signum, sighandler); 935 signal (signum, ev_sighandler);
877#endif 936#endif
878 937
879 signals [signum - 1].gotsig = 1; 938 signals [signum - 1].gotsig = 1;
880 evpipe_write (EV_A_ 1, 0); 939 evpipe_write (EV_A_ &gotsig);
881} 940}
882 941
883void noinline 942void noinline
884ev_feed_signal_event (EV_P_ int signum) 943ev_feed_signal_event (EV_P_ int signum)
885{ 944{
… …
911#ifndef WIFCONTINUED 970#ifndef WIFCONTINUED
912# define WIFCONTINUED(status) 0 971# define WIFCONTINUED(status) 0
913#endif 972#endif
914 973
915void inline_speed 974void inline_speed
916child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 975child_reap (EV_P_ int chain, int pid, int status)
917{ 976{
918 ev_child *w; 977 ev_child *w;
919 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 978 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
920 979
921 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 980 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
922 { 981 {
923 if ((w->pid == pid || !w->pid) 982 if ((w->pid == pid || !w->pid)
924 && (!traced || (w->flags & 1))) 983 && (!traced || (w->flags & 1)))
925 { 984 {
926 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 985 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
927 w->rpid = pid; 986 w->rpid = pid;
928 w->rstatus = status; 987 w->rstatus = status;
929 ev_feed_event (EV_A_ (W)w, EV_CHILD); 988 ev_feed_event (EV_A_ (W)w, EV_CHILD);
930 } 989 }
931 } 990 }
… …
945 if (!WCONTINUED 1004 if (!WCONTINUED
946 || errno != EINVAL 1005 || errno != EINVAL
947 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1006 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
948 return; 1007 return;
949 1008
950 /* make sure we are called again until all childs have been reaped */ 1009 /* make sure we are called again until all children have been reaped */
951 /* we need to do it this way so that the callback gets called before we continue */ 1010 /* we need to do it this way so that the callback gets called before we continue */
952 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1011 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
953 1012
954 child_reap (EV_A_ sw, pid, pid, status); 1013 child_reap (EV_A_ pid, pid, status);
955 if (EV_PID_HASHSIZE > 1) 1014 if (EV_PID_HASHSIZE > 1)
956 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1015 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
957} 1016}
958 1017
959#endif 1018#endif
960 1019
961/*****************************************************************************/ 1020/*****************************************************************************/
… …
1079 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1138 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1080 have_monotonic = 1; 1139 have_monotonic = 1;
1081 } 1140 }
1082#endif 1141#endif
1083 1142
1084 ev_rt_now = ev_time (); 1143 ev_rt_now = ev_time ();
1085 mn_now = get_clock (); 1144 mn_now = get_clock ();
1086 now_floor = mn_now; 1145 now_floor = mn_now;
1087 rtmn_diff = ev_rt_now - mn_now; 1146 rtmn_diff = ev_rt_now - mn_now;
1088 1147
1089 io_blocktime = 0.; 1148 io_blocktime = 0.;
1090 timeout_blocktime = 0.; 1149 timeout_blocktime = 0.;
1150 backend = 0;
1151 backend_fd = -1;
1152 gotasync = 0;
1153#if EV_USE_INOTIFY
1154 fs_fd = -2;
1155#endif
1091 1156
1092 /* pid check not overridable via env */ 1157 /* pid check not overridable via env */
1093#ifndef _WIN32 1158#ifndef _WIN32
1094 if (flags & EVFLAG_FORKCHECK) 1159 if (flags & EVFLAG_FORKCHECK)
1095 curpid = getpid (); 1160 curpid = getpid ();
… …
1101 flags = atoi (getenv ("LIBEV_FLAGS")); 1166 flags = atoi (getenv ("LIBEV_FLAGS"));
1102 1167
1103 if (!(flags & 0x0000ffffUL)) 1168 if (!(flags & 0x0000ffffUL))
1104 flags |= ev_recommended_backends (); 1169 flags |= ev_recommended_backends ();
1105 1170
1106 backend = 0;
1107 backend_fd = -1;
1108#if EV_USE_INOTIFY
1109 fs_fd = -2;
1110#endif
1111
1112#if EV_USE_PORT 1171#if EV_USE_PORT
1113 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1172 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1114#endif 1173#endif
1115#if EV_USE_KQUEUE 1174#if EV_USE_KQUEUE
1116 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1175 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1138 if (ev_is_active (&pipeev)) 1197 if (ev_is_active (&pipeev))
1139 { 1198 {
1140 ev_ref (EV_A); /* signal watcher */ 1199 ev_ref (EV_A); /* signal watcher */
1141 ev_io_stop (EV_A_ &pipeev); 1200 ev_io_stop (EV_A_ &pipeev);
1142 1201
1143 close (evpipe [0]); evpipe [0] = 0; 1202#if EV_USE_EVENTFD
1144 close (evpipe [1]); evpipe [1] = 0; 1203 if (evfd >= 0)
1204 close (evfd);
1205#endif
1206
1207 if (evpipe [0] >= 0)
1208 {
1209 close (evpipe [0]);
1210 close (evpipe [1]);
1211 }
1145 } 1212 }
1146 1213
1147#if EV_USE_INOTIFY 1214#if EV_USE_INOTIFY
1148 if (fs_fd >= 0) 1215 if (fs_fd >= 0)
1149 close (fs_fd); 1216 close (fs_fd);
… …
1187#if EV_FORK_ENABLE 1254#if EV_FORK_ENABLE
1188 array_free (fork, EMPTY); 1255 array_free (fork, EMPTY);
1189#endif 1256#endif
1190 array_free (prepare, EMPTY); 1257 array_free (prepare, EMPTY);
1191 array_free (check, EMPTY); 1258 array_free (check, EMPTY);
1259#if EV_ASYNC_ENABLE
1260 array_free (async, EMPTY);
1261#endif
1192 1262
1193 backend = 0; 1263 backend = 0;
1194} 1264}
1195 1265
1196void inline_size infy_fork (EV_P); 1266void inline_size infy_fork (EV_P);
… …
1212#endif 1282#endif
1213 1283
1214 if (ev_is_active (&pipeev)) 1284 if (ev_is_active (&pipeev))
1215 { 1285 {
1216 /* this "locks" the handlers against writing to the pipe */ 1286 /* this "locks" the handlers against writing to the pipe */
1287 /* while we modify the fd vars */
1288 gotsig = 1;
1289#if EV_ASYNC_ENABLE
1217 gotsig = gotasync = 1; 1290 gotasync = 1;
1291#endif
1218 1292
1219 ev_ref (EV_A); 1293 ev_ref (EV_A);
1220 ev_io_stop (EV_A_ &pipeev); 1294 ev_io_stop (EV_A_ &pipeev);
1295
1296#if EV_USE_EVENTFD
1297 if (evfd >= 0)
1298 close (evfd);
1299#endif
1300
1301 if (evpipe [0] >= 0)
1302 {
1221 close (evpipe [0]); 1303 close (evpipe [0]);
1222 close (evpipe [1]); 1304 close (evpipe [1]);
1305 }
1223 1306
1224 evpipe_init (EV_A); 1307 evpipe_init (EV_A);
1225 /* now iterate over everything, in case we missed something */ 1308 /* now iterate over everything, in case we missed something */
1226 pipecb (EV_A_ &pipeev, EV_READ); 1309 pipecb (EV_A_ &pipeev, EV_READ);
1227 } 1310 }
… …
1534static int loop_done; 1617static int loop_done;
1535 1618
1536void 1619void
1537ev_loop (EV_P_ int flags) 1620ev_loop (EV_P_ int flags)
1538{ 1621{
1539 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1622 loop_done = EVUNLOOP_CANCEL;
1540 ? EVUNLOOP_ONE
1541 : EVUNLOOP_CANCEL;
1542 1623
1543 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1624 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1544 1625
1545 do 1626 do
1546 { 1627 {
… …
1642 /* queue check watchers, to be executed first */ 1723 /* queue check watchers, to be executed first */
1643 if (expect_false (checkcnt)) 1724 if (expect_false (checkcnt))
1644 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1725 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1645 1726
1646 call_pending (EV_A); 1727 call_pending (EV_A);
1647
1648 } 1728 }
1649 while (expect_true (activecnt && !loop_done)); 1729 while (expect_true (
1730 activecnt
1731 && !loop_done
1732 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1733 ));
1650 1734
1651 if (loop_done == EVUNLOOP_ONE) 1735 if (loop_done == EVUNLOOP_ONE)
1652 loop_done = EVUNLOOP_CANCEL; 1736 loop_done = EVUNLOOP_CANCEL;
1653} 1737}
1654 1738
… …
1922 wlist_add (&signals [w->signum - 1].head, (WL)w); 2006 wlist_add (&signals [w->signum - 1].head, (WL)w);
1923 2007
1924 if (!((WL)w)->next) 2008 if (!((WL)w)->next)
1925 { 2009 {
1926#if _WIN32 2010#if _WIN32
1927 signal (w->signum, sighandler); 2011 signal (w->signum, ev_sighandler);
1928#else 2012#else
1929 struct sigaction sa; 2013 struct sigaction sa;
1930 sa.sa_handler = sighandler; 2014 sa.sa_handler = ev_sighandler;
1931 sigfillset (&sa.sa_mask); 2015 sigfillset (&sa.sa_mask);
1932 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2016 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1933 sigaction (w->signum, &sa, 0); 2017 sigaction (w->signum, &sa, 0);
1934#endif 2018#endif
1935 } 2019 }
… …
2458 2542
2459void 2543void
2460ev_async_send (EV_P_ ev_async *w) 2544ev_async_send (EV_P_ ev_async *w)
2461{ 2545{
2462 w->sent = 1; 2546 w->sent = 1;
2463 evpipe_write (EV_A_ 0, 1); 2547 evpipe_write (EV_A_ &gotasync);
2464} 2548}
2465#endif 2549#endif
2466 2550
2467/*****************************************************************************/ 2551/*****************************************************************************/
2468 2552

Diff Legend

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