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

Comparing libev/ev.c (file contents):
Revision 1.185 by root, Fri Dec 14 18:22:30 2007 UTC vs.
Revision 1.278 by root, Tue Jan 6 19:46:56 2009 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,2009 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
… …
207#if !EV_STAT_ENABLE 299#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY 300# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0 301# define EV_USE_INOTIFY 0
210#endif 302#endif
211 303
304#if !EV_USE_NANOSLEEP
305# ifndef _WIN32
306# include <sys/select.h>
307# endif
308#endif
309
212#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
213# include <sys/inotify.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
214#endif 319#endif
215 320
216#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
217# include <winsock.h> 322# include <winsock.h>
218#endif 323#endif
219 324
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
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" {
339# endif
340int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus
342}
343# endif
344#endif
345
220/**/ 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
221 353
222/* 354/*
223 * This is used to avoid floating point rounding problems. 355 * This is used to avoid floating point rounding problems.
224 * It is added to ev_rt_now when scheduling periodics 356 * It is added to ev_rt_now when scheduling periodics
225 * to ensure progress, time-wise, even when rounding 357 * to ensure progress, time-wise, even when rounding
… …
237# define expect(expr,value) __builtin_expect ((expr),(value)) 369# define expect(expr,value) __builtin_expect ((expr),(value))
238# define noinline __attribute__ ((noinline)) 370# define noinline __attribute__ ((noinline))
239#else 371#else
240# define expect(expr,value) (expr) 372# define expect(expr,value) (expr)
241# define noinline 373# define noinline
242# if __STDC_VERSION__ < 199901L 374# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
243# define inline 375# define inline
244# endif 376# endif
245#endif 377#endif
246 378
247#define expect_false(expr) expect ((expr) != 0, 0) 379#define expect_false(expr) expect ((expr) != 0, 0)
… …
262 394
263typedef ev_watcher *W; 395typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 396typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
266 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 */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 405static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
406#endif
268 407
269#ifdef _WIN32 408#ifdef _WIN32
270# include "ev_win32.c" 409# include "ev_win32.c"
271#endif 410#endif
272 411
… …
279{ 418{
280 syserr_cb = cb; 419 syserr_cb = cb;
281} 420}
282 421
283static void noinline 422static void noinline
284syserr (const char *msg) 423ev_syserr (const char *msg)
285{ 424{
286 if (!msg) 425 if (!msg)
287 msg = "(libev) system error"; 426 msg = "(libev) system error";
288 427
289 if (syserr_cb) 428 if (syserr_cb)
… …
293 perror (msg); 432 perror (msg);
294 abort (); 433 abort ();
295 } 434 }
296} 435}
297 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
298static void *(*alloc)(void *ptr, long size); 452static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
299 453
300void 454void
301ev_set_allocator (void *(*cb)(void *ptr, long size)) 455ev_set_allocator (void *(*cb)(void *ptr, long size))
302{ 456{
303 alloc = cb; 457 alloc = cb;
304} 458}
305 459
306inline_speed void * 460inline_speed void *
307ev_realloc (void *ptr, long size) 461ev_realloc (void *ptr, long size)
308{ 462{
309 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 463 ptr = alloc (ptr, size);
310 464
311 if (!ptr && size) 465 if (!ptr && size)
312 { 466 {
313 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 467 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
314 abort (); 468 abort ();
… …
325typedef struct 479typedef struct
326{ 480{
327 WL head; 481 WL head;
328 unsigned char events; 482 unsigned char events;
329 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
330#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
331 SOCKET handle; 490 SOCKET handle;
332#endif 491#endif
333} ANFD; 492} ANFD;
334 493
… …
337 W w; 496 W w;
338 int events; 497 int events;
339} ANPENDING; 498} ANPENDING;
340 499
341#if EV_USE_INOTIFY 500#if EV_USE_INOTIFY
501/* hash table entry per inotify-id */
342typedef struct 502typedef struct
343{ 503{
344 WL head; 504 WL head;
345} 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)
346#endif 524#endif
347 525
348#if EV_MULTIPLICITY 526#if EV_MULTIPLICITY
349 527
350 struct ev_loop 528 struct ev_loop
… …
408{ 586{
409 return ev_rt_now; 587 return ev_rt_now;
410} 588}
411#endif 589#endif
412 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
413int inline_size 623int inline_size
414array_nextsize (int elem, int cur, int cnt) 624array_nextsize (int elem, int cur, int cnt)
415{ 625{
416 int ncur = cur + 1; 626 int ncur = cur + 1;
417 627
418 do 628 do
419 ncur <<= 1; 629 ncur <<= 1;
420 while (cnt > ncur); 630 while (cnt > ncur);
421 631
422 /* 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 */
423 if (elem * ncur > 4096) 633 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
424 { 634 {
425 ncur *= elem; 635 ncur *= elem;
426 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 636 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
427 ncur = ncur - sizeof (void *) * 4; 637 ncur = ncur - sizeof (void *) * 4;
428 ncur /= elem; 638 ncur /= elem;
429 } 639 }
430 640
431 return ncur; 641 return ncur;
… …
435array_realloc (int elem, void *base, int *cur, int cnt) 645array_realloc (int elem, void *base, int *cur, int cnt)
436{ 646{
437 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
438 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
439} 649}
650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
440 653
441#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
442 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
443 { \ 656 { \
444 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
… …
488 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
489} 702}
490 703
491/*****************************************************************************/ 704/*****************************************************************************/
492 705
493void inline_size
494anfds_init (ANFD *base, int count)
495{
496 while (count--)
497 {
498 base->head = 0;
499 base->events = EV_NONE;
500 base->reify = 0;
501
502 ++base;
503 }
504}
505
506void inline_speed 706void inline_speed
507fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
508{ 708{
509 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
510 ev_io *w; 710 ev_io *w;
… …
542 events |= (unsigned char)w->events; 742 events |= (unsigned char)w->events;
543 743
544#if EV_SELECT_IS_WINSOCKET 744#if EV_SELECT_IS_WINSOCKET
545 if (events) 745 if (events)
546 { 746 {
547 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
548 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
752 #endif
549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 753 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
550 } 754 }
551#endif 755#endif
552 756
553 { 757 {
554 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
607{ 811{
608 int fd; 812 int fd;
609 813
610 for (fd = 0; fd < anfdmax; ++fd) 814 for (fd = 0; fd < anfdmax; ++fd)
611 if (anfds [fd].events) 815 if (anfds [fd].events)
612 if (!fd_valid (fd) == -1 && errno == EBADF) 816 if (!fd_valid (fd) && errno == EBADF)
613 fd_kill (EV_A_ fd); 817 fd_kill (EV_A_ fd);
614} 818}
615 819
616/* 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 */
617static void noinline 821static void noinline
… …
635 839
636 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
637 if (anfds [fd].events) 841 if (anfds [fd].events)
638 { 842 {
639 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
640 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
641 } 846 }
642} 847}
643 848
644/*****************************************************************************/ 849/*****************************************************************************/
645 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 */
646void inline_speed 871void inline_speed
647upheap (WT *heap, int k) 872downheap (ANHE *heap, int N, int k)
648{ 873{
649 WT w = heap [k]; 874 ANHE he = heap [k];
875 ANHE *E = heap + N + HEAP0;
650 876
651 while (k) 877 for (;;)
652 { 878 {
653 int p = (k - 1) >> 1; 879 ev_tstamp minat;
880 ANHE *minpos;
881 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
654 882
655 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
656 break; 899 break;
657 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
658 heap [k] = heap [p]; 963 heap [k] = heap [p];
659 ((W)heap [k])->active = k + 1; 964 ev_active (ANHE_w (heap [k])) = k;
660 k = p; 965 k = p;
661 } 966 }
662 967
663 heap [k] = w; 968 heap [k] = he;
664 ((W)heap [k])->active = k + 1; 969 ev_active (ANHE_w (he)) = k;
665}
666
667void inline_speed
668downheap (WT *heap, int N, int k)
669{
670 WT w = heap [k];
671
672 for (;;)
673 {
674 int c = (k << 1) + 1;
675
676 if (c >= N)
677 break;
678
679 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
680 ? 1 : 0;
681
682 if (w->at <= heap [c]->at)
683 break;
684
685 heap [k] = heap [c];
686 ((W)heap [k])->active = k + 1;
687
688 k = c;
689 }
690
691 heap [k] = w;
692 ((W)heap [k])->active = k + 1;
693} 970}
694 971
695void inline_size 972void inline_size
696adjustheap (WT *heap, int N, int k) 973adjustheap (ANHE *heap, int N, int k)
697{ 974{
975 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
698 upheap (heap, k); 976 upheap (heap, k);
977 else
699 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);
700} 991}
701 992
702/*****************************************************************************/ 993/*****************************************************************************/
703 994
704typedef struct 995typedef struct
705{ 996{
706 WL head; 997 WL head;
707 sig_atomic_t volatile gotsig; 998 EV_ATOMIC_T gotsig;
708} ANSIG; 999} ANSIG;
709 1000
710static ANSIG *signals; 1001static ANSIG *signals;
711static int signalmax; 1002static int signalmax;
712 1003
713static int sigpipe [2]; 1004static EV_ATOMIC_T gotsig;
714static sig_atomic_t volatile gotsig;
715static ev_io sigev;
716 1005
717void inline_size 1006/*****************************************************************************/
718signals_init (ANSIG *base, int count)
719{
720 while (count--)
721 {
722 base->head = 0;
723 base->gotsig = 0;
724
725 ++base;
726 }
727}
728
729static void
730sighandler (int signum)
731{
732#if _WIN32
733 signal (signum, sighandler);
734#endif
735
736 signals [signum - 1].gotsig = 1;
737
738 if (!gotsig)
739 {
740 int old_errno = errno;
741 gotsig = 1;
742 write (sigpipe [1], &signum, 1);
743 errno = old_errno;
744 }
745}
746
747void noinline
748ev_feed_signal_event (EV_P_ int signum)
749{
750 WL w;
751
752#if EV_MULTIPLICITY
753 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
754#endif
755
756 --signum;
757
758 if (signum < 0 || signum >= signalmax)
759 return;
760
761 signals [signum].gotsig = 0;
762
763 for (w = signals [signum].head; w; w = w->next)
764 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
765}
766
767static void
768sigcb (EV_P_ ev_io *iow, int revents)
769{
770 int signum;
771
772 read (sigpipe [0], &revents, 1);
773 gotsig = 0;
774
775 for (signum = signalmax; signum--; )
776 if (signals [signum].gotsig)
777 ev_feed_signal_event (EV_A_ signum + 1);
778}
779 1007
780void inline_speed 1008void inline_speed
781fd_intern (int fd) 1009fd_intern (int fd)
782{ 1010{
783#ifdef _WIN32 1011#ifdef _WIN32
784 int arg = 1; 1012 unsigned long arg = 1;
785 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
786#else 1014#else
787 fcntl (fd, F_SETFD, FD_CLOEXEC); 1015 fcntl (fd, F_SETFD, FD_CLOEXEC);
788 fcntl (fd, F_SETFL, O_NONBLOCK); 1016 fcntl (fd, F_SETFL, O_NONBLOCK);
789#endif 1017#endif
790} 1018}
791 1019
792static void noinline 1020static void noinline
793siginit (EV_P) 1021evpipe_init (EV_P)
794{ 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
795 fd_intern (sigpipe [0]); 1038 fd_intern (evpipe [0]);
796 fd_intern (sigpipe [1]); 1039 fd_intern (evpipe [1]);
1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1041 }
797 1042
798 ev_io_set (&sigev, sigpipe [0], EV_READ);
799 ev_io_start (EV_A_ &sigev); 1043 ev_io_start (EV_A_ &pipeev);
800 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
801} 1111}
802 1112
803/*****************************************************************************/ 1113/*****************************************************************************/
804 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 (("libev: 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
805static WL childs [EV_PID_HASHSIZE]; 1152static WL childs [EV_PID_HASHSIZE];
806 1153
807#ifndef _WIN32 1154#ifndef _WIN32
808 1155
809static ev_signal childev; 1156static ev_signal childev;
810 1157
1158#ifndef WIFCONTINUED
1159# define WIFCONTINUED(status) 0
1160#endif
1161
811void inline_speed 1162void inline_speed
812child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1163child_reap (EV_P_ int chain, int pid, int status)
813{ 1164{
814 ev_child *w; 1165 ev_child *w;
1166 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
815 1167
816 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 {
817 if (w->pid == pid || !w->pid) 1170 if ((w->pid == pid || !w->pid)
1171 && (!traced || (w->flags & 1)))
818 { 1172 {
819 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 */
820 w->rpid = pid; 1174 w->rpid = pid;
821 w->rstatus = status; 1175 w->rstatus = status;
822 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1176 ev_feed_event (EV_A_ (W)w, EV_CHILD);
823 } 1177 }
1178 }
824} 1179}
825 1180
826#ifndef WCONTINUED 1181#ifndef WCONTINUED
827# define WCONTINUED 0 1182# define WCONTINUED 0
828#endif 1183#endif
… …
837 if (!WCONTINUED 1192 if (!WCONTINUED
838 || errno != EINVAL 1193 || errno != EINVAL
839 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1194 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
840 return; 1195 return;
841 1196
842 /* 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 */
843 /* 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 */
844 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1199 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
845 1200
846 child_reap (EV_A_ sw, pid, pid, status); 1201 child_reap (EV_A_ pid, pid, status);
847 if (EV_PID_HASHSIZE > 1) 1202 if (EV_PID_HASHSIZE > 1)
848 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 */
849} 1204}
850 1205
851#endif 1206#endif
852 1207
853/*****************************************************************************/ 1208/*****************************************************************************/
… …
915 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
916 /* 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 */
917 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
918#endif 1273#endif
919#ifdef __APPLE__ 1274#ifdef __APPLE__
920 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 /* only select works correctly on that "unix-certified" platform */
921 flags &= ~EVBACKEND_POLL; 1276 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1277 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
922#endif 1278#endif
923 1279
924 return flags; 1280 return flags;
925} 1281}
926 1282
927unsigned int 1283unsigned int
928ev_embeddable_backends (void) 1284ev_embeddable_backends (void)
929{ 1285{
930 return EVBACKEND_EPOLL 1286 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
931 | EVBACKEND_KQUEUE 1287
932 | EVBACKEND_PORT; 1288 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1289 /* please fix it and tell me how to detect the fix */
1290 flags &= ~EVBACKEND_EPOLL;
1291
1292 return flags;
933} 1293}
934 1294
935unsigned int 1295unsigned int
936ev_backend (EV_P) 1296ev_backend (EV_P)
937{ 1297{
… …
940 1300
941unsigned int 1301unsigned int
942ev_loop_count (EV_P) 1302ev_loop_count (EV_P)
943{ 1303{
944 return loop_count; 1304 return loop_count;
1305}
1306
1307void
1308ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1309{
1310 io_blocktime = interval;
1311}
1312
1313void
1314ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1315{
1316 timeout_blocktime = interval;
945} 1317}
946 1318
947static void noinline 1319static void noinline
948loop_init (EV_P_ unsigned int flags) 1320loop_init (EV_P_ unsigned int flags)
949{ 1321{
… …
955 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1327 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
956 have_monotonic = 1; 1328 have_monotonic = 1;
957 } 1329 }
958#endif 1330#endif
959 1331
960 ev_rt_now = ev_time (); 1332 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1333 mn_now = get_clock ();
962 now_floor = mn_now; 1334 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1335 rtmn_diff = ev_rt_now - mn_now;
1336
1337 io_blocktime = 0.;
1338 timeout_blocktime = 0.;
1339 backend = 0;
1340 backend_fd = -1;
1341 gotasync = 0;
1342#if EV_USE_INOTIFY
1343 fs_fd = -2;
1344#endif
964 1345
965 /* pid check not overridable via env */ 1346 /* pid check not overridable via env */
966#ifndef _WIN32 1347#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1348 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1349 curpid = getpid ();
… …
971 if (!(flags & EVFLAG_NOENV) 1352 if (!(flags & EVFLAG_NOENV)
972 && !enable_secure () 1353 && !enable_secure ()
973 && getenv ("LIBEV_FLAGS")) 1354 && getenv ("LIBEV_FLAGS"))
974 flags = atoi (getenv ("LIBEV_FLAGS")); 1355 flags = atoi (getenv ("LIBEV_FLAGS"));
975 1356
976 if (!(flags & 0x0000ffffUL)) 1357 if (!(flags & 0x0000ffffU))
977 flags |= ev_recommended_backends (); 1358 flags |= ev_recommended_backends ();
978
979 backend = 0;
980 backend_fd = -1;
981#if EV_USE_INOTIFY
982 fs_fd = -2;
983#endif
984 1359
985#if EV_USE_PORT 1360#if EV_USE_PORT
986 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1361 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
987#endif 1362#endif
988#if EV_USE_KQUEUE 1363#if EV_USE_KQUEUE
… …
996#endif 1371#endif
997#if EV_USE_SELECT 1372#if EV_USE_SELECT
998 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1373 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
999#endif 1374#endif
1000 1375
1001 ev_init (&sigev, sigcb); 1376 ev_init (&pipeev, pipecb);
1002 ev_set_priority (&sigev, EV_MAXPRI); 1377 ev_set_priority (&pipeev, EV_MAXPRI);
1003 } 1378 }
1004} 1379}
1005 1380
1006static void noinline 1381static void noinline
1007loop_destroy (EV_P) 1382loop_destroy (EV_P)
1008{ 1383{
1009 int i; 1384 int i;
1385
1386 if (ev_is_active (&pipeev))
1387 {
1388 ev_ref (EV_A); /* signal watcher */
1389 ev_io_stop (EV_A_ &pipeev);
1390
1391#if EV_USE_EVENTFD
1392 if (evfd >= 0)
1393 close (evfd);
1394#endif
1395
1396 if (evpipe [0] >= 0)
1397 {
1398 close (evpipe [0]);
1399 close (evpipe [1]);
1400 }
1401 }
1010 1402
1011#if EV_USE_INOTIFY 1403#if EV_USE_INOTIFY
1012 if (fs_fd >= 0) 1404 if (fs_fd >= 0)
1013 close (fs_fd); 1405 close (fs_fd);
1014#endif 1406#endif
… …
1037 array_free (pending, [i]); 1429 array_free (pending, [i]);
1038#if EV_IDLE_ENABLE 1430#if EV_IDLE_ENABLE
1039 array_free (idle, [i]); 1431 array_free (idle, [i]);
1040#endif 1432#endif
1041 } 1433 }
1434
1435 ev_free (anfds); anfdmax = 0;
1042 1436
1043 /* have to use the microsoft-never-gets-it-right macro */ 1437 /* have to use the microsoft-never-gets-it-right macro */
1044 array_free (fdchange, EMPTY); 1438 array_free (fdchange, EMPTY);
1045 array_free (timer, EMPTY); 1439 array_free (timer, EMPTY);
1046#if EV_PERIODIC_ENABLE 1440#if EV_PERIODIC_ENABLE
1047 array_free (periodic, EMPTY); 1441 array_free (periodic, EMPTY);
1048#endif 1442#endif
1443#if EV_FORK_ENABLE
1444 array_free (fork, EMPTY);
1445#endif
1049 array_free (prepare, EMPTY); 1446 array_free (prepare, EMPTY);
1050 array_free (check, EMPTY); 1447 array_free (check, EMPTY);
1448#if EV_ASYNC_ENABLE
1449 array_free (async, EMPTY);
1450#endif
1051 1451
1052 backend = 0; 1452 backend = 0;
1053} 1453}
1054 1454
1455#if EV_USE_INOTIFY
1055void inline_size infy_fork (EV_P); 1456void inline_size infy_fork (EV_P);
1457#endif
1056 1458
1057void inline_size 1459void inline_size
1058loop_fork (EV_P) 1460loop_fork (EV_P)
1059{ 1461{
1060#if EV_USE_PORT 1462#if EV_USE_PORT
… …
1068#endif 1470#endif
1069#if EV_USE_INOTIFY 1471#if EV_USE_INOTIFY
1070 infy_fork (EV_A); 1472 infy_fork (EV_A);
1071#endif 1473#endif
1072 1474
1073 if (ev_is_active (&sigev)) 1475 if (ev_is_active (&pipeev))
1074 { 1476 {
1075 /* default loop */ 1477 /* this "locks" the handlers against writing to the pipe */
1478 /* while we modify the fd vars */
1479 gotsig = 1;
1480#if EV_ASYNC_ENABLE
1481 gotasync = 1;
1482#endif
1076 1483
1077 ev_ref (EV_A); 1484 ev_ref (EV_A);
1078 ev_io_stop (EV_A_ &sigev); 1485 ev_io_stop (EV_A_ &pipeev);
1486
1487#if EV_USE_EVENTFD
1488 if (evfd >= 0)
1489 close (evfd);
1490#endif
1491
1492 if (evpipe [0] >= 0)
1493 {
1079 close (sigpipe [0]); 1494 close (evpipe [0]);
1080 close (sigpipe [1]); 1495 close (evpipe [1]);
1496 }
1081 1497
1082 while (pipe (sigpipe))
1083 syserr ("(libev) error creating pipe");
1084
1085 siginit (EV_A); 1498 evpipe_init (EV_A);
1499 /* now iterate over everything, in case we missed something */
1500 pipecb (EV_A_ &pipeev, EV_READ);
1086 } 1501 }
1087 1502
1088 postfork = 0; 1503 postfork = 0;
1089} 1504}
1090 1505
1091#if EV_MULTIPLICITY 1506#if EV_MULTIPLICITY
1507
1092struct ev_loop * 1508struct ev_loop *
1093ev_loop_new (unsigned int flags) 1509ev_loop_new (unsigned int flags)
1094{ 1510{
1095 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1511 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1096 1512
… …
1112} 1528}
1113 1529
1114void 1530void
1115ev_loop_fork (EV_P) 1531ev_loop_fork (EV_P)
1116{ 1532{
1117 postfork = 1; 1533 postfork = 1; /* must be in line with ev_default_fork */
1118} 1534}
1119 1535
1536#if EV_VERIFY
1537static void noinline
1538verify_watcher (EV_P_ W w)
1539{
1540 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1541
1542 if (w->pending)
1543 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1544}
1545
1546static void noinline
1547verify_heap (EV_P_ ANHE *heap, int N)
1548{
1549 int i;
1550
1551 for (i = HEAP0; i < N + HEAP0; ++i)
1552 {
1553 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1554 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1555 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1556
1557 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1558 }
1559}
1560
1561static void noinline
1562array_verify (EV_P_ W *ws, int cnt)
1563{
1564 while (cnt--)
1565 {
1566 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1567 verify_watcher (EV_A_ ws [cnt]);
1568 }
1569}
1570#endif
1571
1572void
1573ev_loop_verify (EV_P)
1574{
1575#if EV_VERIFY
1576 int i;
1577 WL w;
1578
1579 assert (activecnt >= -1);
1580
1581 assert (fdchangemax >= fdchangecnt);
1582 for (i = 0; i < fdchangecnt; ++i)
1583 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1584
1585 assert (anfdmax >= 0);
1586 for (i = 0; i < anfdmax; ++i)
1587 for (w = anfds [i].head; w; w = w->next)
1588 {
1589 verify_watcher (EV_A_ (W)w);
1590 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1591 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1592 }
1593
1594 assert (timermax >= timercnt);
1595 verify_heap (EV_A_ timers, timercnt);
1596
1597#if EV_PERIODIC_ENABLE
1598 assert (periodicmax >= periodiccnt);
1599 verify_heap (EV_A_ periodics, periodiccnt);
1600#endif
1601
1602 for (i = NUMPRI; i--; )
1603 {
1604 assert (pendingmax [i] >= pendingcnt [i]);
1605#if EV_IDLE_ENABLE
1606 assert (idleall >= 0);
1607 assert (idlemax [i] >= idlecnt [i]);
1608 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1609#endif
1610 }
1611
1612#if EV_FORK_ENABLE
1613 assert (forkmax >= forkcnt);
1614 array_verify (EV_A_ (W *)forks, forkcnt);
1615#endif
1616
1617#if EV_ASYNC_ENABLE
1618 assert (asyncmax >= asynccnt);
1619 array_verify (EV_A_ (W *)asyncs, asynccnt);
1620#endif
1621
1622 assert (preparemax >= preparecnt);
1623 array_verify (EV_A_ (W *)prepares, preparecnt);
1624
1625 assert (checkmax >= checkcnt);
1626 array_verify (EV_A_ (W *)checks, checkcnt);
1627
1628# if 0
1629 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1630 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1120#endif 1631# endif
1632#endif
1633}
1634
1635#endif /* multiplicity */
1121 1636
1122#if EV_MULTIPLICITY 1637#if EV_MULTIPLICITY
1123struct ev_loop * 1638struct ev_loop *
1124ev_default_loop_init (unsigned int flags) 1639ev_default_loop_init (unsigned int flags)
1125#else 1640#else
1126int 1641int
1127ev_default_loop (unsigned int flags) 1642ev_default_loop (unsigned int flags)
1128#endif 1643#endif
1129{ 1644{
1130 if (sigpipe [0] == sigpipe [1])
1131 if (pipe (sigpipe))
1132 return 0;
1133
1134 if (!ev_default_loop_ptr) 1645 if (!ev_default_loop_ptr)
1135 { 1646 {
1136#if EV_MULTIPLICITY 1647#if EV_MULTIPLICITY
1137 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1648 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1138#else 1649#else
… …
1141 1652
1142 loop_init (EV_A_ flags); 1653 loop_init (EV_A_ flags);
1143 1654
1144 if (ev_backend (EV_A)) 1655 if (ev_backend (EV_A))
1145 { 1656 {
1146 siginit (EV_A);
1147
1148#ifndef _WIN32 1657#ifndef _WIN32
1149 ev_signal_init (&childev, childcb, SIGCHLD); 1658 ev_signal_init (&childev, childcb, SIGCHLD);
1150 ev_set_priority (&childev, EV_MAXPRI); 1659 ev_set_priority (&childev, EV_MAXPRI);
1151 ev_signal_start (EV_A_ &childev); 1660 ev_signal_start (EV_A_ &childev);
1152 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1661 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1164{ 1673{
1165#if EV_MULTIPLICITY 1674#if EV_MULTIPLICITY
1166 struct ev_loop *loop = ev_default_loop_ptr; 1675 struct ev_loop *loop = ev_default_loop_ptr;
1167#endif 1676#endif
1168 1677
1678 ev_default_loop_ptr = 0;
1679
1169#ifndef _WIN32 1680#ifndef _WIN32
1170 ev_ref (EV_A); /* child watcher */ 1681 ev_ref (EV_A); /* child watcher */
1171 ev_signal_stop (EV_A_ &childev); 1682 ev_signal_stop (EV_A_ &childev);
1172#endif 1683#endif
1173 1684
1174 ev_ref (EV_A); /* signal watcher */
1175 ev_io_stop (EV_A_ &sigev);
1176
1177 close (sigpipe [0]); sigpipe [0] = 0;
1178 close (sigpipe [1]); sigpipe [1] = 0;
1179
1180 loop_destroy (EV_A); 1685 loop_destroy (EV_A);
1181} 1686}
1182 1687
1183void 1688void
1184ev_default_fork (void) 1689ev_default_fork (void)
1185{ 1690{
1186#if EV_MULTIPLICITY 1691#if EV_MULTIPLICITY
1187 struct ev_loop *loop = ev_default_loop_ptr; 1692 struct ev_loop *loop = ev_default_loop_ptr;
1188#endif 1693#endif
1189 1694
1190 if (backend) 1695 postfork = 1; /* must be in line with ev_loop_fork */
1191 postfork = 1;
1192} 1696}
1193 1697
1194/*****************************************************************************/ 1698/*****************************************************************************/
1195 1699
1196void 1700void
… …
1209 { 1713 {
1210 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1714 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1211 1715
1212 if (expect_true (p->w)) 1716 if (expect_true (p->w))
1213 { 1717 {
1214 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1718 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1215 1719
1216 p->w->pending = 0; 1720 p->w->pending = 0;
1217 EV_CB_INVOKE (p->w, p->events); 1721 EV_CB_INVOKE (p->w, p->events);
1722 EV_FREQUENT_CHECK;
1218 } 1723 }
1219 } 1724 }
1220} 1725}
1221
1222void inline_size
1223timers_reify (EV_P)
1224{
1225 while (timercnt && ((WT)timers [0])->at <= mn_now)
1226 {
1227 ev_timer *w = (ev_timer *)timers [0];
1228
1229 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1230
1231 /* first reschedule or stop timer */
1232 if (w->repeat)
1233 {
1234 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1235
1236 ((WT)w)->at += w->repeat;
1237 if (((WT)w)->at < mn_now)
1238 ((WT)w)->at = mn_now;
1239
1240 downheap (timers, timercnt, 0);
1241 }
1242 else
1243 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1244
1245 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1246 }
1247}
1248
1249#if EV_PERIODIC_ENABLE
1250void inline_size
1251periodics_reify (EV_P)
1252{
1253 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1254 {
1255 ev_periodic *w = (ev_periodic *)periodics [0];
1256
1257 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1258
1259 /* first reschedule or stop timer */
1260 if (w->reschedule_cb)
1261 {
1262 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1263 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1264 downheap (periodics, periodiccnt, 0);
1265 }
1266 else if (w->interval)
1267 {
1268 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1269 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1270 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1271 downheap (periodics, periodiccnt, 0);
1272 }
1273 else
1274 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1275
1276 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1277 }
1278}
1279
1280static void noinline
1281periodics_reschedule (EV_P)
1282{
1283 int i;
1284
1285 /* adjust periodics after time jump */
1286 for (i = 0; i < periodiccnt; ++i)
1287 {
1288 ev_periodic *w = (ev_periodic *)periodics [i];
1289
1290 if (w->reschedule_cb)
1291 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1292 else if (w->interval)
1293 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1294 }
1295
1296 /* now rebuild the heap */
1297 for (i = periodiccnt >> 1; i--; )
1298 downheap (periodics, periodiccnt, i);
1299}
1300#endif
1301 1726
1302#if EV_IDLE_ENABLE 1727#if EV_IDLE_ENABLE
1303void inline_size 1728void inline_size
1304idle_reify (EV_P) 1729idle_reify (EV_P)
1305{ 1730{
… …
1317 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1742 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1318 break; 1743 break;
1319 } 1744 }
1320 } 1745 }
1321 } 1746 }
1747}
1748#endif
1749
1750void inline_size
1751timers_reify (EV_P)
1752{
1753 EV_FREQUENT_CHECK;
1754
1755 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1756 {
1757 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1758
1759 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1760
1761 /* first reschedule or stop timer */
1762 if (w->repeat)
1763 {
1764 ev_at (w) += w->repeat;
1765 if (ev_at (w) < mn_now)
1766 ev_at (w) = mn_now;
1767
1768 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1769
1770 ANHE_at_cache (timers [HEAP0]);
1771 downheap (timers, timercnt, HEAP0);
1772 }
1773 else
1774 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1775
1776 EV_FREQUENT_CHECK;
1777 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1778 }
1779}
1780
1781#if EV_PERIODIC_ENABLE
1782void inline_size
1783periodics_reify (EV_P)
1784{
1785 EV_FREQUENT_CHECK;
1786
1787 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1788 {
1789 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1790
1791 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1792
1793 /* first reschedule or stop timer */
1794 if (w->reschedule_cb)
1795 {
1796 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1797
1798 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1799
1800 ANHE_at_cache (periodics [HEAP0]);
1801 downheap (periodics, periodiccnt, HEAP0);
1802 }
1803 else if (w->interval)
1804 {
1805 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1806 /* if next trigger time is not sufficiently in the future, put it there */
1807 /* this might happen because of floating point inexactness */
1808 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1809 {
1810 ev_at (w) += w->interval;
1811
1812 /* if interval is unreasonably low we might still have a time in the past */
1813 /* so correct this. this will make the periodic very inexact, but the user */
1814 /* has effectively asked to get triggered more often than possible */
1815 if (ev_at (w) < ev_rt_now)
1816 ev_at (w) = ev_rt_now;
1817 }
1818
1819 ANHE_at_cache (periodics [HEAP0]);
1820 downheap (periodics, periodiccnt, HEAP0);
1821 }
1822 else
1823 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1824
1825 EV_FREQUENT_CHECK;
1826 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1827 }
1828}
1829
1830static void noinline
1831periodics_reschedule (EV_P)
1832{
1833 int i;
1834
1835 /* adjust periodics after time jump */
1836 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1837 {
1838 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1839
1840 if (w->reschedule_cb)
1841 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1842 else if (w->interval)
1843 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1844
1845 ANHE_at_cache (periodics [i]);
1846 }
1847
1848 reheap (periodics, periodiccnt);
1322} 1849}
1323#endif 1850#endif
1324 1851
1325void inline_speed 1852void inline_speed
1326time_update (EV_P_ ev_tstamp max_block) 1853time_update (EV_P_ ev_tstamp max_block)
… …
1355 */ 1882 */
1356 for (i = 4; --i; ) 1883 for (i = 4; --i; )
1357 { 1884 {
1358 rtmn_diff = ev_rt_now - mn_now; 1885 rtmn_diff = ev_rt_now - mn_now;
1359 1886
1360 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1887 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1361 return; /* all is well */ 1888 return; /* all is well */
1362 1889
1363 ev_rt_now = ev_time (); 1890 ev_rt_now = ev_time ();
1364 mn_now = get_clock (); 1891 mn_now = get_clock ();
1365 now_floor = mn_now; 1892 now_floor = mn_now;
… …
1381#if EV_PERIODIC_ENABLE 1908#if EV_PERIODIC_ENABLE
1382 periodics_reschedule (EV_A); 1909 periodics_reschedule (EV_A);
1383#endif 1910#endif
1384 /* adjust timers. this is easy, as the offset is the same for all of them */ 1911 /* adjust timers. this is easy, as the offset is the same for all of them */
1385 for (i = 0; i < timercnt; ++i) 1912 for (i = 0; i < timercnt; ++i)
1913 {
1914 ANHE *he = timers + i + HEAP0;
1386 ((WT)timers [i])->at += ev_rt_now - mn_now; 1915 ANHE_w (*he)->at += ev_rt_now - mn_now;
1916 ANHE_at_cache (*he);
1917 }
1387 } 1918 }
1388 1919
1389 mn_now = ev_rt_now; 1920 mn_now = ev_rt_now;
1390 } 1921 }
1391} 1922}
… …
1400ev_unref (EV_P) 1931ev_unref (EV_P)
1401{ 1932{
1402 --activecnt; 1933 --activecnt;
1403} 1934}
1404 1935
1936void
1937ev_now_update (EV_P)
1938{
1939 time_update (EV_A_ 1e100);
1940}
1941
1405static int loop_done; 1942static int loop_done;
1406 1943
1407void 1944void
1408ev_loop (EV_P_ int flags) 1945ev_loop (EV_P_ int flags)
1409{ 1946{
1410 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1947 loop_done = EVUNLOOP_CANCEL;
1411 ? EVUNLOOP_ONE
1412 : EVUNLOOP_CANCEL;
1413 1948
1414 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1949 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1415 1950
1416 do 1951 do
1417 { 1952 {
1953#if EV_VERIFY >= 2
1954 ev_loop_verify (EV_A);
1955#endif
1956
1418#ifndef _WIN32 1957#ifndef _WIN32
1419 if (expect_false (curpid)) /* penalise the forking check even more */ 1958 if (expect_false (curpid)) /* penalise the forking check even more */
1420 if (expect_false (getpid () != curpid)) 1959 if (expect_false (getpid () != curpid))
1421 { 1960 {
1422 curpid = getpid (); 1961 curpid = getpid ();
… …
1451 /* update fd-related kernel structures */ 1990 /* update fd-related kernel structures */
1452 fd_reify (EV_A); 1991 fd_reify (EV_A);
1453 1992
1454 /* calculate blocking time */ 1993 /* calculate blocking time */
1455 { 1994 {
1456 ev_tstamp block; 1995 ev_tstamp waittime = 0.;
1996 ev_tstamp sleeptime = 0.;
1457 1997
1458 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1998 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1459 block = 0.; /* do not block at all */
1460 else
1461 { 1999 {
1462 /* update time to cancel out callback processing overhead */ 2000 /* update time to cancel out callback processing overhead */
1463 time_update (EV_A_ 1e100); 2001 time_update (EV_A_ 1e100);
1464 2002
1465 block = MAX_BLOCKTIME; 2003 waittime = MAX_BLOCKTIME;
1466 2004
1467 if (timercnt) 2005 if (timercnt)
1468 { 2006 {
1469 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 2007 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1470 if (block > to) block = to; 2008 if (waittime > to) waittime = to;
1471 } 2009 }
1472 2010
1473#if EV_PERIODIC_ENABLE 2011#if EV_PERIODIC_ENABLE
1474 if (periodiccnt) 2012 if (periodiccnt)
1475 { 2013 {
1476 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 2014 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1477 if (block > to) block = to; 2015 if (waittime > to) waittime = to;
1478 } 2016 }
1479#endif 2017#endif
1480 2018
1481 if (expect_false (block < 0.)) block = 0.; 2019 if (expect_false (waittime < timeout_blocktime))
2020 waittime = timeout_blocktime;
2021
2022 sleeptime = waittime - backend_fudge;
2023
2024 if (expect_true (sleeptime > io_blocktime))
2025 sleeptime = io_blocktime;
2026
2027 if (sleeptime)
2028 {
2029 ev_sleep (sleeptime);
2030 waittime -= sleeptime;
2031 }
1482 } 2032 }
1483 2033
1484 ++loop_count; 2034 ++loop_count;
1485 backend_poll (EV_A_ block); 2035 backend_poll (EV_A_ waittime);
1486 2036
1487 /* update ev_rt_now, do magic */ 2037 /* update ev_rt_now, do magic */
1488 time_update (EV_A_ block); 2038 time_update (EV_A_ waittime + sleeptime);
1489 } 2039 }
1490 2040
1491 /* queue pending timers and reschedule them */ 2041 /* queue pending timers and reschedule them */
1492 timers_reify (EV_A); /* relative timers called last */ 2042 timers_reify (EV_A); /* relative timers called last */
1493#if EV_PERIODIC_ENABLE 2043#if EV_PERIODIC_ENABLE
… …
1502 /* queue check watchers, to be executed first */ 2052 /* queue check watchers, to be executed first */
1503 if (expect_false (checkcnt)) 2053 if (expect_false (checkcnt))
1504 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2054 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1505 2055
1506 call_pending (EV_A); 2056 call_pending (EV_A);
1507
1508 } 2057 }
1509 while (expect_true (activecnt && !loop_done)); 2058 while (expect_true (
2059 activecnt
2060 && !loop_done
2061 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2062 ));
1510 2063
1511 if (loop_done == EVUNLOOP_ONE) 2064 if (loop_done == EVUNLOOP_ONE)
1512 loop_done = EVUNLOOP_CANCEL; 2065 loop_done = EVUNLOOP_CANCEL;
1513} 2066}
1514 2067
… …
1601 int fd = w->fd; 2154 int fd = w->fd;
1602 2155
1603 if (expect_false (ev_is_active (w))) 2156 if (expect_false (ev_is_active (w)))
1604 return; 2157 return;
1605 2158
1606 assert (("ev_io_start called with negative fd", fd >= 0)); 2159 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2160 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2161
2162 EV_FREQUENT_CHECK;
1607 2163
1608 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
1609 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2165 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1610 wlist_add (&anfds[fd].head, (WL)w); 2166 wlist_add (&anfds[fd].head, (WL)w);
1611 2167
1612 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2168 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1613 w->events &= ~EV_IOFDSET; 2169 w->events &= ~EV_IOFDSET;
2170
2171 EV_FREQUENT_CHECK;
1614} 2172}
1615 2173
1616void noinline 2174void noinline
1617ev_io_stop (EV_P_ ev_io *w) 2175ev_io_stop (EV_P_ ev_io *w)
1618{ 2176{
1619 clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
1620 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
1621 return; 2179 return;
1622 2180
1623 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2181 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2182
2183 EV_FREQUENT_CHECK;
1624 2184
1625 wlist_del (&anfds[w->fd].head, (WL)w); 2185 wlist_del (&anfds[w->fd].head, (WL)w);
1626 ev_stop (EV_A_ (W)w); 2186 ev_stop (EV_A_ (W)w);
1627 2187
1628 fd_change (EV_A_ w->fd, 1); 2188 fd_change (EV_A_ w->fd, 1);
2189
2190 EV_FREQUENT_CHECK;
1629} 2191}
1630 2192
1631void noinline 2193void noinline
1632ev_timer_start (EV_P_ ev_timer *w) 2194ev_timer_start (EV_P_ ev_timer *w)
1633{ 2195{
1634 if (expect_false (ev_is_active (w))) 2196 if (expect_false (ev_is_active (w)))
1635 return; 2197 return;
1636 2198
1637 ((WT)w)->at += mn_now; 2199 ev_at (w) += mn_now;
1638 2200
1639 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2201 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1640 2202
2203 EV_FREQUENT_CHECK;
2204
2205 ++timercnt;
1641 ev_start (EV_A_ (W)w, ++timercnt); 2206 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1642 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2207 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1643 timers [timercnt - 1] = (WT)w; 2208 ANHE_w (timers [ev_active (w)]) = (WT)w;
1644 upheap (timers, timercnt - 1); 2209 ANHE_at_cache (timers [ev_active (w)]);
2210 upheap (timers, ev_active (w));
1645 2211
2212 EV_FREQUENT_CHECK;
2213
1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2214 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1647} 2215}
1648 2216
1649void noinline 2217void noinline
1650ev_timer_stop (EV_P_ ev_timer *w) 2218ev_timer_stop (EV_P_ ev_timer *w)
1651{ 2219{
1652 clear_pending (EV_A_ (W)w); 2220 clear_pending (EV_A_ (W)w);
1653 if (expect_false (!ev_is_active (w))) 2221 if (expect_false (!ev_is_active (w)))
1654 return; 2222 return;
1655 2223
1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 2224 EV_FREQUENT_CHECK;
1657 2225
1658 { 2226 {
1659 int active = ((W)w)->active; 2227 int active = ev_active (w);
1660 2228
2229 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2230
2231 --timercnt;
2232
1661 if (expect_true (--active < --timercnt)) 2233 if (expect_true (active < timercnt + HEAP0))
1662 { 2234 {
1663 timers [active] = timers [timercnt]; 2235 timers [active] = timers [timercnt + HEAP0];
1664 adjustheap (timers, timercnt, active); 2236 adjustheap (timers, timercnt, active);
1665 } 2237 }
1666 } 2238 }
1667 2239
1668 ((WT)w)->at -= mn_now; 2240 EV_FREQUENT_CHECK;
2241
2242 ev_at (w) -= mn_now;
1669 2243
1670 ev_stop (EV_A_ (W)w); 2244 ev_stop (EV_A_ (W)w);
1671} 2245}
1672 2246
1673void noinline 2247void noinline
1674ev_timer_again (EV_P_ ev_timer *w) 2248ev_timer_again (EV_P_ ev_timer *w)
1675{ 2249{
2250 EV_FREQUENT_CHECK;
2251
1676 if (ev_is_active (w)) 2252 if (ev_is_active (w))
1677 { 2253 {
1678 if (w->repeat) 2254 if (w->repeat)
1679 { 2255 {
1680 ((WT)w)->at = mn_now + w->repeat; 2256 ev_at (w) = mn_now + w->repeat;
2257 ANHE_at_cache (timers [ev_active (w)]);
1681 adjustheap (timers, timercnt, ((W)w)->active - 1); 2258 adjustheap (timers, timercnt, ev_active (w));
1682 } 2259 }
1683 else 2260 else
1684 ev_timer_stop (EV_A_ w); 2261 ev_timer_stop (EV_A_ w);
1685 } 2262 }
1686 else if (w->repeat) 2263 else if (w->repeat)
1687 { 2264 {
1688 w->at = w->repeat; 2265 ev_at (w) = w->repeat;
1689 ev_timer_start (EV_A_ w); 2266 ev_timer_start (EV_A_ w);
1690 } 2267 }
2268
2269 EV_FREQUENT_CHECK;
1691} 2270}
1692 2271
1693#if EV_PERIODIC_ENABLE 2272#if EV_PERIODIC_ENABLE
1694void noinline 2273void noinline
1695ev_periodic_start (EV_P_ ev_periodic *w) 2274ev_periodic_start (EV_P_ ev_periodic *w)
1696{ 2275{
1697 if (expect_false (ev_is_active (w))) 2276 if (expect_false (ev_is_active (w)))
1698 return; 2277 return;
1699 2278
1700 if (w->reschedule_cb) 2279 if (w->reschedule_cb)
1701 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2280 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1702 else if (w->interval) 2281 else if (w->interval)
1703 { 2282 {
1704 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2283 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
1705 /* this formula differs from the one in periodic_reify because we do not always round up */ 2284 /* this formula differs from the one in periodic_reify because we do not always round up */
1706 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2285 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1707 } 2286 }
1708 else 2287 else
1709 ((WT)w)->at = w->offset; 2288 ev_at (w) = w->offset;
1710 2289
2290 EV_FREQUENT_CHECK;
2291
2292 ++periodiccnt;
1711 ev_start (EV_A_ (W)w, ++periodiccnt); 2293 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1712 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2294 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1713 periodics [periodiccnt - 1] = (WT)w; 2295 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1714 upheap (periodics, periodiccnt - 1); 2296 ANHE_at_cache (periodics [ev_active (w)]);
2297 upheap (periodics, ev_active (w));
1715 2298
2299 EV_FREQUENT_CHECK;
2300
1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2301 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1717} 2302}
1718 2303
1719void noinline 2304void noinline
1720ev_periodic_stop (EV_P_ ev_periodic *w) 2305ev_periodic_stop (EV_P_ ev_periodic *w)
1721{ 2306{
1722 clear_pending (EV_A_ (W)w); 2307 clear_pending (EV_A_ (W)w);
1723 if (expect_false (!ev_is_active (w))) 2308 if (expect_false (!ev_is_active (w)))
1724 return; 2309 return;
1725 2310
1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 2311 EV_FREQUENT_CHECK;
1727 2312
1728 { 2313 {
1729 int active = ((W)w)->active; 2314 int active = ev_active (w);
1730 2315
2316 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2317
2318 --periodiccnt;
2319
1731 if (expect_true (--active < --periodiccnt)) 2320 if (expect_true (active < periodiccnt + HEAP0))
1732 { 2321 {
1733 periodics [active] = periodics [periodiccnt]; 2322 periodics [active] = periodics [periodiccnt + HEAP0];
1734 adjustheap (periodics, periodiccnt, active); 2323 adjustheap (periodics, periodiccnt, active);
1735 } 2324 }
1736 } 2325 }
1737 2326
2327 EV_FREQUENT_CHECK;
2328
1738 ev_stop (EV_A_ (W)w); 2329 ev_stop (EV_A_ (W)w);
1739} 2330}
1740 2331
1741void noinline 2332void noinline
1742ev_periodic_again (EV_P_ ev_periodic *w) 2333ev_periodic_again (EV_P_ ev_periodic *w)
… …
1753 2344
1754void noinline 2345void noinline
1755ev_signal_start (EV_P_ ev_signal *w) 2346ev_signal_start (EV_P_ ev_signal *w)
1756{ 2347{
1757#if EV_MULTIPLICITY 2348#if EV_MULTIPLICITY
1758 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2349 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1759#endif 2350#endif
1760 if (expect_false (ev_is_active (w))) 2351 if (expect_false (ev_is_active (w)))
1761 return; 2352 return;
1762 2353
1763 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2354 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2355
2356 evpipe_init (EV_A);
2357
2358 EV_FREQUENT_CHECK;
1764 2359
1765 { 2360 {
1766#ifndef _WIN32 2361#ifndef _WIN32
1767 sigset_t full, prev; 2362 sigset_t full, prev;
1768 sigfillset (&full); 2363 sigfillset (&full);
1769 sigprocmask (SIG_SETMASK, &full, &prev); 2364 sigprocmask (SIG_SETMASK, &full, &prev);
1770#endif 2365#endif
1771 2366
1772 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2367 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
1773 2368
1774#ifndef _WIN32 2369#ifndef _WIN32
1775 sigprocmask (SIG_SETMASK, &prev, 0); 2370 sigprocmask (SIG_SETMASK, &prev, 0);
1776#endif 2371#endif
1777 } 2372 }
… …
1780 wlist_add (&signals [w->signum - 1].head, (WL)w); 2375 wlist_add (&signals [w->signum - 1].head, (WL)w);
1781 2376
1782 if (!((WL)w)->next) 2377 if (!((WL)w)->next)
1783 { 2378 {
1784#if _WIN32 2379#if _WIN32
1785 signal (w->signum, sighandler); 2380 signal (w->signum, ev_sighandler);
1786#else 2381#else
1787 struct sigaction sa; 2382 struct sigaction sa;
1788 sa.sa_handler = sighandler; 2383 sa.sa_handler = ev_sighandler;
1789 sigfillset (&sa.sa_mask); 2384 sigfillset (&sa.sa_mask);
1790 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2385 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1791 sigaction (w->signum, &sa, 0); 2386 sigaction (w->signum, &sa, 0);
1792#endif 2387#endif
1793 } 2388 }
2389
2390 EV_FREQUENT_CHECK;
1794} 2391}
1795 2392
1796void noinline 2393void noinline
1797ev_signal_stop (EV_P_ ev_signal *w) 2394ev_signal_stop (EV_P_ ev_signal *w)
1798{ 2395{
1799 clear_pending (EV_A_ (W)w); 2396 clear_pending (EV_A_ (W)w);
1800 if (expect_false (!ev_is_active (w))) 2397 if (expect_false (!ev_is_active (w)))
1801 return; 2398 return;
1802 2399
2400 EV_FREQUENT_CHECK;
2401
1803 wlist_del (&signals [w->signum - 1].head, (WL)w); 2402 wlist_del (&signals [w->signum - 1].head, (WL)w);
1804 ev_stop (EV_A_ (W)w); 2403 ev_stop (EV_A_ (W)w);
1805 2404
1806 if (!signals [w->signum - 1].head) 2405 if (!signals [w->signum - 1].head)
1807 signal (w->signum, SIG_DFL); 2406 signal (w->signum, SIG_DFL);
2407
2408 EV_FREQUENT_CHECK;
1808} 2409}
1809 2410
1810void 2411void
1811ev_child_start (EV_P_ ev_child *w) 2412ev_child_start (EV_P_ ev_child *w)
1812{ 2413{
1813#if EV_MULTIPLICITY 2414#if EV_MULTIPLICITY
1814 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2415 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1815#endif 2416#endif
1816 if (expect_false (ev_is_active (w))) 2417 if (expect_false (ev_is_active (w)))
1817 return; 2418 return;
1818 2419
2420 EV_FREQUENT_CHECK;
2421
1819 ev_start (EV_A_ (W)w, 1); 2422 ev_start (EV_A_ (W)w, 1);
1820 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2423 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2424
2425 EV_FREQUENT_CHECK;
1821} 2426}
1822 2427
1823void 2428void
1824ev_child_stop (EV_P_ ev_child *w) 2429ev_child_stop (EV_P_ ev_child *w)
1825{ 2430{
1826 clear_pending (EV_A_ (W)w); 2431 clear_pending (EV_A_ (W)w);
1827 if (expect_false (!ev_is_active (w))) 2432 if (expect_false (!ev_is_active (w)))
1828 return; 2433 return;
1829 2434
2435 EV_FREQUENT_CHECK;
2436
1830 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2437 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1831 ev_stop (EV_A_ (W)w); 2438 ev_stop (EV_A_ (W)w);
2439
2440 EV_FREQUENT_CHECK;
1832} 2441}
1833 2442
1834#if EV_STAT_ENABLE 2443#if EV_STAT_ENABLE
1835 2444
1836# ifdef _WIN32 2445# ifdef _WIN32
1837# undef lstat 2446# undef lstat
1838# define lstat(a,b) _stati64 (a,b) 2447# define lstat(a,b) _stati64 (a,b)
1839# endif 2448# endif
1840 2449
1841#define DEF_STAT_INTERVAL 5.0074891 2450#define DEF_STAT_INTERVAL 5.0074891
2451#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
1842#define MIN_STAT_INTERVAL 0.1074891 2452#define MIN_STAT_INTERVAL 0.1074891
1843 2453
1844static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2454static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1845 2455
1846#if EV_USE_INOTIFY 2456#if EV_USE_INOTIFY
1847# define EV_INOTIFY_BUFSIZE 8192 2457# define EV_INOTIFY_BUFSIZE 8192
… …
1851{ 2461{
1852 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); 2462 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);
1853 2463
1854 if (w->wd < 0) 2464 if (w->wd < 0)
1855 { 2465 {
2466 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
1856 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2467 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1857 2468
1858 /* monitor some parent directory for speedup hints */ 2469 /* monitor some parent directory for speedup hints */
2470 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2471 /* but an efficiency issue only */
1859 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2472 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1860 { 2473 {
1861 char path [4096]; 2474 char path [4096];
1862 strcpy (path, w->path); 2475 strcpy (path, w->path);
1863 2476
… …
1866 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2479 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1867 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2480 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1868 2481
1869 char *pend = strrchr (path, '/'); 2482 char *pend = strrchr (path, '/');
1870 2483
1871 if (!pend) 2484 if (!pend || pend == path)
1872 break; /* whoops, no '/', complain to your admin */ 2485 break;
1873 2486
1874 *pend = 0; 2487 *pend = 0;
1875 w->wd = inotify_add_watch (fs_fd, path, mask); 2488 w->wd = inotify_add_watch (fs_fd, path, mask);
1876 } 2489 }
1877 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2490 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1878 } 2491 }
1879 } 2492 }
1880 else
1881 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1882 2493
1883 if (w->wd >= 0) 2494 if (w->wd >= 0)
2495 {
1884 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2496 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2497
2498 /* now local changes will be tracked by inotify, but remote changes won't */
2499 /* unless the filesystem it known to be local, we therefore still poll */
2500 /* also do poll on <2.6.25, but with normal frequency */
2501 struct statfs sfs;
2502
2503 if (fs_2625 && !statfs (w->path, &sfs))
2504 if (sfs.f_type == 0x1373 /* devfs */
2505 || sfs.f_type == 0xEF53 /* ext2/3 */
2506 || sfs.f_type == 0x3153464a /* jfs */
2507 || sfs.f_type == 0x52654973 /* reiser3 */
2508 || sfs.f_type == 0x01021994 /* tempfs */
2509 || sfs.f_type == 0x58465342 /* xfs */)
2510 return;
2511
2512 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2513 ev_timer_again (EV_A_ &w->timer);
2514 }
1885} 2515}
1886 2516
1887static void noinline 2517static void noinline
1888infy_del (EV_P_ ev_stat *w) 2518infy_del (EV_P_ ev_stat *w)
1889{ 2519{
… …
1903 2533
1904static void noinline 2534static void noinline
1905infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2535infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1906{ 2536{
1907 if (slot < 0) 2537 if (slot < 0)
1908 /* overflow, need to check for all hahs slots */ 2538 /* overflow, need to check for all hash slots */
1909 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2539 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1910 infy_wd (EV_A_ slot, wd, ev); 2540 infy_wd (EV_A_ slot, wd, ev);
1911 else 2541 else
1912 { 2542 {
1913 WL w_; 2543 WL w_;
… …
1919 2549
1920 if (w->wd == wd || wd == -1) 2550 if (w->wd == wd || wd == -1)
1921 { 2551 {
1922 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2552 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1923 { 2553 {
2554 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1924 w->wd = -1; 2555 w->wd = -1;
1925 infy_add (EV_A_ w); /* re-add, no matter what */ 2556 infy_add (EV_A_ w); /* re-add, no matter what */
1926 } 2557 }
1927 2558
1928 stat_timer_cb (EV_A_ &w->timer, 0); 2559 stat_timer_cb (EV_A_ &w->timer, 0);
… …
1942 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2573 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1943 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2574 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1944} 2575}
1945 2576
1946void inline_size 2577void inline_size
2578check_2625 (EV_P)
2579{
2580 /* kernels < 2.6.25 are borked
2581 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2582 */
2583 struct utsname buf;
2584 int major, minor, micro;
2585
2586 if (uname (&buf))
2587 return;
2588
2589 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2590 return;
2591
2592 if (major < 2
2593 || (major == 2 && minor < 6)
2594 || (major == 2 && minor == 6 && micro < 25))
2595 return;
2596
2597 fs_2625 = 1;
2598}
2599
2600void inline_size
1947infy_init (EV_P) 2601infy_init (EV_P)
1948{ 2602{
1949 if (fs_fd != -2) 2603 if (fs_fd != -2)
1950 return; 2604 return;
2605
2606 fs_fd = -1;
2607
2608 check_2625 (EV_A);
1951 2609
1952 fs_fd = inotify_init (); 2610 fs_fd = inotify_init ();
1953 2611
1954 if (fs_fd >= 0) 2612 if (fs_fd >= 0)
1955 { 2613 {
… …
1983 w->wd = -1; 2641 w->wd = -1;
1984 2642
1985 if (fs_fd >= 0) 2643 if (fs_fd >= 0)
1986 infy_add (EV_A_ w); /* re-add, no matter what */ 2644 infy_add (EV_A_ w); /* re-add, no matter what */
1987 else 2645 else
1988 ev_timer_start (EV_A_ &w->timer); 2646 ev_timer_again (EV_A_ &w->timer);
1989 } 2647 }
1990
1991 } 2648 }
1992} 2649}
1993 2650
2651#endif
2652
2653#ifdef _WIN32
2654# define EV_LSTAT(p,b) _stati64 (p, b)
2655#else
2656# define EV_LSTAT(p,b) lstat (p, b)
1994#endif 2657#endif
1995 2658
1996void 2659void
1997ev_stat_stat (EV_P_ ev_stat *w) 2660ev_stat_stat (EV_P_ ev_stat *w)
1998{ 2661{
… …
2025 || w->prev.st_atime != w->attr.st_atime 2688 || w->prev.st_atime != w->attr.st_atime
2026 || w->prev.st_mtime != w->attr.st_mtime 2689 || w->prev.st_mtime != w->attr.st_mtime
2027 || w->prev.st_ctime != w->attr.st_ctime 2690 || w->prev.st_ctime != w->attr.st_ctime
2028 ) { 2691 ) {
2029 #if EV_USE_INOTIFY 2692 #if EV_USE_INOTIFY
2693 if (fs_fd >= 0)
2694 {
2030 infy_del (EV_A_ w); 2695 infy_del (EV_A_ w);
2031 infy_add (EV_A_ w); 2696 infy_add (EV_A_ w);
2032 ev_stat_stat (EV_A_ w); /* avoid race... */ 2697 ev_stat_stat (EV_A_ w); /* avoid race... */
2698 }
2033 #endif 2699 #endif
2034 2700
2035 ev_feed_event (EV_A_ w, EV_STAT); 2701 ev_feed_event (EV_A_ w, EV_STAT);
2036 } 2702 }
2037} 2703}
… …
2040ev_stat_start (EV_P_ ev_stat *w) 2706ev_stat_start (EV_P_ ev_stat *w)
2041{ 2707{
2042 if (expect_false (ev_is_active (w))) 2708 if (expect_false (ev_is_active (w)))
2043 return; 2709 return;
2044 2710
2045 /* since we use memcmp, we need to clear any padding data etc. */
2046 memset (&w->prev, 0, sizeof (ev_statdata));
2047 memset (&w->attr, 0, sizeof (ev_statdata));
2048
2049 ev_stat_stat (EV_A_ w); 2711 ev_stat_stat (EV_A_ w);
2050 2712
2713 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2051 if (w->interval < MIN_STAT_INTERVAL) 2714 w->interval = MIN_STAT_INTERVAL;
2052 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2053 2715
2054 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2716 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2055 ev_set_priority (&w->timer, ev_priority (w)); 2717 ev_set_priority (&w->timer, ev_priority (w));
2056 2718
2057#if EV_USE_INOTIFY 2719#if EV_USE_INOTIFY
2058 infy_init (EV_A); 2720 infy_init (EV_A);
2059 2721
2060 if (fs_fd >= 0) 2722 if (fs_fd >= 0)
2061 infy_add (EV_A_ w); 2723 infy_add (EV_A_ w);
2062 else 2724 else
2063#endif 2725#endif
2064 ev_timer_start (EV_A_ &w->timer); 2726 ev_timer_again (EV_A_ &w->timer);
2065 2727
2066 ev_start (EV_A_ (W)w, 1); 2728 ev_start (EV_A_ (W)w, 1);
2729
2730 EV_FREQUENT_CHECK;
2067} 2731}
2068 2732
2069void 2733void
2070ev_stat_stop (EV_P_ ev_stat *w) 2734ev_stat_stop (EV_P_ ev_stat *w)
2071{ 2735{
2072 clear_pending (EV_A_ (W)w); 2736 clear_pending (EV_A_ (W)w);
2073 if (expect_false (!ev_is_active (w))) 2737 if (expect_false (!ev_is_active (w)))
2074 return; 2738 return;
2075 2739
2740 EV_FREQUENT_CHECK;
2741
2076#if EV_USE_INOTIFY 2742#if EV_USE_INOTIFY
2077 infy_del (EV_A_ w); 2743 infy_del (EV_A_ w);
2078#endif 2744#endif
2079 ev_timer_stop (EV_A_ &w->timer); 2745 ev_timer_stop (EV_A_ &w->timer);
2080 2746
2081 ev_stop (EV_A_ (W)w); 2747 ev_stop (EV_A_ (W)w);
2748
2749 EV_FREQUENT_CHECK;
2082} 2750}
2083#endif 2751#endif
2084 2752
2085#if EV_IDLE_ENABLE 2753#if EV_IDLE_ENABLE
2086void 2754void
… …
2088{ 2756{
2089 if (expect_false (ev_is_active (w))) 2757 if (expect_false (ev_is_active (w)))
2090 return; 2758 return;
2091 2759
2092 pri_adjust (EV_A_ (W)w); 2760 pri_adjust (EV_A_ (W)w);
2761
2762 EV_FREQUENT_CHECK;
2093 2763
2094 { 2764 {
2095 int active = ++idlecnt [ABSPRI (w)]; 2765 int active = ++idlecnt [ABSPRI (w)];
2096 2766
2097 ++idleall; 2767 ++idleall;
2098 ev_start (EV_A_ (W)w, active); 2768 ev_start (EV_A_ (W)w, active);
2099 2769
2100 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2770 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2101 idles [ABSPRI (w)][active - 1] = w; 2771 idles [ABSPRI (w)][active - 1] = w;
2102 } 2772 }
2773
2774 EV_FREQUENT_CHECK;
2103} 2775}
2104 2776
2105void 2777void
2106ev_idle_stop (EV_P_ ev_idle *w) 2778ev_idle_stop (EV_P_ ev_idle *w)
2107{ 2779{
2108 clear_pending (EV_A_ (W)w); 2780 clear_pending (EV_A_ (W)w);
2109 if (expect_false (!ev_is_active (w))) 2781 if (expect_false (!ev_is_active (w)))
2110 return; 2782 return;
2111 2783
2784 EV_FREQUENT_CHECK;
2785
2112 { 2786 {
2113 int active = ((W)w)->active; 2787 int active = ev_active (w);
2114 2788
2115 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2789 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2116 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2790 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2117 2791
2118 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2119 --idleall; 2793 --idleall;
2120 } 2794 }
2795
2796 EV_FREQUENT_CHECK;
2121} 2797}
2122#endif 2798#endif
2123 2799
2124void 2800void
2125ev_prepare_start (EV_P_ ev_prepare *w) 2801ev_prepare_start (EV_P_ ev_prepare *w)
2126{ 2802{
2127 if (expect_false (ev_is_active (w))) 2803 if (expect_false (ev_is_active (w)))
2128 return; 2804 return;
2805
2806 EV_FREQUENT_CHECK;
2129 2807
2130 ev_start (EV_A_ (W)w, ++preparecnt); 2808 ev_start (EV_A_ (W)w, ++preparecnt);
2131 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2809 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2132 prepares [preparecnt - 1] = w; 2810 prepares [preparecnt - 1] = w;
2811
2812 EV_FREQUENT_CHECK;
2133} 2813}
2134 2814
2135void 2815void
2136ev_prepare_stop (EV_P_ ev_prepare *w) 2816ev_prepare_stop (EV_P_ ev_prepare *w)
2137{ 2817{
2138 clear_pending (EV_A_ (W)w); 2818 clear_pending (EV_A_ (W)w);
2139 if (expect_false (!ev_is_active (w))) 2819 if (expect_false (!ev_is_active (w)))
2140 return; 2820 return;
2141 2821
2822 EV_FREQUENT_CHECK;
2823
2142 { 2824 {
2143 int active = ((W)w)->active; 2825 int active = ev_active (w);
2826
2144 prepares [active - 1] = prepares [--preparecnt]; 2827 prepares [active - 1] = prepares [--preparecnt];
2145 ((W)prepares [active - 1])->active = active; 2828 ev_active (prepares [active - 1]) = active;
2146 } 2829 }
2147 2830
2148 ev_stop (EV_A_ (W)w); 2831 ev_stop (EV_A_ (W)w);
2832
2833 EV_FREQUENT_CHECK;
2149} 2834}
2150 2835
2151void 2836void
2152ev_check_start (EV_P_ ev_check *w) 2837ev_check_start (EV_P_ ev_check *w)
2153{ 2838{
2154 if (expect_false (ev_is_active (w))) 2839 if (expect_false (ev_is_active (w)))
2155 return; 2840 return;
2841
2842 EV_FREQUENT_CHECK;
2156 2843
2157 ev_start (EV_A_ (W)w, ++checkcnt); 2844 ev_start (EV_A_ (W)w, ++checkcnt);
2158 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2845 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2159 checks [checkcnt - 1] = w; 2846 checks [checkcnt - 1] = w;
2847
2848 EV_FREQUENT_CHECK;
2160} 2849}
2161 2850
2162void 2851void
2163ev_check_stop (EV_P_ ev_check *w) 2852ev_check_stop (EV_P_ ev_check *w)
2164{ 2853{
2165 clear_pending (EV_A_ (W)w); 2854 clear_pending (EV_A_ (W)w);
2166 if (expect_false (!ev_is_active (w))) 2855 if (expect_false (!ev_is_active (w)))
2167 return; 2856 return;
2168 2857
2858 EV_FREQUENT_CHECK;
2859
2169 { 2860 {
2170 int active = ((W)w)->active; 2861 int active = ev_active (w);
2862
2171 checks [active - 1] = checks [--checkcnt]; 2863 checks [active - 1] = checks [--checkcnt];
2172 ((W)checks [active - 1])->active = active; 2864 ev_active (checks [active - 1]) = active;
2173 } 2865 }
2174 2866
2175 ev_stop (EV_A_ (W)w); 2867 ev_stop (EV_A_ (W)w);
2868
2869 EV_FREQUENT_CHECK;
2176} 2870}
2177 2871
2178#if EV_EMBED_ENABLE 2872#if EV_EMBED_ENABLE
2179void noinline 2873void noinline
2180ev_embed_sweep (EV_P_ ev_embed *w) 2874ev_embed_sweep (EV_P_ ev_embed *w)
2181{ 2875{
2182 ev_loop (w->loop, EVLOOP_NONBLOCK); 2876 ev_loop (w->other, EVLOOP_NONBLOCK);
2183} 2877}
2184 2878
2185static void 2879static void
2186embed_cb (EV_P_ ev_io *io, int revents) 2880embed_io_cb (EV_P_ ev_io *io, int revents)
2187{ 2881{
2188 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2882 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2189 2883
2190 if (ev_cb (w)) 2884 if (ev_cb (w))
2191 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2885 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2192 else 2886 else
2193 ev_embed_sweep (loop, w); 2887 ev_loop (w->other, EVLOOP_NONBLOCK);
2194} 2888}
2889
2890static void
2891embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2892{
2893 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2894
2895 {
2896 struct ev_loop *loop = w->other;
2897
2898 while (fdchangecnt)
2899 {
2900 fd_reify (EV_A);
2901 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2902 }
2903 }
2904}
2905
2906static void
2907embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2908{
2909 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2910
2911 ev_embed_stop (EV_A_ w);
2912
2913 {
2914 struct ev_loop *loop = w->other;
2915
2916 ev_loop_fork (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2918 }
2919
2920 ev_embed_start (EV_A_ w);
2921}
2922
2923#if 0
2924static void
2925embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2926{
2927 ev_idle_stop (EV_A_ idle);
2928}
2929#endif
2195 2930
2196void 2931void
2197ev_embed_start (EV_P_ ev_embed *w) 2932ev_embed_start (EV_P_ ev_embed *w)
2198{ 2933{
2199 if (expect_false (ev_is_active (w))) 2934 if (expect_false (ev_is_active (w)))
2200 return; 2935 return;
2201 2936
2202 { 2937 {
2203 struct ev_loop *loop = w->loop; 2938 struct ev_loop *loop = w->other;
2204 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2939 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2205 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2940 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2206 } 2941 }
2942
2943 EV_FREQUENT_CHECK;
2207 2944
2208 ev_set_priority (&w->io, ev_priority (w)); 2945 ev_set_priority (&w->io, ev_priority (w));
2209 ev_io_start (EV_A_ &w->io); 2946 ev_io_start (EV_A_ &w->io);
2210 2947
2948 ev_prepare_init (&w->prepare, embed_prepare_cb);
2949 ev_set_priority (&w->prepare, EV_MINPRI);
2950 ev_prepare_start (EV_A_ &w->prepare);
2951
2952 ev_fork_init (&w->fork, embed_fork_cb);
2953 ev_fork_start (EV_A_ &w->fork);
2954
2955 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2956
2211 ev_start (EV_A_ (W)w, 1); 2957 ev_start (EV_A_ (W)w, 1);
2958
2959 EV_FREQUENT_CHECK;
2212} 2960}
2213 2961
2214void 2962void
2215ev_embed_stop (EV_P_ ev_embed *w) 2963ev_embed_stop (EV_P_ ev_embed *w)
2216{ 2964{
2217 clear_pending (EV_A_ (W)w); 2965 clear_pending (EV_A_ (W)w);
2218 if (expect_false (!ev_is_active (w))) 2966 if (expect_false (!ev_is_active (w)))
2219 return; 2967 return;
2220 2968
2969 EV_FREQUENT_CHECK;
2970
2221 ev_io_stop (EV_A_ &w->io); 2971 ev_io_stop (EV_A_ &w->io);
2972 ev_prepare_stop (EV_A_ &w->prepare);
2973 ev_fork_stop (EV_A_ &w->fork);
2222 2974
2223 ev_stop (EV_A_ (W)w); 2975 EV_FREQUENT_CHECK;
2224} 2976}
2225#endif 2977#endif
2226 2978
2227#if EV_FORK_ENABLE 2979#if EV_FORK_ENABLE
2228void 2980void
2229ev_fork_start (EV_P_ ev_fork *w) 2981ev_fork_start (EV_P_ ev_fork *w)
2230{ 2982{
2231 if (expect_false (ev_is_active (w))) 2983 if (expect_false (ev_is_active (w)))
2232 return; 2984 return;
2985
2986 EV_FREQUENT_CHECK;
2233 2987
2234 ev_start (EV_A_ (W)w, ++forkcnt); 2988 ev_start (EV_A_ (W)w, ++forkcnt);
2235 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2989 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2236 forks [forkcnt - 1] = w; 2990 forks [forkcnt - 1] = w;
2991
2992 EV_FREQUENT_CHECK;
2237} 2993}
2238 2994
2239void 2995void
2240ev_fork_stop (EV_P_ ev_fork *w) 2996ev_fork_stop (EV_P_ ev_fork *w)
2241{ 2997{
2242 clear_pending (EV_A_ (W)w); 2998 clear_pending (EV_A_ (W)w);
2243 if (expect_false (!ev_is_active (w))) 2999 if (expect_false (!ev_is_active (w)))
2244 return; 3000 return;
2245 3001
3002 EV_FREQUENT_CHECK;
3003
2246 { 3004 {
2247 int active = ((W)w)->active; 3005 int active = ev_active (w);
3006
2248 forks [active - 1] = forks [--forkcnt]; 3007 forks [active - 1] = forks [--forkcnt];
2249 ((W)forks [active - 1])->active = active; 3008 ev_active (forks [active - 1]) = active;
2250 } 3009 }
2251 3010
2252 ev_stop (EV_A_ (W)w); 3011 ev_stop (EV_A_ (W)w);
3012
3013 EV_FREQUENT_CHECK;
3014}
3015#endif
3016
3017#if EV_ASYNC_ENABLE
3018void
3019ev_async_start (EV_P_ ev_async *w)
3020{
3021 if (expect_false (ev_is_active (w)))
3022 return;
3023
3024 evpipe_init (EV_A);
3025
3026 EV_FREQUENT_CHECK;
3027
3028 ev_start (EV_A_ (W)w, ++asynccnt);
3029 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
3030 asyncs [asynccnt - 1] = w;
3031
3032 EV_FREQUENT_CHECK;
3033}
3034
3035void
3036ev_async_stop (EV_P_ ev_async *w)
3037{
3038 clear_pending (EV_A_ (W)w);
3039 if (expect_false (!ev_is_active (w)))
3040 return;
3041
3042 EV_FREQUENT_CHECK;
3043
3044 {
3045 int active = ev_active (w);
3046
3047 asyncs [active - 1] = asyncs [--asynccnt];
3048 ev_active (asyncs [active - 1]) = active;
3049 }
3050
3051 ev_stop (EV_A_ (W)w);
3052
3053 EV_FREQUENT_CHECK;
3054}
3055
3056void
3057ev_async_send (EV_P_ ev_async *w)
3058{
3059 w->sent = 1;
3060 evpipe_write (EV_A_ &gotasync);
2253} 3061}
2254#endif 3062#endif
2255 3063
2256/*****************************************************************************/ 3064/*****************************************************************************/
2257 3065
… …
2267once_cb (EV_P_ struct ev_once *once, int revents) 3075once_cb (EV_P_ struct ev_once *once, int revents)
2268{ 3076{
2269 void (*cb)(int revents, void *arg) = once->cb; 3077 void (*cb)(int revents, void *arg) = once->cb;
2270 void *arg = once->arg; 3078 void *arg = once->arg;
2271 3079
2272 ev_io_stop (EV_A_ &once->io); 3080 ev_io_stop (EV_A_ &once->io);
2273 ev_timer_stop (EV_A_ &once->to); 3081 ev_timer_stop (EV_A_ &once->to);
2274 ev_free (once); 3082 ev_free (once);
2275 3083
2276 cb (revents, arg); 3084 cb (revents, arg);
2277} 3085}
2278 3086
2279static void 3087static void
2280once_cb_io (EV_P_ ev_io *w, int revents) 3088once_cb_io (EV_P_ ev_io *w, int revents)
2281{ 3089{
2282 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3090 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3091
3092 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2283} 3093}
2284 3094
2285static void 3095static void
2286once_cb_to (EV_P_ ev_timer *w, int revents) 3096once_cb_to (EV_P_ ev_timer *w, int revents)
2287{ 3097{
2288 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3098 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3099
3100 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2289} 3101}
2290 3102
2291void 3103void
2292ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3104ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2293{ 3105{
… …
2315 ev_timer_set (&once->to, timeout, 0.); 3127 ev_timer_set (&once->to, timeout, 0.);
2316 ev_timer_start (EV_A_ &once->to); 3128 ev_timer_start (EV_A_ &once->to);
2317 } 3129 }
2318} 3130}
2319 3131
3132#if EV_MULTIPLICITY
3133 #include "ev_wrap.h"
3134#endif
3135
2320#ifdef __cplusplus 3136#ifdef __cplusplus
2321} 3137}
2322#endif 3138#endif
2323 3139

Diff Legend

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