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

Comparing libev/ev.c (file contents):
Revision 1.315 by root, Wed Aug 26 17:46:22 2009 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
… …
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
… …
182# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 185# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
186# endif 188# endif
189# undef EV_AVOID_STDIO
187#endif 190#endif
188 191
189/* 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 */
190 193
191/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
… …
204#elif defined (MAXSIG) 207#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 215#else
213# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
214/* 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! :) */
215# define EV_NSIG 65 219# define EV_NSIG 65
216#endif 220#endif
217 221
218#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
… …
343# endif 347# endif
344#endif 348#endif
345 349
346/* 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 */
347 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
348#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
351#endif 361#endif
352 362
… …
395# endif 405# endif
396# endif 406# endif
397# ifdef __cplusplus 407# ifdef __cplusplus
398extern "C" { 408extern "C" {
399# endif 409# endif
400int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 411# ifdef __cplusplus
402} 412}
403# endif 413# endif
404#endif 414#endif
405 415
… …
450 */ 460 */
451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
452 462
453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
455/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
456 465
457#if __GNUC__ >= 4 466#if __GNUC__ >= 4
458# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
459# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
460#else 469#else
… …
505 514
506#ifndef EV_FD_TO_WIN32_HANDLE 515#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 517#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 518#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 520#endif
512#ifndef EV_WIN32_CLOSE_FD 521#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 522# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 523#endif
515 524
516#ifdef _WIN32 525#ifdef _WIN32
517# include "ev_win32.c" 526# include "ev_win32.c"
518#endif 527#endif
519 528
520/*****************************************************************************/ 529/*****************************************************************************/
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
521 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))
… …
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 _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 1004#else
971 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
972#endif 1006#endif
973} 1007}
974 1008
… …
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 (_get_osfhandle (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
… …
1294{ 1331{
1295#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1333 EV_P = signals [signum - 1].loop;
1297#endif 1334#endif
1298 1335
1299#if _WIN32 1336#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1301#endif 1338#endif
1302 1339
1303 signals [signum - 1].pending = 1; 1340 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1341 evpipe_write (EV_A_ &sig_pending);
… …
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
… …
1605#endif 1643#endif
1606#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1646#endif
1609#if EV_USE_SIGNALFD 1647#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1649#endif
1612 1650
1613 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1615 1653
… …
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
… …
1659 } 1699 }
1660 } 1700 }
1661 1701
1662#if EV_USE_SIGNALFD 1702#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w)) 1703 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd); 1704 close (sigfd);
1669 }
1670#endif 1705#endif
1671 1706
1672#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1673 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1674 close (fs_fd); 1709 close (fs_fd);
… …
1763 { 1798 {
1764 EV_WIN32_CLOSE_FD (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1765 EV_WIN32_CLOSE_FD (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1766 } 1801 }
1767 1802
1803#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1768 evpipe_init (EV_A); 1804 evpipe_init (EV_A);
1769 /* now iterate over everything, in case we missed something */ 1805 /* now iterate over everything, in case we missed something */
1770 pipecb (EV_A_ &pipe_w, EV_READ); 1806 pipecb (EV_A_ &pipe_w, EV_READ);
1807#endif
1771 } 1808 }
1772 1809
1773 postfork = 0; 1810 postfork = 0;
1774} 1811}
1775 1812
… …
1888#if EV_ASYNC_ENABLE 1925#if EV_ASYNC_ENABLE
1889 assert (asyncmax >= asynccnt); 1926 assert (asyncmax >= asynccnt);
1890 array_verify (EV_A_ (W *)asyncs, asynccnt); 1927 array_verify (EV_A_ (W *)asyncs, asynccnt);
1891#endif 1928#endif
1892 1929
1930#if EV_PREPARE_ENABLE
1893 assert (preparemax >= preparecnt); 1931 assert (preparemax >= preparecnt);
1894 array_verify (EV_A_ (W *)prepares, preparecnt); 1932 array_verify (EV_A_ (W *)prepares, preparecnt);
1933#endif
1895 1934
1935#if EV_CHECK_ENABLE
1896 assert (checkmax >= checkcnt); 1936 assert (checkmax >= checkcnt);
1897 array_verify (EV_A_ (W *)checks, checkcnt); 1937 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif
1898 1939
1899# if 0 1940# if 0
1941#if EV_CHILD_ENABLE
1900 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)
1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif
1902# endif 1945# endif
1903#endif 1946#endif
1904} 1947}
1905#endif 1948#endif
1906 1949
… …
1922 1965
1923 loop_init (EV_A_ flags); 1966 loop_init (EV_A_ flags);
1924 1967
1925 if (ev_backend (EV_A)) 1968 if (ev_backend (EV_A))
1926 { 1969 {
1927#ifndef _WIN32 1970#if EV_CHILD_ENABLE
1928 ev_signal_init (&childev, childcb, SIGCHLD); 1971 ev_signal_init (&childev, childcb, SIGCHLD);
1929 ev_set_priority (&childev, EV_MAXPRI); 1972 ev_set_priority (&childev, EV_MAXPRI);
1930 ev_signal_start (EV_A_ &childev); 1973 ev_signal_start (EV_A_ &childev);
1931 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1974 ev_unref (EV_A); /* child watcher should not keep loop alive */
1932#endif 1975#endif
… …
1945 EV_P = ev_default_loop_ptr; 1988 EV_P = ev_default_loop_ptr;
1946#endif 1989#endif
1947 1990
1948 ev_default_loop_ptr = 0; 1991 ev_default_loop_ptr = 0;
1949 1992
1950#ifndef _WIN32 1993#if EV_CHILD_ENABLE
1951 ev_ref (EV_A); /* child watcher */ 1994 ev_ref (EV_A); /* child watcher */
1952 ev_signal_stop (EV_A_ &childev); 1995 ev_signal_stop (EV_A_ &childev);
1953#endif 1996#endif
1954 1997
1955 loop_destroy (EV_A); 1998 loop_destroy (EV_A);
… …
2162 ANHE_at_cache (*he); 2205 ANHE_at_cache (*he);
2163 } 2206 }
2164} 2207}
2165 2208
2166/* fetch new monotonic and realtime times from the kernel */ 2209/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */ 2210/* also detect if there was a timejump, and act accordingly */
2168inline_speed void 2211inline_speed void
2169time_update (EV_P_ ev_tstamp max_block) 2212time_update (EV_P_ ev_tstamp max_block)
2170{ 2213{
2171#if EV_USE_MONOTONIC 2214#if EV_USE_MONOTONIC
2172 if (expect_true (have_monotonic)) 2215 if (expect_true (have_monotonic))
… …
2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2310 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2268 EV_INVOKE_PENDING; 2311 EV_INVOKE_PENDING;
2269 } 2312 }
2270#endif 2313#endif
2271 2314
2315#if EV_PREPARE_ENABLE
2272 /* queue prepare watchers (and execute them) */ 2316 /* queue prepare watchers (and execute them) */
2273 if (expect_false (preparecnt)) 2317 if (expect_false (preparecnt))
2274 { 2318 {
2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2319 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2276 EV_INVOKE_PENDING; 2320 EV_INVOKE_PENDING;
2277 } 2321 }
2322#endif
2278 2323
2279 if (expect_false (loop_done)) 2324 if (expect_false (loop_done))
2280 break; 2325 break;
2281 2326
2282 /* we might have forked, so reify kernel state if necessary */ 2327 /* we might have forked, so reify kernel state if necessary */
… …
2355#if EV_IDLE_ENABLE 2400#if EV_IDLE_ENABLE
2356 /* queue idle watchers unless other events are pending */ 2401 /* queue idle watchers unless other events are pending */
2357 idle_reify (EV_A); 2402 idle_reify (EV_A);
2358#endif 2403#endif
2359 2404
2405#if EV_CHECK_ENABLE
2360 /* queue check watchers, to be executed first */ 2406 /* queue check watchers, to be executed first */
2361 if (expect_false (checkcnt)) 2407 if (expect_false (checkcnt))
2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2408 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2409#endif
2363 2410
2364 EV_INVOKE_PENDING; 2411 EV_INVOKE_PENDING;
2365 } 2412 }
2366 while (expect_true ( 2413 while (expect_true (
2367 activecnt 2414 activecnt
… …
2506 2553
2507 if (expect_false (ev_is_active (w))) 2554 if (expect_false (ev_is_active (w)))
2508 return; 2555 return;
2509 2556
2510 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2557 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2511 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))));
2512 2559
2513 EV_FREQUENT_CHECK; 2560 EV_FREQUENT_CHECK;
2514 2561
2515 ev_start (EV_A_ (W)w, 1); 2562 ev_start (EV_A_ (W)w, 1);
2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2563 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2586 timers [active] = timers [timercnt + HEAP0]; 2633 timers [active] = timers [timercnt + HEAP0];
2587 adjustheap (timers, timercnt, active); 2634 adjustheap (timers, timercnt, active);
2588 } 2635 }
2589 } 2636 }
2590 2637
2591 EV_FREQUENT_CHECK;
2592
2593 ev_at (w) -= mn_now; 2638 ev_at (w) -= mn_now;
2594 2639
2595 ev_stop (EV_A_ (W)w); 2640 ev_stop (EV_A_ (W)w);
2641
2642 EV_FREQUENT_CHECK;
2596} 2643}
2597 2644
2598void noinline 2645void noinline
2599ev_timer_again (EV_P_ ev_timer *w) 2646ev_timer_again (EV_P_ ev_timer *w)
2600{ 2647{
… …
2679 periodics [active] = periodics [periodiccnt + HEAP0]; 2726 periodics [active] = periodics [periodiccnt + HEAP0];
2680 adjustheap (periodics, periodiccnt, active); 2727 adjustheap (periodics, periodiccnt, active);
2681 } 2728 }
2682 } 2729 }
2683 2730
2684 EV_FREQUENT_CHECK;
2685
2686 ev_stop (EV_A_ (W)w); 2731 ev_stop (EV_A_ (W)w);
2732
2733 EV_FREQUENT_CHECK;
2687} 2734}
2688 2735
2689void noinline 2736void noinline
2690ev_periodic_again (EV_P_ ev_periodic *w) 2737ev_periodic_again (EV_P_ ev_periodic *w)
2691{ 2738{
… …
2696#endif 2743#endif
2697 2744
2698#ifndef SA_RESTART 2745#ifndef SA_RESTART
2699# define SA_RESTART 0 2746# define SA_RESTART 0
2700#endif 2747#endif
2748
2749#if EV_SIGNAL_ENABLE
2701 2750
2702void noinline 2751void noinline
2703ev_signal_start (EV_P_ ev_signal *w) 2752ev_signal_start (EV_P_ ev_signal *w)
2704{ 2753{
2705 if (expect_false (ev_is_active (w))) 2754 if (expect_false (ev_is_active (w)))
… …
2752 if (!((WL)w)->next) 2801 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD 2802# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/ 2803 if (sigfd < 0) /*TODO*/
2755# endif 2804# endif
2756 { 2805 {
2757# if _WIN32 2806# ifdef _WIN32
2807 evpipe_init (EV_A);
2808
2758 signal (w->signum, ev_sighandler); 2809 signal (w->signum, ev_sighandler);
2759# else 2810# else
2760 struct sigaction sa; 2811 struct sigaction sa;
2761 2812
2762 evpipe_init (EV_A); 2813 evpipe_init (EV_A);
… …
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2844 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif 2845#endif
2795#if EV_USE_SIGNALFD 2846#if EV_USE_SIGNALFD
2796 if (sigfd >= 0) 2847 if (sigfd >= 0)
2797 { 2848 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2849 sigset_t ss;
2850
2851 sigemptyset (&ss);
2852 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum); 2853 sigdelset (&sigfd_set, w->signum);
2854
2800 signalfd (sigfd, &sigfd_set, 0); 2855 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2856 sigprocmask (SIG_UNBLOCK, &ss, 0);
2802 /*TODO: maybe unblock signal? */
2803 } 2857 }
2804 else 2858 else
2805#endif 2859#endif
2806 signal (w->signum, SIG_DFL); 2860 signal (w->signum, SIG_DFL);
2807 } 2861 }
2808 2862
2809 EV_FREQUENT_CHECK; 2863 EV_FREQUENT_CHECK;
2810} 2864}
2865
2866#endif
2867
2868#if EV_CHILD_ENABLE
2811 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
… …
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);
2864 2926
2865 if (w->wd < 0) 2927 if (w->wd >= 0)
2928 {
2929 struct statfs sfs;
2930
2931 /* now local changes will be tracked by inotify, but remote changes won't */
2932 /* unless the filesystem is known to be local, we therefore still poll */
2933 /* also do poll on <2.6.25, but with normal frequency */
2934
2935 if (!fs_2625)
2936 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2937 else if (!statfs (w->path, &sfs)
2938 && (sfs.f_type == 0x1373 /* devfs */
2939 || sfs.f_type == 0xEF53 /* ext2/3 */
2940 || sfs.f_type == 0x3153464a /* jfs */
2941 || sfs.f_type == 0x52654973 /* reiser3 */
2942 || sfs.f_type == 0x01021994 /* tempfs */
2943 || sfs.f_type == 0x58465342 /* xfs */))
2944 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2945 else
2946 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2866 { 2947 }
2948 else
2949 {
2950 /* can't use inotify, continue to stat */
2867 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2951 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2868 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2869 2952
2870 /* monitor some parent directory for speedup hints */ 2953 /* if path is not there, monitor some parent directory for speedup hints */
2871 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2954 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2872 /* but an efficiency issue only */ 2955 /* but an efficiency issue only */
2873 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2956 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2874 { 2957 {
2875 char path [4096]; 2958 char path [4096];
… …
2891 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2892 } 2975 }
2893 } 2976 }
2894 2977
2895 if (w->wd >= 0) 2978 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2979 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2900 2980
2901 /* now local changes will be tracked by inotify, but remote changes won't */ 2981 /* now re-arm timer, if required */
2902 /* unless the filesystem it known to be local, we therefore still poll */ 2982 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2903 /* also do poll on <2.6.25, but with normal frequency */
2904
2905 if (fs_2625 && !statfs (w->path, &sfs))
2906 if (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */)
2912 return;
2913
2914 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2915 ev_timer_again (EV_A_ &w->timer); 2983 ev_timer_again (EV_A_ &w->timer);
2916 } 2984 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2917} 2985}
2918 2986
2919static void noinline 2987static void noinline
2920infy_del (EV_P_ ev_stat *w) 2988infy_del (EV_P_ ev_stat *w)
2921{ 2989{
… …
2966 3034
2967static void 3035static void
2968infy_cb (EV_P_ ev_io *w, int revents) 3036infy_cb (EV_P_ ev_io *w, int revents)
2969{ 3037{
2970 char buf [EV_INOTIFY_BUFSIZE]; 3038 char buf [EV_INOTIFY_BUFSIZE];
2971 struct inotify_event *ev = (struct inotify_event *)buf;
2972 int ofs; 3039 int ofs;
2973 int len = read (fs_fd, buf, sizeof (buf)); 3040 int len = read (fs_fd, buf, sizeof (buf));
2974 3041
2975 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);
2976 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;
2977} 3080}
2978 3081
2979inline_size void 3082inline_size void
2980check_2625 (EV_P) 3083ev_check_2625 (EV_P)
2981{ 3084{
2982 /* kernels < 2.6.25 are borked 3085 /* kernels < 2.6.25 are borked
2983 * 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
2984 */ 3087 */
2985 struct utsname buf; 3088 if (ev_linux_version () < 0x020619)
2986 int major, minor, micro;
2987
2988 if (uname (&buf))
2989 return;
2990
2991 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2992 return;
2993
2994 if (major < 2
2995 || (major == 2 && minor < 6)
2996 || (major == 2 && minor == 6 && micro < 25))
2997 return; 3089 return;
2998 3090
2999 fs_2625 = 1; 3091 fs_2625 = 1;
3000} 3092}
3001 3093
… …
3016 if (fs_fd != -2) 3108 if (fs_fd != -2)
3017 return; 3109 return;
3018 3110
3019 fs_fd = -1; 3111 fs_fd = -1;
3020 3112
3021 check_2625 (EV_A); 3113 ev_check_2625 (EV_A);
3022 3114
3023 fs_fd = infy_newfd (); 3115 fs_fd = infy_newfd ();
3024 3116
3025 if (fs_fd >= 0) 3117 if (fs_fd >= 0)
3026 { 3118 {
3027 fd_intern (fs_fd); 3119 fd_intern (fs_fd);
3028 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3120 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3029 ev_set_priority (&fs_w, EV_MAXPRI); 3121 ev_set_priority (&fs_w, EV_MAXPRI);
3030 ev_io_start (EV_A_ &fs_w); 3122 ev_io_start (EV_A_ &fs_w);
3123 ev_unref (EV_A);
3031 } 3124 }
3032} 3125}
3033 3126
3034inline_size void 3127inline_size void
3035infy_fork (EV_P) 3128infy_fork (EV_P)
… …
3037 int slot; 3130 int slot;
3038 3131
3039 if (fs_fd < 0) 3132 if (fs_fd < 0)
3040 return; 3133 return;
3041 3134
3135 ev_ref (EV_A);
3042 ev_io_stop (EV_A_ &fs_w); 3136 ev_io_stop (EV_A_ &fs_w);
3043 close (fs_fd); 3137 close (fs_fd);
3044 fs_fd = infy_newfd (); 3138 fs_fd = infy_newfd ();
3045 3139
3046 if (fs_fd >= 0) 3140 if (fs_fd >= 0)
3047 { 3141 {
3048 fd_intern (fs_fd); 3142 fd_intern (fs_fd);
3049 ev_io_set (&fs_w, fs_fd, EV_READ); 3143 ev_io_set (&fs_w, fs_fd, EV_READ);
3050 ev_io_start (EV_A_ &fs_w); 3144 ev_io_start (EV_A_ &fs_w);
3145 ev_unref (EV_A);
3051 } 3146 }
3052 3147
3053 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3054 { 3149 {
3055 WL w_ = fs_hash [slot].head; 3150 WL w_ = fs_hash [slot].head;
… …
3063 w->wd = -1; 3158 w->wd = -1;
3064 3159
3065 if (fs_fd >= 0) 3160 if (fs_fd >= 0)
3066 infy_add (EV_A_ w); /* re-add, no matter what */ 3161 infy_add (EV_A_ w); /* re-add, no matter what */
3067 else 3162 else
3163 {
3164 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3165 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3068 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3168 }
3069 } 3169 }
3070 } 3170 }
3071} 3171}
3072 3172
3073#endif 3173#endif
… …
3090static void noinline 3190static void noinline
3091stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3191stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3092{ 3192{
3093 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3193 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3094 3194
3095 /* we copy this here each the time so that */ 3195 ev_statdata prev = w->attr;
3096 /* prev has the old value when the callback gets invoked */
3097 w->prev = w->attr;
3098 ev_stat_stat (EV_A_ w); 3196 ev_stat_stat (EV_A_ w);
3099 3197
3100 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3198 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3101 if ( 3199 if (
3102 w->prev.st_dev != w->attr.st_dev 3200 prev.st_dev != w->attr.st_dev
3103 || w->prev.st_ino != w->attr.st_ino 3201 || prev.st_ino != w->attr.st_ino
3104 || w->prev.st_mode != w->attr.st_mode 3202 || prev.st_mode != w->attr.st_mode
3105 || w->prev.st_nlink != w->attr.st_nlink 3203 || prev.st_nlink != w->attr.st_nlink
3106 || w->prev.st_uid != w->attr.st_uid 3204 || prev.st_uid != w->attr.st_uid
3107 || w->prev.st_gid != w->attr.st_gid 3205 || prev.st_gid != w->attr.st_gid
3108 || w->prev.st_rdev != w->attr.st_rdev 3206 || prev.st_rdev != w->attr.st_rdev
3109 || w->prev.st_size != w->attr.st_size 3207 || prev.st_size != w->attr.st_size
3110 || w->prev.st_atime != w->attr.st_atime 3208 || prev.st_atime != w->attr.st_atime
3111 || w->prev.st_mtime != w->attr.st_mtime 3209 || prev.st_mtime != w->attr.st_mtime
3112 || w->prev.st_ctime != w->attr.st_ctime 3210 || prev.st_ctime != w->attr.st_ctime
3113 ) { 3211 ) {
3212 /* we only update w->prev on actual differences */
3213 /* in case we test more often than invoke the callback, */
3214 /* to ensure that prev is always different to attr */
3215 w->prev = prev;
3216
3114 #if EV_USE_INOTIFY 3217 #if EV_USE_INOTIFY
3115 if (fs_fd >= 0) 3218 if (fs_fd >= 0)
3116 { 3219 {
3117 infy_del (EV_A_ w); 3220 infy_del (EV_A_ w);
3118 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
… …
3143 3246
3144 if (fs_fd >= 0) 3247 if (fs_fd >= 0)
3145 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
3146 else 3249 else
3147#endif 3250#endif
3251 {
3148 ev_timer_again (EV_A_ &w->timer); 3252 ev_timer_again (EV_A_ &w->timer);
3253 ev_unref (EV_A);
3254 }
3149 3255
3150 ev_start (EV_A_ (W)w, 1); 3256 ev_start (EV_A_ (W)w, 1);
3151 3257
3152 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
3153} 3259}
… …
3162 EV_FREQUENT_CHECK; 3268 EV_FREQUENT_CHECK;
3163 3269
3164#if EV_USE_INOTIFY 3270#if EV_USE_INOTIFY
3165 infy_del (EV_A_ w); 3271 infy_del (EV_A_ w);
3166#endif 3272#endif
3273
3274 if (ev_is_active (&w->timer))
3275 {
3276 ev_ref (EV_A);
3167 ev_timer_stop (EV_A_ &w->timer); 3277 ev_timer_stop (EV_A_ &w->timer);
3278 }
3168 3279
3169 ev_stop (EV_A_ (W)w); 3280 ev_stop (EV_A_ (W)w);
3170 3281
3171 EV_FREQUENT_CHECK; 3282 EV_FREQUENT_CHECK;
3172} 3283}
… …
3217 3328
3218 EV_FREQUENT_CHECK; 3329 EV_FREQUENT_CHECK;
3219} 3330}
3220#endif 3331#endif
3221 3332
3333#if EV_PREPARE_ENABLE
3222void 3334void
3223ev_prepare_start (EV_P_ ev_prepare *w) 3335ev_prepare_start (EV_P_ ev_prepare *w)
3224{ 3336{
3225 if (expect_false (ev_is_active (w))) 3337 if (expect_false (ev_is_active (w)))
3226 return; 3338 return;
… …
3252 3364
3253 ev_stop (EV_A_ (W)w); 3365 ev_stop (EV_A_ (W)w);
3254 3366
3255 EV_FREQUENT_CHECK; 3367 EV_FREQUENT_CHECK;
3256} 3368}
3369#endif
3257 3370
3371#if EV_CHECK_ENABLE
3258void 3372void
3259ev_check_start (EV_P_ ev_check *w) 3373ev_check_start (EV_P_ ev_check *w)
3260{ 3374{
3261 if (expect_false (ev_is_active (w))) 3375 if (expect_false (ev_is_active (w)))
3262 return; 3376 return;
… …
3288 3402
3289 ev_stop (EV_A_ (W)w); 3403 ev_stop (EV_A_ (W)w);
3290 3404
3291 EV_FREQUENT_CHECK; 3405 EV_FREQUENT_CHECK;
3292} 3406}
3407#endif
3293 3408
3294#if EV_EMBED_ENABLE 3409#if EV_EMBED_ENABLE
3295void noinline 3410void noinline
3296ev_embed_sweep (EV_P_ ev_embed *w) 3411ev_embed_sweep (EV_P_ ev_embed *w)
3297{ 3412{
… …
3391 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3392 3507
3393 ev_io_stop (EV_A_ &w->io); 3508 ev_io_stop (EV_A_ &w->io);
3394 ev_prepare_stop (EV_A_ &w->prepare); 3509 ev_prepare_stop (EV_A_ &w->prepare);
3395 ev_fork_stop (EV_A_ &w->fork); 3510 ev_fork_stop (EV_A_ &w->fork);
3511
3512 ev_stop (EV_A_ (W)w);
3396 3513
3397 EV_FREQUENT_CHECK; 3514 EV_FREQUENT_CHECK;
3398} 3515}
3399#endif 3516#endif
3400 3517
… …
3624 if (types & EV_ASYNC) 3741 if (types & EV_ASYNC)
3625 for (i = asynccnt; i--; ) 3742 for (i = asynccnt; i--; )
3626 cb (EV_A_ EV_ASYNC, asyncs [i]); 3743 cb (EV_A_ EV_ASYNC, asyncs [i]);
3627#endif 3744#endif
3628 3745
3746#if EV_PREPARE_ENABLE
3629 if (types & EV_PREPARE) 3747 if (types & EV_PREPARE)
3630 for (i = preparecnt; i--; ) 3748 for (i = preparecnt; i--; )
3631#if EV_EMBED_ENABLE 3749# if EV_EMBED_ENABLE
3632 if (ev_cb (prepares [i]) != embed_prepare_cb) 3750 if (ev_cb (prepares [i]) != embed_prepare_cb)
3633#endif 3751# endif
3634 cb (EV_A_ EV_PREPARE, prepares [i]); 3752 cb (EV_A_ EV_PREPARE, prepares [i]);
3753#endif
3635 3754
3755#if EV_CHECK_ENABLE
3636 if (types & EV_CHECK) 3756 if (types & EV_CHECK)
3637 for (i = checkcnt; i--; ) 3757 for (i = checkcnt; i--; )
3638 cb (EV_A_ EV_CHECK, checks [i]); 3758 cb (EV_A_ EV_CHECK, checks [i]);
3759#endif
3639 3760
3761#if EV_SIGNAL_ENABLE
3640 if (types & EV_SIGNAL) 3762 if (types & EV_SIGNAL)
3641 for (i = 0; i < EV_NSIG - 1; ++i) 3763 for (i = 0; i < EV_NSIG - 1; ++i)
3642 for (wl = signals [i].head; wl; ) 3764 for (wl = signals [i].head; wl; )
3643 { 3765 {
3644 wn = wl->next; 3766 wn = wl->next;
3645 cb (EV_A_ EV_SIGNAL, wl); 3767 cb (EV_A_ EV_SIGNAL, wl);
3646 wl = wn; 3768 wl = wn;
3647 } 3769 }
3770#endif
3648 3771
3772#if EV_CHILD_ENABLE
3649 if (types & EV_CHILD) 3773 if (types & EV_CHILD)
3650 for (i = EV_PID_HASHSIZE; i--; ) 3774 for (i = EV_PID_HASHSIZE; i--; )
3651 for (wl = childs [i]; wl; ) 3775 for (wl = childs [i]; wl; )
3652 { 3776 {
3653 wn = wl->next; 3777 wn = wl->next;
3654 cb (EV_A_ EV_CHILD, wl); 3778 cb (EV_A_ EV_CHILD, wl);
3655 wl = wn; 3779 wl = wn;
3656 } 3780 }
3781#endif
3657/* EV_STAT 0x00001000 /* stat data changed */ 3782/* EV_STAT 0x00001000 /* stat data changed */
3658/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3783/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3659} 3784}
3660#endif 3785#endif
3661 3786

Diff Legend

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