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

Comparing libev/ev.c (file contents):
Revision 1.182 by root, Wed Dec 12 01:27:08 2007 UTC vs.
Revision 1.277 by root, Sun Dec 14 21:58:08 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 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 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
50# endif
51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
41# endif 62# endif
42 63
43# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
45# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
… …
51# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
53# endif 74# endif
54# ifndef EV_USE_REALTIME 75# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 76# define EV_USE_REALTIME 0
77# endif
78# endif
79
80# ifndef EV_USE_NANOSLEEP
81# if HAVE_NANOSLEEP
82# define EV_USE_NANOSLEEP 1
83# else
84# define EV_USE_NANOSLEEP 0
56# endif 85# endif
57# endif 86# endif
58 87
59# ifndef EV_USE_SELECT 88# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 89# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
102# else 131# else
103# define EV_USE_INOTIFY 0 132# define EV_USE_INOTIFY 0
104# endif 133# endif
105# endif 134# endif
106 135
136# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1
139# else
140# define EV_USE_EVENTFD 0
141# endif
142# endif
143
107#endif 144#endif
108 145
109#include <math.h> 146#include <math.h>
110#include <stdlib.h> 147#include <stdlib.h>
111#include <fcntl.h> 148#include <fcntl.h>
… …
129#ifndef _WIN32 166#ifndef _WIN32
130# include <sys/time.h> 167# include <sys/time.h>
131# include <sys/wait.h> 168# include <sys/wait.h>
132# include <unistd.h> 169# include <unistd.h>
133#else 170#else
171# include <io.h>
134# define WIN32_LEAN_AND_MEAN 172# define WIN32_LEAN_AND_MEAN
135# include <windows.h> 173# include <windows.h>
136# ifndef EV_SELECT_IS_WINSOCKET 174# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1 175# define EV_SELECT_IS_WINSOCKET 1
138# endif 176# endif
139#endif 177#endif
140 178
141/**/ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
142 188
143#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1
192# else
144# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif
145#endif 195#endif
146 196
147#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME 0
199#endif
200
201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1
204# else
205# define EV_USE_NANOSLEEP 0
206# endif
149#endif 207#endif
150 208
151#ifndef EV_USE_SELECT 209#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 210# define EV_USE_SELECT 1
153#endif 211#endif
… …
159# define EV_USE_POLL 1 217# define EV_USE_POLL 1
160# endif 218# endif
161#endif 219#endif
162 220
163#ifndef EV_USE_EPOLL 221#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1
224# else
164# define EV_USE_EPOLL 0 225# define EV_USE_EPOLL 0
226# endif
165#endif 227#endif
166 228
167#ifndef EV_USE_KQUEUE 229#ifndef EV_USE_KQUEUE
168# define EV_USE_KQUEUE 0 230# define EV_USE_KQUEUE 0
169#endif 231#endif
… …
171#ifndef EV_USE_PORT 233#ifndef EV_USE_PORT
172# define EV_USE_PORT 0 234# define EV_USE_PORT 0
173#endif 235#endif
174 236
175#ifndef EV_USE_INOTIFY 237#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1
240# else
176# define EV_USE_INOTIFY 0 241# define EV_USE_INOTIFY 0
242# endif
177#endif 243#endif
178 244
179#ifndef EV_PID_HASHSIZE 245#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL 246# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1 247# define EV_PID_HASHSIZE 1
… …
190# else 256# else
191# define EV_INOTIFY_HASHSIZE 16 257# define EV_INOTIFY_HASHSIZE 16
192# endif 258# endif
193#endif 259#endif
194 260
195/**/ 261#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1
264# else
265# define EV_USE_EVENTFD 0
266# endif
267#endif
268
269#if 0 /* debugging */
270# define EV_VERIFY 3
271# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1
273#endif
274
275#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL
277#endif
278
279#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL
281#endif
282
283#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif
286
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */
196 288
197#ifndef CLOCK_MONOTONIC 289#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 290# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 291# define EV_USE_MONOTONIC 0
200#endif 292#endif
… …
202#ifndef CLOCK_REALTIME 294#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 295# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 296# define EV_USE_REALTIME 0
205#endif 297#endif
206 298
299#if !EV_STAT_ENABLE
300# undef EV_USE_INOTIFY
301# define EV_USE_INOTIFY 0
302#endif
303
304#if !EV_USE_NANOSLEEP
305# ifndef _WIN32
306# include <sys/select.h>
307# endif
308#endif
309
310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
313# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318# endif
319#endif
320
207#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 322# include <winsock.h>
209#endif 323#endif
210 324
211#if !EV_STAT_ENABLE 325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
212# define EV_USE_INOTIFY 0 331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h>
337# ifdef __cplusplus
338extern "C" {
213#endif 339# endif
214 340int eventfd (unsigned int initval, int flags);
215#if EV_USE_INOTIFY 341# ifdef __cplusplus
216# include <sys/inotify.h> 342}
343# endif
217#endif 344#endif
218 345
219/**/ 346/**/
347
348#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
350#else
351# define EV_FREQUENT_CHECK do { } while (0)
352#endif
220 353
221/* 354/*
222 * This is used to avoid floating point rounding problems. 355 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics 356 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding 357 * to ensure progress, time-wise, even when rounding
… …
230 363
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 367
235#if __GNUC__ >= 3 368#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 369# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 370# define noinline __attribute__ ((noinline))
238#else 371#else
239# define expect(expr,value) (expr) 372# define expect(expr,value) (expr)
240# define noinline 373# define noinline
241# if __STDC_VERSION__ < 199901L 374# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
242# define inline 375# define inline
243# endif 376# endif
244#endif 377#endif
245 378
246#define expect_false(expr) expect ((expr) != 0, 0) 379#define expect_false(expr) expect ((expr) != 0, 0)
… …
261 394
262typedef ev_watcher *W; 395typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 396typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
265 398
399#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at
401
402#if EV_USE_MONOTONIC
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 405static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
406#endif
267 407
268#ifdef _WIN32 408#ifdef _WIN32
269# include "ev_win32.c" 409# include "ev_win32.c"
270#endif 410#endif
271 411
… …
278{ 418{
279 syserr_cb = cb; 419 syserr_cb = cb;
280} 420}
281 421
282static void noinline 422static void noinline
283syserr (const char *msg) 423ev_syserr (const char *msg)
284{ 424{
285 if (!msg) 425 if (!msg)
286 msg = "(libev) system error"; 426 msg = "(libev) system error";
287 427
288 if (syserr_cb) 428 if (syserr_cb)
… …
292 perror (msg); 432 perror (msg);
293 abort (); 433 abort ();
294 } 434 }
295} 435}
296 436
437static void *
438ev_realloc_emul (void *ptr, long size)
439{
440 /* some systems, notably openbsd and darwin, fail to properly
441 * implement realloc (x, 0) (as required by both ansi c-98 and
442 * the single unix specification, so work around them here.
443 */
444
445 if (size)
446 return realloc (ptr, size);
447
448 free (ptr);
449 return 0;
450}
451
297static void *(*alloc)(void *ptr, long size); 452static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
298 453
299void 454void
300ev_set_allocator (void *(*cb)(void *ptr, long size)) 455ev_set_allocator (void *(*cb)(void *ptr, long size))
301{ 456{
302 alloc = cb; 457 alloc = cb;
303} 458}
304 459
305inline_speed void * 460inline_speed void *
306ev_realloc (void *ptr, long size) 461ev_realloc (void *ptr, long size)
307{ 462{
308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 463 ptr = alloc (ptr, size);
309 464
310 if (!ptr && size) 465 if (!ptr && size)
311 { 466 {
312 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 467 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
313 abort (); 468 abort ();
… …
324typedef struct 479typedef struct
325{ 480{
326 WL head; 481 WL head;
327 unsigned char events; 482 unsigned char events;
328 unsigned char reify; 483 unsigned char reify;
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
329#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
330 SOCKET handle; 490 SOCKET handle;
331#endif 491#endif
332} ANFD; 492} ANFD;
333 493
… …
336 W w; 496 W w;
337 int events; 497 int events;
338} ANPENDING; 498} ANPENDING;
339 499
340#if EV_USE_INOTIFY 500#if EV_USE_INOTIFY
501/* hash table entry per inotify-id */
341typedef struct 502typedef struct
342{ 503{
343 WL head; 504 WL head;
344} ANFS; 505} ANFS;
506#endif
507
508/* Heap Entry */
509#if EV_HEAP_CACHE_AT
510 typedef struct {
511 ev_tstamp at;
512 WT w;
513 } ANHE;
514
515 #define ANHE_w(he) (he).w /* access watcher, read-write */
516 #define ANHE_at(he) (he).at /* access cached at, read-only */
517 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
518#else
519 typedef WT ANHE;
520
521 #define ANHE_w(he) (he)
522 #define ANHE_at(he) (he)->at
523 #define ANHE_at_cache(he)
345#endif 524#endif
346 525
347#if EV_MULTIPLICITY 526#if EV_MULTIPLICITY
348 527
349 struct ev_loop 528 struct ev_loop
… …
407{ 586{
408 return ev_rt_now; 587 return ev_rt_now;
409} 588}
410#endif 589#endif
411 590
591void
592ev_sleep (ev_tstamp delay)
593{
594 if (delay > 0.)
595 {
596#if EV_USE_NANOSLEEP
597 struct timespec ts;
598
599 ts.tv_sec = (time_t)delay;
600 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
601
602 nanosleep (&ts, 0);
603#elif defined(_WIN32)
604 Sleep ((unsigned long)(delay * 1e3));
605#else
606 struct timeval tv;
607
608 tv.tv_sec = (time_t)delay;
609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
610
611 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
612 /* somehting nto guaranteed by newer posix versions, but guaranteed */
613 /* by older ones */
614 select (0, 0, 0, 0, &tv);
615#endif
616 }
617}
618
619/*****************************************************************************/
620
621#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
622
412int inline_size 623int inline_size
413array_nextsize (int elem, int cur, int cnt) 624array_nextsize (int elem, int cur, int cnt)
414{ 625{
415 int ncur = cur + 1; 626 int ncur = cur + 1;
416 627
417 do 628 do
418 ncur <<= 1; 629 ncur <<= 1;
419 while (cnt > ncur); 630 while (cnt > ncur);
420 631
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 632 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096) 633 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
423 { 634 {
424 ncur *= elem; 635 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 636 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
426 ncur = ncur - sizeof (void *) * 4; 637 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem; 638 ncur /= elem;
428 } 639 }
429 640
430 return ncur; 641 return ncur;
… …
434array_realloc (int elem, void *base, int *cur, int cnt) 645array_realloc (int elem, void *base, int *cur, int cnt)
435{ 646{
436 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
437 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
438} 649}
650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
439 653
440#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
441 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
442 { \ 656 { \
443 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
… …
487 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
488} 702}
489 703
490/*****************************************************************************/ 704/*****************************************************************************/
491 705
492void inline_size
493anfds_init (ANFD *base, int count)
494{
495 while (count--)
496 {
497 base->head = 0;
498 base->events = EV_NONE;
499 base->reify = 0;
500
501 ++base;
502 }
503}
504
505void inline_speed 706void inline_speed
506fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
507{ 708{
508 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
509 ev_io *w; 710 ev_io *w;
… …
533 { 734 {
534 int fd = fdchanges [i]; 735 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 736 ANFD *anfd = anfds + fd;
536 ev_io *w; 737 ev_io *w;
537 738
538 int events = 0; 739 unsigned char events = 0;
539 740
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 741 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 742 events |= (unsigned char)w->events;
542 743
543#if EV_SELECT_IS_WINSOCKET 744#if EV_SELECT_IS_WINSOCKET
544 if (events) 745 if (events)
545 { 746 {
546 unsigned long argp; 747 unsigned long arg;
748 #ifdef EV_FD_TO_WIN32_HANDLE
749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
750 #else
547 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
752 #endif
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 753 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
549 } 754 }
550#endif 755#endif
551 756
757 {
758 unsigned char o_events = anfd->events;
759 unsigned char o_reify = anfd->reify;
760
552 anfd->reify = 0; 761 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 762 anfd->events = events;
763
764 if (o_events != events || o_reify & EV_IOFDSET)
765 backend_modify (EV_A_ fd, o_events, events);
766 }
556 } 767 }
557 768
558 fdchangecnt = 0; 769 fdchangecnt = 0;
559} 770}
560 771
561void inline_size 772void inline_size
562fd_change (EV_P_ int fd) 773fd_change (EV_P_ int fd, int flags)
563{ 774{
564 if (expect_false (anfds [fd].reify)) 775 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 776 anfds [fd].reify |= flags;
568 777
778 if (expect_true (!reify))
779 {
569 ++fdchangecnt; 780 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 781 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 782 fdchanges [fdchangecnt - 1] = fd;
783 }
572} 784}
573 785
574void inline_speed 786void inline_speed
575fd_kill (EV_P_ int fd) 787fd_kill (EV_P_ int fd)
576{ 788{
… …
599{ 811{
600 int fd; 812 int fd;
601 813
602 for (fd = 0; fd < anfdmax; ++fd) 814 for (fd = 0; fd < anfdmax; ++fd)
603 if (anfds [fd].events) 815 if (anfds [fd].events)
604 if (!fd_valid (fd) == -1 && errno == EBADF) 816 if (!fd_valid (fd) && errno == EBADF)
605 fd_kill (EV_A_ fd); 817 fd_kill (EV_A_ fd);
606} 818}
607 819
608/* called on ENOMEM in select/poll to kill some fds and retry */ 820/* called on ENOMEM in select/poll to kill some fds and retry */
609static void noinline 821static void noinline
… …
627 839
628 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 841 if (anfds [fd].events)
630 { 842 {
631 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
632 fd_change (EV_A_ fd); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 846 }
634} 847}
635 848
636/*****************************************************************************/ 849/*****************************************************************************/
637 850
851/*
852 * the heap functions want a real array index. array index 0 uis guaranteed to not
853 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
854 * the branching factor of the d-tree.
855 */
856
857/*
858 * at the moment we allow libev the luxury of two heaps,
859 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
860 * which is more cache-efficient.
861 * the difference is about 5% with 50000+ watchers.
862 */
863#if EV_USE_4HEAP
864
865#define DHEAP 4
866#define HEAP0 (DHEAP - 1) /* index of first element in heap */
867#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
868#define UPHEAP_DONE(p,k) ((p) == (k))
869
870/* away from the root */
638void inline_speed 871void inline_speed
639upheap (WT *heap, int k) 872downheap (ANHE *heap, int N, int k)
640{ 873{
641 WT w = heap [k]; 874 ANHE he = heap [k];
875 ANHE *E = heap + N + HEAP0;
642 876
643 while (k) 877 for (;;)
644 { 878 {
645 int p = (k - 1) >> 1; 879 ev_tstamp minat;
880 ANHE *minpos;
881 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
646 882
647 if (heap [p]->at <= w->at) 883 /* find minimum child */
884 if (expect_true (pos + DHEAP - 1 < E))
885 {
886 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
887 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
888 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
889 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
890 }
891 else if (pos < E)
892 {
893 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
894 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
895 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
896 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
897 }
898 else
648 break; 899 break;
649 900
901 if (ANHE_at (he) <= minat)
902 break;
903
904 heap [k] = *minpos;
905 ev_active (ANHE_w (*minpos)) = k;
906
907 k = minpos - heap;
908 }
909
910 heap [k] = he;
911 ev_active (ANHE_w (he)) = k;
912}
913
914#else /* 4HEAP */
915
916#define HEAP0 1
917#define HPARENT(k) ((k) >> 1)
918#define UPHEAP_DONE(p,k) (!(p))
919
920/* away from the root */
921void inline_speed
922downheap (ANHE *heap, int N, int k)
923{
924 ANHE he = heap [k];
925
926 for (;;)
927 {
928 int c = k << 1;
929
930 if (c > N + HEAP0 - 1)
931 break;
932
933 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
934 ? 1 : 0;
935
936 if (ANHE_at (he) <= ANHE_at (heap [c]))
937 break;
938
939 heap [k] = heap [c];
940 ev_active (ANHE_w (heap [k])) = k;
941
942 k = c;
943 }
944
945 heap [k] = he;
946 ev_active (ANHE_w (he)) = k;
947}
948#endif
949
950/* towards the root */
951void inline_speed
952upheap (ANHE *heap, int k)
953{
954 ANHE he = heap [k];
955
956 for (;;)
957 {
958 int p = HPARENT (k);
959
960 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
961 break;
962
650 heap [k] = heap [p]; 963 heap [k] = heap [p];
651 ((W)heap [k])->active = k + 1; 964 ev_active (ANHE_w (heap [k])) = k;
652 k = p; 965 k = p;
653 } 966 }
654 967
655 heap [k] = w; 968 heap [k] = he;
656 ((W)heap [k])->active = k + 1; 969 ev_active (ANHE_w (he)) = k;
657}
658
659void inline_speed
660downheap (WT *heap, int N, int k)
661{
662 WT w = heap [k];
663
664 for (;;)
665 {
666 int c = (k << 1) + 1;
667
668 if (c >= N)
669 break;
670
671 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
672 ? 1 : 0;
673
674 if (w->at <= heap [c]->at)
675 break;
676
677 heap [k] = heap [c];
678 ((W)heap [k])->active = k + 1;
679
680 k = c;
681 }
682
683 heap [k] = w;
684 ((W)heap [k])->active = k + 1;
685} 970}
686 971
687void inline_size 972void inline_size
688adjustheap (WT *heap, int N, int k) 973adjustheap (ANHE *heap, int N, int k)
689{ 974{
975 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
690 upheap (heap, k); 976 upheap (heap, k);
977 else
691 downheap (heap, N, k); 978 downheap (heap, N, k);
979}
980
981/* rebuild the heap: this function is used only once and executed rarely */
982void inline_size
983reheap (ANHE *heap, int N)
984{
985 int i;
986
987 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
988 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
989 for (i = 0; i < N; ++i)
990 upheap (heap, i + HEAP0);
692} 991}
693 992
694/*****************************************************************************/ 993/*****************************************************************************/
695 994
696typedef struct 995typedef struct
697{ 996{
698 WL head; 997 WL head;
699 sig_atomic_t volatile gotsig; 998 EV_ATOMIC_T gotsig;
700} ANSIG; 999} ANSIG;
701 1000
702static ANSIG *signals; 1001static ANSIG *signals;
703static int signalmax; 1002static int signalmax;
704 1003
705static int sigpipe [2]; 1004static EV_ATOMIC_T gotsig;
706static sig_atomic_t volatile gotsig;
707static ev_io sigev;
708 1005
709void inline_size 1006/*****************************************************************************/
710signals_init (ANSIG *base, int count)
711{
712 while (count--)
713 {
714 base->head = 0;
715 base->gotsig = 0;
716
717 ++base;
718 }
719}
720
721static void
722sighandler (int signum)
723{
724#if _WIN32
725 signal (signum, sighandler);
726#endif
727
728 signals [signum - 1].gotsig = 1;
729
730 if (!gotsig)
731 {
732 int old_errno = errno;
733 gotsig = 1;
734 write (sigpipe [1], &signum, 1);
735 errno = old_errno;
736 }
737}
738
739void noinline
740ev_feed_signal_event (EV_P_ int signum)
741{
742 WL w;
743
744#if EV_MULTIPLICITY
745 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
746#endif
747
748 --signum;
749
750 if (signum < 0 || signum >= signalmax)
751 return;
752
753 signals [signum].gotsig = 0;
754
755 for (w = signals [signum].head; w; w = w->next)
756 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
757}
758
759static void
760sigcb (EV_P_ ev_io *iow, int revents)
761{
762 int signum;
763
764 read (sigpipe [0], &revents, 1);
765 gotsig = 0;
766
767 for (signum = signalmax; signum--; )
768 if (signals [signum].gotsig)
769 ev_feed_signal_event (EV_A_ signum + 1);
770}
771 1007
772void inline_speed 1008void inline_speed
773fd_intern (int fd) 1009fd_intern (int fd)
774{ 1010{
775#ifdef _WIN32 1011#ifdef _WIN32
776 int arg = 1; 1012 unsigned long arg = 1;
777 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
778#else 1014#else
779 fcntl (fd, F_SETFD, FD_CLOEXEC); 1015 fcntl (fd, F_SETFD, FD_CLOEXEC);
780 fcntl (fd, F_SETFL, O_NONBLOCK); 1016 fcntl (fd, F_SETFL, O_NONBLOCK);
781#endif 1017#endif
782} 1018}
783 1019
784static void noinline 1020static void noinline
785siginit (EV_P) 1021evpipe_init (EV_P)
786{ 1022{
1023 if (!ev_is_active (&pipeev))
1024 {
1025#if EV_USE_EVENTFD
1026 if ((evfd = eventfd (0, 0)) >= 0)
1027 {
1028 evpipe [0] = -1;
1029 fd_intern (evfd);
1030 ev_io_set (&pipeev, evfd, EV_READ);
1031 }
1032 else
1033#endif
1034 {
1035 while (pipe (evpipe))
1036 ev_syserr ("(libev) error creating signal/async pipe");
1037
787 fd_intern (sigpipe [0]); 1038 fd_intern (evpipe [0]);
788 fd_intern (sigpipe [1]); 1039 fd_intern (evpipe [1]);
1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1041 }
789 1042
790 ev_io_set (&sigev, sigpipe [0], EV_READ);
791 ev_io_start (EV_A_ &sigev); 1043 ev_io_start (EV_A_ &pipeev);
792 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1044 ev_unref (EV_A); /* watcher should not keep loop alive */
1045 }
1046}
1047
1048void inline_size
1049evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1050{
1051 if (!*flag)
1052 {
1053 int old_errno = errno; /* save errno because write might clobber it */
1054
1055 *flag = 1;
1056
1057#if EV_USE_EVENTFD
1058 if (evfd >= 0)
1059 {
1060 uint64_t counter = 1;
1061 write (evfd, &counter, sizeof (uint64_t));
1062 }
1063 else
1064#endif
1065 write (evpipe [1], &old_errno, 1);
1066
1067 errno = old_errno;
1068 }
1069}
1070
1071static void
1072pipecb (EV_P_ ev_io *iow, int revents)
1073{
1074#if EV_USE_EVENTFD
1075 if (evfd >= 0)
1076 {
1077 uint64_t counter;
1078 read (evfd, &counter, sizeof (uint64_t));
1079 }
1080 else
1081#endif
1082 {
1083 char dummy;
1084 read (evpipe [0], &dummy, 1);
1085 }
1086
1087 if (gotsig && ev_is_default_loop (EV_A))
1088 {
1089 int signum;
1090 gotsig = 0;
1091
1092 for (signum = signalmax; signum--; )
1093 if (signals [signum].gotsig)
1094 ev_feed_signal_event (EV_A_ signum + 1);
1095 }
1096
1097#if EV_ASYNC_ENABLE
1098 if (gotasync)
1099 {
1100 int i;
1101 gotasync = 0;
1102
1103 for (i = asynccnt; i--; )
1104 if (asyncs [i]->sent)
1105 {
1106 asyncs [i]->sent = 0;
1107 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1108 }
1109 }
1110#endif
793} 1111}
794 1112
795/*****************************************************************************/ 1113/*****************************************************************************/
796 1114
1115static void
1116ev_sighandler (int signum)
1117{
1118#if EV_MULTIPLICITY
1119 struct ev_loop *loop = &default_loop_struct;
1120#endif
1121
1122#if _WIN32
1123 signal (signum, ev_sighandler);
1124#endif
1125
1126 signals [signum - 1].gotsig = 1;
1127 evpipe_write (EV_A_ &gotsig);
1128}
1129
1130void noinline
1131ev_feed_signal_event (EV_P_ int signum)
1132{
1133 WL w;
1134
1135#if EV_MULTIPLICITY
1136 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1137#endif
1138
1139 --signum;
1140
1141 if (signum < 0 || signum >= signalmax)
1142 return;
1143
1144 signals [signum].gotsig = 0;
1145
1146 for (w = signals [signum].head; w; w = w->next)
1147 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1148}
1149
1150/*****************************************************************************/
1151
797static WL childs [EV_PID_HASHSIZE]; 1152static WL childs [EV_PID_HASHSIZE];
798 1153
799#ifndef _WIN32 1154#ifndef _WIN32
800 1155
801static ev_signal childev; 1156static ev_signal childev;
802 1157
1158#ifndef WIFCONTINUED
1159# define WIFCONTINUED(status) 0
1160#endif
1161
803void inline_speed 1162void inline_speed
804child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1163child_reap (EV_P_ int chain, int pid, int status)
805{ 1164{
806 ev_child *w; 1165 ev_child *w;
1166 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
807 1167
808 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1168 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1169 {
809 if (w->pid == pid || !w->pid) 1170 if ((w->pid == pid || !w->pid)
1171 && (!traced || (w->flags & 1)))
810 { 1172 {
811 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1173 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
812 w->rpid = pid; 1174 w->rpid = pid;
813 w->rstatus = status; 1175 w->rstatus = status;
814 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1176 ev_feed_event (EV_A_ (W)w, EV_CHILD);
815 } 1177 }
1178 }
816} 1179}
817 1180
818#ifndef WCONTINUED 1181#ifndef WCONTINUED
819# define WCONTINUED 0 1182# define WCONTINUED 0
820#endif 1183#endif
… …
829 if (!WCONTINUED 1192 if (!WCONTINUED
830 || errno != EINVAL 1193 || errno != EINVAL
831 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1194 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
832 return; 1195 return;
833 1196
834 /* make sure we are called again until all childs have been reaped */ 1197 /* make sure we are called again until all children have been reaped */
835 /* we need to do it this way so that the callback gets called before we continue */ 1198 /* we need to do it this way so that the callback gets called before we continue */
836 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1199 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
837 1200
838 child_reap (EV_A_ sw, pid, pid, status); 1201 child_reap (EV_A_ pid, pid, status);
839 if (EV_PID_HASHSIZE > 1) 1202 if (EV_PID_HASHSIZE > 1)
840 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1203 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
841} 1204}
842 1205
843#endif 1206#endif
844 1207
845/*****************************************************************************/ 1208/*****************************************************************************/
… …
907 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
908 /* it usually doesn't work correctly on anything but sockets and pipes */ 1271 /* it usually doesn't work correctly on anything but sockets and pipes */
909 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
910#endif 1273#endif
911#ifdef __APPLE__ 1274#ifdef __APPLE__
912 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 // flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation
913 flags &= ~EVBACKEND_POLL; 1276 flags &= ~EVBACKEND_SELECT;
914#endif 1277#endif
915 1278
916 return flags; 1279 return flags;
917} 1280}
918 1281
919unsigned int 1282unsigned int
920ev_embeddable_backends (void) 1283ev_embeddable_backends (void)
921{ 1284{
922 return EVBACKEND_EPOLL 1285 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
923 | EVBACKEND_KQUEUE 1286
924 | EVBACKEND_PORT; 1287 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1288 /* please fix it and tell me how to detect the fix */
1289 flags &= ~EVBACKEND_EPOLL;
1290
1291 return flags;
925} 1292}
926 1293
927unsigned int 1294unsigned int
928ev_backend (EV_P) 1295ev_backend (EV_P)
929{ 1296{
… …
932 1299
933unsigned int 1300unsigned int
934ev_loop_count (EV_P) 1301ev_loop_count (EV_P)
935{ 1302{
936 return loop_count; 1303 return loop_count;
1304}
1305
1306void
1307ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1308{
1309 io_blocktime = interval;
1310}
1311
1312void
1313ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1314{
1315 timeout_blocktime = interval;
937} 1316}
938 1317
939static void noinline 1318static void noinline
940loop_init (EV_P_ unsigned int flags) 1319loop_init (EV_P_ unsigned int flags)
941{ 1320{
… …
947 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1326 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
948 have_monotonic = 1; 1327 have_monotonic = 1;
949 } 1328 }
950#endif 1329#endif
951 1330
952 ev_rt_now = ev_time (); 1331 ev_rt_now = ev_time ();
953 mn_now = get_clock (); 1332 mn_now = get_clock ();
954 now_floor = mn_now; 1333 now_floor = mn_now;
955 rtmn_diff = ev_rt_now - mn_now; 1334 rtmn_diff = ev_rt_now - mn_now;
1335
1336 io_blocktime = 0.;
1337 timeout_blocktime = 0.;
1338 backend = 0;
1339 backend_fd = -1;
1340 gotasync = 0;
1341#if EV_USE_INOTIFY
1342 fs_fd = -2;
1343#endif
956 1344
957 /* pid check not overridable via env */ 1345 /* pid check not overridable via env */
958#ifndef _WIN32 1346#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK) 1347 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid (); 1348 curpid = getpid ();
… …
963 if (!(flags & EVFLAG_NOENV) 1351 if (!(flags & EVFLAG_NOENV)
964 && !enable_secure () 1352 && !enable_secure ()
965 && getenv ("LIBEV_FLAGS")) 1353 && getenv ("LIBEV_FLAGS"))
966 flags = atoi (getenv ("LIBEV_FLAGS")); 1354 flags = atoi (getenv ("LIBEV_FLAGS"));
967 1355
968 if (!(flags & 0x0000ffffUL)) 1356 if (!(flags & 0x0000ffffU))
969 flags |= ev_recommended_backends (); 1357 flags |= ev_recommended_backends ();
970
971 backend = 0;
972 backend_fd = -1;
973#if EV_USE_INOTIFY
974 fs_fd = -2;
975#endif
976 1358
977#if EV_USE_PORT 1359#if EV_USE_PORT
978 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1360 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
979#endif 1361#endif
980#if EV_USE_KQUEUE 1362#if EV_USE_KQUEUE
… …
988#endif 1370#endif
989#if EV_USE_SELECT 1371#if EV_USE_SELECT
990 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1372 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
991#endif 1373#endif
992 1374
993 ev_init (&sigev, sigcb); 1375 ev_init (&pipeev, pipecb);
994 ev_set_priority (&sigev, EV_MAXPRI); 1376 ev_set_priority (&pipeev, EV_MAXPRI);
995 } 1377 }
996} 1378}
997 1379
998static void noinline 1380static void noinline
999loop_destroy (EV_P) 1381loop_destroy (EV_P)
1000{ 1382{
1001 int i; 1383 int i;
1384
1385 if (ev_is_active (&pipeev))
1386 {
1387 ev_ref (EV_A); /* signal watcher */
1388 ev_io_stop (EV_A_ &pipeev);
1389
1390#if EV_USE_EVENTFD
1391 if (evfd >= 0)
1392 close (evfd);
1393#endif
1394
1395 if (evpipe [0] >= 0)
1396 {
1397 close (evpipe [0]);
1398 close (evpipe [1]);
1399 }
1400 }
1002 1401
1003#if EV_USE_INOTIFY 1402#if EV_USE_INOTIFY
1004 if (fs_fd >= 0) 1403 if (fs_fd >= 0)
1005 close (fs_fd); 1404 close (fs_fd);
1006#endif 1405#endif
… …
1029 array_free (pending, [i]); 1428 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE 1429#if EV_IDLE_ENABLE
1031 array_free (idle, [i]); 1430 array_free (idle, [i]);
1032#endif 1431#endif
1033 } 1432 }
1433
1434 ev_free (anfds); anfdmax = 0;
1034 1435
1035 /* have to use the microsoft-never-gets-it-right macro */ 1436 /* have to use the microsoft-never-gets-it-right macro */
1036 array_free (fdchange, EMPTY); 1437 array_free (fdchange, EMPTY);
1037 array_free (timer, EMPTY); 1438 array_free (timer, EMPTY);
1038#if EV_PERIODIC_ENABLE 1439#if EV_PERIODIC_ENABLE
1039 array_free (periodic, EMPTY); 1440 array_free (periodic, EMPTY);
1040#endif 1441#endif
1442#if EV_FORK_ENABLE
1443 array_free (fork, EMPTY);
1444#endif
1041 array_free (prepare, EMPTY); 1445 array_free (prepare, EMPTY);
1042 array_free (check, EMPTY); 1446 array_free (check, EMPTY);
1447#if EV_ASYNC_ENABLE
1448 array_free (async, EMPTY);
1449#endif
1043 1450
1044 backend = 0; 1451 backend = 0;
1045} 1452}
1046 1453
1454#if EV_USE_INOTIFY
1047void inline_size infy_fork (EV_P); 1455void inline_size infy_fork (EV_P);
1456#endif
1048 1457
1049void inline_size 1458void inline_size
1050loop_fork (EV_P) 1459loop_fork (EV_P)
1051{ 1460{
1052#if EV_USE_PORT 1461#if EV_USE_PORT
… …
1060#endif 1469#endif
1061#if EV_USE_INOTIFY 1470#if EV_USE_INOTIFY
1062 infy_fork (EV_A); 1471 infy_fork (EV_A);
1063#endif 1472#endif
1064 1473
1065 if (ev_is_active (&sigev)) 1474 if (ev_is_active (&pipeev))
1066 { 1475 {
1067 /* default loop */ 1476 /* this "locks" the handlers against writing to the pipe */
1477 /* while we modify the fd vars */
1478 gotsig = 1;
1479#if EV_ASYNC_ENABLE
1480 gotasync = 1;
1481#endif
1068 1482
1069 ev_ref (EV_A); 1483 ev_ref (EV_A);
1070 ev_io_stop (EV_A_ &sigev); 1484 ev_io_stop (EV_A_ &pipeev);
1485
1486#if EV_USE_EVENTFD
1487 if (evfd >= 0)
1488 close (evfd);
1489#endif
1490
1491 if (evpipe [0] >= 0)
1492 {
1071 close (sigpipe [0]); 1493 close (evpipe [0]);
1072 close (sigpipe [1]); 1494 close (evpipe [1]);
1495 }
1073 1496
1074 while (pipe (sigpipe))
1075 syserr ("(libev) error creating pipe");
1076
1077 siginit (EV_A); 1497 evpipe_init (EV_A);
1498 /* now iterate over everything, in case we missed something */
1499 pipecb (EV_A_ &pipeev, EV_READ);
1078 } 1500 }
1079 1501
1080 postfork = 0; 1502 postfork = 0;
1081} 1503}
1082 1504
1083#if EV_MULTIPLICITY 1505#if EV_MULTIPLICITY
1506
1084struct ev_loop * 1507struct ev_loop *
1085ev_loop_new (unsigned int flags) 1508ev_loop_new (unsigned int flags)
1086{ 1509{
1087 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1510 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1088 1511
… …
1104} 1527}
1105 1528
1106void 1529void
1107ev_loop_fork (EV_P) 1530ev_loop_fork (EV_P)
1108{ 1531{
1109 postfork = 1; 1532 postfork = 1; /* must be in line with ev_default_fork */
1110} 1533}
1111 1534
1535#if EV_VERIFY
1536static void noinline
1537verify_watcher (EV_P_ W w)
1538{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540
1541 if (w->pending)
1542 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1543}
1544
1545static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N)
1547{
1548 int i;
1549
1550 for (i = HEAP0; i < N + HEAP0; ++i)
1551 {
1552 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1553 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1554 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1555
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 }
1558}
1559
1560static void noinline
1561array_verify (EV_P_ W *ws, int cnt)
1562{
1563 while (cnt--)
1564 {
1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]);
1567 }
1568}
1569#endif
1570
1571void
1572ev_loop_verify (EV_P)
1573{
1574#if EV_VERIFY
1575 int i;
1576 WL w;
1577
1578 assert (activecnt >= -1);
1579
1580 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1583
1584 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next)
1587 {
1588 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1590 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1591 }
1592
1593 assert (timermax >= timercnt);
1594 verify_heap (EV_A_ timers, timercnt);
1595
1596#if EV_PERIODIC_ENABLE
1597 assert (periodicmax >= periodiccnt);
1598 verify_heap (EV_A_ periodics, periodiccnt);
1599#endif
1600
1601 for (i = NUMPRI; i--; )
1602 {
1603 assert (pendingmax [i] >= pendingcnt [i]);
1604#if EV_IDLE_ENABLE
1605 assert (idleall >= 0);
1606 assert (idlemax [i] >= idlecnt [i]);
1607 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1608#endif
1609 }
1610
1611#if EV_FORK_ENABLE
1612 assert (forkmax >= forkcnt);
1613 array_verify (EV_A_ (W *)forks, forkcnt);
1614#endif
1615
1616#if EV_ASYNC_ENABLE
1617 assert (asyncmax >= asynccnt);
1618 array_verify (EV_A_ (W *)asyncs, asynccnt);
1619#endif
1620
1621 assert (preparemax >= preparecnt);
1622 array_verify (EV_A_ (W *)prepares, preparecnt);
1623
1624 assert (checkmax >= checkcnt);
1625 array_verify (EV_A_ (W *)checks, checkcnt);
1626
1627# if 0
1628 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1629 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1112#endif 1630# endif
1631#endif
1632}
1633
1634#endif /* multiplicity */
1113 1635
1114#if EV_MULTIPLICITY 1636#if EV_MULTIPLICITY
1115struct ev_loop * 1637struct ev_loop *
1116ev_default_loop_init (unsigned int flags) 1638ev_default_loop_init (unsigned int flags)
1117#else 1639#else
1118int 1640int
1119ev_default_loop (unsigned int flags) 1641ev_default_loop (unsigned int flags)
1120#endif 1642#endif
1121{ 1643{
1122 if (sigpipe [0] == sigpipe [1])
1123 if (pipe (sigpipe))
1124 return 0;
1125
1126 if (!ev_default_loop_ptr) 1644 if (!ev_default_loop_ptr)
1127 { 1645 {
1128#if EV_MULTIPLICITY 1646#if EV_MULTIPLICITY
1129 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1647 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1130#else 1648#else
… …
1133 1651
1134 loop_init (EV_A_ flags); 1652 loop_init (EV_A_ flags);
1135 1653
1136 if (ev_backend (EV_A)) 1654 if (ev_backend (EV_A))
1137 { 1655 {
1138 siginit (EV_A);
1139
1140#ifndef _WIN32 1656#ifndef _WIN32
1141 ev_signal_init (&childev, childcb, SIGCHLD); 1657 ev_signal_init (&childev, childcb, SIGCHLD);
1142 ev_set_priority (&childev, EV_MAXPRI); 1658 ev_set_priority (&childev, EV_MAXPRI);
1143 ev_signal_start (EV_A_ &childev); 1659 ev_signal_start (EV_A_ &childev);
1144 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1660 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1156{ 1672{
1157#if EV_MULTIPLICITY 1673#if EV_MULTIPLICITY
1158 struct ev_loop *loop = ev_default_loop_ptr; 1674 struct ev_loop *loop = ev_default_loop_ptr;
1159#endif 1675#endif
1160 1676
1677 ev_default_loop_ptr = 0;
1678
1161#ifndef _WIN32 1679#ifndef _WIN32
1162 ev_ref (EV_A); /* child watcher */ 1680 ev_ref (EV_A); /* child watcher */
1163 ev_signal_stop (EV_A_ &childev); 1681 ev_signal_stop (EV_A_ &childev);
1164#endif 1682#endif
1165 1683
1166 ev_ref (EV_A); /* signal watcher */
1167 ev_io_stop (EV_A_ &sigev);
1168
1169 close (sigpipe [0]); sigpipe [0] = 0;
1170 close (sigpipe [1]); sigpipe [1] = 0;
1171
1172 loop_destroy (EV_A); 1684 loop_destroy (EV_A);
1173} 1685}
1174 1686
1175void 1687void
1176ev_default_fork (void) 1688ev_default_fork (void)
1177{ 1689{
1178#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1179 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1180#endif 1692#endif
1181 1693
1182 if (backend) 1694 postfork = 1; /* must be in line with ev_loop_fork */
1183 postfork = 1;
1184} 1695}
1185 1696
1186/*****************************************************************************/ 1697/*****************************************************************************/
1187 1698
1188void 1699void
… …
1205 { 1716 {
1206 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1717 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1207 1718
1208 p->w->pending = 0; 1719 p->w->pending = 0;
1209 EV_CB_INVOKE (p->w, p->events); 1720 EV_CB_INVOKE (p->w, p->events);
1721 EV_FREQUENT_CHECK;
1210 } 1722 }
1211 } 1723 }
1212} 1724}
1213
1214void inline_size
1215timers_reify (EV_P)
1216{
1217 while (timercnt && ((WT)timers [0])->at <= mn_now)
1218 {
1219 ev_timer *w = (ev_timer *)timers [0];
1220
1221 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1222
1223 /* first reschedule or stop timer */
1224 if (w->repeat)
1225 {
1226 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1227
1228 ((WT)w)->at += w->repeat;
1229 if (((WT)w)->at < mn_now)
1230 ((WT)w)->at = mn_now;
1231
1232 downheap (timers, timercnt, 0);
1233 }
1234 else
1235 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1236
1237 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1238 }
1239}
1240
1241#if EV_PERIODIC_ENABLE
1242void inline_size
1243periodics_reify (EV_P)
1244{
1245 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1246 {
1247 ev_periodic *w = (ev_periodic *)periodics [0];
1248
1249 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1250
1251 /* first reschedule or stop timer */
1252 if (w->reschedule_cb)
1253 {
1254 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1255 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1256 downheap (periodics, periodiccnt, 0);
1257 }
1258 else if (w->interval)
1259 {
1260 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1261 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1262 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1263 downheap (periodics, periodiccnt, 0);
1264 }
1265 else
1266 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1267
1268 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1269 }
1270}
1271
1272static void noinline
1273periodics_reschedule (EV_P)
1274{
1275 int i;
1276
1277 /* adjust periodics after time jump */
1278 for (i = 0; i < periodiccnt; ++i)
1279 {
1280 ev_periodic *w = (ev_periodic *)periodics [i];
1281
1282 if (w->reschedule_cb)
1283 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1284 else if (w->interval)
1285 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1286 }
1287
1288 /* now rebuild the heap */
1289 for (i = periodiccnt >> 1; i--; )
1290 downheap (periodics, periodiccnt, i);
1291}
1292#endif
1293 1725
1294#if EV_IDLE_ENABLE 1726#if EV_IDLE_ENABLE
1295void inline_size 1727void inline_size
1296idle_reify (EV_P) 1728idle_reify (EV_P)
1297{ 1729{
… …
1309 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1741 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1310 break; 1742 break;
1311 } 1743 }
1312 } 1744 }
1313 } 1745 }
1746}
1747#endif
1748
1749void inline_size
1750timers_reify (EV_P)
1751{
1752 EV_FREQUENT_CHECK;
1753
1754 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1755 {
1756 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1757
1758 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1759
1760 /* first reschedule or stop timer */
1761 if (w->repeat)
1762 {
1763 ev_at (w) += w->repeat;
1764 if (ev_at (w) < mn_now)
1765 ev_at (w) = mn_now;
1766
1767 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1768
1769 ANHE_at_cache (timers [HEAP0]);
1770 downheap (timers, timercnt, HEAP0);
1771 }
1772 else
1773 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1774
1775 EV_FREQUENT_CHECK;
1776 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1777 }
1778}
1779
1780#if EV_PERIODIC_ENABLE
1781void inline_size
1782periodics_reify (EV_P)
1783{
1784 EV_FREQUENT_CHECK;
1785
1786 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1787 {
1788 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1789
1790 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1791
1792 /* first reschedule or stop timer */
1793 if (w->reschedule_cb)
1794 {
1795 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1796
1797 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1798
1799 ANHE_at_cache (periodics [HEAP0]);
1800 downheap (periodics, periodiccnt, HEAP0);
1801 }
1802 else if (w->interval)
1803 {
1804 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1805 /* if next trigger time is not sufficiently in the future, put it there */
1806 /* this might happen because of floating point inexactness */
1807 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1808 {
1809 ev_at (w) += w->interval;
1810
1811 /* if interval is unreasonably low we might still have a time in the past */
1812 /* so correct this. this will make the periodic very inexact, but the user */
1813 /* has effectively asked to get triggered more often than possible */
1814 if (ev_at (w) < ev_rt_now)
1815 ev_at (w) = ev_rt_now;
1816 }
1817
1818 ANHE_at_cache (periodics [HEAP0]);
1819 downheap (periodics, periodiccnt, HEAP0);
1820 }
1821 else
1822 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1823
1824 EV_FREQUENT_CHECK;
1825 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1826 }
1827}
1828
1829static void noinline
1830periodics_reschedule (EV_P)
1831{
1832 int i;
1833
1834 /* adjust periodics after time jump */
1835 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1836 {
1837 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1838
1839 if (w->reschedule_cb)
1840 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1841 else if (w->interval)
1842 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1843
1844 ANHE_at_cache (periodics [i]);
1845 }
1846
1847 reheap (periodics, periodiccnt);
1314} 1848}
1315#endif 1849#endif
1316 1850
1317void inline_speed 1851void inline_speed
1318time_update (EV_P_ ev_tstamp max_block) 1852time_update (EV_P_ ev_tstamp max_block)
… …
1347 */ 1881 */
1348 for (i = 4; --i; ) 1882 for (i = 4; --i; )
1349 { 1883 {
1350 rtmn_diff = ev_rt_now - mn_now; 1884 rtmn_diff = ev_rt_now - mn_now;
1351 1885
1352 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1886 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1353 return; /* all is well */ 1887 return; /* all is well */
1354 1888
1355 ev_rt_now = ev_time (); 1889 ev_rt_now = ev_time ();
1356 mn_now = get_clock (); 1890 mn_now = get_clock ();
1357 now_floor = mn_now; 1891 now_floor = mn_now;
… …
1373#if EV_PERIODIC_ENABLE 1907#if EV_PERIODIC_ENABLE
1374 periodics_reschedule (EV_A); 1908 periodics_reschedule (EV_A);
1375#endif 1909#endif
1376 /* adjust timers. this is easy, as the offset is the same for all of them */ 1910 /* adjust timers. this is easy, as the offset is the same for all of them */
1377 for (i = 0; i < timercnt; ++i) 1911 for (i = 0; i < timercnt; ++i)
1912 {
1913 ANHE *he = timers + i + HEAP0;
1378 ((WT)timers [i])->at += ev_rt_now - mn_now; 1914 ANHE_w (*he)->at += ev_rt_now - mn_now;
1915 ANHE_at_cache (*he);
1916 }
1379 } 1917 }
1380 1918
1381 mn_now = ev_rt_now; 1919 mn_now = ev_rt_now;
1382 } 1920 }
1383} 1921}
… …
1392ev_unref (EV_P) 1930ev_unref (EV_P)
1393{ 1931{
1394 --activecnt; 1932 --activecnt;
1395} 1933}
1396 1934
1935void
1936ev_now_update (EV_P)
1937{
1938 time_update (EV_A_ 1e100);
1939}
1940
1397static int loop_done; 1941static int loop_done;
1398 1942
1399void 1943void
1400ev_loop (EV_P_ int flags) 1944ev_loop (EV_P_ int flags)
1401{ 1945{
1402 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1946 loop_done = EVUNLOOP_CANCEL;
1403 ? EVUNLOOP_ONE
1404 : EVUNLOOP_CANCEL;
1405 1947
1406 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1948 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1407 1949
1408 do 1950 do
1409 { 1951 {
1952#if EV_VERIFY >= 2
1953 ev_loop_verify (EV_A);
1954#endif
1955
1410#ifndef _WIN32 1956#ifndef _WIN32
1411 if (expect_false (curpid)) /* penalise the forking check even more */ 1957 if (expect_false (curpid)) /* penalise the forking check even more */
1412 if (expect_false (getpid () != curpid)) 1958 if (expect_false (getpid () != curpid))
1413 { 1959 {
1414 curpid = getpid (); 1960 curpid = getpid ();
… …
1443 /* update fd-related kernel structures */ 1989 /* update fd-related kernel structures */
1444 fd_reify (EV_A); 1990 fd_reify (EV_A);
1445 1991
1446 /* calculate blocking time */ 1992 /* calculate blocking time */
1447 { 1993 {
1448 ev_tstamp block; 1994 ev_tstamp waittime = 0.;
1995 ev_tstamp sleeptime = 0.;
1449 1996
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1997 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1451 block = 0.; /* do not block at all */
1452 else
1453 { 1998 {
1454 /* update time to cancel out callback processing overhead */ 1999 /* update time to cancel out callback processing overhead */
1455 time_update (EV_A_ 1e100); 2000 time_update (EV_A_ 1e100);
1456 2001
1457 block = MAX_BLOCKTIME; 2002 waittime = MAX_BLOCKTIME;
1458 2003
1459 if (timercnt) 2004 if (timercnt)
1460 { 2005 {
1461 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 2006 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1462 if (block > to) block = to; 2007 if (waittime > to) waittime = to;
1463 } 2008 }
1464 2009
1465#if EV_PERIODIC_ENABLE 2010#if EV_PERIODIC_ENABLE
1466 if (periodiccnt) 2011 if (periodiccnt)
1467 { 2012 {
1468 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 2013 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1469 if (block > to) block = to; 2014 if (waittime > to) waittime = to;
1470 } 2015 }
1471#endif 2016#endif
1472 2017
1473 if (expect_false (block < 0.)) block = 0.; 2018 if (expect_false (waittime < timeout_blocktime))
2019 waittime = timeout_blocktime;
2020
2021 sleeptime = waittime - backend_fudge;
2022
2023 if (expect_true (sleeptime > io_blocktime))
2024 sleeptime = io_blocktime;
2025
2026 if (sleeptime)
2027 {
2028 ev_sleep (sleeptime);
2029 waittime -= sleeptime;
2030 }
1474 } 2031 }
1475 2032
1476 ++loop_count; 2033 ++loop_count;
1477 backend_poll (EV_A_ block); 2034 backend_poll (EV_A_ waittime);
1478 2035
1479 /* update ev_rt_now, do magic */ 2036 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block); 2037 time_update (EV_A_ waittime + sleeptime);
1481 } 2038 }
1482 2039
1483 /* queue pending timers and reschedule them */ 2040 /* queue pending timers and reschedule them */
1484 timers_reify (EV_A); /* relative timers called last */ 2041 timers_reify (EV_A); /* relative timers called last */
1485#if EV_PERIODIC_ENABLE 2042#if EV_PERIODIC_ENABLE
… …
1494 /* queue check watchers, to be executed first */ 2051 /* queue check watchers, to be executed first */
1495 if (expect_false (checkcnt)) 2052 if (expect_false (checkcnt))
1496 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2053 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1497 2054
1498 call_pending (EV_A); 2055 call_pending (EV_A);
1499
1500 } 2056 }
1501 while (expect_true (activecnt && !loop_done)); 2057 while (expect_true (
2058 activecnt
2059 && !loop_done
2060 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2061 ));
1502 2062
1503 if (loop_done == EVUNLOOP_ONE) 2063 if (loop_done == EVUNLOOP_ONE)
1504 loop_done = EVUNLOOP_CANCEL; 2064 loop_done = EVUNLOOP_CANCEL;
1505} 2065}
1506 2066
… …
1594 2154
1595 if (expect_false (ev_is_active (w))) 2155 if (expect_false (ev_is_active (w)))
1596 return; 2156 return;
1597 2157
1598 assert (("ev_io_start called with negative fd", fd >= 0)); 2158 assert (("ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2160
2161 EV_FREQUENT_CHECK;
1599 2162
1600 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
1601 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1602 wlist_add (&anfds[fd].head, (WL)w); 2165 wlist_add (&anfds[fd].head, (WL)w);
1603 2166
1604 fd_change (EV_A_ fd); 2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2168 w->events &= ~EV_IOFDSET;
2169
2170 EV_FREQUENT_CHECK;
1605} 2171}
1606 2172
1607void noinline 2173void noinline
1608ev_io_stop (EV_P_ ev_io *w) 2174ev_io_stop (EV_P_ ev_io *w)
1609{ 2175{
1610 clear_pending (EV_A_ (W)w); 2176 clear_pending (EV_A_ (W)w);
1611 if (expect_false (!ev_is_active (w))) 2177 if (expect_false (!ev_is_active (w)))
1612 return; 2178 return;
1613 2179
1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2180 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2181
2182 EV_FREQUENT_CHECK;
1615 2183
1616 wlist_del (&anfds[w->fd].head, (WL)w); 2184 wlist_del (&anfds[w->fd].head, (WL)w);
1617 ev_stop (EV_A_ (W)w); 2185 ev_stop (EV_A_ (W)w);
1618 2186
1619 fd_change (EV_A_ w->fd); 2187 fd_change (EV_A_ w->fd, 1);
2188
2189 EV_FREQUENT_CHECK;
1620} 2190}
1621 2191
1622void noinline 2192void noinline
1623ev_timer_start (EV_P_ ev_timer *w) 2193ev_timer_start (EV_P_ ev_timer *w)
1624{ 2194{
1625 if (expect_false (ev_is_active (w))) 2195 if (expect_false (ev_is_active (w)))
1626 return; 2196 return;
1627 2197
1628 ((WT)w)->at += mn_now; 2198 ev_at (w) += mn_now;
1629 2199
1630 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2200 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1631 2201
2202 EV_FREQUENT_CHECK;
2203
2204 ++timercnt;
1632 ev_start (EV_A_ (W)w, ++timercnt); 2205 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1633 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2206 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1634 timers [timercnt - 1] = (WT)w; 2207 ANHE_w (timers [ev_active (w)]) = (WT)w;
1635 upheap (timers, timercnt - 1); 2208 ANHE_at_cache (timers [ev_active (w)]);
2209 upheap (timers, ev_active (w));
1636 2210
2211 EV_FREQUENT_CHECK;
2212
1637 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2213 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1638} 2214}
1639 2215
1640void noinline 2216void noinline
1641ev_timer_stop (EV_P_ ev_timer *w) 2217ev_timer_stop (EV_P_ ev_timer *w)
1642{ 2218{
1643 clear_pending (EV_A_ (W)w); 2219 clear_pending (EV_A_ (W)w);
1644 if (expect_false (!ev_is_active (w))) 2220 if (expect_false (!ev_is_active (w)))
1645 return; 2221 return;
1646 2222
1647 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 2223 EV_FREQUENT_CHECK;
1648 2224
1649 { 2225 {
1650 int active = ((W)w)->active; 2226 int active = ev_active (w);
1651 2227
2228 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2229
2230 --timercnt;
2231
1652 if (expect_true (--active < --timercnt)) 2232 if (expect_true (active < timercnt + HEAP0))
1653 { 2233 {
1654 timers [active] = timers [timercnt]; 2234 timers [active] = timers [timercnt + HEAP0];
1655 adjustheap (timers, timercnt, active); 2235 adjustheap (timers, timercnt, active);
1656 } 2236 }
1657 } 2237 }
1658 2238
1659 ((WT)w)->at -= mn_now; 2239 EV_FREQUENT_CHECK;
2240
2241 ev_at (w) -= mn_now;
1660 2242
1661 ev_stop (EV_A_ (W)w); 2243 ev_stop (EV_A_ (W)w);
1662} 2244}
1663 2245
1664void noinline 2246void noinline
1665ev_timer_again (EV_P_ ev_timer *w) 2247ev_timer_again (EV_P_ ev_timer *w)
1666{ 2248{
2249 EV_FREQUENT_CHECK;
2250
1667 if (ev_is_active (w)) 2251 if (ev_is_active (w))
1668 { 2252 {
1669 if (w->repeat) 2253 if (w->repeat)
1670 { 2254 {
1671 ((WT)w)->at = mn_now + w->repeat; 2255 ev_at (w) = mn_now + w->repeat;
2256 ANHE_at_cache (timers [ev_active (w)]);
1672 adjustheap (timers, timercnt, ((W)w)->active - 1); 2257 adjustheap (timers, timercnt, ev_active (w));
1673 } 2258 }
1674 else 2259 else
1675 ev_timer_stop (EV_A_ w); 2260 ev_timer_stop (EV_A_ w);
1676 } 2261 }
1677 else if (w->repeat) 2262 else if (w->repeat)
1678 { 2263 {
1679 w->at = w->repeat; 2264 ev_at (w) = w->repeat;
1680 ev_timer_start (EV_A_ w); 2265 ev_timer_start (EV_A_ w);
1681 } 2266 }
2267
2268 EV_FREQUENT_CHECK;
1682} 2269}
1683 2270
1684#if EV_PERIODIC_ENABLE 2271#if EV_PERIODIC_ENABLE
1685void noinline 2272void noinline
1686ev_periodic_start (EV_P_ ev_periodic *w) 2273ev_periodic_start (EV_P_ ev_periodic *w)
1687{ 2274{
1688 if (expect_false (ev_is_active (w))) 2275 if (expect_false (ev_is_active (w)))
1689 return; 2276 return;
1690 2277
1691 if (w->reschedule_cb) 2278 if (w->reschedule_cb)
1692 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2279 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693 else if (w->interval) 2280 else if (w->interval)
1694 { 2281 {
1695 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2282 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1696 /* this formula differs from the one in periodic_reify because we do not always round up */ 2283 /* this formula differs from the one in periodic_reify because we do not always round up */
1697 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2284 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1698 } 2285 }
1699 else 2286 else
1700 ((WT)w)->at = w->offset; 2287 ev_at (w) = w->offset;
1701 2288
2289 EV_FREQUENT_CHECK;
2290
2291 ++periodiccnt;
1702 ev_start (EV_A_ (W)w, ++periodiccnt); 2292 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1703 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2293 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1704 periodics [periodiccnt - 1] = (WT)w; 2294 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1705 upheap (periodics, periodiccnt - 1); 2295 ANHE_at_cache (periodics [ev_active (w)]);
2296 upheap (periodics, ev_active (w));
1706 2297
2298 EV_FREQUENT_CHECK;
2299
1707 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2300 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1708} 2301}
1709 2302
1710void noinline 2303void noinline
1711ev_periodic_stop (EV_P_ ev_periodic *w) 2304ev_periodic_stop (EV_P_ ev_periodic *w)
1712{ 2305{
1713 clear_pending (EV_A_ (W)w); 2306 clear_pending (EV_A_ (W)w);
1714 if (expect_false (!ev_is_active (w))) 2307 if (expect_false (!ev_is_active (w)))
1715 return; 2308 return;
1716 2309
1717 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 2310 EV_FREQUENT_CHECK;
1718 2311
1719 { 2312 {
1720 int active = ((W)w)->active; 2313 int active = ev_active (w);
1721 2314
2315 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2316
2317 --periodiccnt;
2318
1722 if (expect_true (--active < --periodiccnt)) 2319 if (expect_true (active < periodiccnt + HEAP0))
1723 { 2320 {
1724 periodics [active] = periodics [periodiccnt]; 2321 periodics [active] = periodics [periodiccnt + HEAP0];
1725 adjustheap (periodics, periodiccnt, active); 2322 adjustheap (periodics, periodiccnt, active);
1726 } 2323 }
1727 } 2324 }
1728 2325
2326 EV_FREQUENT_CHECK;
2327
1729 ev_stop (EV_A_ (W)w); 2328 ev_stop (EV_A_ (W)w);
1730} 2329}
1731 2330
1732void noinline 2331void noinline
1733ev_periodic_again (EV_P_ ev_periodic *w) 2332ev_periodic_again (EV_P_ ev_periodic *w)
… …
1750#endif 2349#endif
1751 if (expect_false (ev_is_active (w))) 2350 if (expect_false (ev_is_active (w)))
1752 return; 2351 return;
1753 2352
1754 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2353 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2354
2355 evpipe_init (EV_A);
2356
2357 EV_FREQUENT_CHECK;
1755 2358
1756 { 2359 {
1757#ifndef _WIN32 2360#ifndef _WIN32
1758 sigset_t full, prev; 2361 sigset_t full, prev;
1759 sigfillset (&full); 2362 sigfillset (&full);
1760 sigprocmask (SIG_SETMASK, &full, &prev); 2363 sigprocmask (SIG_SETMASK, &full, &prev);
1761#endif 2364#endif
1762 2365
1763 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
1764 2367
1765#ifndef _WIN32 2368#ifndef _WIN32
1766 sigprocmask (SIG_SETMASK, &prev, 0); 2369 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif 2370#endif
1768 } 2371 }
… …
1771 wlist_add (&signals [w->signum - 1].head, (WL)w); 2374 wlist_add (&signals [w->signum - 1].head, (WL)w);
1772 2375
1773 if (!((WL)w)->next) 2376 if (!((WL)w)->next)
1774 { 2377 {
1775#if _WIN32 2378#if _WIN32
1776 signal (w->signum, sighandler); 2379 signal (w->signum, ev_sighandler);
1777#else 2380#else
1778 struct sigaction sa; 2381 struct sigaction sa;
1779 sa.sa_handler = sighandler; 2382 sa.sa_handler = ev_sighandler;
1780 sigfillset (&sa.sa_mask); 2383 sigfillset (&sa.sa_mask);
1781 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2384 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1782 sigaction (w->signum, &sa, 0); 2385 sigaction (w->signum, &sa, 0);
1783#endif 2386#endif
1784 } 2387 }
2388
2389 EV_FREQUENT_CHECK;
1785} 2390}
1786 2391
1787void noinline 2392void noinline
1788ev_signal_stop (EV_P_ ev_signal *w) 2393ev_signal_stop (EV_P_ ev_signal *w)
1789{ 2394{
1790 clear_pending (EV_A_ (W)w); 2395 clear_pending (EV_A_ (W)w);
1791 if (expect_false (!ev_is_active (w))) 2396 if (expect_false (!ev_is_active (w)))
1792 return; 2397 return;
1793 2398
2399 EV_FREQUENT_CHECK;
2400
1794 wlist_del (&signals [w->signum - 1].head, (WL)w); 2401 wlist_del (&signals [w->signum - 1].head, (WL)w);
1795 ev_stop (EV_A_ (W)w); 2402 ev_stop (EV_A_ (W)w);
1796 2403
1797 if (!signals [w->signum - 1].head) 2404 if (!signals [w->signum - 1].head)
1798 signal (w->signum, SIG_DFL); 2405 signal (w->signum, SIG_DFL);
2406
2407 EV_FREQUENT_CHECK;
1799} 2408}
1800 2409
1801void 2410void
1802ev_child_start (EV_P_ ev_child *w) 2411ev_child_start (EV_P_ ev_child *w)
1803{ 2412{
… …
1805 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2414 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1806#endif 2415#endif
1807 if (expect_false (ev_is_active (w))) 2416 if (expect_false (ev_is_active (w)))
1808 return; 2417 return;
1809 2418
2419 EV_FREQUENT_CHECK;
2420
1810 ev_start (EV_A_ (W)w, 1); 2421 ev_start (EV_A_ (W)w, 1);
1811 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2422 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2423
2424 EV_FREQUENT_CHECK;
1812} 2425}
1813 2426
1814void 2427void
1815ev_child_stop (EV_P_ ev_child *w) 2428ev_child_stop (EV_P_ ev_child *w)
1816{ 2429{
1817 clear_pending (EV_A_ (W)w); 2430 clear_pending (EV_A_ (W)w);
1818 if (expect_false (!ev_is_active (w))) 2431 if (expect_false (!ev_is_active (w)))
1819 return; 2432 return;
1820 2433
2434 EV_FREQUENT_CHECK;
2435
1821 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2436 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1822 ev_stop (EV_A_ (W)w); 2437 ev_stop (EV_A_ (W)w);
2438
2439 EV_FREQUENT_CHECK;
1823} 2440}
1824 2441
1825#if EV_STAT_ENABLE 2442#if EV_STAT_ENABLE
1826 2443
1827# ifdef _WIN32 2444# ifdef _WIN32
1828# undef lstat 2445# undef lstat
1829# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
1830# endif 2447# endif
1831 2448
1832#define DEF_STAT_INTERVAL 5.0074891 2449#define DEF_STAT_INTERVAL 5.0074891
2450#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
1833#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
1834 2452
1835static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2453static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1836 2454
1837#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
1838# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
… …
1842{ 2460{
1843 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2461 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
1844 2462
1845 if (w->wd < 0) 2463 if (w->wd < 0)
1846 { 2464 {
2465 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
1847 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2466 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1848 2467
1849 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2470 /* but an efficiency issue only */
1850 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1851 { 2472 {
1852 char path [4096]; 2473 char path [4096];
1853 strcpy (path, w->path); 2474 strcpy (path, w->path);
1854 2475
… …
1857 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2478 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1858 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2479 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1859 2480
1860 char *pend = strrchr (path, '/'); 2481 char *pend = strrchr (path, '/');
1861 2482
1862 if (!pend) 2483 if (!pend || pend == path)
1863 break; /* whoops, no '/', complain to your admin */ 2484 break;
1864 2485
1865 *pend = 0; 2486 *pend = 0;
1866 w->wd = inotify_add_watch (fs_fd, path, mask); 2487 w->wd = inotify_add_watch (fs_fd, path, mask);
1867 } 2488 }
1868 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1869 } 2490 }
1870 } 2491 }
1871 else
1872 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1873 2492
1874 if (w->wd >= 0) 2493 if (w->wd >= 0)
2494 {
1875 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2495 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2496
2497 /* now local changes will be tracked by inotify, but remote changes won't */
2498 /* unless the filesystem it known to be local, we therefore still poll */
2499 /* also do poll on <2.6.25, but with normal frequency */
2500 struct statfs sfs;
2501
2502 if (fs_2625 && !statfs (w->path, &sfs))
2503 if (sfs.f_type == 0x1373 /* devfs */
2504 || sfs.f_type == 0xEF53 /* ext2/3 */
2505 || sfs.f_type == 0x3153464a /* jfs */
2506 || sfs.f_type == 0x52654973 /* reiser3 */
2507 || sfs.f_type == 0x01021994 /* tempfs */
2508 || sfs.f_type == 0x58465342 /* xfs */)
2509 return;
2510
2511 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2512 ev_timer_again (EV_A_ &w->timer);
2513 }
1876} 2514}
1877 2515
1878static void noinline 2516static void noinline
1879infy_del (EV_P_ ev_stat *w) 2517infy_del (EV_P_ ev_stat *w)
1880{ 2518{
… …
1894 2532
1895static void noinline 2533static void noinline
1896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2534infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1897{ 2535{
1898 if (slot < 0) 2536 if (slot < 0)
1899 /* overflow, need to check for all hahs slots */ 2537 /* overflow, need to check for all hash slots */
1900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2538 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1901 infy_wd (EV_A_ slot, wd, ev); 2539 infy_wd (EV_A_ slot, wd, ev);
1902 else 2540 else
1903 { 2541 {
1904 WL w_; 2542 WL w_;
… …
1910 2548
1911 if (w->wd == wd || wd == -1) 2549 if (w->wd == wd || wd == -1)
1912 { 2550 {
1913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2551 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1914 { 2552 {
2553 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1915 w->wd = -1; 2554 w->wd = -1;
1916 infy_add (EV_A_ w); /* re-add, no matter what */ 2555 infy_add (EV_A_ w); /* re-add, no matter what */
1917 } 2556 }
1918 2557
1919 stat_timer_cb (EV_A_ &w->timer, 0); 2558 stat_timer_cb (EV_A_ &w->timer, 0);
… …
1933 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2572 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1934 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2573 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1935} 2574}
1936 2575
1937void inline_size 2576void inline_size
2577check_2625 (EV_P)
2578{
2579 /* kernels < 2.6.25 are borked
2580 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2581 */
2582 struct utsname buf;
2583 int major, minor, micro;
2584
2585 if (uname (&buf))
2586 return;
2587
2588 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2589 return;
2590
2591 if (major < 2
2592 || (major == 2 && minor < 6)
2593 || (major == 2 && minor == 6 && micro < 25))
2594 return;
2595
2596 fs_2625 = 1;
2597}
2598
2599void inline_size
1938infy_init (EV_P) 2600infy_init (EV_P)
1939{ 2601{
1940 if (fs_fd != -2) 2602 if (fs_fd != -2)
1941 return; 2603 return;
2604
2605 fs_fd = -1;
2606
2607 check_2625 (EV_A);
1942 2608
1943 fs_fd = inotify_init (); 2609 fs_fd = inotify_init ();
1944 2610
1945 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
1946 { 2612 {
… …
1974 w->wd = -1; 2640 w->wd = -1;
1975 2641
1976 if (fs_fd >= 0) 2642 if (fs_fd >= 0)
1977 infy_add (EV_A_ w); /* re-add, no matter what */ 2643 infy_add (EV_A_ w); /* re-add, no matter what */
1978 else 2644 else
1979 ev_timer_start (EV_A_ &w->timer); 2645 ev_timer_again (EV_A_ &w->timer);
1980 } 2646 }
1981
1982 } 2647 }
1983} 2648}
1984 2649
2650#endif
2651
2652#ifdef _WIN32
2653# define EV_LSTAT(p,b) _stati64 (p, b)
2654#else
2655# define EV_LSTAT(p,b) lstat (p, b)
1985#endif 2656#endif
1986 2657
1987void 2658void
1988ev_stat_stat (EV_P_ ev_stat *w) 2659ev_stat_stat (EV_P_ ev_stat *w)
1989{ 2660{
… …
2016 || w->prev.st_atime != w->attr.st_atime 2687 || w->prev.st_atime != w->attr.st_atime
2017 || w->prev.st_mtime != w->attr.st_mtime 2688 || w->prev.st_mtime != w->attr.st_mtime
2018 || w->prev.st_ctime != w->attr.st_ctime 2689 || w->prev.st_ctime != w->attr.st_ctime
2019 ) { 2690 ) {
2020 #if EV_USE_INOTIFY 2691 #if EV_USE_INOTIFY
2692 if (fs_fd >= 0)
2693 {
2021 infy_del (EV_A_ w); 2694 infy_del (EV_A_ w);
2022 infy_add (EV_A_ w); 2695 infy_add (EV_A_ w);
2023 ev_stat_stat (EV_A_ w); /* avoid race... */ 2696 ev_stat_stat (EV_A_ w); /* avoid race... */
2697 }
2024 #endif 2698 #endif
2025 2699
2026 ev_feed_event (EV_A_ w, EV_STAT); 2700 ev_feed_event (EV_A_ w, EV_STAT);
2027 } 2701 }
2028} 2702}
… …
2031ev_stat_start (EV_P_ ev_stat *w) 2705ev_stat_start (EV_P_ ev_stat *w)
2032{ 2706{
2033 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2034 return; 2708 return;
2035 2709
2036 /* since we use memcmp, we need to clear any padding data etc. */
2037 memset (&w->prev, 0, sizeof (ev_statdata));
2038 memset (&w->attr, 0, sizeof (ev_statdata));
2039
2040 ev_stat_stat (EV_A_ w); 2710 ev_stat_stat (EV_A_ w);
2041 2711
2712 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2042 if (w->interval < MIN_STAT_INTERVAL) 2713 w->interval = MIN_STAT_INTERVAL;
2043 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2044 2714
2045 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2715 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2046 ev_set_priority (&w->timer, ev_priority (w)); 2716 ev_set_priority (&w->timer, ev_priority (w));
2047 2717
2048#if EV_USE_INOTIFY 2718#if EV_USE_INOTIFY
2049 infy_init (EV_A); 2719 infy_init (EV_A);
2050 2720
2051 if (fs_fd >= 0) 2721 if (fs_fd >= 0)
2052 infy_add (EV_A_ w); 2722 infy_add (EV_A_ w);
2053 else 2723 else
2054#endif 2724#endif
2055 ev_timer_start (EV_A_ &w->timer); 2725 ev_timer_again (EV_A_ &w->timer);
2056 2726
2057 ev_start (EV_A_ (W)w, 1); 2727 ev_start (EV_A_ (W)w, 1);
2728
2729 EV_FREQUENT_CHECK;
2058} 2730}
2059 2731
2060void 2732void
2061ev_stat_stop (EV_P_ ev_stat *w) 2733ev_stat_stop (EV_P_ ev_stat *w)
2062{ 2734{
2063 clear_pending (EV_A_ (W)w); 2735 clear_pending (EV_A_ (W)w);
2064 if (expect_false (!ev_is_active (w))) 2736 if (expect_false (!ev_is_active (w)))
2065 return; 2737 return;
2066 2738
2739 EV_FREQUENT_CHECK;
2740
2067#if EV_USE_INOTIFY 2741#if EV_USE_INOTIFY
2068 infy_del (EV_A_ w); 2742 infy_del (EV_A_ w);
2069#endif 2743#endif
2070 ev_timer_stop (EV_A_ &w->timer); 2744 ev_timer_stop (EV_A_ &w->timer);
2071 2745
2072 ev_stop (EV_A_ (W)w); 2746 ev_stop (EV_A_ (W)w);
2747
2748 EV_FREQUENT_CHECK;
2073} 2749}
2074#endif 2750#endif
2075 2751
2076#if EV_IDLE_ENABLE 2752#if EV_IDLE_ENABLE
2077void 2753void
… …
2079{ 2755{
2080 if (expect_false (ev_is_active (w))) 2756 if (expect_false (ev_is_active (w)))
2081 return; 2757 return;
2082 2758
2083 pri_adjust (EV_A_ (W)w); 2759 pri_adjust (EV_A_ (W)w);
2760
2761 EV_FREQUENT_CHECK;
2084 2762
2085 { 2763 {
2086 int active = ++idlecnt [ABSPRI (w)]; 2764 int active = ++idlecnt [ABSPRI (w)];
2087 2765
2088 ++idleall; 2766 ++idleall;
2089 ev_start (EV_A_ (W)w, active); 2767 ev_start (EV_A_ (W)w, active);
2090 2768
2091 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2769 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2092 idles [ABSPRI (w)][active - 1] = w; 2770 idles [ABSPRI (w)][active - 1] = w;
2093 } 2771 }
2772
2773 EV_FREQUENT_CHECK;
2094} 2774}
2095 2775
2096void 2776void
2097ev_idle_stop (EV_P_ ev_idle *w) 2777ev_idle_stop (EV_P_ ev_idle *w)
2098{ 2778{
2099 clear_pending (EV_A_ (W)w); 2779 clear_pending (EV_A_ (W)w);
2100 if (expect_false (!ev_is_active (w))) 2780 if (expect_false (!ev_is_active (w)))
2101 return; 2781 return;
2102 2782
2783 EV_FREQUENT_CHECK;
2784
2103 { 2785 {
2104 int active = ((W)w)->active; 2786 int active = ev_active (w);
2105 2787
2106 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2788 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2107 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2789 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2108 2790
2109 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2110 --idleall; 2792 --idleall;
2111 } 2793 }
2794
2795 EV_FREQUENT_CHECK;
2112} 2796}
2113#endif 2797#endif
2114 2798
2115void 2799void
2116ev_prepare_start (EV_P_ ev_prepare *w) 2800ev_prepare_start (EV_P_ ev_prepare *w)
2117{ 2801{
2118 if (expect_false (ev_is_active (w))) 2802 if (expect_false (ev_is_active (w)))
2119 return; 2803 return;
2804
2805 EV_FREQUENT_CHECK;
2120 2806
2121 ev_start (EV_A_ (W)w, ++preparecnt); 2807 ev_start (EV_A_ (W)w, ++preparecnt);
2122 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2808 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2123 prepares [preparecnt - 1] = w; 2809 prepares [preparecnt - 1] = w;
2810
2811 EV_FREQUENT_CHECK;
2124} 2812}
2125 2813
2126void 2814void
2127ev_prepare_stop (EV_P_ ev_prepare *w) 2815ev_prepare_stop (EV_P_ ev_prepare *w)
2128{ 2816{
2129 clear_pending (EV_A_ (W)w); 2817 clear_pending (EV_A_ (W)w);
2130 if (expect_false (!ev_is_active (w))) 2818 if (expect_false (!ev_is_active (w)))
2131 return; 2819 return;
2132 2820
2821 EV_FREQUENT_CHECK;
2822
2133 { 2823 {
2134 int active = ((W)w)->active; 2824 int active = ev_active (w);
2825
2135 prepares [active - 1] = prepares [--preparecnt]; 2826 prepares [active - 1] = prepares [--preparecnt];
2136 ((W)prepares [active - 1])->active = active; 2827 ev_active (prepares [active - 1]) = active;
2137 } 2828 }
2138 2829
2139 ev_stop (EV_A_ (W)w); 2830 ev_stop (EV_A_ (W)w);
2831
2832 EV_FREQUENT_CHECK;
2140} 2833}
2141 2834
2142void 2835void
2143ev_check_start (EV_P_ ev_check *w) 2836ev_check_start (EV_P_ ev_check *w)
2144{ 2837{
2145 if (expect_false (ev_is_active (w))) 2838 if (expect_false (ev_is_active (w)))
2146 return; 2839 return;
2840
2841 EV_FREQUENT_CHECK;
2147 2842
2148 ev_start (EV_A_ (W)w, ++checkcnt); 2843 ev_start (EV_A_ (W)w, ++checkcnt);
2149 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2844 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2150 checks [checkcnt - 1] = w; 2845 checks [checkcnt - 1] = w;
2846
2847 EV_FREQUENT_CHECK;
2151} 2848}
2152 2849
2153void 2850void
2154ev_check_stop (EV_P_ ev_check *w) 2851ev_check_stop (EV_P_ ev_check *w)
2155{ 2852{
2156 clear_pending (EV_A_ (W)w); 2853 clear_pending (EV_A_ (W)w);
2157 if (expect_false (!ev_is_active (w))) 2854 if (expect_false (!ev_is_active (w)))
2158 return; 2855 return;
2159 2856
2857 EV_FREQUENT_CHECK;
2858
2160 { 2859 {
2161 int active = ((W)w)->active; 2860 int active = ev_active (w);
2861
2162 checks [active - 1] = checks [--checkcnt]; 2862 checks [active - 1] = checks [--checkcnt];
2163 ((W)checks [active - 1])->active = active; 2863 ev_active (checks [active - 1]) = active;
2164 } 2864 }
2165 2865
2166 ev_stop (EV_A_ (W)w); 2866 ev_stop (EV_A_ (W)w);
2867
2868 EV_FREQUENT_CHECK;
2167} 2869}
2168 2870
2169#if EV_EMBED_ENABLE 2871#if EV_EMBED_ENABLE
2170void noinline 2872void noinline
2171ev_embed_sweep (EV_P_ ev_embed *w) 2873ev_embed_sweep (EV_P_ ev_embed *w)
2172{ 2874{
2173 ev_loop (w->loop, EVLOOP_NONBLOCK); 2875 ev_loop (w->other, EVLOOP_NONBLOCK);
2174} 2876}
2175 2877
2176static void 2878static void
2177embed_cb (EV_P_ ev_io *io, int revents) 2879embed_io_cb (EV_P_ ev_io *io, int revents)
2178{ 2880{
2179 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2881 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2180 2882
2181 if (ev_cb (w)) 2883 if (ev_cb (w))
2182 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2884 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2183 else 2885 else
2184 ev_embed_sweep (loop, w); 2886 ev_loop (w->other, EVLOOP_NONBLOCK);
2185} 2887}
2888
2889static void
2890embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2891{
2892 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2893
2894 {
2895 struct ev_loop *loop = w->other;
2896
2897 while (fdchangecnt)
2898 {
2899 fd_reify (EV_A);
2900 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2901 }
2902 }
2903}
2904
2905static void
2906embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2907{
2908 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2909
2910 ev_embed_stop (EV_A_ w);
2911
2912 {
2913 struct ev_loop *loop = w->other;
2914
2915 ev_loop_fork (EV_A);
2916 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2917 }
2918
2919 ev_embed_start (EV_A_ w);
2920}
2921
2922#if 0
2923static void
2924embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2925{
2926 ev_idle_stop (EV_A_ idle);
2927}
2928#endif
2186 2929
2187void 2930void
2188ev_embed_start (EV_P_ ev_embed *w) 2931ev_embed_start (EV_P_ ev_embed *w)
2189{ 2932{
2190 if (expect_false (ev_is_active (w))) 2933 if (expect_false (ev_is_active (w)))
2191 return; 2934 return;
2192 2935
2193 { 2936 {
2194 struct ev_loop *loop = w->loop; 2937 struct ev_loop *loop = w->other;
2195 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2938 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2196 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2939 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2197 } 2940 }
2941
2942 EV_FREQUENT_CHECK;
2198 2943
2199 ev_set_priority (&w->io, ev_priority (w)); 2944 ev_set_priority (&w->io, ev_priority (w));
2200 ev_io_start (EV_A_ &w->io); 2945 ev_io_start (EV_A_ &w->io);
2201 2946
2947 ev_prepare_init (&w->prepare, embed_prepare_cb);
2948 ev_set_priority (&w->prepare, EV_MINPRI);
2949 ev_prepare_start (EV_A_ &w->prepare);
2950
2951 ev_fork_init (&w->fork, embed_fork_cb);
2952 ev_fork_start (EV_A_ &w->fork);
2953
2954 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2955
2202 ev_start (EV_A_ (W)w, 1); 2956 ev_start (EV_A_ (W)w, 1);
2957
2958 EV_FREQUENT_CHECK;
2203} 2959}
2204 2960
2205void 2961void
2206ev_embed_stop (EV_P_ ev_embed *w) 2962ev_embed_stop (EV_P_ ev_embed *w)
2207{ 2963{
2208 clear_pending (EV_A_ (W)w); 2964 clear_pending (EV_A_ (W)w);
2209 if (expect_false (!ev_is_active (w))) 2965 if (expect_false (!ev_is_active (w)))
2210 return; 2966 return;
2211 2967
2968 EV_FREQUENT_CHECK;
2969
2212 ev_io_stop (EV_A_ &w->io); 2970 ev_io_stop (EV_A_ &w->io);
2971 ev_prepare_stop (EV_A_ &w->prepare);
2972 ev_fork_stop (EV_A_ &w->fork);
2213 2973
2214 ev_stop (EV_A_ (W)w); 2974 EV_FREQUENT_CHECK;
2215} 2975}
2216#endif 2976#endif
2217 2977
2218#if EV_FORK_ENABLE 2978#if EV_FORK_ENABLE
2219void 2979void
2220ev_fork_start (EV_P_ ev_fork *w) 2980ev_fork_start (EV_P_ ev_fork *w)
2221{ 2981{
2222 if (expect_false (ev_is_active (w))) 2982 if (expect_false (ev_is_active (w)))
2223 return; 2983 return;
2984
2985 EV_FREQUENT_CHECK;
2224 2986
2225 ev_start (EV_A_ (W)w, ++forkcnt); 2987 ev_start (EV_A_ (W)w, ++forkcnt);
2226 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2988 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2227 forks [forkcnt - 1] = w; 2989 forks [forkcnt - 1] = w;
2990
2991 EV_FREQUENT_CHECK;
2228} 2992}
2229 2993
2230void 2994void
2231ev_fork_stop (EV_P_ ev_fork *w) 2995ev_fork_stop (EV_P_ ev_fork *w)
2232{ 2996{
2233 clear_pending (EV_A_ (W)w); 2997 clear_pending (EV_A_ (W)w);
2234 if (expect_false (!ev_is_active (w))) 2998 if (expect_false (!ev_is_active (w)))
2235 return; 2999 return;
2236 3000
3001 EV_FREQUENT_CHECK;
3002
2237 { 3003 {
2238 int active = ((W)w)->active; 3004 int active = ev_active (w);
3005
2239 forks [active - 1] = forks [--forkcnt]; 3006 forks [active - 1] = forks [--forkcnt];
2240 ((W)forks [active - 1])->active = active; 3007 ev_active (forks [active - 1]) = active;
2241 } 3008 }
2242 3009
2243 ev_stop (EV_A_ (W)w); 3010 ev_stop (EV_A_ (W)w);
3011
3012 EV_FREQUENT_CHECK;
3013}
3014#endif
3015
3016#if EV_ASYNC_ENABLE
3017void
3018ev_async_start (EV_P_ ev_async *w)
3019{
3020 if (expect_false (ev_is_active (w)))
3021 return;
3022
3023 evpipe_init (EV_A);
3024
3025 EV_FREQUENT_CHECK;
3026
3027 ev_start (EV_A_ (W)w, ++asynccnt);
3028 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
3029 asyncs [asynccnt - 1] = w;
3030
3031 EV_FREQUENT_CHECK;
3032}
3033
3034void
3035ev_async_stop (EV_P_ ev_async *w)
3036{
3037 clear_pending (EV_A_ (W)w);
3038 if (expect_false (!ev_is_active (w)))
3039 return;
3040
3041 EV_FREQUENT_CHECK;
3042
3043 {
3044 int active = ev_active (w);
3045
3046 asyncs [active - 1] = asyncs [--asynccnt];
3047 ev_active (asyncs [active - 1]) = active;
3048 }
3049
3050 ev_stop (EV_A_ (W)w);
3051
3052 EV_FREQUENT_CHECK;
3053}
3054
3055void
3056ev_async_send (EV_P_ ev_async *w)
3057{
3058 w->sent = 1;
3059 evpipe_write (EV_A_ &gotasync);
2244} 3060}
2245#endif 3061#endif
2246 3062
2247/*****************************************************************************/ 3063/*****************************************************************************/
2248 3064
… …
2258once_cb (EV_P_ struct ev_once *once, int revents) 3074once_cb (EV_P_ struct ev_once *once, int revents)
2259{ 3075{
2260 void (*cb)(int revents, void *arg) = once->cb; 3076 void (*cb)(int revents, void *arg) = once->cb;
2261 void *arg = once->arg; 3077 void *arg = once->arg;
2262 3078
2263 ev_io_stop (EV_A_ &once->io); 3079 ev_io_stop (EV_A_ &once->io);
2264 ev_timer_stop (EV_A_ &once->to); 3080 ev_timer_stop (EV_A_ &once->to);
2265 ev_free (once); 3081 ev_free (once);
2266 3082
2267 cb (revents, arg); 3083 cb (revents, arg);
2268} 3084}
2269 3085
2270static void 3086static void
2271once_cb_io (EV_P_ ev_io *w, int revents) 3087once_cb_io (EV_P_ ev_io *w, int revents)
2272{ 3088{
2273 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3089 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3090
3091 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2274} 3092}
2275 3093
2276static void 3094static void
2277once_cb_to (EV_P_ ev_timer *w, int revents) 3095once_cb_to (EV_P_ ev_timer *w, int revents)
2278{ 3096{
2279 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3097 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3098
3099 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2280} 3100}
2281 3101
2282void 3102void
2283ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3103ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2284{ 3104{
… …
2306 ev_timer_set (&once->to, timeout, 0.); 3126 ev_timer_set (&once->to, timeout, 0.);
2307 ev_timer_start (EV_A_ &once->to); 3127 ev_timer_start (EV_A_ &once->to);
2308 } 3128 }
2309} 3129}
2310 3130
3131#if EV_MULTIPLICITY
3132 #include "ev_wrap.h"
3133#endif
3134
2311#ifdef __cplusplus 3135#ifdef __cplusplus
2312} 3136}
2313#endif 3137#endif
2314 3138

Diff Legend

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