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

Comparing libev/ev.c (file contents):
Revision 1.210 by root, Sat Feb 9 00:34:11 2008 UTC vs.
Revision 1.227 by root, Fri May 2 07:20:01 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 */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
244#endif 281#endif
245 282
246/**/ 283/**/
247 284
248/* 285/*
… …
263# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
264# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
265#else 302#else
266# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
267# define noinline 304# define noinline
268# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
269# define inline 306# define inline
270# endif 307# endif
271#endif 308#endif
272 309
273#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
323 perror (msg); 360 perror (msg);
324 abort (); 361 abort ();
325 } 362 }
326} 363}
327 364
365static void *
366ev_realloc_emul (void *ptr, long size)
367{
368 /* some systems, notably openbsd and darwin, fail to properly
369 * implement realloc (x, 0) (as required by both ansi c-98 and
370 * the single unix specification, so work around them here.
371 */
372
373 if (size)
374 return realloc (ptr, size);
375
376 free (ptr);
377 return 0;
378}
379
328static void *(*alloc)(void *ptr, long size); 380static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
329 381
330void 382void
331ev_set_allocator (void *(*cb)(void *ptr, long size)) 383ev_set_allocator (void *(*cb)(void *ptr, long size))
332{ 384{
333 alloc = cb; 385 alloc = cb;
334} 386}
335 387
336inline_speed void * 388inline_speed void *
337ev_realloc (void *ptr, long size) 389ev_realloc (void *ptr, long size)
338{ 390{
339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 391 ptr = alloc (ptr, size);
340 392
341 if (!ptr && size) 393 if (!ptr && size)
342 { 394 {
343 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 395 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
344 abort (); 396 abort ();
… …
451 ts.tv_sec = (time_t)delay; 503 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 504 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 505
454 nanosleep (&ts, 0); 506 nanosleep (&ts, 0);
455#elif defined(_WIN32) 507#elif defined(_WIN32)
456 Sleep (delay * 1e3); 508 Sleep ((unsigned long)(delay * 1e3));
457#else 509#else
458 struct timeval tv; 510 struct timeval tv;
459 511
460 tv.tv_sec = (time_t)delay; 512 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 513 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
702 } 754 }
703} 755}
704 756
705/*****************************************************************************/ 757/*****************************************************************************/
706 758
759/* towards the root */
707void inline_speed 760void inline_speed
708upheap (WT *heap, int k) 761upheap (WT *heap, int k)
709{ 762{
710 WT w = heap [k]; 763 WT w = heap [k];
711 764
… …
723 776
724 heap [k] = w; 777 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 778 ((W)heap [k])->active = k + 1;
726} 779}
727 780
781/* away from the root */
728void inline_speed 782void inline_speed
729downheap (WT *heap, int N, int k) 783downheap (WT *heap, int N, int k)
730{ 784{
731 WT w = heap [k]; 785 WT w = heap [k];
732 786
… …
802static void noinline 856static void noinline
803evpipe_init (EV_P) 857evpipe_init (EV_P)
804{ 858{
805 if (!ev_is_active (&pipeev)) 859 if (!ev_is_active (&pipeev))
806 { 860 {
861#if EV_USE_EVENTFD
862 if ((evfd = eventfd (0, 0)) >= 0)
863 {
864 evpipe [0] = -1;
865 fd_intern (evfd);
866 ev_io_set (&pipeev, evfd, EV_READ);
867 }
868 else
869#endif
870 {
807 while (pipe (evpipe)) 871 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 872 syserr ("(libev) error creating signal/async pipe");
809 873
810 fd_intern (evpipe [0]); 874 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 875 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 876 ev_io_set (&pipeev, evpipe [0], EV_READ);
877 }
878
814 ev_io_start (EV_A_ &pipeev); 879 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* watcher should not keep loop alive */ 880 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 881 }
817} 882}
818 883
819void inline_size 884void inline_size
820evpipe_write (EV_P_ int sig, int async) 885evpipe_write (EV_P_ EV_ATOMIC_T *flag)
821{ 886{
822 if (!(gotasync || gotsig)) 887 if (!*flag)
823 { 888 {
824 int old_errno = errno; /* save errno becaue write might clobber it */ 889 int old_errno = errno; /* save errno because write might clobber it */
825 890
826 if (sig) gotsig = 1; 891 *flag = 1;
827 if (async) gotasync = 1;
828 892
893#if EV_USE_EVENTFD
894 if (evfd >= 0)
895 {
896 uint64_t counter = 1;
897 write (evfd, &counter, sizeof (uint64_t));
898 }
899 else
900#endif
829 write (evpipe [1], &old_errno, 1); 901 write (evpipe [1], &old_errno, 1);
830 902
831 errno = old_errno; 903 errno = old_errno;
832 } 904 }
833} 905}
834 906
835static void 907static void
836pipecb (EV_P_ ev_io *iow, int revents) 908pipecb (EV_P_ ev_io *iow, int revents)
837{ 909{
910#if EV_USE_EVENTFD
911 if (evfd >= 0)
838 { 912 {
839 int dummy; 913 uint64_t counter = 1;
914 read (evfd, &counter, sizeof (uint64_t));
915 }
916 else
917#endif
918 {
919 char dummy;
840 read (evpipe [0], &dummy, 1); 920 read (evpipe [0], &dummy, 1);
841 } 921 }
842 922
843 if (gotsig) 923 if (gotsig && ev_is_default_loop (EV_A))
844 { 924 {
845 int signum; 925 int signum;
846 gotsig = 0; 926 gotsig = 0;
847 927
848 for (signum = signalmax; signum--; ) 928 for (signum = signalmax; signum--; )
… …
867} 947}
868 948
869/*****************************************************************************/ 949/*****************************************************************************/
870 950
871static void 951static void
872sighandler (int signum) 952ev_sighandler (int signum)
873{ 953{
874#if EV_MULTIPLICITY 954#if EV_MULTIPLICITY
875 struct ev_loop *loop = &default_loop_struct; 955 struct ev_loop *loop = &default_loop_struct;
876#endif 956#endif
877 957
878#if _WIN32 958#if _WIN32
879 signal (signum, sighandler); 959 signal (signum, ev_sighandler);
880#endif 960#endif
881 961
882 signals [signum - 1].gotsig = 1; 962 signals [signum - 1].gotsig = 1;
883 evpipe_write (EV_A_ 1, 0); 963 evpipe_write (EV_A_ &gotsig);
884} 964}
885 965
886void noinline 966void noinline
887ev_feed_signal_event (EV_P_ int signum) 967ev_feed_signal_event (EV_P_ int signum)
888{ 968{
… …
914#ifndef WIFCONTINUED 994#ifndef WIFCONTINUED
915# define WIFCONTINUED(status) 0 995# define WIFCONTINUED(status) 0
916#endif 996#endif
917 997
918void inline_speed 998void inline_speed
919child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 999child_reap (EV_P_ int chain, int pid, int status)
920{ 1000{
921 ev_child *w; 1001 ev_child *w;
922 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1002 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
923 1003
924 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1004 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
925 { 1005 {
926 if ((w->pid == pid || !w->pid) 1006 if ((w->pid == pid || !w->pid)
927 && (!traced || (w->flags & 1))) 1007 && (!traced || (w->flags & 1)))
928 { 1008 {
929 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1009 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
930 w->rpid = pid; 1010 w->rpid = pid;
931 w->rstatus = status; 1011 w->rstatus = status;
932 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1012 ev_feed_event (EV_A_ (W)w, EV_CHILD);
933 } 1013 }
934 } 1014 }
… …
948 if (!WCONTINUED 1028 if (!WCONTINUED
949 || errno != EINVAL 1029 || errno != EINVAL
950 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1030 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
951 return; 1031 return;
952 1032
953 /* make sure we are called again until all childs have been reaped */ 1033 /* make sure we are called again until all children have been reaped */
954 /* we need to do it this way so that the callback gets called before we continue */ 1034 /* we need to do it this way so that the callback gets called before we continue */
955 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1035 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
956 1036
957 child_reap (EV_A_ sw, pid, pid, status); 1037 child_reap (EV_A_ pid, pid, status);
958 if (EV_PID_HASHSIZE > 1) 1038 if (EV_PID_HASHSIZE > 1)
959 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1039 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
960} 1040}
961 1041
962#endif 1042#endif
963 1043
964/*****************************************************************************/ 1044/*****************************************************************************/
… …
1107 if (!(flags & EVFLAG_NOENV) 1187 if (!(flags & EVFLAG_NOENV)
1108 && !enable_secure () 1188 && !enable_secure ()
1109 && getenv ("LIBEV_FLAGS")) 1189 && getenv ("LIBEV_FLAGS"))
1110 flags = atoi (getenv ("LIBEV_FLAGS")); 1190 flags = atoi (getenv ("LIBEV_FLAGS"));
1111 1191
1112 if (!(flags & 0x0000ffffUL)) 1192 if (!(flags & 0x0000ffffU))
1113 flags |= ev_recommended_backends (); 1193 flags |= ev_recommended_backends ();
1114 1194
1115#if EV_USE_PORT 1195#if EV_USE_PORT
1116 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1196 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1117#endif 1197#endif
… …
1141 if (ev_is_active (&pipeev)) 1221 if (ev_is_active (&pipeev))
1142 { 1222 {
1143 ev_ref (EV_A); /* signal watcher */ 1223 ev_ref (EV_A); /* signal watcher */
1144 ev_io_stop (EV_A_ &pipeev); 1224 ev_io_stop (EV_A_ &pipeev);
1145 1225
1146 close (evpipe [0]); evpipe [0] = 0; 1226#if EV_USE_EVENTFD
1147 close (evpipe [1]); evpipe [1] = 0; 1227 if (evfd >= 0)
1228 close (evfd);
1229#endif
1230
1231 if (evpipe [0] >= 0)
1232 {
1233 close (evpipe [0]);
1234 close (evpipe [1]);
1235 }
1148 } 1236 }
1149 1237
1150#if EV_USE_INOTIFY 1238#if EV_USE_INOTIFY
1151 if (fs_fd >= 0) 1239 if (fs_fd >= 0)
1152 close (fs_fd); 1240 close (fs_fd);
… …
1197#endif 1285#endif
1198 1286
1199 backend = 0; 1287 backend = 0;
1200} 1288}
1201 1289
1290#if EV_USE_INOTIFY
1202void inline_size infy_fork (EV_P); 1291void inline_size infy_fork (EV_P);
1292#endif
1203 1293
1204void inline_size 1294void inline_size
1205loop_fork (EV_P) 1295loop_fork (EV_P)
1206{ 1296{
1207#if EV_USE_PORT 1297#if EV_USE_PORT
… …
1218#endif 1308#endif
1219 1309
1220 if (ev_is_active (&pipeev)) 1310 if (ev_is_active (&pipeev))
1221 { 1311 {
1222 /* this "locks" the handlers against writing to the pipe */ 1312 /* this "locks" the handlers against writing to the pipe */
1313 /* while we modify the fd vars */
1314 gotsig = 1;
1315#if EV_ASYNC_ENABLE
1223 gotsig = gotasync = 1; 1316 gotasync = 1;
1317#endif
1224 1318
1225 ev_ref (EV_A); 1319 ev_ref (EV_A);
1226 ev_io_stop (EV_A_ &pipeev); 1320 ev_io_stop (EV_A_ &pipeev);
1321
1322#if EV_USE_EVENTFD
1323 if (evfd >= 0)
1324 close (evfd);
1325#endif
1326
1327 if (evpipe [0] >= 0)
1328 {
1227 close (evpipe [0]); 1329 close (evpipe [0]);
1228 close (evpipe [1]); 1330 close (evpipe [1]);
1331 }
1229 1332
1230 evpipe_init (EV_A); 1333 evpipe_init (EV_A);
1231 /* now iterate over everything, in case we missed something */ 1334 /* now iterate over everything, in case we missed something */
1232 pipecb (EV_A_ &pipeev, EV_READ); 1335 pipecb (EV_A_ &pipeev, EV_READ);
1233 } 1336 }
… …
1540static int loop_done; 1643static int loop_done;
1541 1644
1542void 1645void
1543ev_loop (EV_P_ int flags) 1646ev_loop (EV_P_ int flags)
1544{ 1647{
1545 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1648 loop_done = EVUNLOOP_CANCEL;
1546 ? EVUNLOOP_ONE
1547 : EVUNLOOP_CANCEL;
1548 1649
1549 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1650 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1550 1651
1551 do 1652 do
1552 { 1653 {
… …
1648 /* queue check watchers, to be executed first */ 1749 /* queue check watchers, to be executed first */
1649 if (expect_false (checkcnt)) 1750 if (expect_false (checkcnt))
1650 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1751 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1651 1752
1652 call_pending (EV_A); 1753 call_pending (EV_A);
1653
1654 } 1754 }
1655 while (expect_true (activecnt && !loop_done)); 1755 while (expect_true (
1756 activecnt
1757 && !loop_done
1758 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1759 ));
1656 1760
1657 if (loop_done == EVUNLOOP_ONE) 1761 if (loop_done == EVUNLOOP_ONE)
1658 loop_done = EVUNLOOP_CANCEL; 1762 loop_done = EVUNLOOP_CANCEL;
1659} 1763}
1660 1764
… …
1928 wlist_add (&signals [w->signum - 1].head, (WL)w); 2032 wlist_add (&signals [w->signum - 1].head, (WL)w);
1929 2033
1930 if (!((WL)w)->next) 2034 if (!((WL)w)->next)
1931 { 2035 {
1932#if _WIN32 2036#if _WIN32
1933 signal (w->signum, sighandler); 2037 signal (w->signum, ev_sighandler);
1934#else 2038#else
1935 struct sigaction sa; 2039 struct sigaction sa;
1936 sa.sa_handler = sighandler; 2040 sa.sa_handler = ev_sighandler;
1937 sigfillset (&sa.sa_mask); 2041 sigfillset (&sa.sa_mask);
1938 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2042 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1939 sigaction (w->signum, &sa, 0); 2043 sigaction (w->signum, &sa, 0);
1940#endif 2044#endif
1941 } 2045 }
… …
2464 2568
2465void 2569void
2466ev_async_send (EV_P_ ev_async *w) 2570ev_async_send (EV_P_ ev_async *w)
2467{ 2571{
2468 w->sent = 1; 2572 w->sent = 1;
2469 evpipe_write (EV_A_ 0, 1); 2573 evpipe_write (EV_A_ &gotasync);
2470} 2574}
2471#endif 2575#endif
2472 2576
2473/*****************************************************************************/ 2577/*****************************************************************************/
2474 2578

Diff Legend

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