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

Comparing libev/ev.c (file contents):
Revision 1.342 by root, Mon Mar 29 12:40:57 2010 UTC vs.
Revision 1.359 by root, Sun Oct 24 17:58:41 2010 UTC

… …
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 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
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
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP EV_FEATURE_OS 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT EV_FEATURE_BACKENDS 98# define EV_USE_POLL EV_FEATURE_BACKENDS
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL EV_FEATURE_BACKENDS
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# ifndef EV_USE_EPOLL
108# define EV_USE_EPOLL EV_FEATURE_BACKENDS 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
109# else
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
115# ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# ifndef EV_USE_PORT
124# define EV_USE_PORT EV_FEATURE_BACKENDS 125# define EV_USE_PORT EV_FEATURE_BACKENDS
125# else
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
133# ifndef EV_USE_INOTIFY
132# define EV_USE_INOTIFY EV_FEATURE_OS 134# define EV_USE_INOTIFY EV_FEATURE_OS
133# else
134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
142# ifndef EV_USE_SIGNALFD
140# define EV_USE_SIGNALFD EV_FEATURE_OS 143# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else
142# define EV_USE_SIGNALFD 0
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD EV_FEATURE_OS 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
… …
172#ifdef EV_H 177#ifdef EV_H
173# include EV_H 178# include EV_H
174#else 179#else
175# include "ev.h" 180# include "ev.h"
176#endif 181#endif
182
183EV_CPP(extern "C" {)
177 184
178#ifndef _WIN32 185#ifndef _WIN32
179# include <sys/time.h> 186# include <sys/time.h>
180# include <sys/wait.h> 187# include <sys/wait.h>
181# include <unistd.h> 188# include <unistd.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
188# endif 195# endif
189# undef EV_AVOID_STDIO 196# undef EV_AVOID_STDIO
190#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
191 206
192/* 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 */
193 208
194/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
367# include <sys/select.h> 382# include <sys/select.h>
368# endif 383# endif
369#endif 384#endif
370 385
371#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
372# include <sys/utsname.h>
373# include <sys/statfs.h> 387# include <sys/statfs.h>
374# include <sys/inotify.h> 388# include <sys/inotify.h>
375/* 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 */
376# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
377# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
394# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
395# else 409# else
396# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
397# endif 411# endif
398# endif 412# endif
399# ifdef __cplusplus
400extern "C" {
401# endif
402int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
403# ifdef __cplusplus
404}
405# endif
406#endif 414#endif
407 415
408#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
409/* 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 */
410# include <stdint.h> 418# include <stdint.h>
… …
416# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
417# else 425# else
418# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
419# endif 427# endif
420# endif 428# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
425 430
426struct signalfd_siginfo 431struct signalfd_siginfo
427{ 432{
428 uint32_t ssi_signo; 433 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
430}; 435};
431# ifdef __cplusplus
432}
433# endif 436#endif
434#endif
435
436 437
437/**/ 438/**/
438 439
439#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
440# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
454 455
455#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) */
456#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) */
457 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
458#if __GNUC__ >= 4 462#if __GNUC__ >= 4
459# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
460# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
461#else 465#else
462# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
494#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
495#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
496 500
497#if EV_USE_REALTIME 501#if EV_USE_REALTIME
498/* 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 */
499/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
500static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
501#endif 505#endif
502 506
503#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
515#endif 519#endif
516 520
517#ifdef _WIN32 521#ifdef _WIN32
518# include "ev_win32.c" 522# include "ev_win32.c"
519#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}
520 566
521/*****************************************************************************/ 567/*****************************************************************************/
522 568
523#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
524static void noinline 570static void noinline
… …
622 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
623 unsigned char unused; 669 unsigned char unused;
624#if EV_USE_EPOLL 670#if EV_USE_EPOLL
625 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
626#endif 672#endif
627#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
628 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
629#endif 678#endif
630} ANFD; 679} ANFD;
631 680
632/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
633typedef struct 682typedef struct
… …
698# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
699# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
700# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
701#endif 750#endif
702 751
703#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
704 753
705/*****************************************************************************/ 754/*****************************************************************************/
706 755
707#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
708ev_tstamp 757ev_tstamp
… …
752 if (delay > 0.) 801 if (delay > 0.)
753 { 802 {
754#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
755 struct timespec ts; 804 struct timespec ts;
756 805
757 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
758 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
759
760 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
761#elif defined(_WIN32) 808#elif defined(_WIN32)
762 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
763#else 810#else
764 struct timeval tv; 811 struct timeval tv;
765 812
766 tv.tv_sec = (time_t)delay;
767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
768
769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
770 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
771 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
772 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
773#endif 818#endif
774 } 819 }
775} 820}
776 821
777/*****************************************************************************/ 822/*****************************************************************************/
778 823
779#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
780 825
781/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
782/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
783inline_size int 828inline_size int
784array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
785{ 830{
786 int ncur = cur + 1; 831 int ncur = cur + 1;
787 832
… …
928 { 973 {
929 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
930 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
931 ev_io *w; 976 ev_io *w;
932 977
933 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
934 980
935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
936 events |= (unsigned char)w->events;
937 982
938#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
939 if (events) 984 if (o_reify & EV__IOFDSET)
940 { 985 {
941 unsigned long arg; 986 unsigned long arg;
942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
944 } 990 }
945#endif 991#endif
946 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
947 { 994 {
948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
950
951 anfd->reify = 0;
952 anfd->events = events; 995 anfd->events = 0;
953 996
954 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
955 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
956 }
957 } 1006 }
958 1007
959 fdchangecnt = 0; 1008 fdchangecnt = 0;
960} 1009}
961 1010
… …
1054} 1103}
1055 1104
1056/*****************************************************************************/ 1105/*****************************************************************************/
1057 1106
1058/* 1107/*
1059 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * the heap functions want a real array index. array index 0 is guaranteed to not
1060 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1061 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
1062 */ 1111 */
1063 1112
1064/* 1113/*
… …
1264 uint64_t counter = 1; 1313 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1266 } 1315 }
1267 else 1316 else
1268#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1269 write (evpipe [1], &dummy, 1); 1323 write (evpipe [1], &dummy, 1);
1270 1324
1271 errno = old_errno; 1325 errno = old_errno;
1272 } 1326 }
1273} 1327}
… …
1287 } 1341 }
1288 else 1342 else
1289#endif 1343#endif
1290 { 1344 {
1291 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1292 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1293 } 1348 }
1294 1349
1295 if (sig_pending) 1350 if (sig_pending)
1296 { 1351 {
… …
1438 1493
1439#endif 1494#endif
1440 1495
1441/*****************************************************************************/ 1496/*****************************************************************************/
1442 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1443#if EV_USE_PORT 1501#if EV_USE_PORT
1444# include "ev_port.c" 1502# include "ev_port.c"
1445#endif 1503#endif
1446#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1447# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1520ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1521{ 1579{
1522 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1523 1581
1524 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1525 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1526 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1527 1585
1528 return flags; 1586 return flags;
1529} 1587}
1530 1588
1531unsigned int 1589unsigned int
… …
1644#endif 1702#endif
1645 1703
1646 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1647 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1648 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1649#if EV_USE_PORT 1710#if EV_USE_PORT
1650 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1651#endif 1712#endif
1652#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1653 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1670#endif 1731#endif
1671 } 1732 }
1672} 1733}
1673 1734
1674/* free up a loop structure */ 1735/* free up a loop structure */
1675static void noinline 1736void
1676loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1677{ 1738{
1678 int i; 1739 int i;
1740
1741#if EV_CHILD_ENABLE
1742 if (ev_is_active (&childev))
1743 {
1744 ev_ref (EV_A); /* child watcher */
1745 ev_signal_stop (EV_A_ &childev);
1746 }
1747#endif
1679 1748
1680 if (ev_is_active (&pipe_w)) 1749 if (ev_is_active (&pipe_w))
1681 { 1750 {
1682 /*ev_ref (EV_A);*/ 1751 /*ev_ref (EV_A);*/
1683 /*ev_io_stop (EV_A_ &pipe_w);*/ 1752 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1705#endif 1774#endif
1706 1775
1707 if (backend_fd >= 0) 1776 if (backend_fd >= 0)
1708 close (backend_fd); 1777 close (backend_fd);
1709 1778
1779#if EV_USE_IOCP
1780 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1781#endif
1710#if EV_USE_PORT 1782#if EV_USE_PORT
1711 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1783 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1712#endif 1784#endif
1713#if EV_USE_KQUEUE 1785#if EV_USE_KQUEUE
1714 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1786 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1748#if EV_ASYNC_ENABLE 1820#if EV_ASYNC_ENABLE
1749 array_free (async, EMPTY); 1821 array_free (async, EMPTY);
1750#endif 1822#endif
1751 1823
1752 backend = 0; 1824 backend = 0;
1825
1826#if EV_MULTIPLICITY
1827 if (ev_is_default_loop (EV_A))
1828#endif
1829 ev_default_loop_ptr = 0;
1830#if EV_MULTIPLICITY
1831 else
1832 ev_free (EV_A);
1833#endif
1753} 1834}
1754 1835
1755#if EV_USE_INOTIFY 1836#if EV_USE_INOTIFY
1756inline_size void infy_fork (EV_P); 1837inline_size void infy_fork (EV_P);
1757#endif 1838#endif
… …
1816 loop_init (EV_A_ flags); 1897 loop_init (EV_A_ flags);
1817 1898
1818 if (ev_backend (EV_A)) 1899 if (ev_backend (EV_A))
1819 return EV_A; 1900 return EV_A;
1820 1901
1902 ev_free (EV_A);
1821 return 0; 1903 return 0;
1822} 1904}
1823 1905
1824void
1825ev_loop_destroy (EV_P)
1826{
1827 loop_destroy (EV_A);
1828 ev_free (loop);
1829}
1830
1831void
1832ev_loop_fork (EV_P)
1833{
1834 postfork = 1; /* must be in line with ev_default_fork */
1835}
1836#endif /* multiplicity */ 1906#endif /* multiplicity */
1837 1907
1838#if EV_VERIFY 1908#if EV_VERIFY
1839static void noinline 1909static void noinline
1840verify_watcher (EV_P_ W w) 1910verify_watcher (EV_P_ W w)
… …
1942} 2012}
1943#endif 2013#endif
1944 2014
1945#if EV_MULTIPLICITY 2015#if EV_MULTIPLICITY
1946struct ev_loop * 2016struct ev_loop *
1947ev_default_loop_init (unsigned int flags)
1948#else 2017#else
1949int 2018int
2019#endif
1950ev_default_loop (unsigned int flags) 2020ev_default_loop (unsigned int flags)
1951#endif
1952{ 2021{
1953 if (!ev_default_loop_ptr) 2022 if (!ev_default_loop_ptr)
1954 { 2023 {
1955#if EV_MULTIPLICITY 2024#if EV_MULTIPLICITY
1956 EV_P = ev_default_loop_ptr = &default_loop_struct; 2025 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1975 2044
1976 return ev_default_loop_ptr; 2045 return ev_default_loop_ptr;
1977} 2046}
1978 2047
1979void 2048void
1980ev_default_destroy (void) 2049ev_loop_fork (EV_P)
1981{ 2050{
1982#if EV_MULTIPLICITY
1983 EV_P = ev_default_loop_ptr;
1984#endif
1985
1986 ev_default_loop_ptr = 0;
1987
1988#if EV_CHILD_ENABLE
1989 ev_ref (EV_A); /* child watcher */
1990 ev_signal_stop (EV_A_ &childev);
1991#endif
1992
1993 loop_destroy (EV_A);
1994}
1995
1996void
1997ev_default_fork (void)
1998{
1999#if EV_MULTIPLICITY
2000 EV_P = ev_default_loop_ptr;
2001#endif
2002
2003 postfork = 1; /* must be in line with ev_loop_fork */ 2051 postfork = 1; /* must be in line with ev_default_fork */
2004} 2052}
2005 2053
2006/*****************************************************************************/ 2054/*****************************************************************************/
2007 2055
2008void 2056void
… …
2162 feed_reverse_done (EV_A_ EV_PERIODIC); 2210 feed_reverse_done (EV_A_ EV_PERIODIC);
2163 } 2211 }
2164} 2212}
2165 2213
2166/* simply recalculate all periodics */ 2214/* simply recalculate all periodics */
2167/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2215/* TODO: maybe ensure that at least one event happens when jumping forward? */
2168static void noinline 2216static void noinline
2169periodics_reschedule (EV_P) 2217periodics_reschedule (EV_P)
2170{ 2218{
2171 int i; 2219 int i;
2172 2220
… …
2268 mn_now = ev_rt_now; 2316 mn_now = ev_rt_now;
2269 } 2317 }
2270} 2318}
2271 2319
2272void 2320void
2273ev_loop (EV_P_ int flags) 2321ev_run (EV_P_ int flags)
2274{ 2322{
2275#if EV_FEATURE_API 2323#if EV_FEATURE_API
2276 ++loop_depth; 2324 ++loop_depth;
2277#endif 2325#endif
2278 2326
2279 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2327 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2280 2328
2281 loop_done = EVUNLOOP_CANCEL; 2329 loop_done = EVBREAK_CANCEL;
2282 2330
2283 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2331 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2284 2332
2285 do 2333 do
2286 { 2334 {
… …
2329 /* calculate blocking time */ 2377 /* calculate blocking time */
2330 { 2378 {
2331 ev_tstamp waittime = 0.; 2379 ev_tstamp waittime = 0.;
2332 ev_tstamp sleeptime = 0.; 2380 ev_tstamp sleeptime = 0.;
2333 2381
2382 /* remember old timestamp for io_blocktime calculation */
2383 ev_tstamp prev_mn_now = mn_now;
2384
2385 /* update time to cancel out callback processing overhead */
2386 time_update (EV_A_ 1e100);
2387
2334 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2388 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2335 { 2389 {
2336 /* remember old timestamp for io_blocktime calculation */
2337 ev_tstamp prev_mn_now = mn_now;
2338
2339 /* update time to cancel out callback processing overhead */
2340 time_update (EV_A_ 1e100);
2341
2342 waittime = MAX_BLOCKTIME; 2390 waittime = MAX_BLOCKTIME;
2343 2391
2344 if (timercnt) 2392 if (timercnt)
2345 { 2393 {
2346 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2394 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2376 } 2424 }
2377 2425
2378#if EV_FEATURE_API 2426#if EV_FEATURE_API
2379 ++loop_count; 2427 ++loop_count;
2380#endif 2428#endif
2381 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2429 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2382 backend_poll (EV_A_ waittime); 2430 backend_poll (EV_A_ waittime);
2383 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2431 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2384 2432
2385 /* update ev_rt_now, do magic */ 2433 /* update ev_rt_now, do magic */
2386 time_update (EV_A_ waittime + sleeptime); 2434 time_update (EV_A_ waittime + sleeptime);
2387 } 2435 }
2388 2436
… …
2406 EV_INVOKE_PENDING; 2454 EV_INVOKE_PENDING;
2407 } 2455 }
2408 while (expect_true ( 2456 while (expect_true (
2409 activecnt 2457 activecnt
2410 && !loop_done 2458 && !loop_done
2411 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2459 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2412 )); 2460 ));
2413 2461
2414 if (loop_done == EVUNLOOP_ONE) 2462 if (loop_done == EVBREAK_ONE)
2415 loop_done = EVUNLOOP_CANCEL; 2463 loop_done = EVBREAK_CANCEL;
2416 2464
2417#if EV_FEATURE_API 2465#if EV_FEATURE_API
2418 --loop_depth; 2466 --loop_depth;
2419#endif 2467#endif
2420} 2468}
2421 2469
2422void 2470void
2423ev_unloop (EV_P_ int how) 2471ev_break (EV_P_ int how)
2424{ 2472{
2425 loop_done = how; 2473 loop_done = how;
2426} 2474}
2427 2475
2428void 2476void
… …
2576 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2577 2625
2578 wlist_del (&anfds[w->fd].head, (WL)w); 2626 wlist_del (&anfds[w->fd].head, (WL)w);
2579 ev_stop (EV_A_ (W)w); 2627 ev_stop (EV_A_ (W)w);
2580 2628
2581 fd_change (EV_A_ w->fd, 1); 2629 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2582 2630
2583 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2584} 2632}
2585 2633
2586void noinline 2634void noinline
… …
3038 { 3086 {
3039 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3087 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3040 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3088 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3041 ofs += sizeof (struct inotify_event) + ev->len; 3089 ofs += sizeof (struct inotify_event) + ev->len;
3042 } 3090 }
3043}
3044
3045inline_size unsigned int
3046ev_linux_version (void)
3047{
3048 struct utsname buf;
3049 unsigned int v;
3050 int i;
3051 char *p = buf.release;
3052
3053 if (uname (&buf))
3054 return 0;
3055
3056 for (i = 3+1; --i; )
3057 {
3058 unsigned int c = 0;
3059
3060 for (;;)
3061 {
3062 if (*p >= '0' && *p <= '9')
3063 c = c * 10 + *p++ - '0';
3064 else
3065 {
3066 p += *p == '.';
3067 break;
3068 }
3069 }
3070
3071 v = (v << 8) | c;
3072 }
3073
3074 return v;
3075} 3091}
3076 3092
3077inline_size void 3093inline_size void
3078ev_check_2625 (EV_P) 3094ev_check_2625 (EV_P)
3079{ 3095{
… …
3403 3419
3404#if EV_EMBED_ENABLE 3420#if EV_EMBED_ENABLE
3405void noinline 3421void noinline
3406ev_embed_sweep (EV_P_ ev_embed *w) 3422ev_embed_sweep (EV_P_ ev_embed *w)
3407{ 3423{
3408 ev_loop (w->other, EVLOOP_NONBLOCK); 3424 ev_run (w->other, EVRUN_NOWAIT);
3409} 3425}
3410 3426
3411static void 3427static void
3412embed_io_cb (EV_P_ ev_io *io, int revents) 3428embed_io_cb (EV_P_ ev_io *io, int revents)
3413{ 3429{
3414 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3430 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3415 3431
3416 if (ev_cb (w)) 3432 if (ev_cb (w))
3417 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3433 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3418 else 3434 else
3419 ev_loop (w->other, EVLOOP_NONBLOCK); 3435 ev_run (w->other, EVRUN_NOWAIT);
3420} 3436}
3421 3437
3422static void 3438static void
3423embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3439embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3424{ 3440{
… …
3428 EV_P = w->other; 3444 EV_P = w->other;
3429 3445
3430 while (fdchangecnt) 3446 while (fdchangecnt)
3431 { 3447 {
3432 fd_reify (EV_A); 3448 fd_reify (EV_A);
3433 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_run (EV_A_ EVRUN_NOWAIT);
3434 } 3450 }
3435 } 3451 }
3436} 3452}
3437 3453
3438static void 3454static void
… …
3444 3460
3445 { 3461 {
3446 EV_P = w->other; 3462 EV_P = w->other;
3447 3463
3448 ev_loop_fork (EV_A); 3464 ev_loop_fork (EV_A);
3449 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3450 } 3466 }
3451 3467
3452 ev_embed_start (EV_A_ w); 3468 ev_embed_start (EV_A_ w);
3453} 3469}
3454 3470
… …
3552void 3568void
3553ev_async_start (EV_P_ ev_async *w) 3569ev_async_start (EV_P_ ev_async *w)
3554{ 3570{
3555 if (expect_false (ev_is_active (w))) 3571 if (expect_false (ev_is_active (w)))
3556 return; 3572 return;
3573
3574 w->sent = 0;
3557 3575
3558 evpipe_init (EV_A); 3576 evpipe_init (EV_A);
3559 3577
3560 EV_FREQUENT_CHECK; 3578 EV_FREQUENT_CHECK;
3561 3579
… …
3781 3799
3782#if EV_MULTIPLICITY 3800#if EV_MULTIPLICITY
3783 #include "ev_wrap.h" 3801 #include "ev_wrap.h"
3784#endif 3802#endif
3785 3803
3786#ifdef __cplusplus 3804EV_CPP(})
3787}
3788#endif
3789 3805

Diff Legend

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