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

Comparing libev/ev.c (file contents):
Revision 1.212 by root, Tue Feb 19 19:01:13 2008 UTC vs.
Revision 1.224 by root, Wed Apr 9 22:07:50 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);
… …
802static void noinline 854static void noinline
803evpipe_init (EV_P) 855evpipe_init (EV_P)
804{ 856{
805 if (!ev_is_active (&pipeev)) 857 if (!ev_is_active (&pipeev))
806 { 858 {
859#if EV_USE_EVENTFD
860 if ((evfd = eventfd (0, 0)) >= 0)
861 {
862 evpipe [0] = -1;
863 fd_intern (evfd);
864 ev_io_set (&pipeev, evfd, EV_READ);
865 }
866 else
867#endif
868 {
807 while (pipe (evpipe)) 869 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 870 syserr ("(libev) error creating signal/async pipe");
809 871
810 fd_intern (evpipe [0]); 872 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 873 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 874 ev_io_set (&pipeev, evpipe [0], EV_READ);
875 }
876
814 ev_io_start (EV_A_ &pipeev); 877 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* watcher should not keep loop alive */ 878 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 879 }
817} 880}
818 881
819void inline_size 882void inline_size
820evpipe_write (EV_P_ int sig, int async) 883evpipe_write (EV_P_ EV_ATOMIC_T *flag)
821{ 884{
822 if (!(gotasync || gotsig)) 885 if (!*flag)
823 { 886 {
824 int old_errno = errno; /* save errno becaue write might clobber it */ 887 int old_errno = errno; /* save errno because write might clobber it */
825 888
826 if (sig) gotsig = 1; 889 *flag = 1;
827 if (async) gotasync = 1;
828 890
891#if EV_USE_EVENTFD
892 if (evfd >= 0)
893 {
894 uint64_t counter = 1;
895 write (evfd, &counter, sizeof (uint64_t));
896 }
897 else
898#endif
829 write (evpipe [1], &old_errno, 1); 899 write (evpipe [1], &old_errno, 1);
830 900
831 errno = old_errno; 901 errno = old_errno;
832 } 902 }
833} 903}
834 904
835static void 905static void
836pipecb (EV_P_ ev_io *iow, int revents) 906pipecb (EV_P_ ev_io *iow, int revents)
837{ 907{
908#if EV_USE_EVENTFD
909 if (evfd >= 0)
838 { 910 {
839 int dummy; 911 uint64_t counter = 1;
912 read (evfd, &counter, sizeof (uint64_t));
913 }
914 else
915#endif
916 {
917 char dummy;
840 read (evpipe [0], &dummy, 1); 918 read (evpipe [0], &dummy, 1);
841 } 919 }
842 920
843 if (gotsig && ev_is_default_loop (EV_A)) 921 if (gotsig && ev_is_default_loop (EV_A))
844 { 922 {
845 int signum; 923 int signum;
846 gotsig = 0; 924 gotsig = 0;
… …
867} 945}
868 946
869/*****************************************************************************/ 947/*****************************************************************************/
870 948
871static void 949static void
872sighandler (int signum) 950ev_sighandler (int signum)
873{ 951{
874#if EV_MULTIPLICITY 952#if EV_MULTIPLICITY
875 struct ev_loop *loop = &default_loop_struct; 953 struct ev_loop *loop = &default_loop_struct;
876#endif 954#endif
877 955
878#if _WIN32 956#if _WIN32
879 signal (signum, sighandler); 957 signal (signum, ev_sighandler);
880#endif 958#endif
881 959
882 signals [signum - 1].gotsig = 1; 960 signals [signum - 1].gotsig = 1;
883 evpipe_write (EV_A_ 1, 0); 961 evpipe_write (EV_A_ &gotsig);
884} 962}
885 963
886void noinline 964void noinline
887ev_feed_signal_event (EV_P_ int signum) 965ev_feed_signal_event (EV_P_ int signum)
888{ 966{
… …
914#ifndef WIFCONTINUED 992#ifndef WIFCONTINUED
915# define WIFCONTINUED(status) 0 993# define WIFCONTINUED(status) 0
916#endif 994#endif
917 995
918void inline_speed 996void inline_speed
919child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 997child_reap (EV_P_ int chain, int pid, int status)
920{ 998{
921 ev_child *w; 999 ev_child *w;
922 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1000 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
923 1001
924 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1002 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
925 { 1003 {
926 if ((w->pid == pid || !w->pid) 1004 if ((w->pid == pid || !w->pid)
927 && (!traced || (w->flags & 1))) 1005 && (!traced || (w->flags & 1)))
928 { 1006 {
929 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1007 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; 1008 w->rpid = pid;
931 w->rstatus = status; 1009 w->rstatus = status;
932 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1010 ev_feed_event (EV_A_ (W)w, EV_CHILD);
933 } 1011 }
934 } 1012 }
… …
948 if (!WCONTINUED 1026 if (!WCONTINUED
949 || errno != EINVAL 1027 || errno != EINVAL
950 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1028 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
951 return; 1029 return;
952 1030
953 /* make sure we are called again until all childs have been reaped */ 1031 /* 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 */ 1032 /* 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); 1033 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
956 1034
957 child_reap (EV_A_ sw, pid, pid, status); 1035 child_reap (EV_A_ pid, pid, status);
958 if (EV_PID_HASHSIZE > 1) 1036 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 */ 1037 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
960} 1038}
961 1039
962#endif 1040#endif
963 1041
964/*****************************************************************************/ 1042/*****************************************************************************/
… …
1141 if (ev_is_active (&pipeev)) 1219 if (ev_is_active (&pipeev))
1142 { 1220 {
1143 ev_ref (EV_A); /* signal watcher */ 1221 ev_ref (EV_A); /* signal watcher */
1144 ev_io_stop (EV_A_ &pipeev); 1222 ev_io_stop (EV_A_ &pipeev);
1145 1223
1146 close (evpipe [0]); evpipe [0] = 0; 1224#if EV_USE_EVENTFD
1147 close (evpipe [1]); evpipe [1] = 0; 1225 if (evfd >= 0)
1226 close (evfd);
1227#endif
1228
1229 if (evpipe [0] >= 0)
1230 {
1231 close (evpipe [0]);
1232 close (evpipe [1]);
1233 }
1148 } 1234 }
1149 1235
1150#if EV_USE_INOTIFY 1236#if EV_USE_INOTIFY
1151 if (fs_fd >= 0) 1237 if (fs_fd >= 0)
1152 close (fs_fd); 1238 close (fs_fd);
… …
1226 gotasync = 1; 1312 gotasync = 1;
1227#endif 1313#endif
1228 1314
1229 ev_ref (EV_A); 1315 ev_ref (EV_A);
1230 ev_io_stop (EV_A_ &pipeev); 1316 ev_io_stop (EV_A_ &pipeev);
1317
1318#if EV_USE_EVENTFD
1319 if (evfd >= 0)
1320 close (evfd);
1321#endif
1322
1323 if (evpipe [0] >= 0)
1324 {
1231 close (evpipe [0]); 1325 close (evpipe [0]);
1232 close (evpipe [1]); 1326 close (evpipe [1]);
1327 }
1233 1328
1234 evpipe_init (EV_A); 1329 evpipe_init (EV_A);
1235 /* now iterate over everything, in case we missed something */ 1330 /* now iterate over everything, in case we missed something */
1236 pipecb (EV_A_ &pipeev, EV_READ); 1331 pipecb (EV_A_ &pipeev, EV_READ);
1237 } 1332 }
… …
1544static int loop_done; 1639static int loop_done;
1545 1640
1546void 1641void
1547ev_loop (EV_P_ int flags) 1642ev_loop (EV_P_ int flags)
1548{ 1643{
1549 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1644 loop_done = EVUNLOOP_CANCEL;
1550 ? EVUNLOOP_ONE
1551 : EVUNLOOP_CANCEL;
1552 1645
1553 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1646 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1554 1647
1555 do 1648 do
1556 { 1649 {
… …
1652 /* queue check watchers, to be executed first */ 1745 /* queue check watchers, to be executed first */
1653 if (expect_false (checkcnt)) 1746 if (expect_false (checkcnt))
1654 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1747 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1655 1748
1656 call_pending (EV_A); 1749 call_pending (EV_A);
1657
1658 } 1750 }
1659 while (expect_true (activecnt && !loop_done)); 1751 while (expect_true (
1752 activecnt
1753 && !loop_done
1754 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1755 ));
1660 1756
1661 if (loop_done == EVUNLOOP_ONE) 1757 if (loop_done == EVUNLOOP_ONE)
1662 loop_done = EVUNLOOP_CANCEL; 1758 loop_done = EVUNLOOP_CANCEL;
1663} 1759}
1664 1760
… …
1932 wlist_add (&signals [w->signum - 1].head, (WL)w); 2028 wlist_add (&signals [w->signum - 1].head, (WL)w);
1933 2029
1934 if (!((WL)w)->next) 2030 if (!((WL)w)->next)
1935 { 2031 {
1936#if _WIN32 2032#if _WIN32
1937 signal (w->signum, sighandler); 2033 signal (w->signum, ev_sighandler);
1938#else 2034#else
1939 struct sigaction sa; 2035 struct sigaction sa;
1940 sa.sa_handler = sighandler; 2036 sa.sa_handler = ev_sighandler;
1941 sigfillset (&sa.sa_mask); 2037 sigfillset (&sa.sa_mask);
1942 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2038 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1943 sigaction (w->signum, &sa, 0); 2039 sigaction (w->signum, &sa, 0);
1944#endif 2040#endif
1945 } 2041 }
… …
2468 2564
2469void 2565void
2470ev_async_send (EV_P_ ev_async *w) 2566ev_async_send (EV_P_ ev_async *w)
2471{ 2567{
2472 w->sent = 1; 2568 w->sent = 1;
2473 evpipe_write (EV_A_ 0, 1); 2569 evpipe_write (EV_A_ &gotasync);
2474} 2570}
2475#endif 2571#endif
2476 2572
2477/*****************************************************************************/ 2573/*****************************************************************************/
2478 2574

Diff Legend

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