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

Comparing libev/ev.c (file contents):
Revision 1.322 by root, Thu Jan 7 06:49:31 2010 UTC vs.
Revision 1.337 by root, Wed Mar 10 09:18:24 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
163 163
164#include <assert.h> 164#include <assert.h>
165#include <errno.h> 165#include <errno.h>
166#include <sys/types.h> 166#include <sys/types.h>
167#include <time.h> 167#include <time.h>
168#include <limits.h>
168 169
169#include <signal.h> 170#include <signal.h>
170 171
171#ifdef EV_H 172#ifdef EV_H
172# include EV_H 173# include EV_H
… …
183# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
184# include <windows.h> 185# include <windows.h>
185# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
186# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
187# endif 188# endif
189# undef EV_AVOID_STDIO
188#endif 190#endif
189 191
190/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
191 193
192/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
… …
205#elif defined (MAXSIG) 207#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 215#else
214# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
216# define EV_NSIG 65 219# define EV_NSIG 65
217#endif 220#endif
218 221
219#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
… …
344# endif 347# endif
345#endif 348#endif
346 349
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 350/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 351
352#ifdef _AIX
353/* AIX has a completely broken poll.h header */
354# undef EV_USE_POLL
355# define EV_USE_POLL 0
356#endif
357
349#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
352#endif 361#endif
353 362
… …
396# endif 405# endif
397# endif 406# endif
398# ifdef __cplusplus 407# ifdef __cplusplus
399extern "C" { 408extern "C" {
400# endif 409# endif
401int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
402# ifdef __cplusplus 411# ifdef __cplusplus
403} 412}
404# endif 413# endif
405#endif 414#endif
406 415
… …
517# include "ev_win32.c" 526# include "ev_win32.c"
518#endif 527#endif
519 528
520/*****************************************************************************/ 529/*****************************************************************************/
521 530
531#if EV_AVOID_STDIO
532static void noinline
533ev_printerr (const char *msg)
534{
535 write (STDERR_FILENO, msg, strlen (msg));
536}
537#endif
538
522static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
523 540
524void 541void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
526{ 543{
… …
535 552
536 if (syserr_cb) 553 if (syserr_cb)
537 syserr_cb (msg); 554 syserr_cb (msg);
538 else 555 else
539 { 556 {
557#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg);
561 ev_printerr (": ");
562 ev_printerr (err);
563 ev_printerr ("\n");
564#else
540 perror (msg); 565 perror (msg);
566#endif
541 abort (); 567 abort ();
542 } 568 }
543} 569}
544 570
545static void * 571static void *
546ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
547{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
548 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
549 * implement realloc (x, 0) (as required by both ansi c-98 and 578 * implement realloc (x, 0) (as required by both ansi c-89 and
550 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
551 */ 580 */
552 581
553 if (size) 582 if (size)
554 return realloc (ptr, size); 583 return realloc (ptr, size);
555 584
556 free (ptr); 585 free (ptr);
557 return 0; 586 return 0;
587#endif
558} 588}
559 589
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 591
562void 592void
… …
570{ 600{
571 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
572 602
573 if (!ptr && size) 603 if (!ptr && size)
574 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
576 abort (); 610 abort ();
577 } 611 }
578 612
579 return ptr; 613 return ptr;
580} 614}
… …
857} 891}
858 892
859/*****************************************************************************/ 893/*****************************************************************************/
860 894
861inline_speed void 895inline_speed void
862fd_event_nc (EV_P_ int fd, int revents) 896fd_event_nocheck (EV_P_ int fd, int revents)
863{ 897{
864 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
865 ev_io *w; 899 ev_io *w;
866 900
867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 901 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
879fd_event (EV_P_ int fd, int revents) 913fd_event (EV_P_ int fd, int revents)
880{ 914{
881 ANFD *anfd = anfds + fd; 915 ANFD *anfd = anfds + fd;
882 916
883 if (expect_true (!anfd->reify)) 917 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
885} 919}
886 920
887void 921void
888ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
889{ 923{
890 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
891 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
892} 926}
893 927
894/* make sure the external fd watch events are in-sync */ 928/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */ 929/* with the kernel/libev internal state */
896inline_size void 930inline_size void
… …
959 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
961 } 995 }
962} 996}
963 997
964/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
965inline_size int 999inline_size int
966fd_valid (int fd) 1000fd_valid (int fd)
967{ 1001{
968#ifdef _WIN32 1002#ifdef _WIN32
969 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1009 { 1043 {
1010 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
1011 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1013 } 1047 }
1048}
1049
1050/* used to prepare libev internal fd's */
1051/* this is not fork-safe */
1052inline_speed void
1053fd_intern (int fd)
1054{
1055#ifdef _WIN32
1056 unsigned long arg = 1;
1057 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1058#else
1059 fcntl (fd, F_SETFD, FD_CLOEXEC);
1060 fcntl (fd, F_SETFL, O_NONBLOCK);
1061#endif
1014} 1062}
1015 1063
1016/*****************************************************************************/ 1064/*****************************************************************************/
1017 1065
1018/* 1066/*
… …
1172 1220
1173static ANSIG signals [EV_NSIG - 1]; 1221static ANSIG signals [EV_NSIG - 1];
1174 1222
1175/*****************************************************************************/ 1223/*****************************************************************************/
1176 1224
1177/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1178/* this is not fork-safe */
1179inline_speed void
1180fd_intern (int fd)
1181{
1182#ifdef _WIN32
1183 unsigned long arg = 1;
1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif
1189}
1190 1226
1191static void noinline 1227static void noinline
1192evpipe_init (EV_P) 1228evpipe_init (EV_P)
1193{ 1229{
1194 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1195 { 1231 {
1196#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL) 1234 if (evfd < 0 && errno == EINVAL)
1199 evfd = eventfd (0, 0); 1235 evfd = eventfd (0, 0);
1200 1236
1201 if (evfd >= 0) 1237 if (evfd >= 0)
… …
1203 evpipe [0] = -1; 1239 evpipe [0] = -1;
1204 fd_intern (evfd); /* doing it twice doesn't hurt */ 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1205 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1206 } 1242 }
1207 else 1243 else
1208#endif 1244# endif
1209 { 1245 {
1210 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1211 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1212 1248
1213 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
… …
1224evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1225{ 1261{
1226 if (!*flag) 1262 if (!*flag)
1227 { 1263 {
1228 int old_errno = errno; /* save errno because write might clobber it */ 1264 int old_errno = errno; /* save errno because write might clobber it */
1265 char dummy;
1229 1266
1230 *flag = 1; 1267 *flag = 1;
1231 1268
1232#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1233 if (evfd >= 0) 1270 if (evfd >= 0)
… …
1235 uint64_t counter = 1; 1272 uint64_t counter = 1;
1236 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1237 } 1274 }
1238 else 1275 else
1239#endif 1276#endif
1240 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1241 1278
1242 errno = old_errno; 1279 errno = old_errno;
1243 } 1280 }
1244} 1281}
1245 1282
… …
1346 break; 1383 break;
1347 } 1384 }
1348} 1385}
1349#endif 1386#endif
1350 1387
1388#endif
1389
1351/*****************************************************************************/ 1390/*****************************************************************************/
1352 1391
1392#if EV_CHILD_ENABLE
1353static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1354
1355#ifndef _WIN32
1356 1394
1357static ev_signal childev; 1395static ev_signal childev;
1358 1396
1359#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1360# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
… …
1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1630#endif 1668#endif
1631 1669
1632 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1633 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1634 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1635 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1636 } 1676 }
1637} 1677}
1638 1678
1639/* free up a loop structure */ 1679/* free up a loop structure */
1640static void noinline 1680static void noinline
… …
1758 { 1798 {
1759 EV_WIN32_CLOSE_FD (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1760 EV_WIN32_CLOSE_FD (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1761 } 1801 }
1762 1802
1803#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1763 evpipe_init (EV_A); 1804 evpipe_init (EV_A);
1764 /* now iterate over everything, in case we missed something */ 1805 /* now iterate over everything, in case we missed something */
1765 pipecb (EV_A_ &pipe_w, EV_READ); 1806 pipecb (EV_A_ &pipe_w, EV_READ);
1807#endif
1766 } 1808 }
1767 1809
1768 postfork = 0; 1810 postfork = 0;
1769} 1811}
1770 1812
… …
1883#if EV_ASYNC_ENABLE 1925#if EV_ASYNC_ENABLE
1884 assert (asyncmax >= asynccnt); 1926 assert (asyncmax >= asynccnt);
1885 array_verify (EV_A_ (W *)asyncs, asynccnt); 1927 array_verify (EV_A_ (W *)asyncs, asynccnt);
1886#endif 1928#endif
1887 1929
1930#if EV_PREPARE_ENABLE
1888 assert (preparemax >= preparecnt); 1931 assert (preparemax >= preparecnt);
1889 array_verify (EV_A_ (W *)prepares, preparecnt); 1932 array_verify (EV_A_ (W *)prepares, preparecnt);
1933#endif
1890 1934
1935#if EV_CHECK_ENABLE
1891 assert (checkmax >= checkcnt); 1936 assert (checkmax >= checkcnt);
1892 array_verify (EV_A_ (W *)checks, checkcnt); 1937 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif
1893 1939
1894# if 0 1940# if 0
1941#if EV_CHILD_ENABLE
1895 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1942 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif
1897# endif 1945# endif
1898#endif 1946#endif
1899} 1947}
1900#endif 1948#endif
1901 1949
… …
1917 1965
1918 loop_init (EV_A_ flags); 1966 loop_init (EV_A_ flags);
1919 1967
1920 if (ev_backend (EV_A)) 1968 if (ev_backend (EV_A))
1921 { 1969 {
1922#ifndef _WIN32 1970#if EV_CHILD_ENABLE
1923 ev_signal_init (&childev, childcb, SIGCHLD); 1971 ev_signal_init (&childev, childcb, SIGCHLD);
1924 ev_set_priority (&childev, EV_MAXPRI); 1972 ev_set_priority (&childev, EV_MAXPRI);
1925 ev_signal_start (EV_A_ &childev); 1973 ev_signal_start (EV_A_ &childev);
1926 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1974 ev_unref (EV_A); /* child watcher should not keep loop alive */
1927#endif 1975#endif
… …
1940 EV_P = ev_default_loop_ptr; 1988 EV_P = ev_default_loop_ptr;
1941#endif 1989#endif
1942 1990
1943 ev_default_loop_ptr = 0; 1991 ev_default_loop_ptr = 0;
1944 1992
1945#ifndef _WIN32 1993#if EV_CHILD_ENABLE
1946 ev_ref (EV_A); /* child watcher */ 1994 ev_ref (EV_A); /* child watcher */
1947 ev_signal_stop (EV_A_ &childev); 1995 ev_signal_stop (EV_A_ &childev);
1948#endif 1996#endif
1949 1997
1950 loop_destroy (EV_A); 1998 loop_destroy (EV_A);
… …
2157 ANHE_at_cache (*he); 2205 ANHE_at_cache (*he);
2158 } 2206 }
2159} 2207}
2160 2208
2161/* fetch new monotonic and realtime times from the kernel */ 2209/* fetch new monotonic and realtime times from the kernel */
2162/* also detetc if there was a timejump, and act accordingly */ 2210/* also detect if there was a timejump, and act accordingly */
2163inline_speed void 2211inline_speed void
2164time_update (EV_P_ ev_tstamp max_block) 2212time_update (EV_P_ ev_tstamp max_block)
2165{ 2213{
2166#if EV_USE_MONOTONIC 2214#if EV_USE_MONOTONIC
2167 if (expect_true (have_monotonic)) 2215 if (expect_true (have_monotonic))
… …
2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2310 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2263 EV_INVOKE_PENDING; 2311 EV_INVOKE_PENDING;
2264 } 2312 }
2265#endif 2313#endif
2266 2314
2315#if EV_PREPARE_ENABLE
2267 /* queue prepare watchers (and execute them) */ 2316 /* queue prepare watchers (and execute them) */
2268 if (expect_false (preparecnt)) 2317 if (expect_false (preparecnt))
2269 { 2318 {
2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2319 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2271 EV_INVOKE_PENDING; 2320 EV_INVOKE_PENDING;
2272 } 2321 }
2322#endif
2273 2323
2274 if (expect_false (loop_done)) 2324 if (expect_false (loop_done))
2275 break; 2325 break;
2276 2326
2277 /* we might have forked, so reify kernel state if necessary */ 2327 /* we might have forked, so reify kernel state if necessary */
… …
2350#if EV_IDLE_ENABLE 2400#if EV_IDLE_ENABLE
2351 /* queue idle watchers unless other events are pending */ 2401 /* queue idle watchers unless other events are pending */
2352 idle_reify (EV_A); 2402 idle_reify (EV_A);
2353#endif 2403#endif
2354 2404
2405#if EV_CHECK_ENABLE
2355 /* queue check watchers, to be executed first */ 2406 /* queue check watchers, to be executed first */
2356 if (expect_false (checkcnt)) 2407 if (expect_false (checkcnt))
2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2408 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2409#endif
2358 2410
2359 EV_INVOKE_PENDING; 2411 EV_INVOKE_PENDING;
2360 } 2412 }
2361 while (expect_true ( 2413 while (expect_true (
2362 activecnt 2414 activecnt
… …
2501 2553
2502 if (expect_false (ev_is_active (w))) 2554 if (expect_false (ev_is_active (w)))
2503 return; 2555 return;
2504 2556
2505 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2557 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2506 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2558 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2507 2559
2508 EV_FREQUENT_CHECK; 2560 EV_FREQUENT_CHECK;
2509 2561
2510 ev_start (EV_A_ (W)w, 1); 2562 ev_start (EV_A_ (W)w, 1);
2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2563 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2581 timers [active] = timers [timercnt + HEAP0]; 2633 timers [active] = timers [timercnt + HEAP0];
2582 adjustheap (timers, timercnt, active); 2634 adjustheap (timers, timercnt, active);
2583 } 2635 }
2584 } 2636 }
2585 2637
2586 EV_FREQUENT_CHECK;
2587
2588 ev_at (w) -= mn_now; 2638 ev_at (w) -= mn_now;
2589 2639
2590 ev_stop (EV_A_ (W)w); 2640 ev_stop (EV_A_ (W)w);
2641
2642 EV_FREQUENT_CHECK;
2591} 2643}
2592 2644
2593void noinline 2645void noinline
2594ev_timer_again (EV_P_ ev_timer *w) 2646ev_timer_again (EV_P_ ev_timer *w)
2595{ 2647{
… …
2674 periodics [active] = periodics [periodiccnt + HEAP0]; 2726 periodics [active] = periodics [periodiccnt + HEAP0];
2675 adjustheap (periodics, periodiccnt, active); 2727 adjustheap (periodics, periodiccnt, active);
2676 } 2728 }
2677 } 2729 }
2678 2730
2679 EV_FREQUENT_CHECK;
2680
2681 ev_stop (EV_A_ (W)w); 2731 ev_stop (EV_A_ (W)w);
2732
2733 EV_FREQUENT_CHECK;
2682} 2734}
2683 2735
2684void noinline 2736void noinline
2685ev_periodic_again (EV_P_ ev_periodic *w) 2737ev_periodic_again (EV_P_ ev_periodic *w)
2686{ 2738{
… …
2691#endif 2743#endif
2692 2744
2693#ifndef SA_RESTART 2745#ifndef SA_RESTART
2694# define SA_RESTART 0 2746# define SA_RESTART 0
2695#endif 2747#endif
2748
2749#if EV_SIGNAL_ENABLE
2696 2750
2697void noinline 2751void noinline
2698ev_signal_start (EV_P_ ev_signal *w) 2752ev_signal_start (EV_P_ ev_signal *w)
2699{ 2753{
2700 if (expect_false (ev_is_active (w))) 2754 if (expect_false (ev_is_active (w)))
… …
2807 } 2861 }
2808 2862
2809 EV_FREQUENT_CHECK; 2863 EV_FREQUENT_CHECK;
2810} 2864}
2811 2865
2866#endif
2867
2868#if EV_CHILD_ENABLE
2869
2812void 2870void
2813ev_child_start (EV_P_ ev_child *w) 2871ev_child_start (EV_P_ ev_child *w)
2814{ 2872{
2815#if EV_MULTIPLICITY 2873#if EV_MULTIPLICITY
2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2874 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2839 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2840 2898
2841 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2842} 2900}
2843 2901
2902#endif
2903
2844#if EV_STAT_ENABLE 2904#if EV_STAT_ENABLE
2845 2905
2846# ifdef _WIN32 2906# ifdef _WIN32
2847# undef lstat 2907# undef lstat
2848# define lstat(a,b) _stati64 (a,b) 2908# define lstat(a,b) _stati64 (a,b)
… …
2853#define MIN_STAT_INTERVAL 0.1074891 2913#define MIN_STAT_INTERVAL 0.1074891
2854 2914
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2915static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 2916
2857#if EV_USE_INOTIFY 2917#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 2918
2919/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2920# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 2921
2860static void noinline 2922static void noinline
2861infy_add (EV_P_ ev_stat *w) 2923infy_add (EV_P_ ev_stat *w)
2862{ 2924{
2863 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2925 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
… …
2972 3034
2973static void 3035static void
2974infy_cb (EV_P_ ev_io *w, int revents) 3036infy_cb (EV_P_ ev_io *w, int revents)
2975{ 3037{
2976 char buf [EV_INOTIFY_BUFSIZE]; 3038 char buf [EV_INOTIFY_BUFSIZE];
2977 struct inotify_event *ev = (struct inotify_event *)buf;
2978 int ofs; 3039 int ofs;
2979 int len = read (fs_fd, buf, sizeof (buf)); 3040 int len = read (fs_fd, buf, sizeof (buf));
2980 3041
2981 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3042 for (ofs = 0; ofs < len; )
3043 {
3044 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2982 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3045 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3046 ofs += sizeof (struct inotify_event) + ev->len;
3047 }
3048}
3049
3050inline_size unsigned int
3051ev_linux_version (void)
3052{
3053 struct utsname buf;
3054 unsigned int v;
3055 int i;
3056 char *p = buf.release;
3057
3058 if (uname (&buf))
3059 return 0;
3060
3061 for (i = 3+1; --i; )
3062 {
3063 unsigned int c = 0;
3064
3065 for (;;)
3066 {
3067 if (*p >= '0' && *p <= '9')
3068 c = c * 10 + *p++ - '0';
3069 else
3070 {
3071 p += *p == '.';
3072 break;
3073 }
3074 }
3075
3076 v = (v << 8) | c;
3077 }
3078
3079 return v;
2983} 3080}
2984 3081
2985inline_size void 3082inline_size void
2986check_2625 (EV_P) 3083ev_check_2625 (EV_P)
2987{ 3084{
2988 /* kernels < 2.6.25 are borked 3085 /* kernels < 2.6.25 are borked
2989 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3086 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2990 */ 3087 */
2991 struct utsname buf; 3088 if (ev_linux_version () < 0x020619)
2992 int major, minor, micro;
2993
2994 if (uname (&buf))
2995 return;
2996
2997 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2998 return;
2999
3000 if (major < 2
3001 || (major == 2 && minor < 6)
3002 || (major == 2 && minor == 6 && micro < 25))
3003 return; 3089 return;
3004 3090
3005 fs_2625 = 1; 3091 fs_2625 = 1;
3006} 3092}
3007 3093
… …
3022 if (fs_fd != -2) 3108 if (fs_fd != -2)
3023 return; 3109 return;
3024 3110
3025 fs_fd = -1; 3111 fs_fd = -1;
3026 3112
3027 check_2625 (EV_A); 3113 ev_check_2625 (EV_A);
3028 3114
3029 fs_fd = infy_newfd (); 3115 fs_fd = infy_newfd ();
3030 3116
3031 if (fs_fd >= 0) 3117 if (fs_fd >= 0)
3032 { 3118 {
… …
3242 3328
3243 EV_FREQUENT_CHECK; 3329 EV_FREQUENT_CHECK;
3244} 3330}
3245#endif 3331#endif
3246 3332
3333#if EV_PREPARE_ENABLE
3247void 3334void
3248ev_prepare_start (EV_P_ ev_prepare *w) 3335ev_prepare_start (EV_P_ ev_prepare *w)
3249{ 3336{
3250 if (expect_false (ev_is_active (w))) 3337 if (expect_false (ev_is_active (w)))
3251 return; 3338 return;
… …
3277 3364
3278 ev_stop (EV_A_ (W)w); 3365 ev_stop (EV_A_ (W)w);
3279 3366
3280 EV_FREQUENT_CHECK; 3367 EV_FREQUENT_CHECK;
3281} 3368}
3369#endif
3282 3370
3371#if EV_CHECK_ENABLE
3283void 3372void
3284ev_check_start (EV_P_ ev_check *w) 3373ev_check_start (EV_P_ ev_check *w)
3285{ 3374{
3286 if (expect_false (ev_is_active (w))) 3375 if (expect_false (ev_is_active (w)))
3287 return; 3376 return;
… …
3313 3402
3314 ev_stop (EV_A_ (W)w); 3403 ev_stop (EV_A_ (W)w);
3315 3404
3316 EV_FREQUENT_CHECK; 3405 EV_FREQUENT_CHECK;
3317} 3406}
3407#endif
3318 3408
3319#if EV_EMBED_ENABLE 3409#if EV_EMBED_ENABLE
3320void noinline 3410void noinline
3321ev_embed_sweep (EV_P_ ev_embed *w) 3411ev_embed_sweep (EV_P_ ev_embed *w)
3322{ 3412{
… …
3416 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3417 3507
3418 ev_io_stop (EV_A_ &w->io); 3508 ev_io_stop (EV_A_ &w->io);
3419 ev_prepare_stop (EV_A_ &w->prepare); 3509 ev_prepare_stop (EV_A_ &w->prepare);
3420 ev_fork_stop (EV_A_ &w->fork); 3510 ev_fork_stop (EV_A_ &w->fork);
3511
3512 ev_stop (EV_A_ (W)w);
3421 3513
3422 EV_FREQUENT_CHECK; 3514 EV_FREQUENT_CHECK;
3423} 3515}
3424#endif 3516#endif
3425 3517
… …
3649 if (types & EV_ASYNC) 3741 if (types & EV_ASYNC)
3650 for (i = asynccnt; i--; ) 3742 for (i = asynccnt; i--; )
3651 cb (EV_A_ EV_ASYNC, asyncs [i]); 3743 cb (EV_A_ EV_ASYNC, asyncs [i]);
3652#endif 3744#endif
3653 3745
3746#if EV_PREPARE_ENABLE
3654 if (types & EV_PREPARE) 3747 if (types & EV_PREPARE)
3655 for (i = preparecnt; i--; ) 3748 for (i = preparecnt; i--; )
3656#if EV_EMBED_ENABLE 3749# if EV_EMBED_ENABLE
3657 if (ev_cb (prepares [i]) != embed_prepare_cb) 3750 if (ev_cb (prepares [i]) != embed_prepare_cb)
3658#endif 3751# endif
3659 cb (EV_A_ EV_PREPARE, prepares [i]); 3752 cb (EV_A_ EV_PREPARE, prepares [i]);
3753#endif
3660 3754
3755#if EV_CHECK_ENABLE
3661 if (types & EV_CHECK) 3756 if (types & EV_CHECK)
3662 for (i = checkcnt; i--; ) 3757 for (i = checkcnt; i--; )
3663 cb (EV_A_ EV_CHECK, checks [i]); 3758 cb (EV_A_ EV_CHECK, checks [i]);
3759#endif
3664 3760
3761#if EV_SIGNAL_ENABLE
3665 if (types & EV_SIGNAL) 3762 if (types & EV_SIGNAL)
3666 for (i = 0; i < EV_NSIG - 1; ++i) 3763 for (i = 0; i < EV_NSIG - 1; ++i)
3667 for (wl = signals [i].head; wl; ) 3764 for (wl = signals [i].head; wl; )
3668 { 3765 {
3669 wn = wl->next; 3766 wn = wl->next;
3670 cb (EV_A_ EV_SIGNAL, wl); 3767 cb (EV_A_ EV_SIGNAL, wl);
3671 wl = wn; 3768 wl = wn;
3672 } 3769 }
3770#endif
3673 3771
3772#if EV_CHILD_ENABLE
3674 if (types & EV_CHILD) 3773 if (types & EV_CHILD)
3675 for (i = EV_PID_HASHSIZE; i--; ) 3774 for (i = EV_PID_HASHSIZE; i--; )
3676 for (wl = childs [i]; wl; ) 3775 for (wl = childs [i]; wl; )
3677 { 3776 {
3678 wn = wl->next; 3777 wn = wl->next;
3679 cb (EV_A_ EV_CHILD, wl); 3778 cb (EV_A_ EV_CHILD, wl);
3680 wl = wn; 3779 wl = wn;
3681 } 3780 }
3781#endif
3682/* EV_STAT 0x00001000 /* stat data changed */ 3782/* EV_STAT 0x00001000 /* stat data changed */
3683/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3783/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3684} 3784}
3685#endif 3785#endif
3686 3786

Diff Legend

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