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

Comparing libev/ev.c (file contents):
Revision 1.338 by root, Tue Mar 16 00:20:17 2010 UTC vs.
Revision 1.370 by root, Sun Jan 30 19:05:41 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
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 1 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 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
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 1
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
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
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
116# define EV_USE_KQUEUE 1 115# ifndef EV_USE_KQUEUE
117# else 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
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# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
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
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
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
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
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 1 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)
… …
361# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
362# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
363#endif 378#endif
364 379
365#if !EV_USE_NANOSLEEP 380#if !EV_USE_NANOSLEEP
366# ifndef _WIN32 381/* hp-ux has it in sys/time.h, which we unconditionally include above */
382# if !defined(_WIN32) && !defined(__hpux)
367# include <sys/select.h> 383# include <sys/select.h>
368# endif 384# endif
369#endif 385#endif
370 386
371#if EV_USE_INOTIFY 387#if EV_USE_INOTIFY
372# include <sys/utsname.h>
373# include <sys/statfs.h> 388# include <sys/statfs.h>
374# include <sys/inotify.h> 389# include <sys/inotify.h>
375/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
376# ifndef IN_DONT_FOLLOW 391# ifndef IN_DONT_FOLLOW
377# undef EV_USE_INOTIFY 392# undef EV_USE_INOTIFY
… …
394# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
395# else 410# else
396# define EFD_CLOEXEC 02000000 411# define EFD_CLOEXEC 02000000
397# endif 412# endif
398# endif 413# endif
399# ifdef __cplusplus
400extern "C" {
401# endif
402int (eventfd) (unsigned int initval, int flags); 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
403# ifdef __cplusplus
404}
405# endif
406#endif 415#endif
407 416
408#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h> 419# include <stdint.h>
… …
416# define SFD_CLOEXEC O_CLOEXEC 425# define SFD_CLOEXEC O_CLOEXEC
417# else 426# else
418# define SFD_CLOEXEC 02000000 427# define SFD_CLOEXEC 02000000
419# endif 428# endif
420# endif 429# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags); 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
425 431
426struct signalfd_siginfo 432struct signalfd_siginfo
427{ 433{
428 uint32_t ssi_signo; 434 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)]; 435 char pad[128 - sizeof (uint32_t)];
430}; 436};
431# ifdef __cplusplus
432}
433# endif 437#endif
434#endif
435
436 438
437/**/ 439/**/
438 440
439#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
440# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
441#else 443#else
442# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
443#endif 445#endif
444 446
445/* 447/*
… …
453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
454 456
455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
457 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
462
458#if __GNUC__ >= 4 463#if __GNUC__ >= 4
459# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
460# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
461#else 466#else
462# define expect(expr,value) (expr) 467# define expect(expr,value) (expr)
… …
494#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
495#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
496 501
497#if EV_USE_REALTIME 502#if EV_USE_REALTIME
498/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* 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 */ 504/* giving it a reasonably high chance of working on typical architectures */
500static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
501#endif 506#endif
502 507
503#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
515#endif 520#endif
516 521
517#ifdef _WIN32 522#ifdef _WIN32
518# include "ev_win32.c" 523# include "ev_win32.c"
519#endif 524#endif
525
526/*****************************************************************************/
527
528#ifdef __linux
529# include <sys/utsname.h>
530#endif
531
532static unsigned int noinline
533ev_linux_version (void)
534{
535#ifdef __linux
536 unsigned int v = 0;
537 struct utsname buf;
538 int i;
539 char *p = buf.release;
540
541 if (uname (&buf))
542 return 0;
543
544 for (i = 3+1; --i; )
545 {
546 unsigned int c = 0;
547
548 for (;;)
549 {
550 if (*p >= '0' && *p <= '9')
551 c = c * 10 + *p++ - '0';
552 else
553 {
554 p += *p == '.';
555 break;
556 }
557 }
558
559 v = (v << 8) | c;
560 }
561
562 return v;
563#else
564 return 0;
565#endif
566}
520 567
521/*****************************************************************************/ 568/*****************************************************************************/
522 569
523#if EV_AVOID_STDIO 570#if EV_AVOID_STDIO
524static void noinline 571static void noinline
… …
545 if (syserr_cb) 592 if (syserr_cb)
546 syserr_cb (msg); 593 syserr_cb (msg);
547 else 594 else
548 { 595 {
549#if EV_AVOID_STDIO 596#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg); 597 ev_printerr (msg);
553 ev_printerr (": "); 598 ev_printerr (": ");
554 ev_printerr (err); 599 ev_printerr (strerror (errno));
555 ev_printerr ("\n"); 600 ev_printerr ("\n");
556#else 601#else
557 perror (msg); 602 perror (msg);
558#endif 603#endif
559 abort (); 604 abort ();
… …
593 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
594 639
595 if (!ptr && size) 640 if (!ptr && size)
596 { 641 {
597#if EV_AVOID_STDIO 642#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n"); 643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
599#else 644#else
600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
601#endif 646#endif
602 abort (); 647 abort ();
603 } 648 }
604 649
605 return ptr; 650 return ptr;
… …
622 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 667 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
623 unsigned char unused; 668 unsigned char unused;
624#if EV_USE_EPOLL 669#if EV_USE_EPOLL
625 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
626#endif 671#endif
627#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
628 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
629#endif 677#endif
630} ANFD; 678} ANFD;
631 679
632/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
633typedef struct 681typedef struct
… …
698# define EV_RELEASE_CB (void)0 746# define EV_RELEASE_CB (void)0
699# define EV_ACQUIRE_CB (void)0 747# define EV_ACQUIRE_CB (void)0
700# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 748# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
701#endif 749#endif
702 750
703#define EVUNLOOP_RECURSE 0x80 751#define EVBREAK_RECURSE 0x80
704 752
705/*****************************************************************************/ 753/*****************************************************************************/
706 754
707#ifndef EV_HAVE_EV_TIME 755#ifndef EV_HAVE_EV_TIME
708ev_tstamp 756ev_tstamp
… …
752 if (delay > 0.) 800 if (delay > 0.)
753 { 801 {
754#if EV_USE_NANOSLEEP 802#if EV_USE_NANOSLEEP
755 struct timespec ts; 803 struct timespec ts;
756 804
757 ts.tv_sec = (time_t)delay; 805 EV_TS_SET (ts, delay);
758 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
759
760 nanosleep (&ts, 0); 806 nanosleep (&ts, 0);
761#elif defined(_WIN32) 807#elif defined(_WIN32)
762 Sleep ((unsigned long)(delay * 1e3)); 808 Sleep ((unsigned long)(delay * 1e3));
763#else 809#else
764 struct timeval tv; 810 struct timeval tv;
765 811
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 */ 812 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
770 /* something not guaranteed by newer posix versions, but guaranteed */ 813 /* something not guaranteed by newer posix versions, but guaranteed */
771 /* by older ones */ 814 /* by older ones */
815 EV_TV_SET (tv, delay);
772 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
773#endif 817#endif
774 } 818 }
775} 819}
776 820
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
777/*****************************************************************************/ 829/*****************************************************************************/
778 830
779#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
780 832
781/* find a suitable new size for the given array, */ 833/* find a suitable new size for the given array, */
782/* hopefully by rounding to a ncie-to-malloc size */ 834/* hopefully by rounding to a nice-to-malloc size */
783inline_size int 835inline_size int
784array_nextsize (int elem, int cur, int cnt) 836array_nextsize (int elem, int cur, int cnt)
785{ 837{
786 int ncur = cur + 1; 838 int ncur = cur + 1;
787 839
… …
928 { 980 {
929 int fd = fdchanges [i]; 981 int fd = fdchanges [i];
930 ANFD *anfd = anfds + fd; 982 ANFD *anfd = anfds + fd;
931 ev_io *w; 983 ev_io *w;
932 984
933 unsigned char events = 0; 985 unsigned char o_events = anfd->events;
986 unsigned char o_reify = anfd->reify;
934 987
935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 988 anfd->reify = 0;
936 events |= (unsigned char)w->events;
937 989
938#if EV_SELECT_IS_WINSOCKET 990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
939 if (events) 991 if (o_reify & EV__IOFDSET)
940 { 992 {
941 unsigned long arg; 993 unsigned long arg;
942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
944 } 997 }
945#endif 998#endif
946 999
1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
947 { 1001 {
948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
950
951 anfd->reify = 0;
952 anfd->events = events; 1002 anfd->events = 0;
953 1003
954 if (o_events != events || o_reify & EV__IOFDSET) 1004 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1005 anfd->events |= (unsigned char)w->events;
1006
1007 if (o_events != anfd->events)
1008 o_reify = EV__IOFDSET; /* actually |= */
1009 }
1010
1011 if (o_reify & EV__IOFDSET)
955 backend_modify (EV_A_ fd, o_events, events); 1012 backend_modify (EV_A_ fd, o_events, anfd->events);
956 }
957 } 1013 }
958 1014
959 fdchangecnt = 0; 1015 fdchangecnt = 0;
960} 1016}
961 1017
… …
1054} 1110}
1055 1111
1056/*****************************************************************************/ 1112/*****************************************************************************/
1057 1113
1058/* 1114/*
1059 * the heap functions want a real array index. array index 0 uis guaranteed to not 1115 * 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 1116 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1061 * the branching factor of the d-tree. 1117 * the branching factor of the d-tree.
1062 */ 1118 */
1063 1119
1064/* 1120/*
… …
1264 uint64_t counter = 1; 1320 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t)); 1321 write (evfd, &counter, sizeof (uint64_t));
1266 } 1322 }
1267 else 1323 else
1268#endif 1324#endif
1325 /* win32 people keep sending patches that change this write() to send() */
1326 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1327 /* so when you think this write should be a send instead, please find out */
1328 /* where your send() is from - it's definitely not the microsoft send, and */
1329 /* tell me. thank you. */
1269 write (evpipe [1], &dummy, 1); 1330 write (evpipe [1], &dummy, 1);
1270 1331
1271 errno = old_errno; 1332 errno = old_errno;
1272 } 1333 }
1273} 1334}
… …
1287 } 1348 }
1288 else 1349 else
1289#endif 1350#endif
1290 { 1351 {
1291 char dummy; 1352 char dummy;
1353 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1292 read (evpipe [0], &dummy, 1); 1354 read (evpipe [0], &dummy, 1);
1293 } 1355 }
1294 1356
1357#if EV_SIGNAL_ENABLE
1295 if (sig_pending) 1358 if (sig_pending)
1296 { 1359 {
1297 sig_pending = 0; 1360 sig_pending = 0;
1298 1361
1299 for (i = EV_NSIG - 1; i--; ) 1362 for (i = EV_NSIG - 1; i--; )
1300 if (expect_false (signals [i].pending)) 1363 if (expect_false (signals [i].pending))
1301 ev_feed_signal_event (EV_A_ i + 1); 1364 ev_feed_signal_event (EV_A_ i + 1);
1302 } 1365 }
1366#endif
1303 1367
1304#if EV_ASYNC_ENABLE 1368#if EV_ASYNC_ENABLE
1305 if (async_pending) 1369 if (async_pending)
1306 { 1370 {
1307 async_pending = 0; 1371 async_pending = 0;
… …
1316#endif 1380#endif
1317} 1381}
1318 1382
1319/*****************************************************************************/ 1383/*****************************************************************************/
1320 1384
1385void
1386ev_feed_signal (int signum)
1387{
1388#if EV_MULTIPLICITY
1389 EV_P = signals [signum - 1].loop;
1390
1391 if (!EV_A)
1392 return;
1393#endif
1394
1395 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending);
1397}
1398
1321static void 1399static void
1322ev_sighandler (int signum) 1400ev_sighandler (int signum)
1323{ 1401{
1324#if EV_MULTIPLICITY
1325 EV_P = signals [signum - 1].loop;
1326#endif
1327
1328#ifdef _WIN32 1402#ifdef _WIN32
1329 signal (signum, ev_sighandler); 1403 signal (signum, ev_sighandler);
1330#endif 1404#endif
1331 1405
1332 signals [signum - 1].pending = 1; 1406 ev_feed_signal (signum);
1333 evpipe_write (EV_A_ &sig_pending);
1334} 1407}
1335 1408
1336void noinline 1409void noinline
1337ev_feed_signal_event (EV_P_ int signum) 1410ev_feed_signal_event (EV_P_ int signum)
1338{ 1411{
… …
1438 1511
1439#endif 1512#endif
1440 1513
1441/*****************************************************************************/ 1514/*****************************************************************************/
1442 1515
1516#if EV_USE_IOCP
1517# include "ev_iocp.c"
1518#endif
1443#if EV_USE_PORT 1519#if EV_USE_PORT
1444# include "ev_port.c" 1520# include "ev_port.c"
1445#endif 1521#endif
1446#if EV_USE_KQUEUE 1522#if EV_USE_KQUEUE
1447# include "ev_kqueue.c" 1523# include "ev_kqueue.c"
… …
1507#ifdef __APPLE__ 1583#ifdef __APPLE__
1508 /* only select works correctly on that "unix-certified" platform */ 1584 /* only select works correctly on that "unix-certified" platform */
1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1585 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1510 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1586 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1511#endif 1587#endif
1588#ifdef __FreeBSD__
1589 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1590#endif
1512 1591
1513 return flags; 1592 return flags;
1514} 1593}
1515 1594
1516unsigned int 1595unsigned int
1517ev_embeddable_backends (void) 1596ev_embeddable_backends (void)
1518{ 1597{
1519 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1520 1599
1521 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1600 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1522 /* please fix it and tell me how to detect the fix */ 1601 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1523 flags &= ~EVBACKEND_EPOLL; 1602 flags &= ~EVBACKEND_EPOLL;
1524 1603
1525 return flags; 1604 return flags;
1526} 1605}
1527 1606
1528unsigned int 1607unsigned int
… …
1531 return backend; 1610 return backend;
1532} 1611}
1533 1612
1534#if EV_FEATURE_API 1613#if EV_FEATURE_API
1535unsigned int 1614unsigned int
1536ev_loop_count (EV_P) 1615ev_iteration (EV_P)
1537{ 1616{
1538 return loop_count; 1617 return loop_count;
1539} 1618}
1540 1619
1541unsigned int 1620unsigned int
1542ev_loop_depth (EV_P) 1621ev_depth (EV_P)
1543{ 1622{
1544 return loop_depth; 1623 return loop_depth;
1545} 1624}
1546 1625
1547void 1626void
… …
1584static void noinline 1663static void noinline
1585loop_init (EV_P_ unsigned int flags) 1664loop_init (EV_P_ unsigned int flags)
1586{ 1665{
1587 if (!backend) 1666 if (!backend)
1588 { 1667 {
1668 origflags = flags;
1669
1589#if EV_USE_REALTIME 1670#if EV_USE_REALTIME
1590 if (!have_realtime) 1671 if (!have_realtime)
1591 { 1672 {
1592 struct timespec ts; 1673 struct timespec ts;
1593 1674
… …
1638#endif 1719#endif
1639#if EV_USE_SIGNALFD 1720#if EV_USE_SIGNALFD
1640 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1641#endif 1722#endif
1642 1723
1643 if (!(flags & 0x0000ffffU)) 1724 if (!(flags & EVBACKEND_MASK))
1644 flags |= ev_recommended_backends (); 1725 flags |= ev_recommended_backends ();
1645 1726
1727#if EV_USE_IOCP
1728 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1729#endif
1646#if EV_USE_PORT 1730#if EV_USE_PORT
1647 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1648#endif 1732#endif
1649#if EV_USE_KQUEUE 1733#if EV_USE_KQUEUE
1650 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1734 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1667#endif 1751#endif
1668 } 1752 }
1669} 1753}
1670 1754
1671/* free up a loop structure */ 1755/* free up a loop structure */
1672static void noinline 1756void
1673loop_destroy (EV_P) 1757ev_loop_destroy (EV_P)
1674{ 1758{
1675 int i; 1759 int i;
1760
1761#if EV_MULTIPLICITY
1762 /* mimic free (0) */
1763 if (!EV_A)
1764 return;
1765#endif
1766
1767#if EV_CLEANUP_ENABLE
1768 /* queue cleanup watchers (and execute them) */
1769 if (expect_false (cleanupcnt))
1770 {
1771 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1772 EV_INVOKE_PENDING;
1773 }
1774#endif
1775
1776#if EV_CHILD_ENABLE
1777 if (ev_is_active (&childev))
1778 {
1779 ev_ref (EV_A); /* child watcher */
1780 ev_signal_stop (EV_A_ &childev);
1781 }
1782#endif
1676 1783
1677 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1678 { 1785 {
1679 /*ev_ref (EV_A);*/ 1786 /*ev_ref (EV_A);*/
1680 /*ev_io_stop (EV_A_ &pipe_w);*/ 1787 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1702#endif 1809#endif
1703 1810
1704 if (backend_fd >= 0) 1811 if (backend_fd >= 0)
1705 close (backend_fd); 1812 close (backend_fd);
1706 1813
1814#if EV_USE_IOCP
1815 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1816#endif
1707#if EV_USE_PORT 1817#if EV_USE_PORT
1708 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1818 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1709#endif 1819#endif
1710#if EV_USE_KQUEUE 1820#if EV_USE_KQUEUE
1711 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1821 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1738 array_free (periodic, EMPTY); 1848 array_free (periodic, EMPTY);
1739#endif 1849#endif
1740#if EV_FORK_ENABLE 1850#if EV_FORK_ENABLE
1741 array_free (fork, EMPTY); 1851 array_free (fork, EMPTY);
1742#endif 1852#endif
1853#if EV_CLEANUP_ENABLE
1854 array_free (cleanup, EMPTY);
1855#endif
1743 array_free (prepare, EMPTY); 1856 array_free (prepare, EMPTY);
1744 array_free (check, EMPTY); 1857 array_free (check, EMPTY);
1745#if EV_ASYNC_ENABLE 1858#if EV_ASYNC_ENABLE
1746 array_free (async, EMPTY); 1859 array_free (async, EMPTY);
1747#endif 1860#endif
1748 1861
1749 backend = 0; 1862 backend = 0;
1863
1864#if EV_MULTIPLICITY
1865 if (ev_is_default_loop (EV_A))
1866#endif
1867 ev_default_loop_ptr = 0;
1868#if EV_MULTIPLICITY
1869 else
1870 ev_free (EV_A);
1871#endif
1750} 1872}
1751 1873
1752#if EV_USE_INOTIFY 1874#if EV_USE_INOTIFY
1753inline_size void infy_fork (EV_P); 1875inline_size void infy_fork (EV_P);
1754#endif 1876#endif
… …
1813 loop_init (EV_A_ flags); 1935 loop_init (EV_A_ flags);
1814 1936
1815 if (ev_backend (EV_A)) 1937 if (ev_backend (EV_A))
1816 return EV_A; 1938 return EV_A;
1817 1939
1940 ev_free (EV_A);
1818 return 0; 1941 return 0;
1819} 1942}
1820 1943
1821void
1822ev_loop_destroy (EV_P)
1823{
1824 loop_destroy (EV_A);
1825 ev_free (loop);
1826}
1827
1828void
1829ev_loop_fork (EV_P)
1830{
1831 postfork = 1; /* must be in line with ev_default_fork */
1832}
1833#endif /* multiplicity */ 1944#endif /* multiplicity */
1834 1945
1835#if EV_VERIFY 1946#if EV_VERIFY
1836static void noinline 1947static void noinline
1837verify_watcher (EV_P_ W w) 1948verify_watcher (EV_P_ W w)
… …
1868} 1979}
1869#endif 1980#endif
1870 1981
1871#if EV_FEATURE_API 1982#if EV_FEATURE_API
1872void 1983void
1873ev_loop_verify (EV_P) 1984ev_verify (EV_P)
1874{ 1985{
1875#if EV_VERIFY 1986#if EV_VERIFY
1876 int i; 1987 int i;
1877 WL w; 1988 WL w;
1878 1989
… …
1912#if EV_FORK_ENABLE 2023#if EV_FORK_ENABLE
1913 assert (forkmax >= forkcnt); 2024 assert (forkmax >= forkcnt);
1914 array_verify (EV_A_ (W *)forks, forkcnt); 2025 array_verify (EV_A_ (W *)forks, forkcnt);
1915#endif 2026#endif
1916 2027
2028#if EV_CLEANUP_ENABLE
2029 assert (cleanupmax >= cleanupcnt);
2030 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2031#endif
2032
1917#if EV_ASYNC_ENABLE 2033#if EV_ASYNC_ENABLE
1918 assert (asyncmax >= asynccnt); 2034 assert (asyncmax >= asynccnt);
1919 array_verify (EV_A_ (W *)asyncs, asynccnt); 2035 array_verify (EV_A_ (W *)asyncs, asynccnt);
1920#endif 2036#endif
1921 2037
… …
1939} 2055}
1940#endif 2056#endif
1941 2057
1942#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1943struct ev_loop * 2059struct ev_loop *
1944ev_default_loop_init (unsigned int flags)
1945#else 2060#else
1946int 2061int
2062#endif
1947ev_default_loop (unsigned int flags) 2063ev_default_loop (unsigned int flags)
1948#endif
1949{ 2064{
1950 if (!ev_default_loop_ptr) 2065 if (!ev_default_loop_ptr)
1951 { 2066 {
1952#if EV_MULTIPLICITY 2067#if EV_MULTIPLICITY
1953 EV_P = ev_default_loop_ptr = &default_loop_struct; 2068 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1972 2087
1973 return ev_default_loop_ptr; 2088 return ev_default_loop_ptr;
1974} 2089}
1975 2090
1976void 2091void
1977ev_default_destroy (void) 2092ev_loop_fork (EV_P)
1978{ 2093{
1979#if EV_MULTIPLICITY
1980 EV_P = ev_default_loop_ptr;
1981#endif
1982
1983 ev_default_loop_ptr = 0;
1984
1985#if EV_CHILD_ENABLE
1986 ev_ref (EV_A); /* child watcher */
1987 ev_signal_stop (EV_A_ &childev);
1988#endif
1989
1990 loop_destroy (EV_A);
1991}
1992
1993void
1994ev_default_fork (void)
1995{
1996#if EV_MULTIPLICITY
1997 EV_P = ev_default_loop_ptr;
1998#endif
1999
2000 postfork = 1; /* must be in line with ev_loop_fork */ 2094 postfork = 1; /* must be in line with ev_default_fork */
2001} 2095}
2002 2096
2003/*****************************************************************************/ 2097/*****************************************************************************/
2004 2098
2005void 2099void
… …
2027 2121
2028 for (pri = NUMPRI; pri--; ) 2122 for (pri = NUMPRI; pri--; )
2029 while (pendingcnt [pri]) 2123 while (pendingcnt [pri])
2030 { 2124 {
2031 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2125 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2032
2033 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2034 /* ^ this is no longer true, as pending_w could be here */
2035 2126
2036 p->w->pending = 0; 2127 p->w->pending = 0;
2037 EV_CB_INVOKE (p->w, p->events); 2128 EV_CB_INVOKE (p->w, p->events);
2038 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
2039 } 2130 }
… …
2096 EV_FREQUENT_CHECK; 2187 EV_FREQUENT_CHECK;
2097 feed_reverse (EV_A_ (W)w); 2188 feed_reverse (EV_A_ (W)w);
2098 } 2189 }
2099 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2190 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2100 2191
2101 feed_reverse_done (EV_A_ EV_TIMEOUT); 2192 feed_reverse_done (EV_A_ EV_TIMER);
2102 } 2193 }
2103} 2194}
2104 2195
2105#if EV_PERIODIC_ENABLE 2196#if EV_PERIODIC_ENABLE
2197
2198inline_speed
2199periodic_recalc (EV_P_ ev_periodic *w)
2200{
2201 /* TODO: use slow but potentially more correct incremental algo, */
2202 /* also do not rely on ceil */
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2204}
2205
2106/* make periodics pending */ 2206/* make periodics pending */
2107inline_size void 2207inline_size void
2108periodics_reify (EV_P) 2208periodics_reify (EV_P)
2109{ 2209{
2110 EV_FREQUENT_CHECK; 2210 EV_FREQUENT_CHECK;
… …
2129 ANHE_at_cache (periodics [HEAP0]); 2229 ANHE_at_cache (periodics [HEAP0]);
2130 downheap (periodics, periodiccnt, HEAP0); 2230 downheap (periodics, periodiccnt, HEAP0);
2131 } 2231 }
2132 else if (w->interval) 2232 else if (w->interval)
2133 { 2233 {
2134 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2234 periodic_recalc (EV_A_ w);
2235
2135 /* if next trigger time is not sufficiently in the future, put it there */ 2236 /* if next trigger time is not sufficiently in the future, put it there */
2136 /* this might happen because of floating point inexactness */ 2237 /* this might happen because of floating point inexactness */
2137 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2138 { 2239 {
2139 ev_at (w) += w->interval; 2240 ev_at (w) += w->interval;
… …
2159 feed_reverse_done (EV_A_ EV_PERIODIC); 2260 feed_reverse_done (EV_A_ EV_PERIODIC);
2160 } 2261 }
2161} 2262}
2162 2263
2163/* simply recalculate all periodics */ 2264/* simply recalculate all periodics */
2164/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2265/* TODO: maybe ensure that at least one event happens when jumping forward? */
2165static void noinline 2266static void noinline
2166periodics_reschedule (EV_P) 2267periodics_reschedule (EV_P)
2167{ 2268{
2168 int i; 2269 int i;
2169 2270
… …
2173 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2274 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2174 2275
2175 if (w->reschedule_cb) 2276 if (w->reschedule_cb)
2176 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2277 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2177 else if (w->interval) 2278 else if (w->interval)
2178 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2279 periodic_recalc (EV_A_ w);
2179 2280
2180 ANHE_at_cache (periodics [i]); 2281 ANHE_at_cache (periodics [i]);
2181 } 2282 }
2182 2283
2183 reheap (periodics, periodiccnt); 2284 reheap (periodics, periodiccnt);
… …
2265 mn_now = ev_rt_now; 2366 mn_now = ev_rt_now;
2266 } 2367 }
2267} 2368}
2268 2369
2269void 2370void
2270ev_loop (EV_P_ int flags) 2371ev_run (EV_P_ int flags)
2271{ 2372{
2272#if EV_FEATURE_API 2373#if EV_FEATURE_API
2273 ++loop_depth; 2374 ++loop_depth;
2274#endif 2375#endif
2275 2376
2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2377 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2277 2378
2278 loop_done = EVUNLOOP_CANCEL; 2379 loop_done = EVBREAK_CANCEL;
2279 2380
2280 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2381 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2281 2382
2282 do 2383 do
2283 { 2384 {
2284#if EV_VERIFY >= 2 2385#if EV_VERIFY >= 2
2285 ev_loop_verify (EV_A); 2386 ev_verify (EV_A);
2286#endif 2387#endif
2287 2388
2288#ifndef _WIN32 2389#ifndef _WIN32
2289 if (expect_false (curpid)) /* penalise the forking check even more */ 2390 if (expect_false (curpid)) /* penalise the forking check even more */
2290 if (expect_false (getpid () != curpid)) 2391 if (expect_false (getpid () != curpid))
… …
2326 /* calculate blocking time */ 2427 /* calculate blocking time */
2327 { 2428 {
2328 ev_tstamp waittime = 0.; 2429 ev_tstamp waittime = 0.;
2329 ev_tstamp sleeptime = 0.; 2430 ev_tstamp sleeptime = 0.;
2330 2431
2432 /* remember old timestamp for io_blocktime calculation */
2433 ev_tstamp prev_mn_now = mn_now;
2434
2435 /* update time to cancel out callback processing overhead */
2436 time_update (EV_A_ 1e100);
2437
2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2438 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2332 { 2439 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
2336 /* update time to cancel out callback processing overhead */
2337 time_update (EV_A_ 1e100);
2338
2339 waittime = MAX_BLOCKTIME; 2440 waittime = MAX_BLOCKTIME;
2340 2441
2341 if (timercnt) 2442 if (timercnt)
2342 { 2443 {
2343 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2444 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2373 } 2474 }
2374 2475
2375#if EV_FEATURE_API 2476#if EV_FEATURE_API
2376 ++loop_count; 2477 ++loop_count;
2377#endif 2478#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2479 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2379 backend_poll (EV_A_ waittime); 2480 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2481 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2381 2482
2382 /* update ev_rt_now, do magic */ 2483 /* update ev_rt_now, do magic */
2383 time_update (EV_A_ waittime + sleeptime); 2484 time_update (EV_A_ waittime + sleeptime);
2384 } 2485 }
2385 2486
… …
2403 EV_INVOKE_PENDING; 2504 EV_INVOKE_PENDING;
2404 } 2505 }
2405 while (expect_true ( 2506 while (expect_true (
2406 activecnt 2507 activecnt
2407 && !loop_done 2508 && !loop_done
2408 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2509 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2409 )); 2510 ));
2410 2511
2411 if (loop_done == EVUNLOOP_ONE) 2512 if (loop_done == EVBREAK_ONE)
2412 loop_done = EVUNLOOP_CANCEL; 2513 loop_done = EVBREAK_CANCEL;
2413 2514
2414#if EV_FEATURE_API 2515#if EV_FEATURE_API
2415 --loop_depth; 2516 --loop_depth;
2416#endif 2517#endif
2417} 2518}
2418 2519
2419void 2520void
2420ev_unloop (EV_P_ int how) 2521ev_break (EV_P_ int how)
2421{ 2522{
2422 loop_done = how; 2523 loop_done = how;
2423} 2524}
2424 2525
2425void 2526void
… …
2573 EV_FREQUENT_CHECK; 2674 EV_FREQUENT_CHECK;
2574 2675
2575 wlist_del (&anfds[w->fd].head, (WL)w); 2676 wlist_del (&anfds[w->fd].head, (WL)w);
2576 ev_stop (EV_A_ (W)w); 2677 ev_stop (EV_A_ (W)w);
2577 2678
2578 fd_change (EV_A_ w->fd, 1); 2679 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2579 2680
2580 EV_FREQUENT_CHECK; 2681 EV_FREQUENT_CHECK;
2581} 2682}
2582 2683
2583void noinline 2684void noinline
… …
2675 if (w->reschedule_cb) 2776 if (w->reschedule_cb)
2676 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2777 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2677 else if (w->interval) 2778 else if (w->interval)
2678 { 2779 {
2679 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2780 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2680 /* this formula differs from the one in periodic_reify because we do not always round up */ 2781 periodic_recalc (EV_A_ w);
2681 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2682 } 2782 }
2683 else 2783 else
2684 ev_at (w) = w->offset; 2784 ev_at (w) = w->offset;
2685 2785
2686 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2807 sa.sa_handler = ev_sighandler; 2907 sa.sa_handler = ev_sighandler;
2808 sigfillset (&sa.sa_mask); 2908 sigfillset (&sa.sa_mask);
2809 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2909 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2810 sigaction (w->signum, &sa, 0); 2910 sigaction (w->signum, &sa, 0);
2811 2911
2912 if (origflags & EVFLAG_NOSIGMASK)
2913 {
2812 sigemptyset (&sa.sa_mask); 2914 sigemptyset (&sa.sa_mask);
2813 sigaddset (&sa.sa_mask, w->signum); 2915 sigaddset (&sa.sa_mask, w->signum);
2814 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2916 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2917 }
2815#endif 2918#endif
2816 } 2919 }
2817 2920
2818 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2819} 2922}
… …
3035 { 3138 {
3036 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3139 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3037 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3140 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3038 ofs += sizeof (struct inotify_event) + ev->len; 3141 ofs += sizeof (struct inotify_event) + ev->len;
3039 } 3142 }
3040}
3041
3042inline_size unsigned int
3043ev_linux_version (void)
3044{
3045 struct utsname buf;
3046 unsigned int v;
3047 int i;
3048 char *p = buf.release;
3049
3050 if (uname (&buf))
3051 return 0;
3052
3053 for (i = 3+1; --i; )
3054 {
3055 unsigned int c = 0;
3056
3057 for (;;)
3058 {
3059 if (*p >= '0' && *p <= '9')
3060 c = c * 10 + *p++ - '0';
3061 else
3062 {
3063 p += *p == '.';
3064 break;
3065 }
3066 }
3067
3068 v = (v << 8) | c;
3069 }
3070
3071 return v;
3072} 3143}
3073 3144
3074inline_size void 3145inline_size void
3075ev_check_2625 (EV_P) 3146ev_check_2625 (EV_P)
3076{ 3147{
… …
3400 3471
3401#if EV_EMBED_ENABLE 3472#if EV_EMBED_ENABLE
3402void noinline 3473void noinline
3403ev_embed_sweep (EV_P_ ev_embed *w) 3474ev_embed_sweep (EV_P_ ev_embed *w)
3404{ 3475{
3405 ev_loop (w->other, EVLOOP_NONBLOCK); 3476 ev_run (w->other, EVRUN_NOWAIT);
3406} 3477}
3407 3478
3408static void 3479static void
3409embed_io_cb (EV_P_ ev_io *io, int revents) 3480embed_io_cb (EV_P_ ev_io *io, int revents)
3410{ 3481{
3411 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3482 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3412 3483
3413 if (ev_cb (w)) 3484 if (ev_cb (w))
3414 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3485 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3415 else 3486 else
3416 ev_loop (w->other, EVLOOP_NONBLOCK); 3487 ev_run (w->other, EVRUN_NOWAIT);
3417} 3488}
3418 3489
3419static void 3490static void
3420embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3491embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3421{ 3492{
… …
3425 EV_P = w->other; 3496 EV_P = w->other;
3426 3497
3427 while (fdchangecnt) 3498 while (fdchangecnt)
3428 { 3499 {
3429 fd_reify (EV_A); 3500 fd_reify (EV_A);
3430 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3501 ev_run (EV_A_ EVRUN_NOWAIT);
3431 } 3502 }
3432 } 3503 }
3433} 3504}
3434 3505
3435static void 3506static void
… …
3441 3512
3442 { 3513 {
3443 EV_P = w->other; 3514 EV_P = w->other;
3444 3515
3445 ev_loop_fork (EV_A); 3516 ev_loop_fork (EV_A);
3446 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3517 ev_run (EV_A_ EVRUN_NOWAIT);
3447 } 3518 }
3448 3519
3449 ev_embed_start (EV_A_ w); 3520 ev_embed_start (EV_A_ w);
3450} 3521}
3451 3522
… …
3543 3614
3544 EV_FREQUENT_CHECK; 3615 EV_FREQUENT_CHECK;
3545} 3616}
3546#endif 3617#endif
3547 3618
3548#if EV_ASYNC_ENABLE 3619#if EV_CLEANUP_ENABLE
3549void 3620void
3550ev_async_start (EV_P_ ev_async *w) 3621ev_cleanup_start (EV_P_ ev_cleanup *w)
3551{ 3622{
3552 if (expect_false (ev_is_active (w))) 3623 if (expect_false (ev_is_active (w)))
3553 return; 3624 return;
3625
3626 EV_FREQUENT_CHECK;
3627
3628 ev_start (EV_A_ (W)w, ++cleanupcnt);
3629 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3630 cleanups [cleanupcnt - 1] = w;
3631
3632 /* cleanup watchers should never keep a refcount on the loop */
3633 ev_unref (EV_A);
3634 EV_FREQUENT_CHECK;
3635}
3636
3637void
3638ev_cleanup_stop (EV_P_ ev_cleanup *w)
3639{
3640 clear_pending (EV_A_ (W)w);
3641 if (expect_false (!ev_is_active (w)))
3642 return;
3643
3644 EV_FREQUENT_CHECK;
3645 ev_ref (EV_A);
3646
3647 {
3648 int active = ev_active (w);
3649
3650 cleanups [active - 1] = cleanups [--cleanupcnt];
3651 ev_active (cleanups [active - 1]) = active;
3652 }
3653
3654 ev_stop (EV_A_ (W)w);
3655
3656 EV_FREQUENT_CHECK;
3657}
3658#endif
3659
3660#if EV_ASYNC_ENABLE
3661void
3662ev_async_start (EV_P_ ev_async *w)
3663{
3664 if (expect_false (ev_is_active (w)))
3665 return;
3666
3667 w->sent = 0;
3554 3668
3555 evpipe_init (EV_A); 3669 evpipe_init (EV_A);
3556 3670
3557 EV_FREQUENT_CHECK; 3671 EV_FREQUENT_CHECK;
3558 3672
… …
3636{ 3750{
3637 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3751 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3638 3752
3639 if (expect_false (!once)) 3753 if (expect_false (!once))
3640 { 3754 {
3641 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3755 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3642 return; 3756 return;
3643 } 3757 }
3644 3758
3645 once->cb = cb; 3759 once->cb = cb;
3646 once->arg = arg; 3760 once->arg = arg;
… …
3778 3892
3779#if EV_MULTIPLICITY 3893#if EV_MULTIPLICITY
3780 #include "ev_wrap.h" 3894 #include "ev_wrap.h"
3781#endif 3895#endif
3782 3896
3783#ifdef __cplusplus 3897EV_CPP(})
3784}
3785#endif
3786 3898

Diff Legend

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