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

Comparing libev/ev.c (file contents):
Revision 1.343 by root, Fri Apr 2 21:03:46 2010 UTC vs.
Revision 1.367 by root, Tue Jan 11 02:15:58 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
… …
195# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
196# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
197# endif 195# endif
198# undef EV_AVOID_STDIO 196# undef EV_AVOID_STDIO
199#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
200 206
201/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
202 208
203/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
204#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
376# include <sys/select.h> 382# include <sys/select.h>
377# endif 383# endif
378#endif 384#endif
379 385
380#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
381# include <sys/utsname.h>
382# include <sys/statfs.h> 387# include <sys/statfs.h>
383# include <sys/inotify.h> 388# include <sys/inotify.h>
384/* 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 */
385# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
386# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
403# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
404# else 409# else
405# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
406# endif 411# endif
407# endif 412# endif
408# ifdef __cplusplus
409extern "C" {
410# endif
411int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
412# ifdef __cplusplus
413}
414# endif
415#endif 414#endif
416 415
417#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
418/* 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 */
419# include <stdint.h> 418# include <stdint.h>
… …
425# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
426# else 425# else
427# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
428# endif 427# endif
429# endif 428# endif
430# ifdef __cplusplus
431extern "C" {
432# endif
433int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
434 430
435struct signalfd_siginfo 431struct signalfd_siginfo
436{ 432{
437 uint32_t ssi_signo; 433 uint32_t ssi_signo;
438 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
439}; 435};
440# ifdef __cplusplus
441}
442# endif 436#endif
443#endif
444
445 437
446/**/ 438/**/
447 439
448#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
449# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
463 455
464#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) */
465#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) */
466 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
467#if __GNUC__ >= 4 462#if __GNUC__ >= 4
468# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
469# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
470#else 465#else
471# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
503#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
504#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
505 500
506#if EV_USE_REALTIME 501#if EV_USE_REALTIME
507/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
508/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
509static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
510#endif 505#endif
511 506
512#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
513static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
524#endif 519#endif
525 520
526#ifdef _WIN32 521#ifdef _WIN32
527# include "ev_win32.c" 522# include "ev_win32.c"
528#endif 523#endif
524
525/*****************************************************************************/
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}
529 566
530/*****************************************************************************/ 567/*****************************************************************************/
531 568
532#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
533static void noinline 570static void noinline
… …
554 if (syserr_cb) 591 if (syserr_cb)
555 syserr_cb (msg); 592 syserr_cb (msg);
556 else 593 else
557 { 594 {
558#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
559 const char *err = strerror (errno);
560
561 ev_printerr (msg); 596 ev_printerr (msg);
562 ev_printerr (": "); 597 ev_printerr (": ");
563 ev_printerr (err); 598 ev_printerr (strerror (errno));
564 ev_printerr ("\n"); 599 ev_printerr ("\n");
565#else 600#else
566 perror (msg); 601 perror (msg);
567#endif 602#endif
568 abort (); 603 abort ();
… …
602 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
603 638
604 if (!ptr && size) 639 if (!ptr && size)
605 { 640 {
606#if EV_AVOID_STDIO 641#if EV_AVOID_STDIO
607 ev_printerr ("libev: memory allocation failed, aborting.\n"); 642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
608#else 643#else
609 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
610#endif 645#endif
611 abort (); 646 abort ();
612 } 647 }
613 648
614 return ptr; 649 return ptr;
… …
631 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 */
632 unsigned char unused; 667 unsigned char unused;
633#if EV_USE_EPOLL 668#if EV_USE_EPOLL
634 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
635#endif 670#endif
636#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
637 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
638#endif 676#endif
639} ANFD; 677} ANFD;
640 678
641/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
642typedef struct 680typedef struct
… …
707# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
708# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
709# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
710#endif 748#endif
711 749
712#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
713 751
714/*****************************************************************************/ 752/*****************************************************************************/
715 753
716#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
717ev_tstamp 755ev_tstamp
… …
761 if (delay > 0.) 799 if (delay > 0.)
762 { 800 {
763#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
764 struct timespec ts; 802 struct timespec ts;
765 803
766 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
767 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
768
769 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
770#elif defined(_WIN32) 806#elif defined(_WIN32)
771 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
772#else 808#else
773 struct timeval tv; 809 struct timeval tv;
774 810
775 tv.tv_sec = (time_t)delay;
776 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
777
778 /* 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 */
779 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
780 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
781 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
782#endif 816#endif
783 } 817 }
784} 818}
785 819
786/*****************************************************************************/ 820/*****************************************************************************/
787 821
788#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 822#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
789 823
790/* find a suitable new size for the given array, */ 824/* find a suitable new size for the given array, */
791/* hopefully by rounding to a ncie-to-malloc size */ 825/* hopefully by rounding to a nice-to-malloc size */
792inline_size int 826inline_size int
793array_nextsize (int elem, int cur, int cnt) 827array_nextsize (int elem, int cur, int cnt)
794{ 828{
795 int ncur = cur + 1; 829 int ncur = cur + 1;
796 830
… …
937 { 971 {
938 int fd = fdchanges [i]; 972 int fd = fdchanges [i];
939 ANFD *anfd = anfds + fd; 973 ANFD *anfd = anfds + fd;
940 ev_io *w; 974 ev_io *w;
941 975
942 unsigned char events = 0; 976 unsigned char o_events = anfd->events;
977 unsigned char o_reify = anfd->reify;
943 978
944 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 979 anfd->reify = 0;
945 events |= (unsigned char)w->events;
946 980
947#if EV_SELECT_IS_WINSOCKET 981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
948 if (events) 982 if (o_reify & EV__IOFDSET)
949 { 983 {
950 unsigned long arg; 984 unsigned long arg;
951 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 985 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
952 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 986 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
987 printf ("oi %d %x\n", fd, anfd->handle);//D
953 } 988 }
954#endif 989#endif
955 990
991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
956 { 992 {
957 unsigned char o_events = anfd->events;
958 unsigned char o_reify = anfd->reify;
959
960 anfd->reify = 0;
961 anfd->events = events; 993 anfd->events = 0;
962 994
963 if (o_events != events || o_reify & EV__IOFDSET) 995 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
996 anfd->events |= (unsigned char)w->events;
997
998 if (o_events != anfd->events)
999 o_reify = EV__IOFDSET; /* actually |= */
1000 }
1001
1002 if (o_reify & EV__IOFDSET)
964 backend_modify (EV_A_ fd, o_events, events); 1003 backend_modify (EV_A_ fd, o_events, anfd->events);
965 }
966 } 1004 }
967 1005
968 fdchangecnt = 0; 1006 fdchangecnt = 0;
969} 1007}
970 1008
… …
1063} 1101}
1064 1102
1065/*****************************************************************************/ 1103/*****************************************************************************/
1066 1104
1067/* 1105/*
1068 * the heap functions want a real array index. array index 0 uis guaranteed to not 1106 * the heap functions want a real array index. array index 0 is guaranteed to not
1069 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1107 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1070 * the branching factor of the d-tree. 1108 * the branching factor of the d-tree.
1071 */ 1109 */
1072 1110
1073/* 1111/*
… …
1273 uint64_t counter = 1; 1311 uint64_t counter = 1;
1274 write (evfd, &counter, sizeof (uint64_t)); 1312 write (evfd, &counter, sizeof (uint64_t));
1275 } 1313 }
1276 else 1314 else
1277#endif 1315#endif
1316 /* win32 people keep sending patches that change this write() to send() */
1317 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1318 /* so when you think this write should be a send instead, please find out */
1319 /* where your send() is from - it's definitely not the microsoft send, and */
1320 /* tell me. thank you. */
1278 write (evpipe [1], &dummy, 1); 1321 write (evpipe [1], &dummy, 1);
1279 1322
1280 errno = old_errno; 1323 errno = old_errno;
1281 } 1324 }
1282} 1325}
… …
1296 } 1339 }
1297 else 1340 else
1298#endif 1341#endif
1299 { 1342 {
1300 char dummy; 1343 char dummy;
1344 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1301 read (evpipe [0], &dummy, 1); 1345 read (evpipe [0], &dummy, 1);
1302 } 1346 }
1303 1347
1304 if (sig_pending) 1348 if (sig_pending)
1305 { 1349 {
… …
1325#endif 1369#endif
1326} 1370}
1327 1371
1328/*****************************************************************************/ 1372/*****************************************************************************/
1329 1373
1374void
1375ev_feed_signal (int signum)
1376{
1377#if EV_MULTIPLICITY
1378 EV_P = signals [signum - 1].loop;
1379
1380 if (!EV_A)
1381 return;
1382#endif
1383
1384 signals [signum - 1].pending = 1;
1385 evpipe_write (EV_A_ &sig_pending);
1386}
1387
1330static void 1388static void
1331ev_sighandler (int signum) 1389ev_sighandler (int signum)
1332{ 1390{
1333#if EV_MULTIPLICITY
1334 EV_P = signals [signum - 1].loop;
1335#endif
1336
1337#ifdef _WIN32 1391#ifdef _WIN32
1338 signal (signum, ev_sighandler); 1392 signal (signum, ev_sighandler);
1339#endif 1393#endif
1340 1394
1341 signals [signum - 1].pending = 1; 1395 ev_feed_signal (signum);
1342 evpipe_write (EV_A_ &sig_pending);
1343} 1396}
1344 1397
1345void noinline 1398void noinline
1346ev_feed_signal_event (EV_P_ int signum) 1399ev_feed_signal_event (EV_P_ int signum)
1347{ 1400{
… …
1447 1500
1448#endif 1501#endif
1449 1502
1450/*****************************************************************************/ 1503/*****************************************************************************/
1451 1504
1505#if EV_USE_IOCP
1506# include "ev_iocp.c"
1507#endif
1452#if EV_USE_PORT 1508#if EV_USE_PORT
1453# include "ev_port.c" 1509# include "ev_port.c"
1454#endif 1510#endif
1455#if EV_USE_KQUEUE 1511#if EV_USE_KQUEUE
1456# include "ev_kqueue.c" 1512# include "ev_kqueue.c"
… …
1529ev_embeddable_backends (void) 1585ev_embeddable_backends (void)
1530{ 1586{
1531 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1587 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1532 1588
1533 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1589 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1534 /* please fix it and tell me how to detect the fix */ 1590 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1535 flags &= ~EVBACKEND_EPOLL; 1591 flags &= ~EVBACKEND_EPOLL;
1536 1592
1537 return flags; 1593 return flags;
1538} 1594}
1539 1595
1540unsigned int 1596unsigned int
… …
1596static void noinline 1652static void noinline
1597loop_init (EV_P_ unsigned int flags) 1653loop_init (EV_P_ unsigned int flags)
1598{ 1654{
1599 if (!backend) 1655 if (!backend)
1600 { 1656 {
1657 origflags = flags;
1658
1601#if EV_USE_REALTIME 1659#if EV_USE_REALTIME
1602 if (!have_realtime) 1660 if (!have_realtime)
1603 { 1661 {
1604 struct timespec ts; 1662 struct timespec ts;
1605 1663
… …
1650#endif 1708#endif
1651#if EV_USE_SIGNALFD 1709#if EV_USE_SIGNALFD
1652 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1710 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1653#endif 1711#endif
1654 1712
1655 if (!(flags & 0x0000ffffU)) 1713 if (!(flags & EVBACKEND_MASK))
1656 flags |= ev_recommended_backends (); 1714 flags |= ev_recommended_backends ();
1657 1715
1716#if EV_USE_IOCP
1717 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1718#endif
1658#if EV_USE_PORT 1719#if EV_USE_PORT
1659 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1720 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1660#endif 1721#endif
1661#if EV_USE_KQUEUE 1722#if EV_USE_KQUEUE
1662 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1679#endif 1740#endif
1680 } 1741 }
1681} 1742}
1682 1743
1683/* free up a loop structure */ 1744/* free up a loop structure */
1684static void noinline 1745void
1685loop_destroy (EV_P) 1746ev_loop_destroy (EV_P)
1686{ 1747{
1687 int i; 1748 int i;
1749
1750#if EV_MULTIPLICITY
1751 /* mimic free (0) */
1752 if (!EV_A)
1753 return;
1754#endif
1755
1756#if EV_CLEANUP_ENABLE
1757 /* queue cleanup watchers (and execute them) */
1758 if (expect_false (cleanupcnt))
1759 {
1760 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1761 EV_INVOKE_PENDING;
1762 }
1763#endif
1764
1765#if EV_CHILD_ENABLE
1766 if (ev_is_active (&childev))
1767 {
1768 ev_ref (EV_A); /* child watcher */
1769 ev_signal_stop (EV_A_ &childev);
1770 }
1771#endif
1688 1772
1689 if (ev_is_active (&pipe_w)) 1773 if (ev_is_active (&pipe_w))
1690 { 1774 {
1691 /*ev_ref (EV_A);*/ 1775 /*ev_ref (EV_A);*/
1692 /*ev_io_stop (EV_A_ &pipe_w);*/ 1776 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1714#endif 1798#endif
1715 1799
1716 if (backend_fd >= 0) 1800 if (backend_fd >= 0)
1717 close (backend_fd); 1801 close (backend_fd);
1718 1802
1803#if EV_USE_IOCP
1804 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1805#endif
1719#if EV_USE_PORT 1806#if EV_USE_PORT
1720 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1807 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1721#endif 1808#endif
1722#if EV_USE_KQUEUE 1809#if EV_USE_KQUEUE
1723 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1810 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1750 array_free (periodic, EMPTY); 1837 array_free (periodic, EMPTY);
1751#endif 1838#endif
1752#if EV_FORK_ENABLE 1839#if EV_FORK_ENABLE
1753 array_free (fork, EMPTY); 1840 array_free (fork, EMPTY);
1754#endif 1841#endif
1842#if EV_CLEANUP_ENABLE
1843 array_free (cleanup, EMPTY);
1844#endif
1755 array_free (prepare, EMPTY); 1845 array_free (prepare, EMPTY);
1756 array_free (check, EMPTY); 1846 array_free (check, EMPTY);
1757#if EV_ASYNC_ENABLE 1847#if EV_ASYNC_ENABLE
1758 array_free (async, EMPTY); 1848 array_free (async, EMPTY);
1759#endif 1849#endif
1760 1850
1761 backend = 0; 1851 backend = 0;
1852
1853#if EV_MULTIPLICITY
1854 if (ev_is_default_loop (EV_A))
1855#endif
1856 ev_default_loop_ptr = 0;
1857#if EV_MULTIPLICITY
1858 else
1859 ev_free (EV_A);
1860#endif
1762} 1861}
1763 1862
1764#if EV_USE_INOTIFY 1863#if EV_USE_INOTIFY
1765inline_size void infy_fork (EV_P); 1864inline_size void infy_fork (EV_P);
1766#endif 1865#endif
… …
1825 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
1826 1925
1827 if (ev_backend (EV_A)) 1926 if (ev_backend (EV_A))
1828 return EV_A; 1927 return EV_A;
1829 1928
1929 ev_free (EV_A);
1830 return 0; 1930 return 0;
1831} 1931}
1832 1932
1833void
1834ev_loop_destroy (EV_P)
1835{
1836 loop_destroy (EV_A);
1837 ev_free (loop);
1838}
1839
1840void
1841ev_loop_fork (EV_P)
1842{
1843 postfork = 1; /* must be in line with ev_default_fork */
1844}
1845#endif /* multiplicity */ 1933#endif /* multiplicity */
1846 1934
1847#if EV_VERIFY 1935#if EV_VERIFY
1848static void noinline 1936static void noinline
1849verify_watcher (EV_P_ W w) 1937verify_watcher (EV_P_ W w)
… …
1924#if EV_FORK_ENABLE 2012#if EV_FORK_ENABLE
1925 assert (forkmax >= forkcnt); 2013 assert (forkmax >= forkcnt);
1926 array_verify (EV_A_ (W *)forks, forkcnt); 2014 array_verify (EV_A_ (W *)forks, forkcnt);
1927#endif 2015#endif
1928 2016
2017#if EV_CLEANUP_ENABLE
2018 assert (cleanupmax >= cleanupcnt);
2019 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2020#endif
2021
1929#if EV_ASYNC_ENABLE 2022#if EV_ASYNC_ENABLE
1930 assert (asyncmax >= asynccnt); 2023 assert (asyncmax >= asynccnt);
1931 array_verify (EV_A_ (W *)asyncs, asynccnt); 2024 array_verify (EV_A_ (W *)asyncs, asynccnt);
1932#endif 2025#endif
1933 2026
… …
1951} 2044}
1952#endif 2045#endif
1953 2046
1954#if EV_MULTIPLICITY 2047#if EV_MULTIPLICITY
1955struct ev_loop * 2048struct ev_loop *
1956ev_default_loop_init (unsigned int flags)
1957#else 2049#else
1958int 2050int
2051#endif
1959ev_default_loop (unsigned int flags) 2052ev_default_loop (unsigned int flags)
1960#endif
1961{ 2053{
1962 if (!ev_default_loop_ptr) 2054 if (!ev_default_loop_ptr)
1963 { 2055 {
1964#if EV_MULTIPLICITY 2056#if EV_MULTIPLICITY
1965 EV_P = ev_default_loop_ptr = &default_loop_struct; 2057 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1984 2076
1985 return ev_default_loop_ptr; 2077 return ev_default_loop_ptr;
1986} 2078}
1987 2079
1988void 2080void
1989ev_default_destroy (void) 2081ev_loop_fork (EV_P)
1990{ 2082{
1991#if EV_MULTIPLICITY
1992 EV_P = ev_default_loop_ptr;
1993#endif
1994
1995 ev_default_loop_ptr = 0;
1996
1997#if EV_CHILD_ENABLE
1998 ev_ref (EV_A); /* child watcher */
1999 ev_signal_stop (EV_A_ &childev);
2000#endif
2001
2002 loop_destroy (EV_A);
2003}
2004
2005void
2006ev_default_fork (void)
2007{
2008#if EV_MULTIPLICITY
2009 EV_P = ev_default_loop_ptr;
2010#endif
2011
2012 postfork = 1; /* must be in line with ev_loop_fork */ 2083 postfork = 1; /* must be in line with ev_default_fork */
2013} 2084}
2014 2085
2015/*****************************************************************************/ 2086/*****************************************************************************/
2016 2087
2017void 2088void
… …
2039 2110
2040 for (pri = NUMPRI; pri--; ) 2111 for (pri = NUMPRI; pri--; )
2041 while (pendingcnt [pri]) 2112 while (pendingcnt [pri])
2042 { 2113 {
2043 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2114 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2044
2045 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2046 /* ^ this is no longer true, as pending_w could be here */
2047 2115
2048 p->w->pending = 0; 2116 p->w->pending = 0;
2049 EV_CB_INVOKE (p->w, p->events); 2117 EV_CB_INVOKE (p->w, p->events);
2050 EV_FREQUENT_CHECK; 2118 EV_FREQUENT_CHECK;
2051 } 2119 }
… …
2171 feed_reverse_done (EV_A_ EV_PERIODIC); 2239 feed_reverse_done (EV_A_ EV_PERIODIC);
2172 } 2240 }
2173} 2241}
2174 2242
2175/* simply recalculate all periodics */ 2243/* simply recalculate all periodics */
2176/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2244/* TODO: maybe ensure that at least one event happens when jumping forward? */
2177static void noinline 2245static void noinline
2178periodics_reschedule (EV_P) 2246periodics_reschedule (EV_P)
2179{ 2247{
2180 int i; 2248 int i;
2181 2249
… …
2277 mn_now = ev_rt_now; 2345 mn_now = ev_rt_now;
2278 } 2346 }
2279} 2347}
2280 2348
2281void 2349void
2282ev_loop (EV_P_ int flags) 2350ev_run (EV_P_ int flags)
2283{ 2351{
2284#if EV_FEATURE_API 2352#if EV_FEATURE_API
2285 ++loop_depth; 2353 ++loop_depth;
2286#endif 2354#endif
2287 2355
2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2356 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2289 2357
2290 loop_done = EVUNLOOP_CANCEL; 2358 loop_done = EVBREAK_CANCEL;
2291 2359
2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2360 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2293 2361
2294 do 2362 do
2295 { 2363 {
… …
2338 /* calculate blocking time */ 2406 /* calculate blocking time */
2339 { 2407 {
2340 ev_tstamp waittime = 0.; 2408 ev_tstamp waittime = 0.;
2341 ev_tstamp sleeptime = 0.; 2409 ev_tstamp sleeptime = 0.;
2342 2410
2411 /* remember old timestamp for io_blocktime calculation */
2412 ev_tstamp prev_mn_now = mn_now;
2413
2414 /* update time to cancel out callback processing overhead */
2415 time_update (EV_A_ 1e100);
2416
2343 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2417 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2344 { 2418 {
2345 /* remember old timestamp for io_blocktime calculation */
2346 ev_tstamp prev_mn_now = mn_now;
2347
2348 /* update time to cancel out callback processing overhead */
2349 time_update (EV_A_ 1e100);
2350
2351 waittime = MAX_BLOCKTIME; 2419 waittime = MAX_BLOCKTIME;
2352 2420
2353 if (timercnt) 2421 if (timercnt)
2354 { 2422 {
2355 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2423 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2385 } 2453 }
2386 2454
2387#if EV_FEATURE_API 2455#if EV_FEATURE_API
2388 ++loop_count; 2456 ++loop_count;
2389#endif 2457#endif
2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2458 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2391 backend_poll (EV_A_ waittime); 2459 backend_poll (EV_A_ waittime);
2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2460 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2393 2461
2394 /* update ev_rt_now, do magic */ 2462 /* update ev_rt_now, do magic */
2395 time_update (EV_A_ waittime + sleeptime); 2463 time_update (EV_A_ waittime + sleeptime);
2396 } 2464 }
2397 2465
… …
2415 EV_INVOKE_PENDING; 2483 EV_INVOKE_PENDING;
2416 } 2484 }
2417 while (expect_true ( 2485 while (expect_true (
2418 activecnt 2486 activecnt
2419 && !loop_done 2487 && !loop_done
2420 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2488 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2421 )); 2489 ));
2422 2490
2423 if (loop_done == EVUNLOOP_ONE) 2491 if (loop_done == EVBREAK_ONE)
2424 loop_done = EVUNLOOP_CANCEL; 2492 loop_done = EVBREAK_CANCEL;
2425 2493
2426#if EV_FEATURE_API 2494#if EV_FEATURE_API
2427 --loop_depth; 2495 --loop_depth;
2428#endif 2496#endif
2429} 2497}
2430 2498
2431void 2499void
2432ev_unloop (EV_P_ int how) 2500ev_break (EV_P_ int how)
2433{ 2501{
2434 loop_done = how; 2502 loop_done = how;
2435} 2503}
2436 2504
2437void 2505void
… …
2585 EV_FREQUENT_CHECK; 2653 EV_FREQUENT_CHECK;
2586 2654
2587 wlist_del (&anfds[w->fd].head, (WL)w); 2655 wlist_del (&anfds[w->fd].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2656 ev_stop (EV_A_ (W)w);
2589 2657
2590 fd_change (EV_A_ w->fd, 1); 2658 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2591 2659
2592 EV_FREQUENT_CHECK; 2660 EV_FREQUENT_CHECK;
2593} 2661}
2594 2662
2595void noinline 2663void noinline
… …
2819 sa.sa_handler = ev_sighandler; 2887 sa.sa_handler = ev_sighandler;
2820 sigfillset (&sa.sa_mask); 2888 sigfillset (&sa.sa_mask);
2821 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2889 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2822 sigaction (w->signum, &sa, 0); 2890 sigaction (w->signum, &sa, 0);
2823 2891
2892 if (origflags & EVFLAG_NOSIGMASK)
2893 {
2824 sigemptyset (&sa.sa_mask); 2894 sigemptyset (&sa.sa_mask);
2825 sigaddset (&sa.sa_mask, w->signum); 2895 sigaddset (&sa.sa_mask, w->signum);
2826 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2896 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2897 }
2827#endif 2898#endif
2828 } 2899 }
2829 2900
2830 EV_FREQUENT_CHECK; 2901 EV_FREQUENT_CHECK;
2831} 2902}
… …
3047 { 3118 {
3048 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3119 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3049 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3120 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3050 ofs += sizeof (struct inotify_event) + ev->len; 3121 ofs += sizeof (struct inotify_event) + ev->len;
3051 } 3122 }
3052}
3053
3054inline_size unsigned int
3055ev_linux_version (void)
3056{
3057 struct utsname buf;
3058 unsigned int v;
3059 int i;
3060 char *p = buf.release;
3061
3062 if (uname (&buf))
3063 return 0;
3064
3065 for (i = 3+1; --i; )
3066 {
3067 unsigned int c = 0;
3068
3069 for (;;)
3070 {
3071 if (*p >= '0' && *p <= '9')
3072 c = c * 10 + *p++ - '0';
3073 else
3074 {
3075 p += *p == '.';
3076 break;
3077 }
3078 }
3079
3080 v = (v << 8) | c;
3081 }
3082
3083 return v;
3084} 3123}
3085 3124
3086inline_size void 3125inline_size void
3087ev_check_2625 (EV_P) 3126ev_check_2625 (EV_P)
3088{ 3127{
… …
3412 3451
3413#if EV_EMBED_ENABLE 3452#if EV_EMBED_ENABLE
3414void noinline 3453void noinline
3415ev_embed_sweep (EV_P_ ev_embed *w) 3454ev_embed_sweep (EV_P_ ev_embed *w)
3416{ 3455{
3417 ev_loop (w->other, EVLOOP_NONBLOCK); 3456 ev_run (w->other, EVRUN_NOWAIT);
3418} 3457}
3419 3458
3420static void 3459static void
3421embed_io_cb (EV_P_ ev_io *io, int revents) 3460embed_io_cb (EV_P_ ev_io *io, int revents)
3422{ 3461{
3423 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3462 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3424 3463
3425 if (ev_cb (w)) 3464 if (ev_cb (w))
3426 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3465 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3427 else 3466 else
3428 ev_loop (w->other, EVLOOP_NONBLOCK); 3467 ev_run (w->other, EVRUN_NOWAIT);
3429} 3468}
3430 3469
3431static void 3470static void
3432embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3471embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3433{ 3472{
… …
3437 EV_P = w->other; 3476 EV_P = w->other;
3438 3477
3439 while (fdchangecnt) 3478 while (fdchangecnt)
3440 { 3479 {
3441 fd_reify (EV_A); 3480 fd_reify (EV_A);
3442 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3481 ev_run (EV_A_ EVRUN_NOWAIT);
3443 } 3482 }
3444 } 3483 }
3445} 3484}
3446 3485
3447static void 3486static void
… …
3453 3492
3454 { 3493 {
3455 EV_P = w->other; 3494 EV_P = w->other;
3456 3495
3457 ev_loop_fork (EV_A); 3496 ev_loop_fork (EV_A);
3458 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3497 ev_run (EV_A_ EVRUN_NOWAIT);
3459 } 3498 }
3460 3499
3461 ev_embed_start (EV_A_ w); 3500 ev_embed_start (EV_A_ w);
3462} 3501}
3463 3502
… …
3555 3594
3556 EV_FREQUENT_CHECK; 3595 EV_FREQUENT_CHECK;
3557} 3596}
3558#endif 3597#endif
3559 3598
3560#if EV_ASYNC_ENABLE 3599#if EV_CLEANUP_ENABLE
3561void 3600void
3562ev_async_start (EV_P_ ev_async *w) 3601ev_cleanup_start (EV_P_ ev_cleanup *w)
3563{ 3602{
3564 if (expect_false (ev_is_active (w))) 3603 if (expect_false (ev_is_active (w)))
3565 return; 3604 return;
3605
3606 EV_FREQUENT_CHECK;
3607
3608 ev_start (EV_A_ (W)w, ++cleanupcnt);
3609 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3610 cleanups [cleanupcnt - 1] = w;
3611
3612 /* cleanup watchers should never keep a refcount on the loop */
3613 ev_unref (EV_A);
3614 EV_FREQUENT_CHECK;
3615}
3616
3617void
3618ev_cleanup_stop (EV_P_ ev_cleanup *w)
3619{
3620 clear_pending (EV_A_ (W)w);
3621 if (expect_false (!ev_is_active (w)))
3622 return;
3623
3624 EV_FREQUENT_CHECK;
3625 ev_ref (EV_A);
3626
3627 {
3628 int active = ev_active (w);
3629
3630 cleanups [active - 1] = cleanups [--cleanupcnt];
3631 ev_active (cleanups [active - 1]) = active;
3632 }
3633
3634 ev_stop (EV_A_ (W)w);
3635
3636 EV_FREQUENT_CHECK;
3637}
3638#endif
3639
3640#if EV_ASYNC_ENABLE
3641void
3642ev_async_start (EV_P_ ev_async *w)
3643{
3644 if (expect_false (ev_is_active (w)))
3645 return;
3646
3647 w->sent = 0;
3566 3648
3567 evpipe_init (EV_A); 3649 evpipe_init (EV_A);
3568 3650
3569 EV_FREQUENT_CHECK; 3651 EV_FREQUENT_CHECK;
3570 3652
… …
3790 3872
3791#if EV_MULTIPLICITY 3873#if EV_MULTIPLICITY
3792 #include "ev_wrap.h" 3874 #include "ev_wrap.h"
3793#endif 3875#endif
3794 3876
3795#ifdef __cplusplus 3877EV_CPP(})
3796}
3797#endif
3798 3878

Diff Legend

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