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

Comparing libev/ev.c (file contents):
Revision 1.346 by root, Thu Oct 14 05:07:04 2010 UTC vs.
Revision 1.368 by root, Mon Jan 17 12:11:11 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
… …
384# include <sys/select.h> 382# include <sys/select.h>
385# endif 383# endif
386#endif 384#endif
387 385
388#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
389# include <sys/utsname.h>
390# include <sys/statfs.h> 387# include <sys/statfs.h>
391# include <sys/inotify.h> 388# include <sys/inotify.h>
392/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
393# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
394# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
411# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
412# else 409# else
413# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
414# endif 411# endif
415# endif 412# endif
416# ifdef __cplusplus
417extern "C" {
418# endif
419int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
420# ifdef __cplusplus
421}
422# endif
423#endif 414#endif
424 415
425#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h> 418# include <stdint.h>
… …
433# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
434# else 425# else
435# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
436# endif 427# endif
437# endif 428# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
442 430
443struct signalfd_siginfo 431struct signalfd_siginfo
444{ 432{
445 uint32_t ssi_signo; 433 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
447}; 435};
448# ifdef __cplusplus
449}
450# endif 436#endif
451#endif
452
453 437
454/**/ 438/**/
455 439
456#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
457# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
471 455
472#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
473#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
474 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461
475#if __GNUC__ >= 4 462#if __GNUC__ >= 4
476# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
477# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
478#else 465#else
479# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
535# include "ev_win32.c" 522# include "ev_win32.c"
536#endif 523#endif
537 524
538/*****************************************************************************/ 525/*****************************************************************************/
539 526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
540#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
541static void noinline 570static void noinline
542ev_printerr (const char *msg) 571ev_printerr (const char *msg)
543{ 572{
544 write (STDERR_FILENO, msg, strlen (msg)); 573 write (STDERR_FILENO, msg, strlen (msg));
… …
562 if (syserr_cb) 591 if (syserr_cb)
563 syserr_cb (msg); 592 syserr_cb (msg);
564 else 593 else
565 { 594 {
566#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
567 const char *err = strerror (errno);
568
569 ev_printerr (msg); 596 ev_printerr (msg);
570 ev_printerr (": "); 597 ev_printerr (": ");
571 ev_printerr (err); 598 ev_printerr (strerror (errno));
572 ev_printerr ("\n"); 599 ev_printerr ("\n");
573#else 600#else
574 perror (msg); 601 perror (msg);
575#endif 602#endif
576 abort (); 603 abort ();
… …
610 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
611 638
612 if (!ptr && size) 639 if (!ptr && size)
613 { 640 {
614#if EV_AVOID_STDIO 641#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n"); 642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
616#else 643#else
617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
618#endif 645#endif
619 abort (); 646 abort ();
620 } 647 }
621 648
622 return ptr; 649 return ptr;
… …
639 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
640 unsigned char unused; 667 unsigned char unused;
641#if EV_USE_EPOLL 668#if EV_USE_EPOLL
642 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
643#endif 670#endif
644#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
645 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
646#endif 676#endif
647} ANFD; 677} ANFD;
648 678
649/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
650typedef struct 680typedef struct
… …
715# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif 748#endif
719 749
720#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
721 751
722/*****************************************************************************/ 752/*****************************************************************************/
723 753
724#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
725ev_tstamp 755ev_tstamp
… …
769 if (delay > 0.) 799 if (delay > 0.)
770 { 800 {
771#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
772 struct timespec ts; 802 struct timespec ts;
773 803
774 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
775 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
776
777 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
778#elif defined(_WIN32) 806#elif defined(_WIN32)
779 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
780#else 808#else
781 struct timeval tv; 809 struct timeval tv;
782 810
783 tv.tv_sec = (time_t)delay;
784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
785
786 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
787 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
788 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
789 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
790#endif 816#endif
791 } 817 }
818}
819
820inline_speed int
821ev_timeout_to_ms (ev_tstamp timeout)
822{
823 int ms = timeout * 1000. + .999999;
824
825 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
792} 826}
793 827
794/*****************************************************************************/ 828/*****************************************************************************/
795 829
796#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
… …
945 { 979 {
946 int fd = fdchanges [i]; 980 int fd = fdchanges [i];
947 ANFD *anfd = anfds + fd; 981 ANFD *anfd = anfds + fd;
948 ev_io *w; 982 ev_io *w;
949 983
950 unsigned char events = 0; 984 unsigned char o_events = anfd->events;
985 unsigned char o_reify = anfd->reify;
951 986
952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 987 anfd->reify = 0;
953 events |= (unsigned char)w->events;
954 988
955#if EV_SELECT_IS_WINSOCKET 989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
956 if (events) 990 if (o_reify & EV__IOFDSET)
957 { 991 {
958 unsigned long arg; 992 unsigned long arg;
959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 993 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
961 } 996 }
962#endif 997#endif
963 998
999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
964 { 1000 {
965 unsigned char o_events = anfd->events;
966 unsigned char o_reify = anfd->reify;
967
968 anfd->reify = 0;
969 anfd->events = events; 1001 anfd->events = 0;
970 1002
971 if (o_events != events || o_reify & EV__IOFDSET) 1003 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1004 anfd->events |= (unsigned char)w->events;
1005
1006 if (o_events != anfd->events)
1007 o_reify = EV__IOFDSET; /* actually |= */
1008 }
1009
1010 if (o_reify & EV__IOFDSET)
972 backend_modify (EV_A_ fd, o_events, events); 1011 backend_modify (EV_A_ fd, o_events, anfd->events);
973 }
974 } 1012 }
975 1013
976 fdchangecnt = 0; 1014 fdchangecnt = 0;
977} 1015}
978 1016
… …
1339#endif 1377#endif
1340} 1378}
1341 1379
1342/*****************************************************************************/ 1380/*****************************************************************************/
1343 1381
1382void
1383ev_feed_signal (int signum)
1384{
1385#if EV_MULTIPLICITY
1386 EV_P = signals [signum - 1].loop;
1387
1388 if (!EV_A)
1389 return;
1390#endif
1391
1392 signals [signum - 1].pending = 1;
1393 evpipe_write (EV_A_ &sig_pending);
1394}
1395
1344static void 1396static void
1345ev_sighandler (int signum) 1397ev_sighandler (int signum)
1346{ 1398{
1347#if EV_MULTIPLICITY
1348 EV_P = signals [signum - 1].loop;
1349#endif
1350
1351#ifdef _WIN32 1399#ifdef _WIN32
1352 signal (signum, ev_sighandler); 1400 signal (signum, ev_sighandler);
1353#endif 1401#endif
1354 1402
1355 signals [signum - 1].pending = 1; 1403 ev_feed_signal (signum);
1356 evpipe_write (EV_A_ &sig_pending);
1357} 1404}
1358 1405
1359void noinline 1406void noinline
1360ev_feed_signal_event (EV_P_ int signum) 1407ev_feed_signal_event (EV_P_ int signum)
1361{ 1408{
… …
1461 1508
1462#endif 1509#endif
1463 1510
1464/*****************************************************************************/ 1511/*****************************************************************************/
1465 1512
1513#if EV_USE_IOCP
1514# include "ev_iocp.c"
1515#endif
1466#if EV_USE_PORT 1516#if EV_USE_PORT
1467# include "ev_port.c" 1517# include "ev_port.c"
1468#endif 1518#endif
1469#if EV_USE_KQUEUE 1519#if EV_USE_KQUEUE
1470# include "ev_kqueue.c" 1520# include "ev_kqueue.c"
… …
1543ev_embeddable_backends (void) 1593ev_embeddable_backends (void)
1544{ 1594{
1545 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1595 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1546 1596
1547 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1597 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1548 /* please fix it and tell me how to detect the fix */ 1598 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1549 flags &= ~EVBACKEND_EPOLL; 1599 flags &= ~EVBACKEND_EPOLL;
1550 1600
1551 return flags; 1601 return flags;
1552} 1602}
1553 1603
1554unsigned int 1604unsigned int
… …
1610static void noinline 1660static void noinline
1611loop_init (EV_P_ unsigned int flags) 1661loop_init (EV_P_ unsigned int flags)
1612{ 1662{
1613 if (!backend) 1663 if (!backend)
1614 { 1664 {
1665 origflags = flags;
1666
1615#if EV_USE_REALTIME 1667#if EV_USE_REALTIME
1616 if (!have_realtime) 1668 if (!have_realtime)
1617 { 1669 {
1618 struct timespec ts; 1670 struct timespec ts;
1619 1671
… …
1664#endif 1716#endif
1665#if EV_USE_SIGNALFD 1717#if EV_USE_SIGNALFD
1666 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1718 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1667#endif 1719#endif
1668 1720
1669 if (!(flags & 0x0000ffffU)) 1721 if (!(flags & EVBACKEND_MASK))
1670 flags |= ev_recommended_backends (); 1722 flags |= ev_recommended_backends ();
1671 1723
1724#if EV_USE_IOCP
1725 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1726#endif
1672#if EV_USE_PORT 1727#if EV_USE_PORT
1673 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1728 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1674#endif 1729#endif
1675#if EV_USE_KQUEUE 1730#if EV_USE_KQUEUE
1676 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1693#endif 1748#endif
1694 } 1749 }
1695} 1750}
1696 1751
1697/* free up a loop structure */ 1752/* free up a loop structure */
1698static void noinline 1753void
1699loop_destroy (EV_P) 1754ev_loop_destroy (EV_P)
1700{ 1755{
1701 int i; 1756 int i;
1757
1758#if EV_MULTIPLICITY
1759 /* mimic free (0) */
1760 if (!EV_A)
1761 return;
1762#endif
1763
1764#if EV_CLEANUP_ENABLE
1765 /* queue cleanup watchers (and execute them) */
1766 if (expect_false (cleanupcnt))
1767 {
1768 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1769 EV_INVOKE_PENDING;
1770 }
1771#endif
1772
1773#if EV_CHILD_ENABLE
1774 if (ev_is_active (&childev))
1775 {
1776 ev_ref (EV_A); /* child watcher */
1777 ev_signal_stop (EV_A_ &childev);
1778 }
1779#endif
1702 1780
1703 if (ev_is_active (&pipe_w)) 1781 if (ev_is_active (&pipe_w))
1704 { 1782 {
1705 /*ev_ref (EV_A);*/ 1783 /*ev_ref (EV_A);*/
1706 /*ev_io_stop (EV_A_ &pipe_w);*/ 1784 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1728#endif 1806#endif
1729 1807
1730 if (backend_fd >= 0) 1808 if (backend_fd >= 0)
1731 close (backend_fd); 1809 close (backend_fd);
1732 1810
1811#if EV_USE_IOCP
1812 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1813#endif
1733#if EV_USE_PORT 1814#if EV_USE_PORT
1734 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1815 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1735#endif 1816#endif
1736#if EV_USE_KQUEUE 1817#if EV_USE_KQUEUE
1737 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1818 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1764 array_free (periodic, EMPTY); 1845 array_free (periodic, EMPTY);
1765#endif 1846#endif
1766#if EV_FORK_ENABLE 1847#if EV_FORK_ENABLE
1767 array_free (fork, EMPTY); 1848 array_free (fork, EMPTY);
1768#endif 1849#endif
1850#if EV_CLEANUP_ENABLE
1851 array_free (cleanup, EMPTY);
1852#endif
1769 array_free (prepare, EMPTY); 1853 array_free (prepare, EMPTY);
1770 array_free (check, EMPTY); 1854 array_free (check, EMPTY);
1771#if EV_ASYNC_ENABLE 1855#if EV_ASYNC_ENABLE
1772 array_free (async, EMPTY); 1856 array_free (async, EMPTY);
1773#endif 1857#endif
1774 1858
1775 backend = 0; 1859 backend = 0;
1860
1861#if EV_MULTIPLICITY
1862 if (ev_is_default_loop (EV_A))
1863#endif
1864 ev_default_loop_ptr = 0;
1865#if EV_MULTIPLICITY
1866 else
1867 ev_free (EV_A);
1868#endif
1776} 1869}
1777 1870
1778#if EV_USE_INOTIFY 1871#if EV_USE_INOTIFY
1779inline_size void infy_fork (EV_P); 1872inline_size void infy_fork (EV_P);
1780#endif 1873#endif
… …
1839 loop_init (EV_A_ flags); 1932 loop_init (EV_A_ flags);
1840 1933
1841 if (ev_backend (EV_A)) 1934 if (ev_backend (EV_A))
1842 return EV_A; 1935 return EV_A;
1843 1936
1937 ev_free (EV_A);
1844 return 0; 1938 return 0;
1845} 1939}
1846 1940
1847void
1848ev_loop_destroy (EV_P)
1849{
1850 loop_destroy (EV_A);
1851 ev_free (loop);
1852}
1853
1854void
1855ev_loop_fork (EV_P)
1856{
1857 postfork = 1; /* must be in line with ev_default_fork */
1858}
1859#endif /* multiplicity */ 1941#endif /* multiplicity */
1860 1942
1861#if EV_VERIFY 1943#if EV_VERIFY
1862static void noinline 1944static void noinline
1863verify_watcher (EV_P_ W w) 1945verify_watcher (EV_P_ W w)
… …
1938#if EV_FORK_ENABLE 2020#if EV_FORK_ENABLE
1939 assert (forkmax >= forkcnt); 2021 assert (forkmax >= forkcnt);
1940 array_verify (EV_A_ (W *)forks, forkcnt); 2022 array_verify (EV_A_ (W *)forks, forkcnt);
1941#endif 2023#endif
1942 2024
2025#if EV_CLEANUP_ENABLE
2026 assert (cleanupmax >= cleanupcnt);
2027 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2028#endif
2029
1943#if EV_ASYNC_ENABLE 2030#if EV_ASYNC_ENABLE
1944 assert (asyncmax >= asynccnt); 2031 assert (asyncmax >= asynccnt);
1945 array_verify (EV_A_ (W *)asyncs, asynccnt); 2032 array_verify (EV_A_ (W *)asyncs, asynccnt);
1946#endif 2033#endif
1947 2034
… …
1965} 2052}
1966#endif 2053#endif
1967 2054
1968#if EV_MULTIPLICITY 2055#if EV_MULTIPLICITY
1969struct ev_loop * 2056struct ev_loop *
1970ev_default_loop_init (unsigned int flags)
1971#else 2057#else
1972int 2058int
2059#endif
1973ev_default_loop (unsigned int flags) 2060ev_default_loop (unsigned int flags)
1974#endif
1975{ 2061{
1976 if (!ev_default_loop_ptr) 2062 if (!ev_default_loop_ptr)
1977 { 2063 {
1978#if EV_MULTIPLICITY 2064#if EV_MULTIPLICITY
1979 EV_P = ev_default_loop_ptr = &default_loop_struct; 2065 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1998 2084
1999 return ev_default_loop_ptr; 2085 return ev_default_loop_ptr;
2000} 2086}
2001 2087
2002void 2088void
2003ev_default_destroy (void) 2089ev_loop_fork (EV_P)
2004{ 2090{
2005#if EV_MULTIPLICITY
2006 EV_P = ev_default_loop_ptr;
2007#endif
2008
2009 ev_default_loop_ptr = 0;
2010
2011#if EV_CHILD_ENABLE
2012 ev_ref (EV_A); /* child watcher */
2013 ev_signal_stop (EV_A_ &childev);
2014#endif
2015
2016 loop_destroy (EV_A);
2017}
2018
2019void
2020ev_default_fork (void)
2021{
2022#if EV_MULTIPLICITY
2023 EV_P = ev_default_loop_ptr;
2024#endif
2025
2026 postfork = 1; /* must be in line with ev_loop_fork */ 2091 postfork = 1; /* must be in line with ev_default_fork */
2027} 2092}
2028 2093
2029/*****************************************************************************/ 2094/*****************************************************************************/
2030 2095
2031void 2096void
… …
2053 2118
2054 for (pri = NUMPRI; pri--; ) 2119 for (pri = NUMPRI; pri--; )
2055 while (pendingcnt [pri]) 2120 while (pendingcnt [pri])
2056 { 2121 {
2057 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2122 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2058
2059 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2060 /* ^ this is no longer true, as pending_w could be here */
2061 2123
2062 p->w->pending = 0; 2124 p->w->pending = 0;
2063 EV_CB_INVOKE (p->w, p->events); 2125 EV_CB_INVOKE (p->w, p->events);
2064 EV_FREQUENT_CHECK; 2126 EV_FREQUENT_CHECK;
2065 } 2127 }
… …
2291 mn_now = ev_rt_now; 2353 mn_now = ev_rt_now;
2292 } 2354 }
2293} 2355}
2294 2356
2295void 2357void
2296ev_loop (EV_P_ int flags) 2358ev_run (EV_P_ int flags)
2297{ 2359{
2298#if EV_FEATURE_API 2360#if EV_FEATURE_API
2299 ++loop_depth; 2361 ++loop_depth;
2300#endif 2362#endif
2301 2363
2302 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2364 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2303 2365
2304 loop_done = EVUNLOOP_CANCEL; 2366 loop_done = EVBREAK_CANCEL;
2305 2367
2306 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2368 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2307 2369
2308 do 2370 do
2309 { 2371 {
… …
2352 /* calculate blocking time */ 2414 /* calculate blocking time */
2353 { 2415 {
2354 ev_tstamp waittime = 0.; 2416 ev_tstamp waittime = 0.;
2355 ev_tstamp sleeptime = 0.; 2417 ev_tstamp sleeptime = 0.;
2356 2418
2419 /* remember old timestamp for io_blocktime calculation */
2420 ev_tstamp prev_mn_now = mn_now;
2421
2422 /* update time to cancel out callback processing overhead */
2423 time_update (EV_A_ 1e100);
2424
2357 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2425 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2358 { 2426 {
2359 /* remember old timestamp for io_blocktime calculation */
2360 ev_tstamp prev_mn_now = mn_now;
2361
2362 /* update time to cancel out callback processing overhead */
2363 time_update (EV_A_ 1e100);
2364
2365 waittime = MAX_BLOCKTIME; 2427 waittime = MAX_BLOCKTIME;
2366 2428
2367 if (timercnt) 2429 if (timercnt)
2368 { 2430 {
2369 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2431 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2399 } 2461 }
2400 2462
2401#if EV_FEATURE_API 2463#if EV_FEATURE_API
2402 ++loop_count; 2464 ++loop_count;
2403#endif 2465#endif
2404 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2466 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2405 backend_poll (EV_A_ waittime); 2467 backend_poll (EV_A_ waittime);
2406 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2468 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2407 2469
2408 /* update ev_rt_now, do magic */ 2470 /* update ev_rt_now, do magic */
2409 time_update (EV_A_ waittime + sleeptime); 2471 time_update (EV_A_ waittime + sleeptime);
2410 } 2472 }
2411 2473
… …
2429 EV_INVOKE_PENDING; 2491 EV_INVOKE_PENDING;
2430 } 2492 }
2431 while (expect_true ( 2493 while (expect_true (
2432 activecnt 2494 activecnt
2433 && !loop_done 2495 && !loop_done
2434 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2496 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2435 )); 2497 ));
2436 2498
2437 if (loop_done == EVUNLOOP_ONE) 2499 if (loop_done == EVBREAK_ONE)
2438 loop_done = EVUNLOOP_CANCEL; 2500 loop_done = EVBREAK_CANCEL;
2439 2501
2440#if EV_FEATURE_API 2502#if EV_FEATURE_API
2441 --loop_depth; 2503 --loop_depth;
2442#endif 2504#endif
2443} 2505}
2444 2506
2445void 2507void
2446ev_unloop (EV_P_ int how) 2508ev_break (EV_P_ int how)
2447{ 2509{
2448 loop_done = how; 2510 loop_done = how;
2449} 2511}
2450 2512
2451void 2513void
… …
2599 EV_FREQUENT_CHECK; 2661 EV_FREQUENT_CHECK;
2600 2662
2601 wlist_del (&anfds[w->fd].head, (WL)w); 2663 wlist_del (&anfds[w->fd].head, (WL)w);
2602 ev_stop (EV_A_ (W)w); 2664 ev_stop (EV_A_ (W)w);
2603 2665
2604 fd_change (EV_A_ w->fd, 1); 2666 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2605 2667
2606 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2607} 2669}
2608 2670
2609void noinline 2671void noinline
… …
2833 sa.sa_handler = ev_sighandler; 2895 sa.sa_handler = ev_sighandler;
2834 sigfillset (&sa.sa_mask); 2896 sigfillset (&sa.sa_mask);
2835 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2897 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2836 sigaction (w->signum, &sa, 0); 2898 sigaction (w->signum, &sa, 0);
2837 2899
2900 if (origflags & EVFLAG_NOSIGMASK)
2901 {
2838 sigemptyset (&sa.sa_mask); 2902 sigemptyset (&sa.sa_mask);
2839 sigaddset (&sa.sa_mask, w->signum); 2903 sigaddset (&sa.sa_mask, w->signum);
2840 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2904 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2905 }
2841#endif 2906#endif
2842 } 2907 }
2843 2908
2844 EV_FREQUENT_CHECK; 2909 EV_FREQUENT_CHECK;
2845} 2910}
… …
3061 { 3126 {
3062 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3127 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3063 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3128 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3064 ofs += sizeof (struct inotify_event) + ev->len; 3129 ofs += sizeof (struct inotify_event) + ev->len;
3065 } 3130 }
3066}
3067
3068inline_size unsigned int
3069ev_linux_version (void)
3070{
3071 struct utsname buf;
3072 unsigned int v;
3073 int i;
3074 char *p = buf.release;
3075
3076 if (uname (&buf))
3077 return 0;
3078
3079 for (i = 3+1; --i; )
3080 {
3081 unsigned int c = 0;
3082
3083 for (;;)
3084 {
3085 if (*p >= '0' && *p <= '9')
3086 c = c * 10 + *p++ - '0';
3087 else
3088 {
3089 p += *p == '.';
3090 break;
3091 }
3092 }
3093
3094 v = (v << 8) | c;
3095 }
3096
3097 return v;
3098} 3131}
3099 3132
3100inline_size void 3133inline_size void
3101ev_check_2625 (EV_P) 3134ev_check_2625 (EV_P)
3102{ 3135{
… …
3426 3459
3427#if EV_EMBED_ENABLE 3460#if EV_EMBED_ENABLE
3428void noinline 3461void noinline
3429ev_embed_sweep (EV_P_ ev_embed *w) 3462ev_embed_sweep (EV_P_ ev_embed *w)
3430{ 3463{
3431 ev_loop (w->other, EVLOOP_NONBLOCK); 3464 ev_run (w->other, EVRUN_NOWAIT);
3432} 3465}
3433 3466
3434static void 3467static void
3435embed_io_cb (EV_P_ ev_io *io, int revents) 3468embed_io_cb (EV_P_ ev_io *io, int revents)
3436{ 3469{
3437 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3470 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3438 3471
3439 if (ev_cb (w)) 3472 if (ev_cb (w))
3440 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3473 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3441 else 3474 else
3442 ev_loop (w->other, EVLOOP_NONBLOCK); 3475 ev_run (w->other, EVRUN_NOWAIT);
3443} 3476}
3444 3477
3445static void 3478static void
3446embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3479embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3447{ 3480{
… …
3451 EV_P = w->other; 3484 EV_P = w->other;
3452 3485
3453 while (fdchangecnt) 3486 while (fdchangecnt)
3454 { 3487 {
3455 fd_reify (EV_A); 3488 fd_reify (EV_A);
3456 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3489 ev_run (EV_A_ EVRUN_NOWAIT);
3457 } 3490 }
3458 } 3491 }
3459} 3492}
3460 3493
3461static void 3494static void
… …
3467 3500
3468 { 3501 {
3469 EV_P = w->other; 3502 EV_P = w->other;
3470 3503
3471 ev_loop_fork (EV_A); 3504 ev_loop_fork (EV_A);
3472 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3505 ev_run (EV_A_ EVRUN_NOWAIT);
3473 } 3506 }
3474 3507
3475 ev_embed_start (EV_A_ w); 3508 ev_embed_start (EV_A_ w);
3476} 3509}
3477 3510
… …
3569 3602
3570 EV_FREQUENT_CHECK; 3603 EV_FREQUENT_CHECK;
3571} 3604}
3572#endif 3605#endif
3573 3606
3574#if EV_ASYNC_ENABLE 3607#if EV_CLEANUP_ENABLE
3575void 3608void
3576ev_async_start (EV_P_ ev_async *w) 3609ev_cleanup_start (EV_P_ ev_cleanup *w)
3577{ 3610{
3578 if (expect_false (ev_is_active (w))) 3611 if (expect_false (ev_is_active (w)))
3579 return; 3612 return;
3613
3614 EV_FREQUENT_CHECK;
3615
3616 ev_start (EV_A_ (W)w, ++cleanupcnt);
3617 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3618 cleanups [cleanupcnt - 1] = w;
3619
3620 /* cleanup watchers should never keep a refcount on the loop */
3621 ev_unref (EV_A);
3622 EV_FREQUENT_CHECK;
3623}
3624
3625void
3626ev_cleanup_stop (EV_P_ ev_cleanup *w)
3627{
3628 clear_pending (EV_A_ (W)w);
3629 if (expect_false (!ev_is_active (w)))
3630 return;
3631
3632 EV_FREQUENT_CHECK;
3633 ev_ref (EV_A);
3634
3635 {
3636 int active = ev_active (w);
3637
3638 cleanups [active - 1] = cleanups [--cleanupcnt];
3639 ev_active (cleanups [active - 1]) = active;
3640 }
3641
3642 ev_stop (EV_A_ (W)w);
3643
3644 EV_FREQUENT_CHECK;
3645}
3646#endif
3647
3648#if EV_ASYNC_ENABLE
3649void
3650ev_async_start (EV_P_ ev_async *w)
3651{
3652 if (expect_false (ev_is_active (w)))
3653 return;
3654
3655 w->sent = 0;
3580 3656
3581 evpipe_init (EV_A); 3657 evpipe_init (EV_A);
3582 3658
3583 EV_FREQUENT_CHECK; 3659 EV_FREQUENT_CHECK;
3584 3660
… …
3804 3880
3805#if EV_MULTIPLICITY 3881#if EV_MULTIPLICITY
3806 #include "ev_wrap.h" 3882 #include "ev_wrap.h"
3807#endif 3883#endif
3808 3884
3809#ifdef __cplusplus 3885EV_CPP(})
3810}
3811#endif
3812 3886

Diff Legend

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