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

Comparing libev/ev.c (file contents):
Revision 1.344 by root, Fri Jul 9 20:55:14 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
… …
384# include <sys/select.h> 382# include <sys/select.h>
385# endif 383# endif
386#endif 384#endif
387 385
388#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
389# include <sys/utsname.h>
390# include <sys/statfs.h> 387# include <sys/statfs.h>
391# include <sys/inotify.h> 388# include <sys/inotify.h>
392/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
393# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
394# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
411# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
412# else 409# else
413# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
414# endif 411# endif
415# endif 412# endif
416# ifdef __cplusplus
417extern "C" {
418# endif
419int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
420# ifdef __cplusplus
421}
422# endif
423#endif 414#endif
424 415
425#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h> 418# include <stdint.h>
… …
433# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
434# else 425# else
435# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
436# endif 427# endif
437# endif 428# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
442 430
443struct signalfd_siginfo 431struct signalfd_siginfo
444{ 432{
445 uint32_t ssi_signo; 433 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
447}; 435};
448# ifdef __cplusplus
449}
450# endif 436#endif
451#endif
452
453 437
454/**/ 438/**/
455 439
456#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
457# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
471 455
472#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
473#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
474 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461
475#if __GNUC__ >= 4 462#if __GNUC__ >= 4
476# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
477# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
478#else 465#else
479# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
511#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
512#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
513 500
514#if EV_USE_REALTIME 501#if EV_USE_REALTIME
515/* 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 */
516/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
517static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
518#endif 505#endif
519 506
520#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
532#endif 519#endif
533 520
534#ifdef _WIN32 521#ifdef _WIN32
535# include "ev_win32.c" 522# include "ev_win32.c"
536#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}
537 566
538/*****************************************************************************/ 567/*****************************************************************************/
539 568
540#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
541static void noinline 570static void noinline
… …
562 if (syserr_cb) 591 if (syserr_cb)
563 syserr_cb (msg); 592 syserr_cb (msg);
564 else 593 else
565 { 594 {
566#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
567 const char *err = strerror (errno);
568
569 ev_printerr (msg); 596 ev_printerr (msg);
570 ev_printerr (": "); 597 ev_printerr (": ");
571 ev_printerr (err); 598 ev_printerr (strerror (errno));
572 ev_printerr ("\n"); 599 ev_printerr ("\n");
573#else 600#else
574 perror (msg); 601 perror (msg);
575#endif 602#endif
576 abort (); 603 abort ();
… …
610 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
611 638
612 if (!ptr && size) 639 if (!ptr && size)
613 { 640 {
614#if EV_AVOID_STDIO 641#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n"); 642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
616#else 643#else
617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
618#endif 645#endif
619 abort (); 646 abort ();
620 } 647 }
621 648
622 return ptr; 649 return ptr;
… …
639 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
640 unsigned char unused; 667 unsigned char unused;
641#if EV_USE_EPOLL 668#if EV_USE_EPOLL
642 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
643#endif 670#endif
644#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
645 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
646#endif 676#endif
647} ANFD; 677} ANFD;
648 678
649/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
650typedef struct 680typedef struct
… …
715# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif 748#endif
719 749
720#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
721 751
722/*****************************************************************************/ 752/*****************************************************************************/
723 753
724#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
725ev_tstamp 755ev_tstamp
… …
769 if (delay > 0.) 799 if (delay > 0.)
770 { 800 {
771#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
772 struct timespec ts; 802 struct timespec ts;
773 803
774 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
775 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
776
777 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
778#elif defined(_WIN32) 806#elif defined(_WIN32)
779 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
780#else 808#else
781 struct timeval tv; 809 struct timeval tv;
782 810
783 tv.tv_sec = (time_t)delay;
784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
785
786 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
787 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
788 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
789 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
790#endif 816#endif
791 } 817 }
792} 818}
793 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
794/*****************************************************************************/ 828/*****************************************************************************/
795 829
796#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
797 831
798/* find a suitable new size for the given array, */ 832/* find a suitable new size for the given array, */
799/* hopefully by rounding to a ncie-to-malloc size */ 833/* hopefully by rounding to a nice-to-malloc size */
800inline_size int 834inline_size int
801array_nextsize (int elem, int cur, int cnt) 835array_nextsize (int elem, int cur, int cnt)
802{ 836{
803 int ncur = cur + 1; 837 int ncur = cur + 1;
804 838
… …
945 { 979 {
946 int fd = fdchanges [i]; 980 int fd = fdchanges [i];
947 ANFD *anfd = anfds + fd; 981 ANFD *anfd = anfds + fd;
948 ev_io *w; 982 ev_io *w;
949 983
950 unsigned char events = 0; 984 unsigned char o_events = anfd->events;
985 unsigned char o_reify = anfd->reify;
951 986
952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 987 anfd->reify = 0;
953 events |= (unsigned char)w->events;
954 988
955#if EV_SELECT_IS_WINSOCKET 989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
956 if (events) 990 if (o_reify & EV__IOFDSET)
957 { 991 {
958 unsigned long arg; 992 unsigned long arg;
959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 993 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
961 } 996 }
962#endif 997#endif
963 998
999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
964 { 1000 {
965 unsigned char o_events = anfd->events;
966 unsigned char o_reify = anfd->reify;
967
968 anfd->reify = 0;
969 anfd->events = events; 1001 anfd->events = 0;
970 1002
971 if (o_events != events || o_reify & EV__IOFDSET) 1003 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1004 anfd->events |= (unsigned char)w->events;
1005
1006 if (o_events != anfd->events)
1007 o_reify = EV__IOFDSET; /* actually |= */
1008 }
1009
1010 if (o_reify & EV__IOFDSET)
972 backend_modify (EV_A_ fd, o_events, events); 1011 backend_modify (EV_A_ fd, o_events, anfd->events);
973 }
974 } 1012 }
975 1013
976 fdchangecnt = 0; 1014 fdchangecnt = 0;
977} 1015}
978 1016
… …
1071} 1109}
1072 1110
1073/*****************************************************************************/ 1111/*****************************************************************************/
1074 1112
1075/* 1113/*
1076 * 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
1077 * 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
1078 * the branching factor of the d-tree. 1116 * the branching factor of the d-tree.
1079 */ 1117 */
1080 1118
1081/* 1119/*
… …
1281 uint64_t counter = 1; 1319 uint64_t counter = 1;
1282 write (evfd, &counter, sizeof (uint64_t)); 1320 write (evfd, &counter, sizeof (uint64_t));
1283 } 1321 }
1284 else 1322 else
1285#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. */
1286 write (evpipe [1], &dummy, 1); 1329 write (evpipe [1], &dummy, 1);
1287 1330
1288 errno = old_errno; 1331 errno = old_errno;
1289 } 1332 }
1290} 1333}
… …
1304 } 1347 }
1305 else 1348 else
1306#endif 1349#endif
1307 { 1350 {
1308 char dummy; 1351 char dummy;
1352 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1309 read (evpipe [0], &dummy, 1); 1353 read (evpipe [0], &dummy, 1);
1310 } 1354 }
1311 1355
1356#if EV_SIGNAL_ENABLE
1312 if (sig_pending) 1357 if (sig_pending)
1313 { 1358 {
1314 sig_pending = 0; 1359 sig_pending = 0;
1315 1360
1316 for (i = EV_NSIG - 1; i--; ) 1361 for (i = EV_NSIG - 1; i--; )
1317 if (expect_false (signals [i].pending)) 1362 if (expect_false (signals [i].pending))
1318 ev_feed_signal_event (EV_A_ i + 1); 1363 ev_feed_signal_event (EV_A_ i + 1);
1319 } 1364 }
1365#endif
1320 1366
1321#if EV_ASYNC_ENABLE 1367#if EV_ASYNC_ENABLE
1322 if (async_pending) 1368 if (async_pending)
1323 { 1369 {
1324 async_pending = 0; 1370 async_pending = 0;
… …
1333#endif 1379#endif
1334} 1380}
1335 1381
1336/*****************************************************************************/ 1382/*****************************************************************************/
1337 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
1338static void 1398static void
1339ev_sighandler (int signum) 1399ev_sighandler (int signum)
1340{ 1400{
1341#if EV_MULTIPLICITY
1342 EV_P = signals [signum - 1].loop;
1343#endif
1344
1345#ifdef _WIN32 1401#ifdef _WIN32
1346 signal (signum, ev_sighandler); 1402 signal (signum, ev_sighandler);
1347#endif 1403#endif
1348 1404
1349 signals [signum - 1].pending = 1; 1405 ev_feed_signal (signum);
1350 evpipe_write (EV_A_ &sig_pending);
1351} 1406}
1352 1407
1353void noinline 1408void noinline
1354ev_feed_signal_event (EV_P_ int signum) 1409ev_feed_signal_event (EV_P_ int signum)
1355{ 1410{
… …
1455 1510
1456#endif 1511#endif
1457 1512
1458/*****************************************************************************/ 1513/*****************************************************************************/
1459 1514
1515#if EV_USE_IOCP
1516# include "ev_iocp.c"
1517#endif
1460#if EV_USE_PORT 1518#if EV_USE_PORT
1461# include "ev_port.c" 1519# include "ev_port.c"
1462#endif 1520#endif
1463#if EV_USE_KQUEUE 1521#if EV_USE_KQUEUE
1464# include "ev_kqueue.c" 1522# include "ev_kqueue.c"
… …
1537ev_embeddable_backends (void) 1595ev_embeddable_backends (void)
1538{ 1596{
1539 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1597 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1540 1598
1541 /* 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 */
1542 /* please fix it and tell me how to detect the fix */ 1600 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1543 flags &= ~EVBACKEND_EPOLL; 1601 flags &= ~EVBACKEND_EPOLL;
1544 1602
1545 return flags; 1603 return flags;
1546} 1604}
1547 1605
1548unsigned int 1606unsigned int
… …
1604static void noinline 1662static void noinline
1605loop_init (EV_P_ unsigned int flags) 1663loop_init (EV_P_ unsigned int flags)
1606{ 1664{
1607 if (!backend) 1665 if (!backend)
1608 { 1666 {
1667 origflags = flags;
1668
1609#if EV_USE_REALTIME 1669#if EV_USE_REALTIME
1610 if (!have_realtime) 1670 if (!have_realtime)
1611 { 1671 {
1612 struct timespec ts; 1672 struct timespec ts;
1613 1673
… …
1658#endif 1718#endif
1659#if EV_USE_SIGNALFD 1719#if EV_USE_SIGNALFD
1660 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1720 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1661#endif 1721#endif
1662 1722
1663 if (!(flags & 0x0000ffffU)) 1723 if (!(flags & EVBACKEND_MASK))
1664 flags |= ev_recommended_backends (); 1724 flags |= ev_recommended_backends ();
1665 1725
1726#if EV_USE_IOCP
1727 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1728#endif
1666#if EV_USE_PORT 1729#if EV_USE_PORT
1667 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1730 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1668#endif 1731#endif
1669#if EV_USE_KQUEUE 1732#if EV_USE_KQUEUE
1670 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1733 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1687#endif 1750#endif
1688 } 1751 }
1689} 1752}
1690 1753
1691/* free up a loop structure */ 1754/* free up a loop structure */
1692static void noinline 1755void
1693loop_destroy (EV_P) 1756ev_loop_destroy (EV_P)
1694{ 1757{
1695 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
1696 1782
1697 if (ev_is_active (&pipe_w)) 1783 if (ev_is_active (&pipe_w))
1698 { 1784 {
1699 /*ev_ref (EV_A);*/ 1785 /*ev_ref (EV_A);*/
1700 /*ev_io_stop (EV_A_ &pipe_w);*/ 1786 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1722#endif 1808#endif
1723 1809
1724 if (backend_fd >= 0) 1810 if (backend_fd >= 0)
1725 close (backend_fd); 1811 close (backend_fd);
1726 1812
1813#if EV_USE_IOCP
1814 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1815#endif
1727#if EV_USE_PORT 1816#if EV_USE_PORT
1728 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1817 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1729#endif 1818#endif
1730#if EV_USE_KQUEUE 1819#if EV_USE_KQUEUE
1731 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1820 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1758 array_free (periodic, EMPTY); 1847 array_free (periodic, EMPTY);
1759#endif 1848#endif
1760#if EV_FORK_ENABLE 1849#if EV_FORK_ENABLE
1761 array_free (fork, EMPTY); 1850 array_free (fork, EMPTY);
1762#endif 1851#endif
1852#if EV_CLEANUP_ENABLE
1853 array_free (cleanup, EMPTY);
1854#endif
1763 array_free (prepare, EMPTY); 1855 array_free (prepare, EMPTY);
1764 array_free (check, EMPTY); 1856 array_free (check, EMPTY);
1765#if EV_ASYNC_ENABLE 1857#if EV_ASYNC_ENABLE
1766 array_free (async, EMPTY); 1858 array_free (async, EMPTY);
1767#endif 1859#endif
1768 1860
1769 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
1770} 1871}
1771 1872
1772#if EV_USE_INOTIFY 1873#if EV_USE_INOTIFY
1773inline_size void infy_fork (EV_P); 1874inline_size void infy_fork (EV_P);
1774#endif 1875#endif
… …
1833 loop_init (EV_A_ flags); 1934 loop_init (EV_A_ flags);
1834 1935
1835 if (ev_backend (EV_A)) 1936 if (ev_backend (EV_A))
1836 return EV_A; 1937 return EV_A;
1837 1938
1939 ev_free (EV_A);
1838 return 0; 1940 return 0;
1839} 1941}
1840 1942
1841void
1842ev_loop_destroy (EV_P)
1843{
1844 loop_destroy (EV_A);
1845 ev_free (loop);
1846}
1847
1848void
1849ev_loop_fork (EV_P)
1850{
1851 postfork = 1; /* must be in line with ev_default_fork */
1852}
1853#endif /* multiplicity */ 1943#endif /* multiplicity */
1854 1944
1855#if EV_VERIFY 1945#if EV_VERIFY
1856static void noinline 1946static void noinline
1857verify_watcher (EV_P_ W w) 1947verify_watcher (EV_P_ W w)
… …
1932#if EV_FORK_ENABLE 2022#if EV_FORK_ENABLE
1933 assert (forkmax >= forkcnt); 2023 assert (forkmax >= forkcnt);
1934 array_verify (EV_A_ (W *)forks, forkcnt); 2024 array_verify (EV_A_ (W *)forks, forkcnt);
1935#endif 2025#endif
1936 2026
2027#if EV_CLEANUP_ENABLE
2028 assert (cleanupmax >= cleanupcnt);
2029 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2030#endif
2031
1937#if EV_ASYNC_ENABLE 2032#if EV_ASYNC_ENABLE
1938 assert (asyncmax >= asynccnt); 2033 assert (asyncmax >= asynccnt);
1939 array_verify (EV_A_ (W *)asyncs, asynccnt); 2034 array_verify (EV_A_ (W *)asyncs, asynccnt);
1940#endif 2035#endif
1941 2036
… …
1959} 2054}
1960#endif 2055#endif
1961 2056
1962#if EV_MULTIPLICITY 2057#if EV_MULTIPLICITY
1963struct ev_loop * 2058struct ev_loop *
1964ev_default_loop_init (unsigned int flags)
1965#else 2059#else
1966int 2060int
2061#endif
1967ev_default_loop (unsigned int flags) 2062ev_default_loop (unsigned int flags)
1968#endif
1969{ 2063{
1970 if (!ev_default_loop_ptr) 2064 if (!ev_default_loop_ptr)
1971 { 2065 {
1972#if EV_MULTIPLICITY 2066#if EV_MULTIPLICITY
1973 EV_P = ev_default_loop_ptr = &default_loop_struct; 2067 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1992 2086
1993 return ev_default_loop_ptr; 2087 return ev_default_loop_ptr;
1994} 2088}
1995 2089
1996void 2090void
1997ev_default_destroy (void) 2091ev_loop_fork (EV_P)
1998{ 2092{
1999#if EV_MULTIPLICITY
2000 EV_P = ev_default_loop_ptr;
2001#endif
2002
2003 ev_default_loop_ptr = 0;
2004
2005#if EV_CHILD_ENABLE
2006 ev_ref (EV_A); /* child watcher */
2007 ev_signal_stop (EV_A_ &childev);
2008#endif
2009
2010 loop_destroy (EV_A);
2011}
2012
2013void
2014ev_default_fork (void)
2015{
2016#if EV_MULTIPLICITY
2017 EV_P = ev_default_loop_ptr;
2018#endif
2019
2020 postfork = 1; /* must be in line with ev_loop_fork */ 2093 postfork = 1; /* must be in line with ev_default_fork */
2021} 2094}
2022 2095
2023/*****************************************************************************/ 2096/*****************************************************************************/
2024 2097
2025void 2098void
… …
2047 2120
2048 for (pri = NUMPRI; pri--; ) 2121 for (pri = NUMPRI; pri--; )
2049 while (pendingcnt [pri]) 2122 while (pendingcnt [pri])
2050 { 2123 {
2051 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2124 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2052
2053 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2054 /* ^ this is no longer true, as pending_w could be here */
2055 2125
2056 p->w->pending = 0; 2126 p->w->pending = 0;
2057 EV_CB_INVOKE (p->w, p->events); 2127 EV_CB_INVOKE (p->w, p->events);
2058 EV_FREQUENT_CHECK; 2128 EV_FREQUENT_CHECK;
2059 } 2129 }
… …
2179 feed_reverse_done (EV_A_ EV_PERIODIC); 2249 feed_reverse_done (EV_A_ EV_PERIODIC);
2180 } 2250 }
2181} 2251}
2182 2252
2183/* simply recalculate all periodics */ 2253/* simply recalculate all periodics */
2184/* 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? */
2185static void noinline 2255static void noinline
2186periodics_reschedule (EV_P) 2256periodics_reschedule (EV_P)
2187{ 2257{
2188 int i; 2258 int i;
2189 2259
… …
2285 mn_now = ev_rt_now; 2355 mn_now = ev_rt_now;
2286 } 2356 }
2287} 2357}
2288 2358
2289void 2359void
2290ev_loop (EV_P_ int flags) 2360ev_run (EV_P_ int flags)
2291{ 2361{
2292#if EV_FEATURE_API 2362#if EV_FEATURE_API
2293 ++loop_depth; 2363 ++loop_depth;
2294#endif 2364#endif
2295 2365
2296 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));
2297 2367
2298 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVBREAK_CANCEL;
2299 2369
2300 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 */
2301 2371
2302 do 2372 do
2303 { 2373 {
… …
2346 /* calculate blocking time */ 2416 /* calculate blocking time */
2347 { 2417 {
2348 ev_tstamp waittime = 0.; 2418 ev_tstamp waittime = 0.;
2349 ev_tstamp sleeptime = 0.; 2419 ev_tstamp sleeptime = 0.;
2350 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
2351 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2427 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2352 { 2428 {
2353 /* remember old timestamp for io_blocktime calculation */
2354 ev_tstamp prev_mn_now = mn_now;
2355
2356 /* update time to cancel out callback processing overhead */
2357 time_update (EV_A_ 1e100);
2358
2359 waittime = MAX_BLOCKTIME; 2429 waittime = MAX_BLOCKTIME;
2360 2430
2361 if (timercnt) 2431 if (timercnt)
2362 { 2432 {
2363 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2433 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2393 } 2463 }
2394 2464
2395#if EV_FEATURE_API 2465#if EV_FEATURE_API
2396 ++loop_count; 2466 ++loop_count;
2397#endif 2467#endif
2398 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2468 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2399 backend_poll (EV_A_ waittime); 2469 backend_poll (EV_A_ waittime);
2400 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2470 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2401 2471
2402 /* update ev_rt_now, do magic */ 2472 /* update ev_rt_now, do magic */
2403 time_update (EV_A_ waittime + sleeptime); 2473 time_update (EV_A_ waittime + sleeptime);
2404 } 2474 }
2405 2475
… …
2423 EV_INVOKE_PENDING; 2493 EV_INVOKE_PENDING;
2424 } 2494 }
2425 while (expect_true ( 2495 while (expect_true (
2426 activecnt 2496 activecnt
2427 && !loop_done 2497 && !loop_done
2428 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2498 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2429 )); 2499 ));
2430 2500
2431 if (loop_done == EVUNLOOP_ONE) 2501 if (loop_done == EVBREAK_ONE)
2432 loop_done = EVUNLOOP_CANCEL; 2502 loop_done = EVBREAK_CANCEL;
2433 2503
2434#if EV_FEATURE_API 2504#if EV_FEATURE_API
2435 --loop_depth; 2505 --loop_depth;
2436#endif 2506#endif
2437} 2507}
2438 2508
2439void 2509void
2440ev_unloop (EV_P_ int how) 2510ev_break (EV_P_ int how)
2441{ 2511{
2442 loop_done = how; 2512 loop_done = how;
2443} 2513}
2444 2514
2445void 2515void
… …
2593 EV_FREQUENT_CHECK; 2663 EV_FREQUENT_CHECK;
2594 2664
2595 wlist_del (&anfds[w->fd].head, (WL)w); 2665 wlist_del (&anfds[w->fd].head, (WL)w);
2596 ev_stop (EV_A_ (W)w); 2666 ev_stop (EV_A_ (W)w);
2597 2667
2598 fd_change (EV_A_ w->fd, 1); 2668 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2599 2669
2600 EV_FREQUENT_CHECK; 2670 EV_FREQUENT_CHECK;
2601} 2671}
2602 2672
2603void noinline 2673void noinline
… …
2827 sa.sa_handler = ev_sighandler; 2897 sa.sa_handler = ev_sighandler;
2828 sigfillset (&sa.sa_mask); 2898 sigfillset (&sa.sa_mask);
2829 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 */
2830 sigaction (w->signum, &sa, 0); 2900 sigaction (w->signum, &sa, 0);
2831 2901
2902 if (origflags & EVFLAG_NOSIGMASK)
2903 {
2832 sigemptyset (&sa.sa_mask); 2904 sigemptyset (&sa.sa_mask);
2833 sigaddset (&sa.sa_mask, w->signum); 2905 sigaddset (&sa.sa_mask, w->signum);
2834 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2906 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2907 }
2835#endif 2908#endif
2836 } 2909 }
2837 2910
2838 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2839} 2912}
… …
3055 { 3128 {
3056 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3129 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3057 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3130 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3058 ofs += sizeof (struct inotify_event) + ev->len; 3131 ofs += sizeof (struct inotify_event) + ev->len;
3059 } 3132 }
3060}
3061
3062inline_size unsigned int
3063ev_linux_version (void)
3064{
3065 struct utsname buf;
3066 unsigned int v;
3067 int i;
3068 char *p = buf.release;
3069
3070 if (uname (&buf))
3071 return 0;
3072
3073 for (i = 3+1; --i; )
3074 {
3075 unsigned int c = 0;
3076
3077 for (;;)
3078 {
3079 if (*p >= '0' && *p <= '9')
3080 c = c * 10 + *p++ - '0';
3081 else
3082 {
3083 p += *p == '.';
3084 break;
3085 }
3086 }
3087
3088 v = (v << 8) | c;
3089 }
3090
3091 return v;
3092} 3133}
3093 3134
3094inline_size void 3135inline_size void
3095ev_check_2625 (EV_P) 3136ev_check_2625 (EV_P)
3096{ 3137{
… …
3420 3461
3421#if EV_EMBED_ENABLE 3462#if EV_EMBED_ENABLE
3422void noinline 3463void noinline
3423ev_embed_sweep (EV_P_ ev_embed *w) 3464ev_embed_sweep (EV_P_ ev_embed *w)
3424{ 3465{
3425 ev_loop (w->other, EVLOOP_NONBLOCK); 3466 ev_run (w->other, EVRUN_NOWAIT);
3426} 3467}
3427 3468
3428static void 3469static void
3429embed_io_cb (EV_P_ ev_io *io, int revents) 3470embed_io_cb (EV_P_ ev_io *io, int revents)
3430{ 3471{
3431 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3472 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3432 3473
3433 if (ev_cb (w)) 3474 if (ev_cb (w))
3434 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3475 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3435 else 3476 else
3436 ev_loop (w->other, EVLOOP_NONBLOCK); 3477 ev_run (w->other, EVRUN_NOWAIT);
3437} 3478}
3438 3479
3439static void 3480static void
3440embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3481embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3441{ 3482{
… …
3445 EV_P = w->other; 3486 EV_P = w->other;
3446 3487
3447 while (fdchangecnt) 3488 while (fdchangecnt)
3448 { 3489 {
3449 fd_reify (EV_A); 3490 fd_reify (EV_A);
3450 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3491 ev_run (EV_A_ EVRUN_NOWAIT);
3451 } 3492 }
3452 } 3493 }
3453} 3494}
3454 3495
3455static void 3496static void
… …
3461 3502
3462 { 3503 {
3463 EV_P = w->other; 3504 EV_P = w->other;
3464 3505
3465 ev_loop_fork (EV_A); 3506 ev_loop_fork (EV_A);
3466 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3507 ev_run (EV_A_ EVRUN_NOWAIT);
3467 } 3508 }
3468 3509
3469 ev_embed_start (EV_A_ w); 3510 ev_embed_start (EV_A_ w);
3470} 3511}
3471 3512
… …
3563 3604
3564 EV_FREQUENT_CHECK; 3605 EV_FREQUENT_CHECK;
3565} 3606}
3566#endif 3607#endif
3567 3608
3568#if EV_ASYNC_ENABLE 3609#if EV_CLEANUP_ENABLE
3569void 3610void
3570ev_async_start (EV_P_ ev_async *w) 3611ev_cleanup_start (EV_P_ ev_cleanup *w)
3571{ 3612{
3572 if (expect_false (ev_is_active (w))) 3613 if (expect_false (ev_is_active (w)))
3573 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;
3574 3658
3575 evpipe_init (EV_A); 3659 evpipe_init (EV_A);
3576 3660
3577 EV_FREQUENT_CHECK; 3661 EV_FREQUENT_CHECK;
3578 3662
… …
3798 3882
3799#if EV_MULTIPLICITY 3883#if EV_MULTIPLICITY
3800 #include "ev_wrap.h" 3884 #include "ev_wrap.h"
3801#endif 3885#endif
3802 3886
3803#ifdef __cplusplus 3887EV_CPP(})
3804}
3805#endif
3806 3888

Diff Legend

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