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

Comparing libev/ev.c (file contents):
Revision 1.353 by root, Thu Oct 21 12:32:47 2010 UTC vs.
Revision 1.370 by root, Sun Jan 30 19:05:41 2011 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,2010 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 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 *
… …
34 * by deleting the provisions above and replace them with the notice 34 * by deleting the provisions above and replace them with the notice
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39
40#ifdef __cplusplus
41extern "C" {
42#endif
43 39
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
… …
182# include EV_H 178# include EV_H
183#else 179#else
184# include "ev.h" 180# include "ev.h"
185#endif 181#endif
186 182
183EV_CPP(extern "C" {)
184
187#ifndef _WIN32 185#ifndef _WIN32
188# include <sys/time.h> 186# include <sys/time.h>
189# include <sys/wait.h> 187# include <sys/wait.h>
190# include <unistd.h> 188# include <unistd.h>
191#else 189#else
… …
378# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
379# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
380#endif 378#endif
381 379
382#if !EV_USE_NANOSLEEP 380#if !EV_USE_NANOSLEEP
383# ifndef _WIN32 381/* hp-ux has it in sys/time.h, which we unconditionally include above */
382# if !defined(_WIN32) && !defined(__hpux)
384# include <sys/select.h> 383# include <sys/select.h>
385# endif 384# endif
386#endif 385#endif
387 386
388#if EV_USE_INOTIFY 387#if EV_USE_INOTIFY
389# include <sys/utsname.h>
390# include <sys/statfs.h> 388# include <sys/statfs.h>
391# include <sys/inotify.h> 389# include <sys/inotify.h>
392/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
393# ifndef IN_DONT_FOLLOW 391# ifndef IN_DONT_FOLLOW
394# undef EV_USE_INOTIFY 392# undef EV_USE_INOTIFY
… …
411# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
412# else 410# else
413# define EFD_CLOEXEC 02000000 411# define EFD_CLOEXEC 02000000
414# endif 412# endif
415# endif 413# endif
416# ifdef __cplusplus
417extern "C" {
418# endif
419int (eventfd) (unsigned int initval, int flags); 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
420# ifdef __cplusplus
421}
422# endif
423#endif 415#endif
424 416
425#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h> 419# include <stdint.h>
… …
433# define SFD_CLOEXEC O_CLOEXEC 425# define SFD_CLOEXEC O_CLOEXEC
434# else 426# else
435# define SFD_CLOEXEC 02000000 427# define SFD_CLOEXEC 02000000
436# endif 428# endif
437# endif 429# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags); 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
442 431
443struct signalfd_siginfo 432struct signalfd_siginfo
444{ 433{
445 uint32_t ssi_signo; 434 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)]; 435 char pad[128 - sizeof (uint32_t)];
447}; 436};
448# ifdef __cplusplus
449}
450# endif
451#endif 437#endif
452 438
453/**/ 439/**/
454 440
455#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
… …
537# include "ev_win32.c" 523# include "ev_win32.c"
538#endif 524#endif
539 525
540/*****************************************************************************/ 526/*****************************************************************************/
541 527
528#ifdef __linux
529# include <sys/utsname.h>
530#endif
531
532static unsigned int noinline
533ev_linux_version (void)
534{
535#ifdef __linux
536 unsigned int v = 0;
537 struct utsname buf;
538 int i;
539 char *p = buf.release;
540
541 if (uname (&buf))
542 return 0;
543
544 for (i = 3+1; --i; )
545 {
546 unsigned int c = 0;
547
548 for (;;)
549 {
550 if (*p >= '0' && *p <= '9')
551 c = c * 10 + *p++ - '0';
552 else
553 {
554 p += *p == '.';
555 break;
556 }
557 }
558
559 v = (v << 8) | c;
560 }
561
562 return v;
563#else
564 return 0;
565#endif
566}
567
568/*****************************************************************************/
569
542#if EV_AVOID_STDIO 570#if EV_AVOID_STDIO
543static void noinline 571static void noinline
544ev_printerr (const char *msg) 572ev_printerr (const char *msg)
545{ 573{
546 write (STDERR_FILENO, msg, strlen (msg)); 574 write (STDERR_FILENO, msg, strlen (msg));
… …
564 if (syserr_cb) 592 if (syserr_cb)
565 syserr_cb (msg); 593 syserr_cb (msg);
566 else 594 else
567 { 595 {
568#if EV_AVOID_STDIO 596#if EV_AVOID_STDIO
569 const char *err = strerror (errno);
570
571 ev_printerr (msg); 597 ev_printerr (msg);
572 ev_printerr (": "); 598 ev_printerr (": ");
573 ev_printerr (err); 599 ev_printerr (strerror (errno));
574 ev_printerr ("\n"); 600 ev_printerr ("\n");
575#else 601#else
576 perror (msg); 602 perror (msg);
577#endif 603#endif
578 abort (); 604 abort ();
… …
612 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
613 639
614 if (!ptr && size) 640 if (!ptr && size)
615 { 641 {
616#if EV_AVOID_STDIO 642#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n"); 643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
618#else 644#else
619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
620#endif 646#endif
621 abort (); 647 abort ();
622 } 648 }
623 649
624 return ptr; 650 return ptr;
… …
641 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 667 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
642 unsigned char unused; 668 unsigned char unused;
643#if EV_USE_EPOLL 669#if EV_USE_EPOLL
644 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
645#endif 671#endif
646#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
647 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
648#endif 677#endif
649} ANFD; 678} ANFD;
650 679
651/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
652typedef struct 681typedef struct
… …
787 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
788#endif 817#endif
789 } 818 }
790} 819}
791 820
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
792/*****************************************************************************/ 829/*****************************************************************************/
793 830
794#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
795 832
796/* find a suitable new size for the given array, */ 833/* find a suitable new size for the given array, */
… …
948 unsigned char o_events = anfd->events; 985 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify; 986 unsigned char o_reify = anfd->reify;
950 987
951 anfd->reify = 0; 988 anfd->reify = 0;
952 989
953#if EV_SELECT_IS_WINSOCKET 990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
954 if (o_reify & EV__IOFDSET) 991 if (o_reify & EV__IOFDSET)
955 { 992 {
956 unsigned long arg; 993 unsigned long arg;
957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
959 } 997 }
960#endif 998#endif
961 999
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
963 { 1001 {
… …
1314 char dummy; 1352 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1353 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1316 read (evpipe [0], &dummy, 1); 1354 read (evpipe [0], &dummy, 1);
1317 } 1355 }
1318 1356
1357#if EV_SIGNAL_ENABLE
1319 if (sig_pending) 1358 if (sig_pending)
1320 { 1359 {
1321 sig_pending = 0; 1360 sig_pending = 0;
1322 1361
1323 for (i = EV_NSIG - 1; i--; ) 1362 for (i = EV_NSIG - 1; i--; )
1324 if (expect_false (signals [i].pending)) 1363 if (expect_false (signals [i].pending))
1325 ev_feed_signal_event (EV_A_ i + 1); 1364 ev_feed_signal_event (EV_A_ i + 1);
1326 } 1365 }
1366#endif
1327 1367
1328#if EV_ASYNC_ENABLE 1368#if EV_ASYNC_ENABLE
1329 if (async_pending) 1369 if (async_pending)
1330 { 1370 {
1331 async_pending = 0; 1371 async_pending = 0;
… …
1340#endif 1380#endif
1341} 1381}
1342 1382
1343/*****************************************************************************/ 1383/*****************************************************************************/
1344 1384
1385void
1386ev_feed_signal (int signum)
1387{
1388#if EV_MULTIPLICITY
1389 EV_P = signals [signum - 1].loop;
1390
1391 if (!EV_A)
1392 return;
1393#endif
1394
1395 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending);
1397}
1398
1345static void 1399static void
1346ev_sighandler (int signum) 1400ev_sighandler (int signum)
1347{ 1401{
1348#if EV_MULTIPLICITY
1349 EV_P = signals [signum - 1].loop;
1350#endif
1351
1352#ifdef _WIN32 1402#ifdef _WIN32
1353 signal (signum, ev_sighandler); 1403 signal (signum, ev_sighandler);
1354#endif 1404#endif
1355 1405
1356 signals [signum - 1].pending = 1; 1406 ev_feed_signal (signum);
1357 evpipe_write (EV_A_ &sig_pending);
1358} 1407}
1359 1408
1360void noinline 1409void noinline
1361ev_feed_signal_event (EV_P_ int signum) 1410ev_feed_signal_event (EV_P_ int signum)
1362{ 1411{
… …
1462 1511
1463#endif 1512#endif
1464 1513
1465/*****************************************************************************/ 1514/*****************************************************************************/
1466 1515
1516#if EV_USE_IOCP
1517# include "ev_iocp.c"
1518#endif
1467#if EV_USE_PORT 1519#if EV_USE_PORT
1468# include "ev_port.c" 1520# include "ev_port.c"
1469#endif 1521#endif
1470#if EV_USE_KQUEUE 1522#if EV_USE_KQUEUE
1471# include "ev_kqueue.c" 1523# include "ev_kqueue.c"
… …
1544ev_embeddable_backends (void) 1596ev_embeddable_backends (void)
1545{ 1597{
1546 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1547 1599
1548 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1600 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1549 /* please fix it and tell me how to detect the fix */ 1601 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1550 flags &= ~EVBACKEND_EPOLL; 1602 flags &= ~EVBACKEND_EPOLL;
1551 1603
1552 return flags; 1604 return flags;
1553} 1605}
1554 1606
1555unsigned int 1607unsigned int
… …
1611static void noinline 1663static void noinline
1612loop_init (EV_P_ unsigned int flags) 1664loop_init (EV_P_ unsigned int flags)
1613{ 1665{
1614 if (!backend) 1666 if (!backend)
1615 { 1667 {
1668 origflags = flags;
1669
1616#if EV_USE_REALTIME 1670#if EV_USE_REALTIME
1617 if (!have_realtime) 1671 if (!have_realtime)
1618 { 1672 {
1619 struct timespec ts; 1673 struct timespec ts;
1620 1674
… …
1665#endif 1719#endif
1666#if EV_USE_SIGNALFD 1720#if EV_USE_SIGNALFD
1667 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1668#endif 1722#endif
1669 1723
1670 if (!(flags & 0x0000ffffU)) 1724 if (!(flags & EVBACKEND_MASK))
1671 flags |= ev_recommended_backends (); 1725 flags |= ev_recommended_backends ();
1672 1726
1727#if EV_USE_IOCP
1728 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1729#endif
1673#if EV_USE_PORT 1730#if EV_USE_PORT
1674 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1675#endif 1732#endif
1676#if EV_USE_KQUEUE 1733#if EV_USE_KQUEUE
1677 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1734 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1694#endif 1751#endif
1695 } 1752 }
1696} 1753}
1697 1754
1698/* free up a loop structure */ 1755/* free up a loop structure */
1699static void noinline 1756void
1700loop_destroy (EV_P) 1757ev_loop_destroy (EV_P)
1701{ 1758{
1702 int i; 1759 int i;
1760
1761#if EV_MULTIPLICITY
1762 /* mimic free (0) */
1763 if (!EV_A)
1764 return;
1765#endif
1766
1767#if EV_CLEANUP_ENABLE
1768 /* queue cleanup watchers (and execute them) */
1769 if (expect_false (cleanupcnt))
1770 {
1771 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1772 EV_INVOKE_PENDING;
1773 }
1774#endif
1775
1776#if EV_CHILD_ENABLE
1777 if (ev_is_active (&childev))
1778 {
1779 ev_ref (EV_A); /* child watcher */
1780 ev_signal_stop (EV_A_ &childev);
1781 }
1782#endif
1703 1783
1704 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1705 { 1785 {
1706 /*ev_ref (EV_A);*/ 1786 /*ev_ref (EV_A);*/
1707 /*ev_io_stop (EV_A_ &pipe_w);*/ 1787 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1729#endif 1809#endif
1730 1810
1731 if (backend_fd >= 0) 1811 if (backend_fd >= 0)
1732 close (backend_fd); 1812 close (backend_fd);
1733 1813
1814#if EV_USE_IOCP
1815 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1816#endif
1734#if EV_USE_PORT 1817#if EV_USE_PORT
1735 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1818 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1736#endif 1819#endif
1737#if EV_USE_KQUEUE 1820#if EV_USE_KQUEUE
1738 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1821 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1765 array_free (periodic, EMPTY); 1848 array_free (periodic, EMPTY);
1766#endif 1849#endif
1767#if EV_FORK_ENABLE 1850#if EV_FORK_ENABLE
1768 array_free (fork, EMPTY); 1851 array_free (fork, EMPTY);
1769#endif 1852#endif
1853#if EV_CLEANUP_ENABLE
1854 array_free (cleanup, EMPTY);
1855#endif
1770 array_free (prepare, EMPTY); 1856 array_free (prepare, EMPTY);
1771 array_free (check, EMPTY); 1857 array_free (check, EMPTY);
1772#if EV_ASYNC_ENABLE 1858#if EV_ASYNC_ENABLE
1773 array_free (async, EMPTY); 1859 array_free (async, EMPTY);
1774#endif 1860#endif
1775 1861
1776 backend = 0; 1862 backend = 0;
1863
1864#if EV_MULTIPLICITY
1865 if (ev_is_default_loop (EV_A))
1866#endif
1867 ev_default_loop_ptr = 0;
1868#if EV_MULTIPLICITY
1869 else
1870 ev_free (EV_A);
1871#endif
1777} 1872}
1778 1873
1779#if EV_USE_INOTIFY 1874#if EV_USE_INOTIFY
1780inline_size void infy_fork (EV_P); 1875inline_size void infy_fork (EV_P);
1781#endif 1876#endif
… …
1840 loop_init (EV_A_ flags); 1935 loop_init (EV_A_ flags);
1841 1936
1842 if (ev_backend (EV_A)) 1937 if (ev_backend (EV_A))
1843 return EV_A; 1938 return EV_A;
1844 1939
1940 ev_free (EV_A);
1845 return 0; 1941 return 0;
1846} 1942}
1847 1943
1848void
1849ev_loop_destroy (EV_P)
1850{
1851 loop_destroy (EV_A);
1852 ev_free (loop);
1853}
1854
1855void
1856ev_loop_fork (EV_P)
1857{
1858 postfork = 1; /* must be in line with ev_default_fork */
1859}
1860#endif /* multiplicity */ 1944#endif /* multiplicity */
1861 1945
1862#if EV_VERIFY 1946#if EV_VERIFY
1863static void noinline 1947static void noinline
1864verify_watcher (EV_P_ W w) 1948verify_watcher (EV_P_ W w)
… …
1939#if EV_FORK_ENABLE 2023#if EV_FORK_ENABLE
1940 assert (forkmax >= forkcnt); 2024 assert (forkmax >= forkcnt);
1941 array_verify (EV_A_ (W *)forks, forkcnt); 2025 array_verify (EV_A_ (W *)forks, forkcnt);
1942#endif 2026#endif
1943 2027
2028#if EV_CLEANUP_ENABLE
2029 assert (cleanupmax >= cleanupcnt);
2030 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2031#endif
2032
1944#if EV_ASYNC_ENABLE 2033#if EV_ASYNC_ENABLE
1945 assert (asyncmax >= asynccnt); 2034 assert (asyncmax >= asynccnt);
1946 array_verify (EV_A_ (W *)asyncs, asynccnt); 2035 array_verify (EV_A_ (W *)asyncs, asynccnt);
1947#endif 2036#endif
1948 2037
… …
1966} 2055}
1967#endif 2056#endif
1968 2057
1969#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1970struct ev_loop * 2059struct ev_loop *
1971ev_default_loop_init (unsigned int flags)
1972#else 2060#else
1973int 2061int
2062#endif
1974ev_default_loop (unsigned int flags) 2063ev_default_loop (unsigned int flags)
1975#endif
1976{ 2064{
1977 if (!ev_default_loop_ptr) 2065 if (!ev_default_loop_ptr)
1978 { 2066 {
1979#if EV_MULTIPLICITY 2067#if EV_MULTIPLICITY
1980 EV_P = ev_default_loop_ptr = &default_loop_struct; 2068 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1999 2087
2000 return ev_default_loop_ptr; 2088 return ev_default_loop_ptr;
2001} 2089}
2002 2090
2003void 2091void
2004ev_default_destroy (void) 2092ev_loop_fork (EV_P)
2005{ 2093{
2006#if EV_MULTIPLICITY
2007 EV_P = ev_default_loop_ptr;
2008#endif
2009
2010 ev_default_loop_ptr = 0;
2011
2012#if EV_CHILD_ENABLE
2013 ev_ref (EV_A); /* child watcher */
2014 ev_signal_stop (EV_A_ &childev);
2015#endif
2016
2017 loop_destroy (EV_A);
2018}
2019
2020void
2021ev_default_fork (void)
2022{
2023#if EV_MULTIPLICITY
2024 EV_P = ev_default_loop_ptr;
2025#endif
2026
2027 postfork = 1; /* must be in line with ev_loop_fork */ 2094 postfork = 1; /* must be in line with ev_default_fork */
2028} 2095}
2029 2096
2030/*****************************************************************************/ 2097/*****************************************************************************/
2031 2098
2032void 2099void
… …
2054 2121
2055 for (pri = NUMPRI; pri--; ) 2122 for (pri = NUMPRI; pri--; )
2056 while (pendingcnt [pri]) 2123 while (pendingcnt [pri])
2057 { 2124 {
2058 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2125 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2059
2060 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2061 /* ^ this is no longer true, as pending_w could be here */
2062 2126
2063 p->w->pending = 0; 2127 p->w->pending = 0;
2064 EV_CB_INVOKE (p->w, p->events); 2128 EV_CB_INVOKE (p->w, p->events);
2065 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
2066 } 2130 }
… …
2128 feed_reverse_done (EV_A_ EV_TIMER); 2192 feed_reverse_done (EV_A_ EV_TIMER);
2129 } 2193 }
2130} 2194}
2131 2195
2132#if EV_PERIODIC_ENABLE 2196#if EV_PERIODIC_ENABLE
2197
2198inline_speed
2199periodic_recalc (EV_P_ ev_periodic *w)
2200{
2201 /* TODO: use slow but potentially more correct incremental algo, */
2202 /* also do not rely on ceil */
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2204}
2205
2133/* make periodics pending */ 2206/* make periodics pending */
2134inline_size void 2207inline_size void
2135periodics_reify (EV_P) 2208periodics_reify (EV_P)
2136{ 2209{
2137 EV_FREQUENT_CHECK; 2210 EV_FREQUENT_CHECK;
… …
2156 ANHE_at_cache (periodics [HEAP0]); 2229 ANHE_at_cache (periodics [HEAP0]);
2157 downheap (periodics, periodiccnt, HEAP0); 2230 downheap (periodics, periodiccnt, HEAP0);
2158 } 2231 }
2159 else if (w->interval) 2232 else if (w->interval)
2160 { 2233 {
2161 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2234 periodic_recalc (EV_A_ w);
2235
2162 /* if next trigger time is not sufficiently in the future, put it there */ 2236 /* if next trigger time is not sufficiently in the future, put it there */
2163 /* this might happen because of floating point inexactness */ 2237 /* this might happen because of floating point inexactness */
2164 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2165 { 2239 {
2166 ev_at (w) += w->interval; 2240 ev_at (w) += w->interval;
… …
2200 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2274 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2201 2275
2202 if (w->reschedule_cb) 2276 if (w->reschedule_cb)
2203 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2277 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2204 else if (w->interval) 2278 else if (w->interval)
2205 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2279 periodic_recalc (EV_A_ w);
2206 2280
2207 ANHE_at_cache (periodics [i]); 2281 ANHE_at_cache (periodics [i]);
2208 } 2282 }
2209 2283
2210 reheap (periodics, periodiccnt); 2284 reheap (periodics, periodiccnt);
… …
2702 if (w->reschedule_cb) 2776 if (w->reschedule_cb)
2703 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2777 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2704 else if (w->interval) 2778 else if (w->interval)
2705 { 2779 {
2706 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2780 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2707 /* this formula differs from the one in periodic_reify because we do not always round up */ 2781 periodic_recalc (EV_A_ w);
2708 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2709 } 2782 }
2710 else 2783 else
2711 ev_at (w) = w->offset; 2784 ev_at (w) = w->offset;
2712 2785
2713 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2834 sa.sa_handler = ev_sighandler; 2907 sa.sa_handler = ev_sighandler;
2835 sigfillset (&sa.sa_mask); 2908 sigfillset (&sa.sa_mask);
2836 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2909 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2837 sigaction (w->signum, &sa, 0); 2910 sigaction (w->signum, &sa, 0);
2838 2911
2912 if (origflags & EVFLAG_NOSIGMASK)
2913 {
2839 sigemptyset (&sa.sa_mask); 2914 sigemptyset (&sa.sa_mask);
2840 sigaddset (&sa.sa_mask, w->signum); 2915 sigaddset (&sa.sa_mask, w->signum);
2841 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2916 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2917 }
2842#endif 2918#endif
2843 } 2919 }
2844 2920
2845 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2846} 2922}
… …
3062 { 3138 {
3063 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3139 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3064 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3140 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3065 ofs += sizeof (struct inotify_event) + ev->len; 3141 ofs += sizeof (struct inotify_event) + ev->len;
3066 } 3142 }
3067}
3068
3069inline_size unsigned int
3070ev_linux_version (void)
3071{
3072 struct utsname buf;
3073 unsigned int v;
3074 int i;
3075 char *p = buf.release;
3076
3077 if (uname (&buf))
3078 return 0;
3079
3080 for (i = 3+1; --i; )
3081 {
3082 unsigned int c = 0;
3083
3084 for (;;)
3085 {
3086 if (*p >= '0' && *p <= '9')
3087 c = c * 10 + *p++ - '0';
3088 else
3089 {
3090 p += *p == '.';
3091 break;
3092 }
3093 }
3094
3095 v = (v << 8) | c;
3096 }
3097
3098 return v;
3099} 3143}
3100 3144
3101inline_size void 3145inline_size void
3102ev_check_2625 (EV_P) 3146ev_check_2625 (EV_P)
3103{ 3147{
… …
3570 3614
3571 EV_FREQUENT_CHECK; 3615 EV_FREQUENT_CHECK;
3572} 3616}
3573#endif 3617#endif
3574 3618
3619#if EV_CLEANUP_ENABLE
3620void
3621ev_cleanup_start (EV_P_ ev_cleanup *w)
3622{
3623 if (expect_false (ev_is_active (w)))
3624 return;
3625
3626 EV_FREQUENT_CHECK;
3627
3628 ev_start (EV_A_ (W)w, ++cleanupcnt);
3629 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3630 cleanups [cleanupcnt - 1] = w;
3631
3632 /* cleanup watchers should never keep a refcount on the loop */
3633 ev_unref (EV_A);
3634 EV_FREQUENT_CHECK;
3635}
3636
3637void
3638ev_cleanup_stop (EV_P_ ev_cleanup *w)
3639{
3640 clear_pending (EV_A_ (W)w);
3641 if (expect_false (!ev_is_active (w)))
3642 return;
3643
3644 EV_FREQUENT_CHECK;
3645 ev_ref (EV_A);
3646
3647 {
3648 int active = ev_active (w);
3649
3650 cleanups [active - 1] = cleanups [--cleanupcnt];
3651 ev_active (cleanups [active - 1]) = active;
3652 }
3653
3654 ev_stop (EV_A_ (W)w);
3655
3656 EV_FREQUENT_CHECK;
3657}
3658#endif
3659
3575#if EV_ASYNC_ENABLE 3660#if EV_ASYNC_ENABLE
3576void 3661void
3577ev_async_start (EV_P_ ev_async *w) 3662ev_async_start (EV_P_ ev_async *w)
3578{ 3663{
3579 if (expect_false (ev_is_active (w))) 3664 if (expect_false (ev_is_active (w)))
… …
3807 3892
3808#if EV_MULTIPLICITY 3893#if EV_MULTIPLICITY
3809 #include "ev_wrap.h" 3894 #include "ev_wrap.h"
3810#endif 3895#endif
3811 3896
3812#ifdef __cplusplus 3897EV_CPP(})
3813}
3814#endif
3815 3898

Diff Legend

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