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.369 by root, Sun Jan 23 18:53:06 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
820inline_speed int
821ev_timeout_to_ms (ev_tstamp timeout)
822{
823 int ms = timeout * 1000. + .999999;
824
825 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
826}
827
786/*****************************************************************************/ 828/*****************************************************************************/
787 829
788#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
789 831
790/* find a suitable new size for the given array, */ 832/* find a suitable new size for the given array, */
791/* hopefully by rounding to a ncie-to-malloc size */ 833/* hopefully by rounding to a nice-to-malloc size */
792inline_size int 834inline_size int
793array_nextsize (int elem, int cur, int cnt) 835array_nextsize (int elem, int cur, int cnt)
794{ 836{
795 int ncur = cur + 1; 837 int ncur = cur + 1;
796 838
… …
937 { 979 {
938 int fd = fdchanges [i]; 980 int fd = fdchanges [i];
939 ANFD *anfd = anfds + fd; 981 ANFD *anfd = anfds + fd;
940 ev_io *w; 982 ev_io *w;
941 983
942 unsigned char events = 0; 984 unsigned char o_events = anfd->events;
985 unsigned char o_reify = anfd->reify;
943 986
944 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 987 anfd->reify = 0;
945 events |= (unsigned char)w->events;
946 988
947#if EV_SELECT_IS_WINSOCKET 989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
948 if (events) 990 if (o_reify & EV__IOFDSET)
949 { 991 {
950 unsigned long arg; 992 unsigned long arg;
951 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 993 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
952 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
953 } 996 }
954#endif 997#endif
955 998
999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
956 { 1000 {
957 unsigned char o_events = anfd->events;
958 unsigned char o_reify = anfd->reify;
959
960 anfd->reify = 0;
961 anfd->events = events; 1001 anfd->events = 0;
962 1002
963 if (o_events != events || o_reify & EV__IOFDSET) 1003 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1004 anfd->events |= (unsigned char)w->events;
1005
1006 if (o_events != anfd->events)
1007 o_reify = EV__IOFDSET; /* actually |= */
1008 }
1009
1010 if (o_reify & EV__IOFDSET)
964 backend_modify (EV_A_ fd, o_events, events); 1011 backend_modify (EV_A_ fd, o_events, anfd->events);
965 }
966 } 1012 }
967 1013
968 fdchangecnt = 0; 1014 fdchangecnt = 0;
969} 1015}
970 1016
… …
1063} 1109}
1064 1110
1065/*****************************************************************************/ 1111/*****************************************************************************/
1066 1112
1067/* 1113/*
1068 * the heap functions want a real array index. array index 0 uis guaranteed to not 1114 * 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 1115 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1070 * the branching factor of the d-tree. 1116 * the branching factor of the d-tree.
1071 */ 1117 */
1072 1118
1073/* 1119/*
… …
1273 uint64_t counter = 1; 1319 uint64_t counter = 1;
1274 write (evfd, &counter, sizeof (uint64_t)); 1320 write (evfd, &counter, sizeof (uint64_t));
1275 } 1321 }
1276 else 1322 else
1277#endif 1323#endif
1324 /* win32 people keep sending patches that change this write() to send() */
1325 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1326 /* so when you think this write should be a send instead, please find out */
1327 /* where your send() is from - it's definitely not the microsoft send, and */
1328 /* tell me. thank you. */
1278 write (evpipe [1], &dummy, 1); 1329 write (evpipe [1], &dummy, 1);
1279 1330
1280 errno = old_errno; 1331 errno = old_errno;
1281 } 1332 }
1282} 1333}
… …
1296 } 1347 }
1297 else 1348 else
1298#endif 1349#endif
1299 { 1350 {
1300 char dummy; 1351 char dummy;
1352 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1301 read (evpipe [0], &dummy, 1); 1353 read (evpipe [0], &dummy, 1);
1302 } 1354 }
1303 1355
1356#if EV_SIGNAL_ENABLE
1304 if (sig_pending) 1357 if (sig_pending)
1305 { 1358 {
1306 sig_pending = 0; 1359 sig_pending = 0;
1307 1360
1308 for (i = EV_NSIG - 1; i--; ) 1361 for (i = EV_NSIG - 1; i--; )
1309 if (expect_false (signals [i].pending)) 1362 if (expect_false (signals [i].pending))
1310 ev_feed_signal_event (EV_A_ i + 1); 1363 ev_feed_signal_event (EV_A_ i + 1);
1311 } 1364 }
1365#endif
1312 1366
1313#if EV_ASYNC_ENABLE 1367#if EV_ASYNC_ENABLE
1314 if (async_pending) 1368 if (async_pending)
1315 { 1369 {
1316 async_pending = 0; 1370 async_pending = 0;
… …
1325#endif 1379#endif
1326} 1380}
1327 1381
1328/*****************************************************************************/ 1382/*****************************************************************************/
1329 1383
1384void
1385ev_feed_signal (int signum)
1386{
1387#if EV_MULTIPLICITY
1388 EV_P = signals [signum - 1].loop;
1389
1390 if (!EV_A)
1391 return;
1392#endif
1393
1394 signals [signum - 1].pending = 1;
1395 evpipe_write (EV_A_ &sig_pending);
1396}
1397
1330static void 1398static void
1331ev_sighandler (int signum) 1399ev_sighandler (int signum)
1332{ 1400{
1333#if EV_MULTIPLICITY
1334 EV_P = signals [signum - 1].loop;
1335#endif
1336
1337#ifdef _WIN32 1401#ifdef _WIN32
1338 signal (signum, ev_sighandler); 1402 signal (signum, ev_sighandler);
1339#endif 1403#endif
1340 1404
1341 signals [signum - 1].pending = 1; 1405 ev_feed_signal (signum);
1342 evpipe_write (EV_A_ &sig_pending);
1343} 1406}
1344 1407
1345void noinline 1408void noinline
1346ev_feed_signal_event (EV_P_ int signum) 1409ev_feed_signal_event (EV_P_ int signum)
1347{ 1410{
… …
1447 1510
1448#endif 1511#endif
1449 1512
1450/*****************************************************************************/ 1513/*****************************************************************************/
1451 1514
1515#if EV_USE_IOCP
1516# include "ev_iocp.c"
1517#endif
1452#if EV_USE_PORT 1518#if EV_USE_PORT
1453# include "ev_port.c" 1519# include "ev_port.c"
1454#endif 1520#endif
1455#if EV_USE_KQUEUE 1521#if EV_USE_KQUEUE
1456# include "ev_kqueue.c" 1522# include "ev_kqueue.c"
… …
1529ev_embeddable_backends (void) 1595ev_embeddable_backends (void)
1530{ 1596{
1531 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1597 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1532 1598
1533 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1599 /* 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 */ 1600 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1535 flags &= ~EVBACKEND_EPOLL; 1601 flags &= ~EVBACKEND_EPOLL;
1536 1602
1537 return flags; 1603 return flags;
1538} 1604}
1539 1605
1540unsigned int 1606unsigned int
… …
1596static void noinline 1662static void noinline
1597loop_init (EV_P_ unsigned int flags) 1663loop_init (EV_P_ unsigned int flags)
1598{ 1664{
1599 if (!backend) 1665 if (!backend)
1600 { 1666 {
1667 origflags = flags;
1668
1601#if EV_USE_REALTIME 1669#if EV_USE_REALTIME
1602 if (!have_realtime) 1670 if (!have_realtime)
1603 { 1671 {
1604 struct timespec ts; 1672 struct timespec ts;
1605 1673
… …
1650#endif 1718#endif
1651#if EV_USE_SIGNALFD 1719#if EV_USE_SIGNALFD
1652 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1720 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1653#endif 1721#endif
1654 1722
1655 if (!(flags & 0x0000ffffU)) 1723 if (!(flags & EVBACKEND_MASK))
1656 flags |= ev_recommended_backends (); 1724 flags |= ev_recommended_backends ();
1657 1725
1726#if EV_USE_IOCP
1727 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1728#endif
1658#if EV_USE_PORT 1729#if EV_USE_PORT
1659 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1730 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1660#endif 1731#endif
1661#if EV_USE_KQUEUE 1732#if EV_USE_KQUEUE
1662 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1733 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1679#endif 1750#endif
1680 } 1751 }
1681} 1752}
1682 1753
1683/* free up a loop structure */ 1754/* free up a loop structure */
1684static void noinline 1755void
1685loop_destroy (EV_P) 1756ev_loop_destroy (EV_P)
1686{ 1757{
1687 int i; 1758 int i;
1759
1760#if EV_MULTIPLICITY
1761 /* mimic free (0) */
1762 if (!EV_A)
1763 return;
1764#endif
1765
1766#if EV_CLEANUP_ENABLE
1767 /* queue cleanup watchers (and execute them) */
1768 if (expect_false (cleanupcnt))
1769 {
1770 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1771 EV_INVOKE_PENDING;
1772 }
1773#endif
1774
1775#if EV_CHILD_ENABLE
1776 if (ev_is_active (&childev))
1777 {
1778 ev_ref (EV_A); /* child watcher */
1779 ev_signal_stop (EV_A_ &childev);
1780 }
1781#endif
1688 1782
1689 if (ev_is_active (&pipe_w)) 1783 if (ev_is_active (&pipe_w))
1690 { 1784 {
1691 /*ev_ref (EV_A);*/ 1785 /*ev_ref (EV_A);*/
1692 /*ev_io_stop (EV_A_ &pipe_w);*/ 1786 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1714#endif 1808#endif
1715 1809
1716 if (backend_fd >= 0) 1810 if (backend_fd >= 0)
1717 close (backend_fd); 1811 close (backend_fd);
1718 1812
1813#if EV_USE_IOCP
1814 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1815#endif
1719#if EV_USE_PORT 1816#if EV_USE_PORT
1720 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1817 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1721#endif 1818#endif
1722#if EV_USE_KQUEUE 1819#if EV_USE_KQUEUE
1723 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1820 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1750 array_free (periodic, EMPTY); 1847 array_free (periodic, EMPTY);
1751#endif 1848#endif
1752#if EV_FORK_ENABLE 1849#if EV_FORK_ENABLE
1753 array_free (fork, EMPTY); 1850 array_free (fork, EMPTY);
1754#endif 1851#endif
1852#if EV_CLEANUP_ENABLE
1853 array_free (cleanup, EMPTY);
1854#endif
1755 array_free (prepare, EMPTY); 1855 array_free (prepare, EMPTY);
1756 array_free (check, EMPTY); 1856 array_free (check, EMPTY);
1757#if EV_ASYNC_ENABLE 1857#if EV_ASYNC_ENABLE
1758 array_free (async, EMPTY); 1858 array_free (async, EMPTY);
1759#endif 1859#endif
1760 1860
1761 backend = 0; 1861 backend = 0;
1862
1863#if EV_MULTIPLICITY
1864 if (ev_is_default_loop (EV_A))
1865#endif
1866 ev_default_loop_ptr = 0;
1867#if EV_MULTIPLICITY
1868 else
1869 ev_free (EV_A);
1870#endif
1762} 1871}
1763 1872
1764#if EV_USE_INOTIFY 1873#if EV_USE_INOTIFY
1765inline_size void infy_fork (EV_P); 1874inline_size void infy_fork (EV_P);
1766#endif 1875#endif
… …
1825 loop_init (EV_A_ flags); 1934 loop_init (EV_A_ flags);
1826 1935
1827 if (ev_backend (EV_A)) 1936 if (ev_backend (EV_A))
1828 return EV_A; 1937 return EV_A;
1829 1938
1939 ev_free (EV_A);
1830 return 0; 1940 return 0;
1831} 1941}
1832 1942
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 */ 1943#endif /* multiplicity */
1846 1944
1847#if EV_VERIFY 1945#if EV_VERIFY
1848static void noinline 1946static void noinline
1849verify_watcher (EV_P_ W w) 1947verify_watcher (EV_P_ W w)
… …
1924#if EV_FORK_ENABLE 2022#if EV_FORK_ENABLE
1925 assert (forkmax >= forkcnt); 2023 assert (forkmax >= forkcnt);
1926 array_verify (EV_A_ (W *)forks, forkcnt); 2024 array_verify (EV_A_ (W *)forks, forkcnt);
1927#endif 2025#endif
1928 2026
2027#if EV_CLEANUP_ENABLE
2028 assert (cleanupmax >= cleanupcnt);
2029 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2030#endif
2031
1929#if EV_ASYNC_ENABLE 2032#if EV_ASYNC_ENABLE
1930 assert (asyncmax >= asynccnt); 2033 assert (asyncmax >= asynccnt);
1931 array_verify (EV_A_ (W *)asyncs, asynccnt); 2034 array_verify (EV_A_ (W *)asyncs, asynccnt);
1932#endif 2035#endif
1933 2036
… …
1951} 2054}
1952#endif 2055#endif
1953 2056
1954#if EV_MULTIPLICITY 2057#if EV_MULTIPLICITY
1955struct ev_loop * 2058struct ev_loop *
1956ev_default_loop_init (unsigned int flags)
1957#else 2059#else
1958int 2060int
2061#endif
1959ev_default_loop (unsigned int flags) 2062ev_default_loop (unsigned int flags)
1960#endif
1961{ 2063{
1962 if (!ev_default_loop_ptr) 2064 if (!ev_default_loop_ptr)
1963 { 2065 {
1964#if EV_MULTIPLICITY 2066#if EV_MULTIPLICITY
1965 EV_P = ev_default_loop_ptr = &default_loop_struct; 2067 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1984 2086
1985 return ev_default_loop_ptr; 2087 return ev_default_loop_ptr;
1986} 2088}
1987 2089
1988void 2090void
1989ev_default_destroy (void) 2091ev_loop_fork (EV_P)
1990{ 2092{
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 */ 2093 postfork = 1; /* must be in line with ev_default_fork */
2013} 2094}
2014 2095
2015/*****************************************************************************/ 2096/*****************************************************************************/
2016 2097
2017void 2098void
… …
2039 2120
2040 for (pri = NUMPRI; pri--; ) 2121 for (pri = NUMPRI; pri--; )
2041 while (pendingcnt [pri]) 2122 while (pendingcnt [pri])
2042 { 2123 {
2043 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2124 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 2125
2048 p->w->pending = 0; 2126 p->w->pending = 0;
2049 EV_CB_INVOKE (p->w, p->events); 2127 EV_CB_INVOKE (p->w, p->events);
2050 EV_FREQUENT_CHECK; 2128 EV_FREQUENT_CHECK;
2051 } 2129 }
… …
2171 feed_reverse_done (EV_A_ EV_PERIODIC); 2249 feed_reverse_done (EV_A_ EV_PERIODIC);
2172 } 2250 }
2173} 2251}
2174 2252
2175/* simply recalculate all periodics */ 2253/* simply recalculate all periodics */
2176/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2254/* TODO: maybe ensure that at least one event happens when jumping forward? */
2177static void noinline 2255static void noinline
2178periodics_reschedule (EV_P) 2256periodics_reschedule (EV_P)
2179{ 2257{
2180 int i; 2258 int i;
2181 2259
… …
2277 mn_now = ev_rt_now; 2355 mn_now = ev_rt_now;
2278 } 2356 }
2279} 2357}
2280 2358
2281void 2359void
2282ev_loop (EV_P_ int flags) 2360ev_run (EV_P_ int flags)
2283{ 2361{
2284#if EV_FEATURE_API 2362#if EV_FEATURE_API
2285 ++loop_depth; 2363 ++loop_depth;
2286#endif 2364#endif
2287 2365
2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2366 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2289 2367
2290 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVBREAK_CANCEL;
2291 2369
2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2370 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2293 2371
2294 do 2372 do
2295 { 2373 {
… …
2338 /* calculate blocking time */ 2416 /* calculate blocking time */
2339 { 2417 {
2340 ev_tstamp waittime = 0.; 2418 ev_tstamp waittime = 0.;
2341 ev_tstamp sleeptime = 0.; 2419 ev_tstamp sleeptime = 0.;
2342 2420
2421 /* remember old timestamp for io_blocktime calculation */
2422 ev_tstamp prev_mn_now = mn_now;
2423
2424 /* update time to cancel out callback processing overhead */
2425 time_update (EV_A_ 1e100);
2426
2343 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2427 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2344 { 2428 {
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; 2429 waittime = MAX_BLOCKTIME;
2352 2430
2353 if (timercnt) 2431 if (timercnt)
2354 { 2432 {
2355 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2433 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2385 } 2463 }
2386 2464
2387#if EV_FEATURE_API 2465#if EV_FEATURE_API
2388 ++loop_count; 2466 ++loop_count;
2389#endif 2467#endif
2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2468 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2391 backend_poll (EV_A_ waittime); 2469 backend_poll (EV_A_ waittime);
2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2470 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2393 2471
2394 /* update ev_rt_now, do magic */ 2472 /* update ev_rt_now, do magic */
2395 time_update (EV_A_ waittime + sleeptime); 2473 time_update (EV_A_ waittime + sleeptime);
2396 } 2474 }
2397 2475
… …
2415 EV_INVOKE_PENDING; 2493 EV_INVOKE_PENDING;
2416 } 2494 }
2417 while (expect_true ( 2495 while (expect_true (
2418 activecnt 2496 activecnt
2419 && !loop_done 2497 && !loop_done
2420 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2498 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2421 )); 2499 ));
2422 2500
2423 if (loop_done == EVUNLOOP_ONE) 2501 if (loop_done == EVBREAK_ONE)
2424 loop_done = EVUNLOOP_CANCEL; 2502 loop_done = EVBREAK_CANCEL;
2425 2503
2426#if EV_FEATURE_API 2504#if EV_FEATURE_API
2427 --loop_depth; 2505 --loop_depth;
2428#endif 2506#endif
2429} 2507}
2430 2508
2431void 2509void
2432ev_unloop (EV_P_ int how) 2510ev_break (EV_P_ int how)
2433{ 2511{
2434 loop_done = how; 2512 loop_done = how;
2435} 2513}
2436 2514
2437void 2515void
… …
2585 EV_FREQUENT_CHECK; 2663 EV_FREQUENT_CHECK;
2586 2664
2587 wlist_del (&anfds[w->fd].head, (WL)w); 2665 wlist_del (&anfds[w->fd].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2666 ev_stop (EV_A_ (W)w);
2589 2667
2590 fd_change (EV_A_ w->fd, 1); 2668 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2591 2669
2592 EV_FREQUENT_CHECK; 2670 EV_FREQUENT_CHECK;
2593} 2671}
2594 2672
2595void noinline 2673void noinline
… …
2819 sa.sa_handler = ev_sighandler; 2897 sa.sa_handler = ev_sighandler;
2820 sigfillset (&sa.sa_mask); 2898 sigfillset (&sa.sa_mask);
2821 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2899 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2822 sigaction (w->signum, &sa, 0); 2900 sigaction (w->signum, &sa, 0);
2823 2901
2902 if (origflags & EVFLAG_NOSIGMASK)
2903 {
2824 sigemptyset (&sa.sa_mask); 2904 sigemptyset (&sa.sa_mask);
2825 sigaddset (&sa.sa_mask, w->signum); 2905 sigaddset (&sa.sa_mask, w->signum);
2826 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2906 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2907 }
2827#endif 2908#endif
2828 } 2909 }
2829 2910
2830 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2831} 2912}
… …
3047 { 3128 {
3048 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3129 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3049 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3130 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3050 ofs += sizeof (struct inotify_event) + ev->len; 3131 ofs += sizeof (struct inotify_event) + ev->len;
3051 } 3132 }
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} 3133}
3085 3134
3086inline_size void 3135inline_size void
3087ev_check_2625 (EV_P) 3136ev_check_2625 (EV_P)
3088{ 3137{
… …
3412 3461
3413#if EV_EMBED_ENABLE 3462#if EV_EMBED_ENABLE
3414void noinline 3463void noinline
3415ev_embed_sweep (EV_P_ ev_embed *w) 3464ev_embed_sweep (EV_P_ ev_embed *w)
3416{ 3465{
3417 ev_loop (w->other, EVLOOP_NONBLOCK); 3466 ev_run (w->other, EVRUN_NOWAIT);
3418} 3467}
3419 3468
3420static void 3469static void
3421embed_io_cb (EV_P_ ev_io *io, int revents) 3470embed_io_cb (EV_P_ ev_io *io, int revents)
3422{ 3471{
3423 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3472 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3424 3473
3425 if (ev_cb (w)) 3474 if (ev_cb (w))
3426 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3475 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3427 else 3476 else
3428 ev_loop (w->other, EVLOOP_NONBLOCK); 3477 ev_run (w->other, EVRUN_NOWAIT);
3429} 3478}
3430 3479
3431static void 3480static void
3432embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3481embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3433{ 3482{
… …
3437 EV_P = w->other; 3486 EV_P = w->other;
3438 3487
3439 while (fdchangecnt) 3488 while (fdchangecnt)
3440 { 3489 {
3441 fd_reify (EV_A); 3490 fd_reify (EV_A);
3442 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3491 ev_run (EV_A_ EVRUN_NOWAIT);
3443 } 3492 }
3444 } 3493 }
3445} 3494}
3446 3495
3447static void 3496static void
… …
3453 3502
3454 { 3503 {
3455 EV_P = w->other; 3504 EV_P = w->other;
3456 3505
3457 ev_loop_fork (EV_A); 3506 ev_loop_fork (EV_A);
3458 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3507 ev_run (EV_A_ EVRUN_NOWAIT);
3459 } 3508 }
3460 3509
3461 ev_embed_start (EV_A_ w); 3510 ev_embed_start (EV_A_ w);
3462} 3511}
3463 3512
… …
3555 3604
3556 EV_FREQUENT_CHECK; 3605 EV_FREQUENT_CHECK;
3557} 3606}
3558#endif 3607#endif
3559 3608
3560#if EV_ASYNC_ENABLE 3609#if EV_CLEANUP_ENABLE
3561void 3610void
3562ev_async_start (EV_P_ ev_async *w) 3611ev_cleanup_start (EV_P_ ev_cleanup *w)
3563{ 3612{
3564 if (expect_false (ev_is_active (w))) 3613 if (expect_false (ev_is_active (w)))
3565 return; 3614 return;
3615
3616 EV_FREQUENT_CHECK;
3617
3618 ev_start (EV_A_ (W)w, ++cleanupcnt);
3619 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3620 cleanups [cleanupcnt - 1] = w;
3621
3622 /* cleanup watchers should never keep a refcount on the loop */
3623 ev_unref (EV_A);
3624 EV_FREQUENT_CHECK;
3625}
3626
3627void
3628ev_cleanup_stop (EV_P_ ev_cleanup *w)
3629{
3630 clear_pending (EV_A_ (W)w);
3631 if (expect_false (!ev_is_active (w)))
3632 return;
3633
3634 EV_FREQUENT_CHECK;
3635 ev_ref (EV_A);
3636
3637 {
3638 int active = ev_active (w);
3639
3640 cleanups [active - 1] = cleanups [--cleanupcnt];
3641 ev_active (cleanups [active - 1]) = active;
3642 }
3643
3644 ev_stop (EV_A_ (W)w);
3645
3646 EV_FREQUENT_CHECK;
3647}
3648#endif
3649
3650#if EV_ASYNC_ENABLE
3651void
3652ev_async_start (EV_P_ ev_async *w)
3653{
3654 if (expect_false (ev_is_active (w)))
3655 return;
3656
3657 w->sent = 0;
3566 3658
3567 evpipe_init (EV_A); 3659 evpipe_init (EV_A);
3568 3660
3569 EV_FREQUENT_CHECK; 3661 EV_FREQUENT_CHECK;
3570 3662
… …
3790 3882
3791#if EV_MULTIPLICITY 3883#if EV_MULTIPLICITY
3792 #include "ev_wrap.h" 3884 #include "ev_wrap.h"
3793#endif 3885#endif
3794 3886
3795#ifdef __cplusplus 3887EV_CPP(})
3796}
3797#endif
3798 3888

Diff Legend

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