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.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 437#endif
451#endif
452
453 438
454/**/ 439/**/
455 440
456#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
457# define EV_FREQUENT_CHECK ev_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
471 456
472#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#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) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
474 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
462
475#if __GNUC__ >= 4 463#if __GNUC__ >= 4
476# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
477# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
478#else 466#else
479# define expect(expr,value) (expr) 467# define expect(expr,value) (expr)
… …
535# include "ev_win32.c" 523# include "ev_win32.c"
536#endif 524#endif
537 525
538/*****************************************************************************/ 526/*****************************************************************************/
539 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
540#if EV_AVOID_STDIO 570#if EV_AVOID_STDIO
541static void noinline 571static void noinline
542ev_printerr (const char *msg) 572ev_printerr (const char *msg)
543{ 573{
544 write (STDERR_FILENO, msg, strlen (msg)); 574 write (STDERR_FILENO, msg, strlen (msg));
… …
562 if (syserr_cb) 592 if (syserr_cb)
563 syserr_cb (msg); 593 syserr_cb (msg);
564 else 594 else
565 { 595 {
566#if EV_AVOID_STDIO 596#if EV_AVOID_STDIO
567 const char *err = strerror (errno);
568
569 ev_printerr (msg); 597 ev_printerr (msg);
570 ev_printerr (": "); 598 ev_printerr (": ");
571 ev_printerr (err); 599 ev_printerr (strerror (errno));
572 ev_printerr ("\n"); 600 ev_printerr ("\n");
573#else 601#else
574 perror (msg); 602 perror (msg);
575#endif 603#endif
576 abort (); 604 abort ();
… …
610 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
611 639
612 if (!ptr && size) 640 if (!ptr && size)
613 { 641 {
614#if EV_AVOID_STDIO 642#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n"); 643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
616#else 644#else
617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
618#endif 646#endif
619 abort (); 647 abort ();
620 } 648 }
621 649
622 return ptr; 650 return ptr;
… …
639 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 */
640 unsigned char unused; 668 unsigned char unused;
641#if EV_USE_EPOLL 669#if EV_USE_EPOLL
642 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
643#endif 671#endif
644#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
645 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
646#endif 677#endif
647} ANFD; 678} ANFD;
648 679
649/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
650typedef struct 681typedef struct
… …
715# define EV_RELEASE_CB (void)0 746# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0 747# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 748# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif 749#endif
719 750
720#define EVUNLOOP_RECURSE 0x80 751#define EVBREAK_RECURSE 0x80
721 752
722/*****************************************************************************/ 753/*****************************************************************************/
723 754
724#ifndef EV_HAVE_EV_TIME 755#ifndef EV_HAVE_EV_TIME
725ev_tstamp 756ev_tstamp
… …
769 if (delay > 0.) 800 if (delay > 0.)
770 { 801 {
771#if EV_USE_NANOSLEEP 802#if EV_USE_NANOSLEEP
772 struct timespec ts; 803 struct timespec ts;
773 804
774 ts.tv_sec = (time_t)delay; 805 EV_TS_SET (ts, delay);
775 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
776
777 nanosleep (&ts, 0); 806 nanosleep (&ts, 0);
778#elif defined(_WIN32) 807#elif defined(_WIN32)
779 Sleep ((unsigned long)(delay * 1e3)); 808 Sleep ((unsigned long)(delay * 1e3));
780#else 809#else
781 struct timeval tv; 810 struct timeval tv;
782 811
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 */ 812 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
787 /* something not guaranteed by newer posix versions, but guaranteed */ 813 /* something not guaranteed by newer posix versions, but guaranteed */
788 /* by older ones */ 814 /* by older ones */
815 EV_TV_SET (tv, delay);
789 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
790#endif 817#endif
791 } 818 }
819}
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;
792} 827}
793 828
794/*****************************************************************************/ 829/*****************************************************************************/
795 830
796#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 */
… …
945 { 980 {
946 int fd = fdchanges [i]; 981 int fd = fdchanges [i];
947 ANFD *anfd = anfds + fd; 982 ANFD *anfd = anfds + fd;
948 ev_io *w; 983 ev_io *w;
949 984
950 unsigned char events = 0; 985 unsigned char o_events = anfd->events;
986 unsigned char o_reify = anfd->reify;
951 987
952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 988 anfd->reify = 0;
953 events |= (unsigned char)w->events;
954 989
955#if EV_SELECT_IS_WINSOCKET 990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
956 if (events) 991 if (o_reify & EV__IOFDSET)
957 { 992 {
958 unsigned long arg; 993 unsigned long arg;
959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
960 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
961 } 997 }
962#endif 998#endif
963 999
1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
964 { 1001 {
965 unsigned char o_events = anfd->events;
966 unsigned char o_reify = anfd->reify;
967
968 anfd->reify = 0;
969 anfd->events = events; 1002 anfd->events = 0;
970 1003
971 if (o_events != events || o_reify & EV__IOFDSET) 1004 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1005 anfd->events |= (unsigned char)w->events;
1006
1007 if (o_events != anfd->events)
1008 o_reify = EV__IOFDSET; /* actually |= */
1009 }
1010
1011 if (o_reify & EV__IOFDSET)
972 backend_modify (EV_A_ fd, o_events, events); 1012 backend_modify (EV_A_ fd, o_events, anfd->events);
973 }
974 } 1013 }
975 1014
976 fdchangecnt = 0; 1015 fdchangecnt = 0;
977} 1016}
978 1017
… …
1313 char dummy; 1352 char dummy;
1314 /* 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 */
1315 read (evpipe [0], &dummy, 1); 1354 read (evpipe [0], &dummy, 1);
1316 } 1355 }
1317 1356
1357#if EV_SIGNAL_ENABLE
1318 if (sig_pending) 1358 if (sig_pending)
1319 { 1359 {
1320 sig_pending = 0; 1360 sig_pending = 0;
1321 1361
1322 for (i = EV_NSIG - 1; i--; ) 1362 for (i = EV_NSIG - 1; i--; )
1323 if (expect_false (signals [i].pending)) 1363 if (expect_false (signals [i].pending))
1324 ev_feed_signal_event (EV_A_ i + 1); 1364 ev_feed_signal_event (EV_A_ i + 1);
1325 } 1365 }
1366#endif
1326 1367
1327#if EV_ASYNC_ENABLE 1368#if EV_ASYNC_ENABLE
1328 if (async_pending) 1369 if (async_pending)
1329 { 1370 {
1330 async_pending = 0; 1371 async_pending = 0;
… …
1339#endif 1380#endif
1340} 1381}
1341 1382
1342/*****************************************************************************/ 1383/*****************************************************************************/
1343 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
1344static void 1399static void
1345ev_sighandler (int signum) 1400ev_sighandler (int signum)
1346{ 1401{
1347#if EV_MULTIPLICITY
1348 EV_P = signals [signum - 1].loop;
1349#endif
1350
1351#ifdef _WIN32 1402#ifdef _WIN32
1352 signal (signum, ev_sighandler); 1403 signal (signum, ev_sighandler);
1353#endif 1404#endif
1354 1405
1355 signals [signum - 1].pending = 1; 1406 ev_feed_signal (signum);
1356 evpipe_write (EV_A_ &sig_pending);
1357} 1407}
1358 1408
1359void noinline 1409void noinline
1360ev_feed_signal_event (EV_P_ int signum) 1410ev_feed_signal_event (EV_P_ int signum)
1361{ 1411{
… …
1461 1511
1462#endif 1512#endif
1463 1513
1464/*****************************************************************************/ 1514/*****************************************************************************/
1465 1515
1516#if EV_USE_IOCP
1517# include "ev_iocp.c"
1518#endif
1466#if EV_USE_PORT 1519#if EV_USE_PORT
1467# include "ev_port.c" 1520# include "ev_port.c"
1468#endif 1521#endif
1469#if EV_USE_KQUEUE 1522#if EV_USE_KQUEUE
1470# include "ev_kqueue.c" 1523# include "ev_kqueue.c"
… …
1543ev_embeddable_backends (void) 1596ev_embeddable_backends (void)
1544{ 1597{
1545 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1546 1599
1547 /* 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 */
1548 /* please fix it and tell me how to detect the fix */ 1601 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1549 flags &= ~EVBACKEND_EPOLL; 1602 flags &= ~EVBACKEND_EPOLL;
1550 1603
1551 return flags; 1604 return flags;
1552} 1605}
1553 1606
1554unsigned int 1607unsigned int
… …
1610static void noinline 1663static void noinline
1611loop_init (EV_P_ unsigned int flags) 1664loop_init (EV_P_ unsigned int flags)
1612{ 1665{
1613 if (!backend) 1666 if (!backend)
1614 { 1667 {
1668 origflags = flags;
1669
1615#if EV_USE_REALTIME 1670#if EV_USE_REALTIME
1616 if (!have_realtime) 1671 if (!have_realtime)
1617 { 1672 {
1618 struct timespec ts; 1673 struct timespec ts;
1619 1674
… …
1664#endif 1719#endif
1665#if EV_USE_SIGNALFD 1720#if EV_USE_SIGNALFD
1666 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1667#endif 1722#endif
1668 1723
1669 if (!(flags & 0x0000ffffU)) 1724 if (!(flags & EVBACKEND_MASK))
1670 flags |= ev_recommended_backends (); 1725 flags |= ev_recommended_backends ();
1671 1726
1727#if EV_USE_IOCP
1728 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1729#endif
1672#if EV_USE_PORT 1730#if EV_USE_PORT
1673 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1674#endif 1732#endif
1675#if EV_USE_KQUEUE 1733#if EV_USE_KQUEUE
1676 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1734 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1693#endif 1751#endif
1694 } 1752 }
1695} 1753}
1696 1754
1697/* free up a loop structure */ 1755/* free up a loop structure */
1698static void noinline 1756void
1699loop_destroy (EV_P) 1757ev_loop_destroy (EV_P)
1700{ 1758{
1701 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
1702 1783
1703 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1704 { 1785 {
1705 /*ev_ref (EV_A);*/ 1786 /*ev_ref (EV_A);*/
1706 /*ev_io_stop (EV_A_ &pipe_w);*/ 1787 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1728#endif 1809#endif
1729 1810
1730 if (backend_fd >= 0) 1811 if (backend_fd >= 0)
1731 close (backend_fd); 1812 close (backend_fd);
1732 1813
1814#if EV_USE_IOCP
1815 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1816#endif
1733#if EV_USE_PORT 1817#if EV_USE_PORT
1734 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1818 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1735#endif 1819#endif
1736#if EV_USE_KQUEUE 1820#if EV_USE_KQUEUE
1737 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1821 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1764 array_free (periodic, EMPTY); 1848 array_free (periodic, EMPTY);
1765#endif 1849#endif
1766#if EV_FORK_ENABLE 1850#if EV_FORK_ENABLE
1767 array_free (fork, EMPTY); 1851 array_free (fork, EMPTY);
1768#endif 1852#endif
1853#if EV_CLEANUP_ENABLE
1854 array_free (cleanup, EMPTY);
1855#endif
1769 array_free (prepare, EMPTY); 1856 array_free (prepare, EMPTY);
1770 array_free (check, EMPTY); 1857 array_free (check, EMPTY);
1771#if EV_ASYNC_ENABLE 1858#if EV_ASYNC_ENABLE
1772 array_free (async, EMPTY); 1859 array_free (async, EMPTY);
1773#endif 1860#endif
1774 1861
1775 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
1776} 1872}
1777 1873
1778#if EV_USE_INOTIFY 1874#if EV_USE_INOTIFY
1779inline_size void infy_fork (EV_P); 1875inline_size void infy_fork (EV_P);
1780#endif 1876#endif
… …
1839 loop_init (EV_A_ flags); 1935 loop_init (EV_A_ flags);
1840 1936
1841 if (ev_backend (EV_A)) 1937 if (ev_backend (EV_A))
1842 return EV_A; 1938 return EV_A;
1843 1939
1940 ev_free (EV_A);
1844 return 0; 1941 return 0;
1845} 1942}
1846 1943
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 */ 1944#endif /* multiplicity */
1860 1945
1861#if EV_VERIFY 1946#if EV_VERIFY
1862static void noinline 1947static void noinline
1863verify_watcher (EV_P_ W w) 1948verify_watcher (EV_P_ W w)
… …
1938#if EV_FORK_ENABLE 2023#if EV_FORK_ENABLE
1939 assert (forkmax >= forkcnt); 2024 assert (forkmax >= forkcnt);
1940 array_verify (EV_A_ (W *)forks, forkcnt); 2025 array_verify (EV_A_ (W *)forks, forkcnt);
1941#endif 2026#endif
1942 2027
2028#if EV_CLEANUP_ENABLE
2029 assert (cleanupmax >= cleanupcnt);
2030 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2031#endif
2032
1943#if EV_ASYNC_ENABLE 2033#if EV_ASYNC_ENABLE
1944 assert (asyncmax >= asynccnt); 2034 assert (asyncmax >= asynccnt);
1945 array_verify (EV_A_ (W *)asyncs, asynccnt); 2035 array_verify (EV_A_ (W *)asyncs, asynccnt);
1946#endif 2036#endif
1947 2037
… …
1965} 2055}
1966#endif 2056#endif
1967 2057
1968#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1969struct ev_loop * 2059struct ev_loop *
1970ev_default_loop_init (unsigned int flags)
1971#else 2060#else
1972int 2061int
2062#endif
1973ev_default_loop (unsigned int flags) 2063ev_default_loop (unsigned int flags)
1974#endif
1975{ 2064{
1976 if (!ev_default_loop_ptr) 2065 if (!ev_default_loop_ptr)
1977 { 2066 {
1978#if EV_MULTIPLICITY 2067#if EV_MULTIPLICITY
1979 EV_P = ev_default_loop_ptr = &default_loop_struct; 2068 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1998 2087
1999 return ev_default_loop_ptr; 2088 return ev_default_loop_ptr;
2000} 2089}
2001 2090
2002void 2091void
2003ev_default_destroy (void) 2092ev_loop_fork (EV_P)
2004{ 2093{
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 */ 2094 postfork = 1; /* must be in line with ev_default_fork */
2027} 2095}
2028 2096
2029/*****************************************************************************/ 2097/*****************************************************************************/
2030 2098
2031void 2099void
… …
2053 2121
2054 for (pri = NUMPRI; pri--; ) 2122 for (pri = NUMPRI; pri--; )
2055 while (pendingcnt [pri]) 2123 while (pendingcnt [pri])
2056 { 2124 {
2057 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2125 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 2126
2062 p->w->pending = 0; 2127 p->w->pending = 0;
2063 EV_CB_INVOKE (p->w, p->events); 2128 EV_CB_INVOKE (p->w, p->events);
2064 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
2065 } 2130 }
… …
2127 feed_reverse_done (EV_A_ EV_TIMER); 2192 feed_reverse_done (EV_A_ EV_TIMER);
2128 } 2193 }
2129} 2194}
2130 2195
2131#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
2132/* make periodics pending */ 2206/* make periodics pending */
2133inline_size void 2207inline_size void
2134periodics_reify (EV_P) 2208periodics_reify (EV_P)
2135{ 2209{
2136 EV_FREQUENT_CHECK; 2210 EV_FREQUENT_CHECK;
… …
2155 ANHE_at_cache (periodics [HEAP0]); 2229 ANHE_at_cache (periodics [HEAP0]);
2156 downheap (periodics, periodiccnt, HEAP0); 2230 downheap (periodics, periodiccnt, HEAP0);
2157 } 2231 }
2158 else if (w->interval) 2232 else if (w->interval)
2159 { 2233 {
2160 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2234 periodic_recalc (EV_A_ w);
2235
2161 /* 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 */
2162 /* this might happen because of floating point inexactness */ 2237 /* this might happen because of floating point inexactness */
2163 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2164 { 2239 {
2165 ev_at (w) += w->interval; 2240 ev_at (w) += w->interval;
… …
2199 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2274 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2200 2275
2201 if (w->reschedule_cb) 2276 if (w->reschedule_cb)
2202 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2277 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2203 else if (w->interval) 2278 else if (w->interval)
2204 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2279 periodic_recalc (EV_A_ w);
2205 2280
2206 ANHE_at_cache (periodics [i]); 2281 ANHE_at_cache (periodics [i]);
2207 } 2282 }
2208 2283
2209 reheap (periodics, periodiccnt); 2284 reheap (periodics, periodiccnt);
… …
2291 mn_now = ev_rt_now; 2366 mn_now = ev_rt_now;
2292 } 2367 }
2293} 2368}
2294 2369
2295void 2370void
2296ev_loop (EV_P_ int flags) 2371ev_run (EV_P_ int flags)
2297{ 2372{
2298#if EV_FEATURE_API 2373#if EV_FEATURE_API
2299 ++loop_depth; 2374 ++loop_depth;
2300#endif 2375#endif
2301 2376
2302 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2377 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2303 2378
2304 loop_done = EVUNLOOP_CANCEL; 2379 loop_done = EVBREAK_CANCEL;
2305 2380
2306 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2381 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2307 2382
2308 do 2383 do
2309 { 2384 {
… …
2352 /* calculate blocking time */ 2427 /* calculate blocking time */
2353 { 2428 {
2354 ev_tstamp waittime = 0.; 2429 ev_tstamp waittime = 0.;
2355 ev_tstamp sleeptime = 0.; 2430 ev_tstamp sleeptime = 0.;
2356 2431
2432 /* remember old timestamp for io_blocktime calculation */
2433 ev_tstamp prev_mn_now = mn_now;
2434
2435 /* update time to cancel out callback processing overhead */
2436 time_update (EV_A_ 1e100);
2437
2357 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2438 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2358 { 2439 {
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; 2440 waittime = MAX_BLOCKTIME;
2366 2441
2367 if (timercnt) 2442 if (timercnt)
2368 { 2443 {
2369 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2444 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2399 } 2474 }
2400 2475
2401#if EV_FEATURE_API 2476#if EV_FEATURE_API
2402 ++loop_count; 2477 ++loop_count;
2403#endif 2478#endif
2404 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2479 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2405 backend_poll (EV_A_ waittime); 2480 backend_poll (EV_A_ waittime);
2406 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2481 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2407 2482
2408 /* update ev_rt_now, do magic */ 2483 /* update ev_rt_now, do magic */
2409 time_update (EV_A_ waittime + sleeptime); 2484 time_update (EV_A_ waittime + sleeptime);
2410 } 2485 }
2411 2486
… …
2429 EV_INVOKE_PENDING; 2504 EV_INVOKE_PENDING;
2430 } 2505 }
2431 while (expect_true ( 2506 while (expect_true (
2432 activecnt 2507 activecnt
2433 && !loop_done 2508 && !loop_done
2434 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2509 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2435 )); 2510 ));
2436 2511
2437 if (loop_done == EVUNLOOP_ONE) 2512 if (loop_done == EVBREAK_ONE)
2438 loop_done = EVUNLOOP_CANCEL; 2513 loop_done = EVBREAK_CANCEL;
2439 2514
2440#if EV_FEATURE_API 2515#if EV_FEATURE_API
2441 --loop_depth; 2516 --loop_depth;
2442#endif 2517#endif
2443} 2518}
2444 2519
2445void 2520void
2446ev_unloop (EV_P_ int how) 2521ev_break (EV_P_ int how)
2447{ 2522{
2448 loop_done = how; 2523 loop_done = how;
2449} 2524}
2450 2525
2451void 2526void
… …
2599 EV_FREQUENT_CHECK; 2674 EV_FREQUENT_CHECK;
2600 2675
2601 wlist_del (&anfds[w->fd].head, (WL)w); 2676 wlist_del (&anfds[w->fd].head, (WL)w);
2602 ev_stop (EV_A_ (W)w); 2677 ev_stop (EV_A_ (W)w);
2603 2678
2604 fd_change (EV_A_ w->fd, 1); 2679 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2605 2680
2606 EV_FREQUENT_CHECK; 2681 EV_FREQUENT_CHECK;
2607} 2682}
2608 2683
2609void noinline 2684void noinline
… …
2701 if (w->reschedule_cb) 2776 if (w->reschedule_cb)
2702 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2777 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2703 else if (w->interval) 2778 else if (w->interval)
2704 { 2779 {
2705 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.));
2706 /* this formula differs from the one in periodic_reify because we do not always round up */ 2781 periodic_recalc (EV_A_ w);
2707 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2708 } 2782 }
2709 else 2783 else
2710 ev_at (w) = w->offset; 2784 ev_at (w) = w->offset;
2711 2785
2712 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2833 sa.sa_handler = ev_sighandler; 2907 sa.sa_handler = ev_sighandler;
2834 sigfillset (&sa.sa_mask); 2908 sigfillset (&sa.sa_mask);
2835 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 */
2836 sigaction (w->signum, &sa, 0); 2910 sigaction (w->signum, &sa, 0);
2837 2911
2912 if (origflags & EVFLAG_NOSIGMASK)
2913 {
2838 sigemptyset (&sa.sa_mask); 2914 sigemptyset (&sa.sa_mask);
2839 sigaddset (&sa.sa_mask, w->signum); 2915 sigaddset (&sa.sa_mask, w->signum);
2840 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2916 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2917 }
2841#endif 2918#endif
2842 } 2919 }
2843 2920
2844 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2845} 2922}
… …
3061 { 3138 {
3062 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3139 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3063 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3140 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3064 ofs += sizeof (struct inotify_event) + ev->len; 3141 ofs += sizeof (struct inotify_event) + ev->len;
3065 } 3142 }
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} 3143}
3099 3144
3100inline_size void 3145inline_size void
3101ev_check_2625 (EV_P) 3146ev_check_2625 (EV_P)
3102{ 3147{
… …
3426 3471
3427#if EV_EMBED_ENABLE 3472#if EV_EMBED_ENABLE
3428void noinline 3473void noinline
3429ev_embed_sweep (EV_P_ ev_embed *w) 3474ev_embed_sweep (EV_P_ ev_embed *w)
3430{ 3475{
3431 ev_loop (w->other, EVLOOP_NONBLOCK); 3476 ev_run (w->other, EVRUN_NOWAIT);
3432} 3477}
3433 3478
3434static void 3479static void
3435embed_io_cb (EV_P_ ev_io *io, int revents) 3480embed_io_cb (EV_P_ ev_io *io, int revents)
3436{ 3481{
3437 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3482 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3438 3483
3439 if (ev_cb (w)) 3484 if (ev_cb (w))
3440 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3485 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3441 else 3486 else
3442 ev_loop (w->other, EVLOOP_NONBLOCK); 3487 ev_run (w->other, EVRUN_NOWAIT);
3443} 3488}
3444 3489
3445static void 3490static void
3446embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3491embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3447{ 3492{
… …
3451 EV_P = w->other; 3496 EV_P = w->other;
3452 3497
3453 while (fdchangecnt) 3498 while (fdchangecnt)
3454 { 3499 {
3455 fd_reify (EV_A); 3500 fd_reify (EV_A);
3456 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3501 ev_run (EV_A_ EVRUN_NOWAIT);
3457 } 3502 }
3458 } 3503 }
3459} 3504}
3460 3505
3461static void 3506static void
… …
3467 3512
3468 { 3513 {
3469 EV_P = w->other; 3514 EV_P = w->other;
3470 3515
3471 ev_loop_fork (EV_A); 3516 ev_loop_fork (EV_A);
3472 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3517 ev_run (EV_A_ EVRUN_NOWAIT);
3473 } 3518 }
3474 3519
3475 ev_embed_start (EV_A_ w); 3520 ev_embed_start (EV_A_ w);
3476} 3521}
3477 3522
… …
3569 3614
3570 EV_FREQUENT_CHECK; 3615 EV_FREQUENT_CHECK;
3571} 3616}
3572#endif 3617#endif
3573 3618
3574#if EV_ASYNC_ENABLE 3619#if EV_CLEANUP_ENABLE
3575void 3620void
3576ev_async_start (EV_P_ ev_async *w) 3621ev_cleanup_start (EV_P_ ev_cleanup *w)
3577{ 3622{
3578 if (expect_false (ev_is_active (w))) 3623 if (expect_false (ev_is_active (w)))
3579 return; 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
3660#if EV_ASYNC_ENABLE
3661void
3662ev_async_start (EV_P_ ev_async *w)
3663{
3664 if (expect_false (ev_is_active (w)))
3665 return;
3666
3667 w->sent = 0;
3580 3668
3581 evpipe_init (EV_A); 3669 evpipe_init (EV_A);
3582 3670
3583 EV_FREQUENT_CHECK; 3671 EV_FREQUENT_CHECK;
3584 3672
… …
3804 3892
3805#if EV_MULTIPLICITY 3893#if EV_MULTIPLICITY
3806 #include "ev_wrap.h" 3894 #include "ev_wrap.h"
3807#endif 3895#endif
3808 3896
3809#ifdef __cplusplus 3897EV_CPP(})
3810}
3811#endif
3812 3898

Diff Legend

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