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

Comparing libev/ev.c (file contents):
Revision 1.149 by root, Tue Nov 27 19:23:31 2007 UTC vs.
Revision 1.236 by root, Wed May 7 14:46:22 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
… …
51# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 61# define EV_USE_MONOTONIC 0
53# endif 62# endif
54# ifndef EV_USE_REALTIME 63# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 64# define EV_USE_REALTIME 0
65# endif
66# endif
67
68# ifndef EV_USE_NANOSLEEP
69# if HAVE_NANOSLEEP
70# define EV_USE_NANOSLEEP 1
71# else
72# define EV_USE_NANOSLEEP 0
56# endif 73# endif
57# endif 74# endif
58 75
59# ifndef EV_USE_SELECT 76# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 77# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
94# else 111# else
95# define EV_USE_PORT 0 112# define EV_USE_PORT 0
96# endif 113# endif
97# endif 114# endif
98 115
116# ifndef EV_USE_INOTIFY
117# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
118# define EV_USE_INOTIFY 1
119# else
120# define EV_USE_INOTIFY 0
121# endif
122# endif
123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
99#endif 132#endif
100 133
101#include <math.h> 134#include <math.h>
102#include <stdlib.h> 135#include <stdlib.h>
103#include <fcntl.h> 136#include <fcntl.h>
… …
109#include <errno.h> 142#include <errno.h>
110#include <sys/types.h> 143#include <sys/types.h>
111#include <time.h> 144#include <time.h>
112 145
113#include <signal.h> 146#include <signal.h>
147
148#ifdef EV_H
149# include EV_H
150#else
151# include "ev.h"
152#endif
114 153
115#ifndef _WIN32 154#ifndef _WIN32
116# include <sys/time.h> 155# include <sys/time.h>
117# include <sys/wait.h> 156# include <sys/wait.h>
118# include <unistd.h> 157# include <unistd.h>
… …
122# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
123# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
124# endif 163# endif
125#endif 164#endif
126 165
127/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
128 167
129#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
130# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
131#endif 170#endif
132 171
133#ifndef EV_USE_REALTIME 172#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0 173# define EV_USE_REALTIME 0
174#endif
175
176#ifndef EV_USE_NANOSLEEP
177# define EV_USE_NANOSLEEP 0
135#endif 178#endif
136 179
137#ifndef EV_USE_SELECT 180#ifndef EV_USE_SELECT
138# define EV_USE_SELECT 1 181# define EV_USE_SELECT 1
139#endif 182#endif
… …
145# define EV_USE_POLL 1 188# define EV_USE_POLL 1
146# endif 189# endif
147#endif 190#endif
148 191
149#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
150# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
151#endif 198#endif
152 199
153#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
154# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
155#endif 202#endif
156 203
157#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 205# define EV_USE_PORT 0
206#endif
207
208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
212# define EV_USE_INOTIFY 0
213# endif
159#endif 214#endif
160 215
161#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
162# if EV_MINIMAL 217# if EV_MINIMAL
163# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
164# else 219# else
165# define EV_PID_HASHSIZE 16 220# define EV_PID_HASHSIZE 16
166# endif 221# endif
167#endif 222#endif
168 223
169/**/ 224#ifndef EV_INOTIFY_HASHSIZE
225# if EV_MINIMAL
226# define EV_INOTIFY_HASHSIZE 1
227# else
228# define EV_INOTIFY_HASHSIZE 16
229# endif
230#endif
231
232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
170 241
171#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
172# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
173# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
174#endif 245#endif
… …
176#ifndef CLOCK_REALTIME 247#ifndef CLOCK_REALTIME
177# undef EV_USE_REALTIME 248# undef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 249# define EV_USE_REALTIME 0
179#endif 250#endif
180 251
252#if !EV_STAT_ENABLE
253# undef EV_USE_INOTIFY
254# define EV_USE_INOTIFY 0
255#endif
256
257#if !EV_USE_NANOSLEEP
258# ifndef _WIN32
259# include <sys/select.h>
260# endif
261#endif
262
263#if EV_USE_INOTIFY
264# include <sys/inotify.h>
265#endif
266
181#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
182# include <winsock.h> 268# include <winsock.h>
183#endif 269#endif
184 270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
281#endif
282
185/**/ 283/**/
284
285/*
286 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding
289 * errors are against us.
290 * This value is good at least till the year 4000.
291 * Better solutions welcome.
292 */
293#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
186 294
187#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 295#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
188#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 296#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
189/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 297/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
190 298
191#ifdef EV_H
192# include EV_H
193#else
194# include "ev.h"
195#endif
196
197#if __GNUC__ >= 3 299#if __GNUC__ >= 4
198# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
199# define inline_size static inline /* inline for codesize */
200# if EV_MINIMAL
201# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
202# define inline_speed static noinline
203# else
204# define noinline
205# define inline_speed static inline
206# endif
207#else 302#else
208# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
209# define inline_speed static
210# define inline_size static
211# define noinline 304# define noinline
305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
306# define inline
307# endif
212#endif 308#endif
213 309
214#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
215#define expect_true(expr) expect ((expr) != 0, 1) 311#define expect_true(expr) expect ((expr) != 0, 1)
312#define inline_size static inline
313
314#if EV_MINIMAL
315# define inline_speed static noinline
316#else
317# define inline_speed static inline
318#endif
216 319
217#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 320#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
218#define ABSPRI(w) ((w)->priority - EV_MINPRI) 321#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
219 322
220#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 323#define EMPTY /* required for microsofts broken pseudo-c compiler */
221#define EMPTY2(a,b) /* used to suppress some warnings */ 324#define EMPTY2(a,b) /* used to suppress some warnings */
222 325
223typedef ev_watcher *W; 326typedef ev_watcher *W;
224typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
225typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
226 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
333#if EV_USE_MONOTONIC
334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
335/* giving it a reasonably high chance of working on typical architetcures */
227static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
228 338
229#ifdef _WIN32 339#ifdef _WIN32
230# include "ev_win32.c" 340# include "ev_win32.c"
231#endif 341#endif
232 342
… …
253 perror (msg); 363 perror (msg);
254 abort (); 364 abort ();
255 } 365 }
256} 366}
257 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
258static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
259 384
260void 385void
261ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
262{ 387{
263 alloc = cb; 388 alloc = cb;
264} 389}
265 390
266static void * 391inline_speed void *
267ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
268{ 393{
269 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
270 395
271 if (!ptr && size) 396 if (!ptr && size)
272 { 397 {
273 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
274 abort (); 399 abort ();
… …
295typedef struct 420typedef struct
296{ 421{
297 W w; 422 W w;
298 int events; 423 int events;
299} ANPENDING; 424} ANPENDING;
425
426#if EV_USE_INOTIFY
427typedef struct
428{
429 WL head;
430} ANFS;
431#endif
300 432
301#if EV_MULTIPLICITY 433#if EV_MULTIPLICITY
302 434
303 struct ev_loop 435 struct ev_loop
304 { 436 {
… …
361{ 493{
362 return ev_rt_now; 494 return ev_rt_now;
363} 495}
364#endif 496#endif
365 497
366#define array_roundsize(type,n) (((n) | 4) & ~3) 498void
499ev_sleep (ev_tstamp delay)
500{
501 if (delay > 0.)
502 {
503#if EV_USE_NANOSLEEP
504 struct timespec ts;
505
506 ts.tv_sec = (time_t)delay;
507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
508
509 nanosleep (&ts, 0);
510#elif defined(_WIN32)
511 Sleep ((unsigned long)(delay * 1e3));
512#else
513 struct timeval tv;
514
515 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517
518 select (0, 0, 0, 0, &tv);
519#endif
520 }
521}
522
523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
527int inline_size
528array_nextsize (int elem, int cur, int cnt)
529{
530 int ncur = cur + 1;
531
532 do
533 ncur <<= 1;
534 while (cnt > ncur);
535
536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
538 {
539 ncur *= elem;
540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
541 ncur = ncur - sizeof (void *) * 4;
542 ncur /= elem;
543 }
544
545 return ncur;
546}
547
548static noinline void *
549array_realloc (int elem, void *base, int *cur, int cnt)
550{
551 *cur = array_nextsize (elem, *cur, cnt);
552 return ev_realloc (base, elem * *cur);
553}
367 554
368#define array_needsize(type,base,cur,cnt,init) \ 555#define array_needsize(type,base,cur,cnt,init) \
369 if (expect_false ((cnt) > cur)) \ 556 if (expect_false ((cnt) > (cur))) \
370 { \ 557 { \
371 int newcnt = cur; \ 558 int ocur_ = (cur); \
372 do \ 559 (base) = (type *)array_realloc \
373 { \ 560 (sizeof (type), (base), &(cur), (cnt)); \
374 newcnt = array_roundsize (type, newcnt << 1); \ 561 init ((base) + (ocur_), (cur) - ocur_); \
375 } \
376 while ((cnt) > newcnt); \
377 \
378 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
379 init (base + cur, newcnt - cur); \
380 cur = newcnt; \
381 } 562 }
382 563
564#if 0
383#define array_slim(type,stem) \ 565#define array_slim(type,stem) \
384 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 566 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
385 { \ 567 { \
386 stem ## max = array_roundsize (stem ## cnt >> 1); \ 568 stem ## max = array_roundsize (stem ## cnt >> 1); \
387 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 569 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
388 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 570 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
389 } 571 }
572#endif
390 573
391#define array_free(stem, idx) \ 574#define array_free(stem, idx) \
392 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 575 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
393 576
394/*****************************************************************************/ 577/*****************************************************************************/
395 578
396void noinline 579void noinline
397ev_feed_event (EV_P_ void *w, int revents) 580ev_feed_event (EV_P_ void *w, int revents)
398{ 581{
399 W w_ = (W)w; 582 W w_ = (W)w;
583 int pri = ABSPRI (w_);
400 584
401 if (expect_false (w_->pending)) 585 if (expect_false (w_->pending))
586 pendings [pri][w_->pending - 1].events |= revents;
587 else
402 { 588 {
589 w_->pending = ++pendingcnt [pri];
590 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
591 pendings [pri][w_->pending - 1].w = w_;
403 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 592 pendings [pri][w_->pending - 1].events = revents;
404 return;
405 } 593 }
406
407 w_->pending = ++pendingcnt [ABSPRI (w_)];
408 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
409 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
410 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
411} 594}
412 595
413void inline_size 596void inline_speed
414queue_events (EV_P_ W *events, int eventcnt, int type) 597queue_events (EV_P_ W *events, int eventcnt, int type)
415{ 598{
416 int i; 599 int i;
417 600
418 for (i = 0; i < eventcnt; ++i) 601 for (i = 0; i < eventcnt; ++i)
… …
450} 633}
451 634
452void 635void
453ev_feed_fd_event (EV_P_ int fd, int revents) 636ev_feed_fd_event (EV_P_ int fd, int revents)
454{ 637{
638 if (fd >= 0 && fd < anfdmax)
455 fd_event (EV_A_ fd, revents); 639 fd_event (EV_A_ fd, revents);
456} 640}
457 641
458void inline_size 642void inline_size
459fd_reify (EV_P) 643fd_reify (EV_P)
460{ 644{
… …
464 { 648 {
465 int fd = fdchanges [i]; 649 int fd = fdchanges [i];
466 ANFD *anfd = anfds + fd; 650 ANFD *anfd = anfds + fd;
467 ev_io *w; 651 ev_io *w;
468 652
469 int events = 0; 653 unsigned char events = 0;
470 654
471 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 655 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
472 events |= w->events; 656 events |= (unsigned char)w->events;
473 657
474#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
475 if (events) 659 if (events)
476 { 660 {
477 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
478 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
479 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
480 } 668 }
481#endif 669#endif
482 670
671 {
672 unsigned char o_events = anfd->events;
673 unsigned char o_reify = anfd->reify;
674
483 anfd->reify = 0; 675 anfd->reify = 0;
484
485 backend_modify (EV_A_ fd, anfd->events, events);
486 anfd->events = events; 676 anfd->events = events;
677
678 if (o_events != events || o_reify & EV_IOFDSET)
679 backend_modify (EV_A_ fd, o_events, events);
680 }
487 } 681 }
488 682
489 fdchangecnt = 0; 683 fdchangecnt = 0;
490} 684}
491 685
492void inline_size 686void inline_size
493fd_change (EV_P_ int fd) 687fd_change (EV_P_ int fd, int flags)
494{ 688{
495 if (expect_false (anfds [fd].reify)) 689 unsigned char reify = anfds [fd].reify;
496 return;
497
498 anfds [fd].reify = 1; 690 anfds [fd].reify |= flags;
499 691
692 if (expect_true (!reify))
693 {
500 ++fdchangecnt; 694 ++fdchangecnt;
501 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 695 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
502 fdchanges [fdchangecnt - 1] = fd; 696 fdchanges [fdchangecnt - 1] = fd;
697 }
503} 698}
504 699
505void inline_speed 700void inline_speed
506fd_kill (EV_P_ int fd) 701fd_kill (EV_P_ int fd)
507{ 702{
… …
554static void noinline 749static void noinline
555fd_rearm_all (EV_P) 750fd_rearm_all (EV_P)
556{ 751{
557 int fd; 752 int fd;
558 753
559 /* this should be highly optimised to not do anything but set a flag */
560 for (fd = 0; fd < anfdmax; ++fd) 754 for (fd = 0; fd < anfdmax; ++fd)
561 if (anfds [fd].events) 755 if (anfds [fd].events)
562 { 756 {
563 anfds [fd].events = 0; 757 anfds [fd].events = 0;
564 fd_change (EV_A_ fd); 758 fd_change (EV_A_ fd, EV_IOFDSET | 1);
565 } 759 }
566} 760}
567 761
568/*****************************************************************************/ 762/*****************************************************************************/
569 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP
772
773#define HEAP0 3 /* index of first element in heap */
774
775/* towards the root */
570void inline_speed 776void inline_speed
571upheap (WT *heap, int k) 777upheap (WT *heap, int k)
572{ 778{
573 WT w = heap [k]; 779 WT w = heap [k];
574 780
575 while (k && heap [k >> 1]->at > w->at) 781 for (;;)
576 { 782 {
783 int p = ((k - HEAP0 - 1) / 4) + HEAP0;
784
785 if (p >= HEAP0 || heap [p]->at <= w->at)
786 break;
787
577 heap [k] = heap [k >> 1]; 788 heap [k] = heap [p];
578 ((W)heap [k])->active = k + 1; 789 ev_active (heap [k]) = k;
579 k >>= 1; 790 k = p;
580 } 791 }
581 792
582 heap [k] = w; 793 heap [k] = w;
583 ((W)heap [k])->active = k + 1; 794 ev_active (heap [k]) = k;
584
585} 795}
586 796
797/* away from the root */
587void inline_speed 798void inline_speed
588downheap (WT *heap, int N, int k) 799downheap (WT *heap, int N, int k)
589{ 800{
590 WT w = heap [k]; 801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
591 803
592 while (k < (N >> 1)) 804 for (;;)
593 { 805 {
594 int j = k << 1; 806 ev_tstamp minat;
807 WT *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
595 809
596 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 810 // find minimum child
811 if (expect_true (pos +3 < E))
597 ++j; 812 {
813 /* fast path */
814 (minpos = pos + 0), (minat = (*minpos)->at);
815 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
816 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
817 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
818 }
819 else
820 {
821 /* slow path */
822 if (pos >= E)
823 break;
824 (minpos = pos + 0), (minat = (*minpos)->at);
825 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
826 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
827 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
828 }
598 829
599 if (w->at <= heap [j]->at) 830 if (w->at <= minat)
600 break; 831 break;
601 832
602 heap [k] = heap [j]; 833 ev_active (*minpos) = k;
603 ((W)heap [k])->active = k + 1; 834 heap [k] = *minpos;
604 k = j; 835
836 k = minpos - heap;
605 } 837 }
606 838
607 heap [k] = w; 839 heap [k] = w;
840 ev_active (heap [k]) = k;
841}
842
843#else // 4HEAP
844
845#define HEAP0 1
846
847/* towards the root */
848void inline_speed
849upheap (WT *heap, int k)
850{
851 WT w = heap [k];
852
853 for (;;)
854 {
855 int p = k >> 1;
856
857 /* maybe we could use a dummy element at heap [0]? */
858 if (!p || heap [p]->at <= w->at)
859 break;
860
861 heap [k] = heap [p];
862 ev_active (heap [k]) = k;
863 k = p;
864 }
865
866 heap [k] = w;
867 ev_active (heap [k]) = k;
868}
869
870/* away from the root */
871void inline_speed
872downheap (WT *heap, int N, int k)
873{
874 WT w = heap [k];
875
876 for (;;)
877 {
878 int c = k << 1;
879
880 if (c > N)
881 break;
882
883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
884 ? 1 : 0;
885
886 if (w->at <= heap [c]->at)
887 break;
888
889 heap [k] = heap [c];
608 ((W)heap [k])->active = k + 1; 890 ((W)heap [k])->active = k;
891
892 k = c;
893 }
894
895 heap [k] = w;
896 ev_active (heap [k]) = k;
609} 897}
898#endif
610 899
611void inline_size 900void inline_size
612adjustheap (WT *heap, int N, int k) 901adjustheap (WT *heap, int N, int k)
613{ 902{
614 upheap (heap, k); 903 upheap (heap, k);
… …
618/*****************************************************************************/ 907/*****************************************************************************/
619 908
620typedef struct 909typedef struct
621{ 910{
622 WL head; 911 WL head;
623 sig_atomic_t volatile gotsig; 912 EV_ATOMIC_T gotsig;
624} ANSIG; 913} ANSIG;
625 914
626static ANSIG *signals; 915static ANSIG *signals;
627static int signalmax; 916static int signalmax;
628 917
629static int sigpipe [2]; 918static EV_ATOMIC_T gotsig;
630static sig_atomic_t volatile gotsig;
631static ev_io sigev;
632 919
633void inline_size 920void inline_size
634signals_init (ANSIG *base, int count) 921signals_init (ANSIG *base, int count)
635{ 922{
636 while (count--) 923 while (count--)
… …
640 927
641 ++base; 928 ++base;
642 } 929 }
643} 930}
644 931
645static void 932/*****************************************************************************/
646sighandler (int signum)
647{
648#if _WIN32
649 signal (signum, sighandler);
650#endif
651 933
652 signals [signum - 1].gotsig = 1;
653
654 if (!gotsig)
655 {
656 int old_errno = errno;
657 gotsig = 1;
658 write (sigpipe [1], &signum, 1);
659 errno = old_errno;
660 }
661}
662
663void noinline
664ev_feed_signal_event (EV_P_ int signum)
665{
666 WL w;
667
668#if EV_MULTIPLICITY
669 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
670#endif
671
672 --signum;
673
674 if (signum < 0 || signum >= signalmax)
675 return;
676
677 signals [signum].gotsig = 0;
678
679 for (w = signals [signum].head; w; w = w->next)
680 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
681}
682
683static void
684sigcb (EV_P_ ev_io *iow, int revents)
685{
686 int signum;
687
688 read (sigpipe [0], &revents, 1);
689 gotsig = 0;
690
691 for (signum = signalmax; signum--; )
692 if (signals [signum].gotsig)
693 ev_feed_signal_event (EV_A_ signum + 1);
694}
695
696void inline_size 934void inline_speed
697fd_intern (int fd) 935fd_intern (int fd)
698{ 936{
699#ifdef _WIN32 937#ifdef _WIN32
700 int arg = 1; 938 int arg = 1;
701 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 939 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
704 fcntl (fd, F_SETFL, O_NONBLOCK); 942 fcntl (fd, F_SETFL, O_NONBLOCK);
705#endif 943#endif
706} 944}
707 945
708static void noinline 946static void noinline
709siginit (EV_P) 947evpipe_init (EV_P)
710{ 948{
949 if (!ev_is_active (&pipeev))
950 {
951#if EV_USE_EVENTFD
952 if ((evfd = eventfd (0, 0)) >= 0)
953 {
954 evpipe [0] = -1;
955 fd_intern (evfd);
956 ev_io_set (&pipeev, evfd, EV_READ);
957 }
958 else
959#endif
960 {
961 while (pipe (evpipe))
962 syserr ("(libev) error creating signal/async pipe");
963
711 fd_intern (sigpipe [0]); 964 fd_intern (evpipe [0]);
712 fd_intern (sigpipe [1]); 965 fd_intern (evpipe [1]);
966 ev_io_set (&pipeev, evpipe [0], EV_READ);
967 }
713 968
714 ev_io_set (&sigev, sigpipe [0], EV_READ);
715 ev_io_start (EV_A_ &sigev); 969 ev_io_start (EV_A_ &pipeev);
716 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* watcher should not keep loop alive */
971 }
972}
973
974void inline_size
975evpipe_write (EV_P_ EV_ATOMIC_T *flag)
976{
977 if (!*flag)
978 {
979 int old_errno = errno; /* save errno because write might clobber it */
980
981 *flag = 1;
982
983#if EV_USE_EVENTFD
984 if (evfd >= 0)
985 {
986 uint64_t counter = 1;
987 write (evfd, &counter, sizeof (uint64_t));
988 }
989 else
990#endif
991 write (evpipe [1], &old_errno, 1);
992
993 errno = old_errno;
994 }
995}
996
997static void
998pipecb (EV_P_ ev_io *iow, int revents)
999{
1000#if EV_USE_EVENTFD
1001 if (evfd >= 0)
1002 {
1003 uint64_t counter;
1004 read (evfd, &counter, sizeof (uint64_t));
1005 }
1006 else
1007#endif
1008 {
1009 char dummy;
1010 read (evpipe [0], &dummy, 1);
1011 }
1012
1013 if (gotsig && ev_is_default_loop (EV_A))
1014 {
1015 int signum;
1016 gotsig = 0;
1017
1018 for (signum = signalmax; signum--; )
1019 if (signals [signum].gotsig)
1020 ev_feed_signal_event (EV_A_ signum + 1);
1021 }
1022
1023#if EV_ASYNC_ENABLE
1024 if (gotasync)
1025 {
1026 int i;
1027 gotasync = 0;
1028
1029 for (i = asynccnt; i--; )
1030 if (asyncs [i]->sent)
1031 {
1032 asyncs [i]->sent = 0;
1033 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1034 }
1035 }
1036#endif
717} 1037}
718 1038
719/*****************************************************************************/ 1039/*****************************************************************************/
720 1040
1041static void
1042ev_sighandler (int signum)
1043{
1044#if EV_MULTIPLICITY
1045 struct ev_loop *loop = &default_loop_struct;
1046#endif
1047
1048#if _WIN32
1049 signal (signum, ev_sighandler);
1050#endif
1051
1052 signals [signum - 1].gotsig = 1;
1053 evpipe_write (EV_A_ &gotsig);
1054}
1055
1056void noinline
1057ev_feed_signal_event (EV_P_ int signum)
1058{
1059 WL w;
1060
1061#if EV_MULTIPLICITY
1062 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1063#endif
1064
1065 --signum;
1066
1067 if (signum < 0 || signum >= signalmax)
1068 return;
1069
1070 signals [signum].gotsig = 0;
1071
1072 for (w = signals [signum].head; w; w = w->next)
1073 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1074}
1075
1076/*****************************************************************************/
1077
721static ev_child *childs [EV_PID_HASHSIZE]; 1078static WL childs [EV_PID_HASHSIZE];
722 1079
723#ifndef _WIN32 1080#ifndef _WIN32
724 1081
725static ev_signal childev; 1082static ev_signal childev;
726 1083
1084#ifndef WIFCONTINUED
1085# define WIFCONTINUED(status) 0
1086#endif
1087
727void inline_speed 1088void inline_speed
728child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1089child_reap (EV_P_ int chain, int pid, int status)
729{ 1090{
730 ev_child *w; 1091 ev_child *w;
1092 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
731 1093
732 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1094 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1095 {
733 if (w->pid == pid || !w->pid) 1096 if ((w->pid == pid || !w->pid)
1097 && (!traced || (w->flags & 1)))
734 { 1098 {
735 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1099 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
736 w->rpid = pid; 1100 w->rpid = pid;
737 w->rstatus = status; 1101 w->rstatus = status;
738 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1102 ev_feed_event (EV_A_ (W)w, EV_CHILD);
739 } 1103 }
1104 }
740} 1105}
741 1106
742#ifndef WCONTINUED 1107#ifndef WCONTINUED
743# define WCONTINUED 0 1108# define WCONTINUED 0
744#endif 1109#endif
… …
753 if (!WCONTINUED 1118 if (!WCONTINUED
754 || errno != EINVAL 1119 || errno != EINVAL
755 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1120 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
756 return; 1121 return;
757 1122
758 /* make sure we are called again until all childs have been reaped */ 1123 /* make sure we are called again until all children have been reaped */
759 /* we need to do it this way so that the callback gets called before we continue */ 1124 /* we need to do it this way so that the callback gets called before we continue */
760 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1125 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
761 1126
762 child_reap (EV_A_ sw, pid, pid, status); 1127 child_reap (EV_A_ pid, pid, status);
763 if (EV_PID_HASHSIZE > 1) 1128 if (EV_PID_HASHSIZE > 1)
764 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1129 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
765} 1130}
766 1131
767#endif 1132#endif
768 1133
769/*****************************************************************************/ 1134/*****************************************************************************/
… …
841} 1206}
842 1207
843unsigned int 1208unsigned int
844ev_embeddable_backends (void) 1209ev_embeddable_backends (void)
845{ 1210{
846 return EVBACKEND_EPOLL 1211 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
847 | EVBACKEND_KQUEUE 1212
848 | EVBACKEND_PORT; 1213 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1214 /* please fix it and tell me how to detect the fix */
1215 flags &= ~EVBACKEND_EPOLL;
1216
1217 return flags;
849} 1218}
850 1219
851unsigned int 1220unsigned int
852ev_backend (EV_P) 1221ev_backend (EV_P)
853{ 1222{
854 return backend; 1223 return backend;
855} 1224}
856 1225
857static void 1226unsigned int
1227ev_loop_count (EV_P)
1228{
1229 return loop_count;
1230}
1231
1232void
1233ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1234{
1235 io_blocktime = interval;
1236}
1237
1238void
1239ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1240{
1241 timeout_blocktime = interval;
1242}
1243
1244static void noinline
858loop_init (EV_P_ unsigned int flags) 1245loop_init (EV_P_ unsigned int flags)
859{ 1246{
860 if (!backend) 1247 if (!backend)
861 { 1248 {
862#if EV_USE_MONOTONIC 1249#if EV_USE_MONOTONIC
… …
865 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1252 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
866 have_monotonic = 1; 1253 have_monotonic = 1;
867 } 1254 }
868#endif 1255#endif
869 1256
870 ev_rt_now = ev_time (); 1257 ev_rt_now = ev_time ();
871 mn_now = get_clock (); 1258 mn_now = get_clock ();
872 now_floor = mn_now; 1259 now_floor = mn_now;
873 rtmn_diff = ev_rt_now - mn_now; 1260 rtmn_diff = ev_rt_now - mn_now;
1261
1262 io_blocktime = 0.;
1263 timeout_blocktime = 0.;
1264 backend = 0;
1265 backend_fd = -1;
1266 gotasync = 0;
1267#if EV_USE_INOTIFY
1268 fs_fd = -2;
1269#endif
1270
1271 /* pid check not overridable via env */
1272#ifndef _WIN32
1273 if (flags & EVFLAG_FORKCHECK)
1274 curpid = getpid ();
1275#endif
874 1276
875 if (!(flags & EVFLAG_NOENV) 1277 if (!(flags & EVFLAG_NOENV)
876 && !enable_secure () 1278 && !enable_secure ()
877 && getenv ("LIBEV_FLAGS")) 1279 && getenv ("LIBEV_FLAGS"))
878 flags = atoi (getenv ("LIBEV_FLAGS")); 1280 flags = atoi (getenv ("LIBEV_FLAGS"));
879 1281
880 if (!(flags & 0x0000ffffUL)) 1282 if (!(flags & 0x0000ffffU))
881 flags |= ev_recommended_backends (); 1283 flags |= ev_recommended_backends ();
882 1284
883 backend = 0;
884#if EV_USE_PORT 1285#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1286 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 1287#endif
887#if EV_USE_KQUEUE 1288#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1289 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
895#endif 1296#endif
896#if EV_USE_SELECT 1297#if EV_USE_SELECT
897 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1298 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
898#endif 1299#endif
899 1300
900 ev_init (&sigev, sigcb); 1301 ev_init (&pipeev, pipecb);
901 ev_set_priority (&sigev, EV_MAXPRI); 1302 ev_set_priority (&pipeev, EV_MAXPRI);
902 } 1303 }
903} 1304}
904 1305
905static void 1306static void noinline
906loop_destroy (EV_P) 1307loop_destroy (EV_P)
907{ 1308{
908 int i; 1309 int i;
1310
1311 if (ev_is_active (&pipeev))
1312 {
1313 ev_ref (EV_A); /* signal watcher */
1314 ev_io_stop (EV_A_ &pipeev);
1315
1316#if EV_USE_EVENTFD
1317 if (evfd >= 0)
1318 close (evfd);
1319#endif
1320
1321 if (evpipe [0] >= 0)
1322 {
1323 close (evpipe [0]);
1324 close (evpipe [1]);
1325 }
1326 }
1327
1328#if EV_USE_INOTIFY
1329 if (fs_fd >= 0)
1330 close (fs_fd);
1331#endif
1332
1333 if (backend_fd >= 0)
1334 close (backend_fd);
909 1335
910#if EV_USE_PORT 1336#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1337 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 1338#endif
913#if EV_USE_KQUEUE 1339#if EV_USE_KQUEUE
… …
922#if EV_USE_SELECT 1348#if EV_USE_SELECT
923 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1349 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
924#endif 1350#endif
925 1351
926 for (i = NUMPRI; i--; ) 1352 for (i = NUMPRI; i--; )
1353 {
927 array_free (pending, [i]); 1354 array_free (pending, [i]);
1355#if EV_IDLE_ENABLE
1356 array_free (idle, [i]);
1357#endif
1358 }
1359
1360 ev_free (anfds); anfdmax = 0;
928 1361
929 /* have to use the microsoft-never-gets-it-right macro */ 1362 /* have to use the microsoft-never-gets-it-right macro */
930 array_free (fdchange, EMPTY0); 1363 array_free (fdchange, EMPTY);
931 array_free (timer, EMPTY0); 1364 array_free (timer, EMPTY);
932#if EV_PERIODIC_ENABLE 1365#if EV_PERIODIC_ENABLE
933 array_free (periodic, EMPTY0); 1366 array_free (periodic, EMPTY);
934#endif 1367#endif
1368#if EV_FORK_ENABLE
935 array_free (idle, EMPTY0); 1369 array_free (fork, EMPTY);
1370#endif
936 array_free (prepare, EMPTY0); 1371 array_free (prepare, EMPTY);
937 array_free (check, EMPTY0); 1372 array_free (check, EMPTY);
1373#if EV_ASYNC_ENABLE
1374 array_free (async, EMPTY);
1375#endif
938 1376
939 backend = 0; 1377 backend = 0;
940} 1378}
941 1379
942static void 1380#if EV_USE_INOTIFY
1381void inline_size infy_fork (EV_P);
1382#endif
1383
1384void inline_size
943loop_fork (EV_P) 1385loop_fork (EV_P)
944{ 1386{
945#if EV_USE_PORT 1387#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1388 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 1389#endif
… …
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1391 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1392#endif
951#if EV_USE_EPOLL 1393#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1394 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
953#endif 1395#endif
1396#if EV_USE_INOTIFY
1397 infy_fork (EV_A);
1398#endif
954 1399
955 if (ev_is_active (&sigev)) 1400 if (ev_is_active (&pipeev))
956 { 1401 {
957 /* default loop */ 1402 /* this "locks" the handlers against writing to the pipe */
1403 /* while we modify the fd vars */
1404 gotsig = 1;
1405#if EV_ASYNC_ENABLE
1406 gotasync = 1;
1407#endif
958 1408
959 ev_ref (EV_A); 1409 ev_ref (EV_A);
960 ev_io_stop (EV_A_ &sigev); 1410 ev_io_stop (EV_A_ &pipeev);
1411
1412#if EV_USE_EVENTFD
1413 if (evfd >= 0)
1414 close (evfd);
1415#endif
1416
1417 if (evpipe [0] >= 0)
1418 {
961 close (sigpipe [0]); 1419 close (evpipe [0]);
962 close (sigpipe [1]); 1420 close (evpipe [1]);
1421 }
963 1422
964 while (pipe (sigpipe))
965 syserr ("(libev) error creating pipe");
966
967 siginit (EV_A); 1423 evpipe_init (EV_A);
1424 /* now iterate over everything, in case we missed something */
1425 pipecb (EV_A_ &pipeev, EV_READ);
968 } 1426 }
969 1427
970 postfork = 0; 1428 postfork = 0;
971} 1429}
972 1430
… …
994} 1452}
995 1453
996void 1454void
997ev_loop_fork (EV_P) 1455ev_loop_fork (EV_P)
998{ 1456{
999 postfork = 1; 1457 postfork = 1; /* must be in line with ev_default_fork */
1000} 1458}
1001
1002#endif 1459#endif
1003 1460
1004#if EV_MULTIPLICITY 1461#if EV_MULTIPLICITY
1005struct ev_loop * 1462struct ev_loop *
1006ev_default_loop_init (unsigned int flags) 1463ev_default_loop_init (unsigned int flags)
1007#else 1464#else
1008int 1465int
1009ev_default_loop (unsigned int flags) 1466ev_default_loop (unsigned int flags)
1010#endif 1467#endif
1011{ 1468{
1012 if (sigpipe [0] == sigpipe [1])
1013 if (pipe (sigpipe))
1014 return 0;
1015
1016 if (!ev_default_loop_ptr) 1469 if (!ev_default_loop_ptr)
1017 { 1470 {
1018#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1019 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1472 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1020#else 1473#else
… …
1023 1476
1024 loop_init (EV_A_ flags); 1477 loop_init (EV_A_ flags);
1025 1478
1026 if (ev_backend (EV_A)) 1479 if (ev_backend (EV_A))
1027 { 1480 {
1028 siginit (EV_A);
1029
1030#ifndef _WIN32 1481#ifndef _WIN32
1031 ev_signal_init (&childev, childcb, SIGCHLD); 1482 ev_signal_init (&childev, childcb, SIGCHLD);
1032 ev_set_priority (&childev, EV_MAXPRI); 1483 ev_set_priority (&childev, EV_MAXPRI);
1033 ev_signal_start (EV_A_ &childev); 1484 ev_signal_start (EV_A_ &childev);
1034 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1485 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1051#ifndef _WIN32 1502#ifndef _WIN32
1052 ev_ref (EV_A); /* child watcher */ 1503 ev_ref (EV_A); /* child watcher */
1053 ev_signal_stop (EV_A_ &childev); 1504 ev_signal_stop (EV_A_ &childev);
1054#endif 1505#endif
1055 1506
1056 ev_ref (EV_A); /* signal watcher */
1057 ev_io_stop (EV_A_ &sigev);
1058
1059 close (sigpipe [0]); sigpipe [0] = 0;
1060 close (sigpipe [1]); sigpipe [1] = 0;
1061
1062 loop_destroy (EV_A); 1507 loop_destroy (EV_A);
1063} 1508}
1064 1509
1065void 1510void
1066ev_default_fork (void) 1511ev_default_fork (void)
… …
1068#if EV_MULTIPLICITY 1513#if EV_MULTIPLICITY
1069 struct ev_loop *loop = ev_default_loop_ptr; 1514 struct ev_loop *loop = ev_default_loop_ptr;
1070#endif 1515#endif
1071 1516
1072 if (backend) 1517 if (backend)
1073 postfork = 1; 1518 postfork = 1; /* must be in line with ev_loop_fork */
1074} 1519}
1075 1520
1076/*****************************************************************************/ 1521/*****************************************************************************/
1077 1522
1078int inline_size 1523void
1079any_pending (EV_P) 1524ev_invoke (EV_P_ void *w, int revents)
1080{ 1525{
1081 int pri; 1526 EV_CB_INVOKE ((W)w, revents);
1082
1083 for (pri = NUMPRI; pri--; )
1084 if (pendingcnt [pri])
1085 return 1;
1086
1087 return 0;
1088} 1527}
1089 1528
1090void inline_speed 1529void inline_speed
1091call_pending (EV_P) 1530call_pending (EV_P)
1092{ 1531{
… …
1097 { 1536 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1537 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1538
1100 if (expect_true (p->w)) 1539 if (expect_true (p->w))
1101 { 1540 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1541 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1542
1104 p->w->pending = 0; 1543 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1544 EV_CB_INVOKE (p->w, p->events);
1106 } 1545 }
1107 } 1546 }
1108} 1547}
1109 1548
1549#if EV_IDLE_ENABLE
1550void inline_size
1551idle_reify (EV_P)
1552{
1553 if (expect_false (idleall))
1554 {
1555 int pri;
1556
1557 for (pri = NUMPRI; pri--; )
1558 {
1559 if (pendingcnt [pri])
1560 break;
1561
1562 if (idlecnt [pri])
1563 {
1564 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1565 break;
1566 }
1567 }
1568 }
1569}
1570#endif
1571
1110void inline_size 1572void inline_size
1111timers_reify (EV_P) 1573timers_reify (EV_P)
1112{ 1574{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1114 { 1576 {
1115 ev_timer *w = timers [0]; 1577 ev_timer *w = (ev_timer *)timers [HEAP0];
1116 1578
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1580
1119 /* first reschedule or stop timer */ 1581 /* first reschedule or stop timer */
1120 if (w->repeat) 1582 if (w->repeat)
1121 { 1583 {
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1584 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1123 1585
1124 ((WT)w)->at += w->repeat; 1586 ev_at (w) += w->repeat;
1125 if (((WT)w)->at < mn_now) 1587 if (ev_at (w) < mn_now)
1126 ((WT)w)->at = mn_now; 1588 ev_at (w) = mn_now;
1127 1589
1128 downheap ((WT *)timers, timercnt, 0); 1590 downheap (timers, timercnt, HEAP0);
1129 } 1591 }
1130 else 1592 else
1131 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1132 1594
1133 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1136 1598
1137#if EV_PERIODIC_ENABLE 1599#if EV_PERIODIC_ENABLE
1138void inline_size 1600void inline_size
1139periodics_reify (EV_P) 1601periodics_reify (EV_P)
1140{ 1602{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1142 { 1604 {
1143 ev_periodic *w = periodics [0]; 1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1144 1606
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1608
1147 /* first reschedule or stop timer */ 1609 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1610 if (w->reschedule_cb)
1149 { 1611 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1612 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1151 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1613 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1152 downheap ((WT *)periodics, periodiccnt, 0); 1614 downheap (periodics, periodiccnt, 1);
1153 } 1615 }
1154 else if (w->interval) 1616 else if (w->interval)
1155 { 1617 {
1156 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1618 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1157 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1158 downheap ((WT *)periodics, periodiccnt, 0); 1621 downheap (periodics, periodiccnt, HEAP0);
1159 } 1622 }
1160 else 1623 else
1161 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1162 1625
1163 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1168periodics_reschedule (EV_P) 1631periodics_reschedule (EV_P)
1169{ 1632{
1170 int i; 1633 int i;
1171 1634
1172 /* adjust periodics after time jump */ 1635 /* adjust periodics after time jump */
1173 for (i = 0; i < periodiccnt; ++i) 1636 for (i = 1; i <= periodiccnt; ++i)
1174 { 1637 {
1175 ev_periodic *w = periodics [i]; 1638 ev_periodic *w = (ev_periodic *)periodics [i];
1176 1639
1177 if (w->reschedule_cb) 1640 if (w->reschedule_cb)
1178 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1179 else if (w->interval) 1642 else if (w->interval)
1180 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1181 } 1644 }
1182 1645
1183 /* now rebuild the heap */ 1646 /* now rebuild the heap */
1184 for (i = periodiccnt >> 1; i--; ) 1647 for (i = periodiccnt >> 1; --i; )
1185 downheap ((WT *)periodics, periodiccnt, i); 1648 downheap (periodics, periodiccnt, i + HEAP0);
1186} 1649}
1187#endif 1650#endif
1188 1651
1189int inline_size 1652void inline_speed
1190time_update_monotonic (EV_P) 1653time_update (EV_P_ ev_tstamp max_block)
1191{ 1654{
1655 int i;
1656
1657#if EV_USE_MONOTONIC
1658 if (expect_true (have_monotonic))
1659 {
1660 ev_tstamp odiff = rtmn_diff;
1661
1192 mn_now = get_clock (); 1662 mn_now = get_clock ();
1193 1663
1664 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1665 /* interpolate in the meantime */
1194 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1666 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1195 { 1667 {
1196 ev_rt_now = rtmn_diff + mn_now; 1668 ev_rt_now = rtmn_diff + mn_now;
1197 return 0; 1669 return;
1198 } 1670 }
1199 else 1671
1200 {
1201 now_floor = mn_now; 1672 now_floor = mn_now;
1202 ev_rt_now = ev_time (); 1673 ev_rt_now = ev_time ();
1203 return 1;
1204 }
1205}
1206 1674
1207void inline_size 1675 /* loop a few times, before making important decisions.
1208time_update (EV_P) 1676 * on the choice of "4": one iteration isn't enough,
1209{ 1677 * in case we get preempted during the calls to
1210 int i; 1678 * ev_time and get_clock. a second call is almost guaranteed
1211 1679 * to succeed in that case, though. and looping a few more times
1212#if EV_USE_MONOTONIC 1680 * doesn't hurt either as we only do this on time-jumps or
1213 if (expect_true (have_monotonic)) 1681 * in the unlikely event of having been preempted here.
1214 { 1682 */
1215 if (time_update_monotonic (EV_A)) 1683 for (i = 4; --i; )
1216 { 1684 {
1217 ev_tstamp odiff = rtmn_diff;
1218
1219 /* loop a few times, before making important decisions.
1220 * on the choice of "4": one iteration isn't enough,
1221 * in case we get preempted during the calls to
1222 * ev_time and get_clock. a second call is almost guarenteed
1223 * to succeed in that case, though. and looping a few more times
1224 * doesn't hurt either as we only do this on time-jumps or
1225 * in the unlikely event of getting preempted here.
1226 */
1227 for (i = 4; --i; )
1228 {
1229 rtmn_diff = ev_rt_now - mn_now; 1685 rtmn_diff = ev_rt_now - mn_now;
1230 1686
1231 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1687 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1232 return; /* all is well */ 1688 return; /* all is well */
1233 1689
1234 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1235 mn_now = get_clock (); 1691 mn_now = get_clock ();
1236 now_floor = mn_now; 1692 now_floor = mn_now;
1237 } 1693 }
1238 1694
1239# if EV_PERIODIC_ENABLE 1695# if EV_PERIODIC_ENABLE
1240 periodics_reschedule (EV_A); 1696 periodics_reschedule (EV_A);
1241# endif 1697# endif
1242 /* no timer adjustment, as the monotonic clock doesn't jump */ 1698 /* no timer adjustment, as the monotonic clock doesn't jump */
1243 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1699 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1244 }
1245 } 1700 }
1246 else 1701 else
1247#endif 1702#endif
1248 { 1703 {
1249 ev_rt_now = ev_time (); 1704 ev_rt_now = ev_time ();
1250 1705
1251 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1706 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1252 { 1707 {
1253#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1709 periodics_reschedule (EV_A);
1255#endif 1710#endif
1256
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1711 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1712 for (i = 1; i <= timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1713 ev_at (timers [i]) += ev_rt_now - mn_now;
1260 } 1714 }
1261 1715
1262 mn_now = ev_rt_now; 1716 mn_now = ev_rt_now;
1263 } 1717 }
1264} 1718}
… …
1278static int loop_done; 1732static int loop_done;
1279 1733
1280void 1734void
1281ev_loop (EV_P_ int flags) 1735ev_loop (EV_P_ int flags)
1282{ 1736{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1737 loop_done = EVUNLOOP_CANCEL;
1284 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL;
1286 1738
1287 while (activecnt) 1739 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1740
1741 do
1288 { 1742 {
1289 /* we might have forked, so reify kernel state if necessary */ 1743#ifndef _WIN32
1744 if (expect_false (curpid)) /* penalise the forking check even more */
1745 if (expect_false (getpid () != curpid))
1746 {
1747 curpid = getpid ();
1748 postfork = 1;
1749 }
1750#endif
1751
1290 #if EV_FORK_ENABLE 1752#if EV_FORK_ENABLE
1753 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1754 if (expect_false (postfork))
1292 if (forkcnt) 1755 if (forkcnt)
1293 { 1756 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1757 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1758 call_pending (EV_A);
1296 } 1759 }
1297 #endif 1760#endif
1298 1761
1299 /* queue check watchers (and execute them) */ 1762 /* queue prepare watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1763 if (expect_false (preparecnt))
1301 { 1764 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1765 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1766 call_pending (EV_A);
1304 } 1767 }
1305 1768
1769 if (expect_false (!activecnt))
1770 break;
1771
1306 /* we might have forked, so reify kernel state if necessary */ 1772 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1773 if (expect_false (postfork))
1308 loop_fork (EV_A); 1774 loop_fork (EV_A);
1309 1775
1310 /* update fd-related kernel structures */ 1776 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1777 fd_reify (EV_A);
1312 1778
1313 /* calculate blocking time */ 1779 /* calculate blocking time */
1314 { 1780 {
1315 double block; 1781 ev_tstamp waittime = 0.;
1782 ev_tstamp sleeptime = 0.;
1316 1783
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1784 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1318 block = 0.; /* do not block at all */
1319 else
1320 { 1785 {
1321 /* update time to cancel out callback processing overhead */ 1786 /* update time to cancel out callback processing overhead */
1322#if EV_USE_MONOTONIC
1323 if (expect_true (have_monotonic))
1324 time_update_monotonic (EV_A); 1787 time_update (EV_A_ 1e100);
1325 else
1326#endif
1327 {
1328 ev_rt_now = ev_time ();
1329 mn_now = ev_rt_now;
1330 }
1331 1788
1332 block = MAX_BLOCKTIME; 1789 waittime = MAX_BLOCKTIME;
1333 1790
1334 if (timercnt) 1791 if (timercnt)
1335 { 1792 {
1336 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1337 if (block > to) block = to; 1794 if (waittime > to) waittime = to;
1338 } 1795 }
1339 1796
1340#if EV_PERIODIC_ENABLE 1797#if EV_PERIODIC_ENABLE
1341 if (periodiccnt) 1798 if (periodiccnt)
1342 { 1799 {
1343 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1344 if (block > to) block = to; 1801 if (waittime > to) waittime = to;
1345 } 1802 }
1346#endif 1803#endif
1347 1804
1348 if (expect_false (block < 0.)) block = 0.; 1805 if (expect_false (waittime < timeout_blocktime))
1806 waittime = timeout_blocktime;
1807
1808 sleeptime = waittime - backend_fudge;
1809
1810 if (expect_true (sleeptime > io_blocktime))
1811 sleeptime = io_blocktime;
1812
1813 if (sleeptime)
1814 {
1815 ev_sleep (sleeptime);
1816 waittime -= sleeptime;
1817 }
1349 } 1818 }
1350 1819
1820 ++loop_count;
1351 backend_poll (EV_A_ block); 1821 backend_poll (EV_A_ waittime);
1822
1823 /* update ev_rt_now, do magic */
1824 time_update (EV_A_ waittime + sleeptime);
1352 } 1825 }
1353
1354 /* update ev_rt_now, do magic */
1355 time_update (EV_A);
1356 1826
1357 /* queue pending timers and reschedule them */ 1827 /* queue pending timers and reschedule them */
1358 timers_reify (EV_A); /* relative timers called last */ 1828 timers_reify (EV_A); /* relative timers called last */
1359#if EV_PERIODIC_ENABLE 1829#if EV_PERIODIC_ENABLE
1360 periodics_reify (EV_A); /* absolute timers called first */ 1830 periodics_reify (EV_A); /* absolute timers called first */
1361#endif 1831#endif
1362 1832
1833#if EV_IDLE_ENABLE
1363 /* queue idle watchers unless other events are pending */ 1834 /* queue idle watchers unless other events are pending */
1364 if (idlecnt && !any_pending (EV_A)) 1835 idle_reify (EV_A);
1365 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1836#endif
1366 1837
1367 /* queue check watchers, to be executed first */ 1838 /* queue check watchers, to be executed first */
1368 if (expect_false (checkcnt)) 1839 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1840 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1841
1371 call_pending (EV_A); 1842 call_pending (EV_A);
1372
1373 if (expect_false (loop_done))
1374 break;
1375 } 1843 }
1844 while (expect_true (
1845 activecnt
1846 && !loop_done
1847 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1848 ));
1376 1849
1377 if (loop_done == EVUNLOOP_ONE) 1850 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1851 loop_done = EVUNLOOP_CANCEL;
1379} 1852}
1380 1853
… …
1407 head = &(*head)->next; 1880 head = &(*head)->next;
1408 } 1881 }
1409} 1882}
1410 1883
1411void inline_speed 1884void inline_speed
1412ev_clear_pending (EV_P_ W w) 1885clear_pending (EV_P_ W w)
1413{ 1886{
1414 if (w->pending) 1887 if (w->pending)
1415 { 1888 {
1416 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1889 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1417 w->pending = 0; 1890 w->pending = 0;
1418 } 1891 }
1419} 1892}
1420 1893
1894int
1895ev_clear_pending (EV_P_ void *w)
1896{
1897 W w_ = (W)w;
1898 int pending = w_->pending;
1899
1900 if (expect_true (pending))
1901 {
1902 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1903 w_->pending = 0;
1904 p->w = 0;
1905 return p->events;
1906 }
1907 else
1908 return 0;
1909}
1910
1911void inline_size
1912pri_adjust (EV_P_ W w)
1913{
1914 int pri = w->priority;
1915 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1916 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1917 w->priority = pri;
1918}
1919
1421void inline_speed 1920void inline_speed
1422ev_start (EV_P_ W w, int active) 1921ev_start (EV_P_ W w, int active)
1423{ 1922{
1424 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1923 pri_adjust (EV_A_ w);
1425 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1426
1427 w->active = active; 1924 w->active = active;
1428 ev_ref (EV_A); 1925 ev_ref (EV_A);
1429} 1926}
1430 1927
1431void inline_size 1928void inline_size
… …
1435 w->active = 0; 1932 w->active = 0;
1436} 1933}
1437 1934
1438/*****************************************************************************/ 1935/*****************************************************************************/
1439 1936
1440void 1937void noinline
1441ev_io_start (EV_P_ ev_io *w) 1938ev_io_start (EV_P_ ev_io *w)
1442{ 1939{
1443 int fd = w->fd; 1940 int fd = w->fd;
1444 1941
1445 if (expect_false (ev_is_active (w))) 1942 if (expect_false (ev_is_active (w)))
… …
1447 1944
1448 assert (("ev_io_start called with negative fd", fd >= 0)); 1945 assert (("ev_io_start called with negative fd", fd >= 0));
1449 1946
1450 ev_start (EV_A_ (W)w, 1); 1947 ev_start (EV_A_ (W)w, 1);
1451 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1948 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1452 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1949 wlist_add (&anfds[fd].head, (WL)w);
1453 1950
1454 fd_change (EV_A_ fd); 1951 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1952 w->events &= ~EV_IOFDSET;
1455} 1953}
1456 1954
1457void 1955void noinline
1458ev_io_stop (EV_P_ ev_io *w) 1956ev_io_stop (EV_P_ ev_io *w)
1459{ 1957{
1460 ev_clear_pending (EV_A_ (W)w); 1958 clear_pending (EV_A_ (W)w);
1461 if (expect_false (!ev_is_active (w))) 1959 if (expect_false (!ev_is_active (w)))
1462 return; 1960 return;
1463 1961
1464 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1962 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1465 1963
1466 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1964 wlist_del (&anfds[w->fd].head, (WL)w);
1467 ev_stop (EV_A_ (W)w); 1965 ev_stop (EV_A_ (W)w);
1468 1966
1469 fd_change (EV_A_ w->fd); 1967 fd_change (EV_A_ w->fd, 1);
1470} 1968}
1471 1969
1472void 1970void noinline
1473ev_timer_start (EV_P_ ev_timer *w) 1971ev_timer_start (EV_P_ ev_timer *w)
1474{ 1972{
1475 if (expect_false (ev_is_active (w))) 1973 if (expect_false (ev_is_active (w)))
1476 return; 1974 return;
1477 1975
1478 ((WT)w)->at += mn_now; 1976 ev_at (w) += mn_now;
1479 1977
1480 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1978 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1481 1979
1482 ev_start (EV_A_ (W)w, ++timercnt); 1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1484 timers [timercnt - 1] = w; 1982 timers [ev_active (w)] = (WT)w;
1485 upheap ((WT *)timers, timercnt - 1); 1983 upheap (timers, ev_active (w));
1486 1984
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1488} 1986}
1489 1987
1490void 1988void noinline
1491ev_timer_stop (EV_P_ ev_timer *w) 1989ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1990{
1493 ev_clear_pending (EV_A_ (W)w); 1991 clear_pending (EV_A_ (W)w);
1494 if (expect_false (!ev_is_active (w))) 1992 if (expect_false (!ev_is_active (w)))
1495 return; 1993 return;
1496 1994
1995 {
1996 int active = ev_active (w);
1997
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1998 assert (("internal timer heap corruption", timers [active] == (WT)w));
1498 1999
1499 if (expect_true (((W)w)->active < timercnt--)) 2000 if (expect_true (active < timercnt + HEAP0 - 1))
1500 { 2001 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 2002 timers [active] = timers [timercnt + HEAP0 - 1];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2003 adjustheap (timers, timercnt, active);
1503 } 2004 }
1504 2005
1505 ((WT)w)->at -= mn_now; 2006 --timercnt;
2007 }
2008
2009 ev_at (w) -= mn_now;
1506 2010
1507 ev_stop (EV_A_ (W)w); 2011 ev_stop (EV_A_ (W)w);
1508} 2012}
1509 2013
1510void 2014void noinline
1511ev_timer_again (EV_P_ ev_timer *w) 2015ev_timer_again (EV_P_ ev_timer *w)
1512{ 2016{
1513 if (ev_is_active (w)) 2017 if (ev_is_active (w))
1514 { 2018 {
1515 if (w->repeat) 2019 if (w->repeat)
1516 { 2020 {
1517 ((WT)w)->at = mn_now + w->repeat; 2021 ev_at (w) = mn_now + w->repeat;
1518 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2022 adjustheap (timers, timercnt, ev_active (w));
1519 } 2023 }
1520 else 2024 else
1521 ev_timer_stop (EV_A_ w); 2025 ev_timer_stop (EV_A_ w);
1522 } 2026 }
1523 else if (w->repeat) 2027 else if (w->repeat)
1524 { 2028 {
1525 w->at = w->repeat; 2029 ev_at (w) = w->repeat;
1526 ev_timer_start (EV_A_ w); 2030 ev_timer_start (EV_A_ w);
1527 } 2031 }
1528} 2032}
1529 2033
1530#if EV_PERIODIC_ENABLE 2034#if EV_PERIODIC_ENABLE
1531void 2035void noinline
1532ev_periodic_start (EV_P_ ev_periodic *w) 2036ev_periodic_start (EV_P_ ev_periodic *w)
1533{ 2037{
1534 if (expect_false (ev_is_active (w))) 2038 if (expect_false (ev_is_active (w)))
1535 return; 2039 return;
1536 2040
1537 if (w->reschedule_cb) 2041 if (w->reschedule_cb)
1538 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2042 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1539 else if (w->interval) 2043 else if (w->interval)
1540 { 2044 {
1541 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2045 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1542 /* this formula differs from the one in periodic_reify because we do not always round up */ 2046 /* this formula differs from the one in periodic_reify because we do not always round up */
1543 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 2047 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1544 } 2048 }
2049 else
2050 ev_at (w) = w->offset;
1545 2051
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 2054 periodics [ev_active (w)] = (WT)w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 2055 upheap (periodics, ev_active (w));
1550 2056
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1552} 2058}
1553 2059
1554void 2060void noinline
1555ev_periodic_stop (EV_P_ ev_periodic *w) 2061ev_periodic_stop (EV_P_ ev_periodic *w)
1556{ 2062{
1557 ev_clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1558 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
1559 return; 2065 return;
1560 2066
2067 {
2068 int active = ev_active (w);
2069
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1562 2071
1563 if (expect_true (((W)w)->active < periodiccnt--)) 2072 if (expect_true (active < periodiccnt + HEAP0 - 1))
1564 { 2073 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 2075 adjustheap (periodics, periodiccnt, active);
1567 } 2076 }
2077
2078 --periodiccnt;
2079 }
1568 2080
1569 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1570} 2082}
1571 2083
1572void 2084void noinline
1573ev_periodic_again (EV_P_ ev_periodic *w) 2085ev_periodic_again (EV_P_ ev_periodic *w)
1574{ 2086{
1575 /* TODO: use adjustheap and recalculation */ 2087 /* TODO: use adjustheap and recalculation */
1576 ev_periodic_stop (EV_A_ w); 2088 ev_periodic_stop (EV_A_ w);
1577 ev_periodic_start (EV_A_ w); 2089 ev_periodic_start (EV_A_ w);
… …
1580 2092
1581#ifndef SA_RESTART 2093#ifndef SA_RESTART
1582# define SA_RESTART 0 2094# define SA_RESTART 0
1583#endif 2095#endif
1584 2096
1585void 2097void noinline
1586ev_signal_start (EV_P_ ev_signal *w) 2098ev_signal_start (EV_P_ ev_signal *w)
1587{ 2099{
1588#if EV_MULTIPLICITY 2100#if EV_MULTIPLICITY
1589 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2101 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1590#endif 2102#endif
1591 if (expect_false (ev_is_active (w))) 2103 if (expect_false (ev_is_active (w)))
1592 return; 2104 return;
1593 2105
1594 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2106 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1595 2107
2108 evpipe_init (EV_A);
2109
2110 {
2111#ifndef _WIN32
2112 sigset_t full, prev;
2113 sigfillset (&full);
2114 sigprocmask (SIG_SETMASK, &full, &prev);
2115#endif
2116
2117 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2118
2119#ifndef _WIN32
2120 sigprocmask (SIG_SETMASK, &prev, 0);
2121#endif
2122 }
2123
1596 ev_start (EV_A_ (W)w, 1); 2124 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1598 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2125 wlist_add (&signals [w->signum - 1].head, (WL)w);
1599 2126
1600 if (!((WL)w)->next) 2127 if (!((WL)w)->next)
1601 { 2128 {
1602#if _WIN32 2129#if _WIN32
1603 signal (w->signum, sighandler); 2130 signal (w->signum, ev_sighandler);
1604#else 2131#else
1605 struct sigaction sa; 2132 struct sigaction sa;
1606 sa.sa_handler = sighandler; 2133 sa.sa_handler = ev_sighandler;
1607 sigfillset (&sa.sa_mask); 2134 sigfillset (&sa.sa_mask);
1608 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2135 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1609 sigaction (w->signum, &sa, 0); 2136 sigaction (w->signum, &sa, 0);
1610#endif 2137#endif
1611 } 2138 }
1612} 2139}
1613 2140
1614void 2141void noinline
1615ev_signal_stop (EV_P_ ev_signal *w) 2142ev_signal_stop (EV_P_ ev_signal *w)
1616{ 2143{
1617 ev_clear_pending (EV_A_ (W)w); 2144 clear_pending (EV_A_ (W)w);
1618 if (expect_false (!ev_is_active (w))) 2145 if (expect_false (!ev_is_active (w)))
1619 return; 2146 return;
1620 2147
1621 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2148 wlist_del (&signals [w->signum - 1].head, (WL)w);
1622 ev_stop (EV_A_ (W)w); 2149 ev_stop (EV_A_ (W)w);
1623 2150
1624 if (!signals [w->signum - 1].head) 2151 if (!signals [w->signum - 1].head)
1625 signal (w->signum, SIG_DFL); 2152 signal (w->signum, SIG_DFL);
1626} 2153}
… …
1633#endif 2160#endif
1634 if (expect_false (ev_is_active (w))) 2161 if (expect_false (ev_is_active (w)))
1635 return; 2162 return;
1636 2163
1637 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
1638 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2165 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1639} 2166}
1640 2167
1641void 2168void
1642ev_child_stop (EV_P_ ev_child *w) 2169ev_child_stop (EV_P_ ev_child *w)
1643{ 2170{
1644 ev_clear_pending (EV_A_ (W)w); 2171 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 2172 if (expect_false (!ev_is_active (w)))
1646 return; 2173 return;
1647 2174
1648 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2175 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1649 ev_stop (EV_A_ (W)w); 2176 ev_stop (EV_A_ (W)w);
1650} 2177}
1651 2178
1652#if EV_STAT_ENABLE 2179#if EV_STAT_ENABLE
1653 2180
… …
1657# endif 2184# endif
1658 2185
1659#define DEF_STAT_INTERVAL 5.0074891 2186#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 2187#define MIN_STAT_INTERVAL 0.1074891
1661 2188
2189static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2190
2191#if EV_USE_INOTIFY
2192# define EV_INOTIFY_BUFSIZE 8192
2193
2194static void noinline
2195infy_add (EV_P_ ev_stat *w)
2196{
2197 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);
2198
2199 if (w->wd < 0)
2200 {
2201 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2202
2203 /* monitor some parent directory for speedup hints */
2204 /* note that exceeding the hardcoded limit is not a correctness issue, */
2205 /* but an efficiency issue only */
2206 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2207 {
2208 char path [4096];
2209 strcpy (path, w->path);
2210
2211 do
2212 {
2213 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2214 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2215
2216 char *pend = strrchr (path, '/');
2217
2218 if (!pend)
2219 break; /* whoops, no '/', complain to your admin */
2220
2221 *pend = 0;
2222 w->wd = inotify_add_watch (fs_fd, path, mask);
2223 }
2224 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2225 }
2226 }
2227 else
2228 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2229
2230 if (w->wd >= 0)
2231 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2232}
2233
2234static void noinline
2235infy_del (EV_P_ ev_stat *w)
2236{
2237 int slot;
2238 int wd = w->wd;
2239
2240 if (wd < 0)
2241 return;
2242
2243 w->wd = -2;
2244 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
2245 wlist_del (&fs_hash [slot].head, (WL)w);
2246
2247 /* remove this watcher, if others are watching it, they will rearm */
2248 inotify_rm_watch (fs_fd, wd);
2249}
2250
2251static void noinline
2252infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2253{
2254 if (slot < 0)
2255 /* overflow, need to check for all hahs slots */
2256 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2257 infy_wd (EV_A_ slot, wd, ev);
2258 else
2259 {
2260 WL w_;
2261
2262 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
2263 {
2264 ev_stat *w = (ev_stat *)w_;
2265 w_ = w_->next; /* lets us remove this watcher and all before it */
2266
2267 if (w->wd == wd || wd == -1)
2268 {
2269 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2270 {
2271 w->wd = -1;
2272 infy_add (EV_A_ w); /* re-add, no matter what */
2273 }
2274
2275 stat_timer_cb (EV_A_ &w->timer, 0);
2276 }
2277 }
2278 }
2279}
2280
2281static void
2282infy_cb (EV_P_ ev_io *w, int revents)
2283{
2284 char buf [EV_INOTIFY_BUFSIZE];
2285 struct inotify_event *ev = (struct inotify_event *)buf;
2286 int ofs;
2287 int len = read (fs_fd, buf, sizeof (buf));
2288
2289 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2290 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2291}
2292
2293void inline_size
2294infy_init (EV_P)
2295{
2296 if (fs_fd != -2)
2297 return;
2298
2299 fs_fd = inotify_init ();
2300
2301 if (fs_fd >= 0)
2302 {
2303 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2304 ev_set_priority (&fs_w, EV_MAXPRI);
2305 ev_io_start (EV_A_ &fs_w);
2306 }
2307}
2308
2309void inline_size
2310infy_fork (EV_P)
2311{
2312 int slot;
2313
2314 if (fs_fd < 0)
2315 return;
2316
2317 close (fs_fd);
2318 fs_fd = inotify_init ();
2319
2320 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2321 {
2322 WL w_ = fs_hash [slot].head;
2323 fs_hash [slot].head = 0;
2324
2325 while (w_)
2326 {
2327 ev_stat *w = (ev_stat *)w_;
2328 w_ = w_->next; /* lets us add this watcher */
2329
2330 w->wd = -1;
2331
2332 if (fs_fd >= 0)
2333 infy_add (EV_A_ w); /* re-add, no matter what */
2334 else
2335 ev_timer_start (EV_A_ &w->timer);
2336 }
2337
2338 }
2339}
2340
2341#endif
2342
1662void 2343void
1663ev_stat_stat (EV_P_ ev_stat *w) 2344ev_stat_stat (EV_P_ ev_stat *w)
1664{ 2345{
1665 if (lstat (w->path, &w->attr) < 0) 2346 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 2347 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 2348 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 2349 w->attr.st_nlink = 1;
1669} 2350}
1670 2351
1671static void 2352static void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2353stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 2354{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2355 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 2356
1676 /* we copy this here each the time so that */ 2357 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 2358 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 2359 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 2360 ev_stat_stat (EV_A_ w);
1680 2361
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2362 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2363 if (
2364 w->prev.st_dev != w->attr.st_dev
2365 || w->prev.st_ino != w->attr.st_ino
2366 || w->prev.st_mode != w->attr.st_mode
2367 || w->prev.st_nlink != w->attr.st_nlink
2368 || w->prev.st_uid != w->attr.st_uid
2369 || w->prev.st_gid != w->attr.st_gid
2370 || w->prev.st_rdev != w->attr.st_rdev
2371 || w->prev.st_size != w->attr.st_size
2372 || w->prev.st_atime != w->attr.st_atime
2373 || w->prev.st_mtime != w->attr.st_mtime
2374 || w->prev.st_ctime != w->attr.st_ctime
2375 ) {
2376 #if EV_USE_INOTIFY
2377 infy_del (EV_A_ w);
2378 infy_add (EV_A_ w);
2379 ev_stat_stat (EV_A_ w); /* avoid race... */
2380 #endif
2381
1682 ev_feed_event (EV_A_ w, EV_STAT); 2382 ev_feed_event (EV_A_ w, EV_STAT);
2383 }
1683} 2384}
1684 2385
1685void 2386void
1686ev_stat_start (EV_P_ ev_stat *w) 2387ev_stat_start (EV_P_ ev_stat *w)
1687{ 2388{
… …
1697 if (w->interval < MIN_STAT_INTERVAL) 2398 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2399 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 2400
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2401 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 2402 ev_set_priority (&w->timer, ev_priority (w));
2403
2404#if EV_USE_INOTIFY
2405 infy_init (EV_A);
2406
2407 if (fs_fd >= 0)
2408 infy_add (EV_A_ w);
2409 else
2410#endif
1702 ev_timer_start (EV_A_ &w->timer); 2411 ev_timer_start (EV_A_ &w->timer);
1703 2412
1704 ev_start (EV_A_ (W)w, 1); 2413 ev_start (EV_A_ (W)w, 1);
1705} 2414}
1706 2415
1707void 2416void
1708ev_stat_stop (EV_P_ ev_stat *w) 2417ev_stat_stop (EV_P_ ev_stat *w)
1709{ 2418{
1710 ev_clear_pending (EV_A_ (W)w); 2419 clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 2420 if (expect_false (!ev_is_active (w)))
1712 return; 2421 return;
1713 2422
2423#if EV_USE_INOTIFY
2424 infy_del (EV_A_ w);
2425#endif
1714 ev_timer_stop (EV_A_ &w->timer); 2426 ev_timer_stop (EV_A_ &w->timer);
1715 2427
1716 ev_stop (EV_A_ (W)w); 2428 ev_stop (EV_A_ (W)w);
1717} 2429}
1718#endif 2430#endif
1719 2431
2432#if EV_IDLE_ENABLE
1720void 2433void
1721ev_idle_start (EV_P_ ev_idle *w) 2434ev_idle_start (EV_P_ ev_idle *w)
1722{ 2435{
1723 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
1724 return; 2437 return;
1725 2438
2439 pri_adjust (EV_A_ (W)w);
2440
2441 {
2442 int active = ++idlecnt [ABSPRI (w)];
2443
2444 ++idleall;
1726 ev_start (EV_A_ (W)w, ++idlecnt); 2445 ev_start (EV_A_ (W)w, active);
2446
1727 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2447 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1728 idles [idlecnt - 1] = w; 2448 idles [ABSPRI (w)][active - 1] = w;
2449 }
1729} 2450}
1730 2451
1731void 2452void
1732ev_idle_stop (EV_P_ ev_idle *w) 2453ev_idle_stop (EV_P_ ev_idle *w)
1733{ 2454{
1734 ev_clear_pending (EV_A_ (W)w); 2455 clear_pending (EV_A_ (W)w);
1735 if (expect_false (!ev_is_active (w))) 2456 if (expect_false (!ev_is_active (w)))
1736 return; 2457 return;
1737 2458
1738 { 2459 {
1739 int active = ((W)w)->active; 2460 int active = ev_active (w);
1740 idles [active - 1] = idles [--idlecnt]; 2461
1741 ((W)idles [active - 1])->active = active; 2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2463 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2464
2465 ev_stop (EV_A_ (W)w);
2466 --idleall;
1742 } 2467 }
1743
1744 ev_stop (EV_A_ (W)w);
1745} 2468}
2469#endif
1746 2470
1747void 2471void
1748ev_prepare_start (EV_P_ ev_prepare *w) 2472ev_prepare_start (EV_P_ ev_prepare *w)
1749{ 2473{
1750 if (expect_false (ev_is_active (w))) 2474 if (expect_false (ev_is_active (w)))
… …
1756} 2480}
1757 2481
1758void 2482void
1759ev_prepare_stop (EV_P_ ev_prepare *w) 2483ev_prepare_stop (EV_P_ ev_prepare *w)
1760{ 2484{
1761 ev_clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
1762 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
1763 return; 2487 return;
1764 2488
1765 { 2489 {
1766 int active = ((W)w)->active; 2490 int active = ev_active (w);
2491
1767 prepares [active - 1] = prepares [--preparecnt]; 2492 prepares [active - 1] = prepares [--preparecnt];
1768 ((W)prepares [active - 1])->active = active; 2493 ev_active (prepares [active - 1]) = active;
1769 } 2494 }
1770 2495
1771 ev_stop (EV_A_ (W)w); 2496 ev_stop (EV_A_ (W)w);
1772} 2497}
1773 2498
… …
1783} 2508}
1784 2509
1785void 2510void
1786ev_check_stop (EV_P_ ev_check *w) 2511ev_check_stop (EV_P_ ev_check *w)
1787{ 2512{
1788 ev_clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
1789 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
1790 return; 2515 return;
1791 2516
1792 { 2517 {
1793 int active = ((W)w)->active; 2518 int active = ev_active (w);
2519
1794 checks [active - 1] = checks [--checkcnt]; 2520 checks [active - 1] = checks [--checkcnt];
1795 ((W)checks [active - 1])->active = active; 2521 ev_active (checks [active - 1]) = active;
1796 } 2522 }
1797 2523
1798 ev_stop (EV_A_ (W)w); 2524 ev_stop (EV_A_ (W)w);
1799} 2525}
1800 2526
1801#if EV_EMBED_ENABLE 2527#if EV_EMBED_ENABLE
1802void noinline 2528void noinline
1803ev_embed_sweep (EV_P_ ev_embed *w) 2529ev_embed_sweep (EV_P_ ev_embed *w)
1804{ 2530{
1805 ev_loop (w->loop, EVLOOP_NONBLOCK); 2531 ev_loop (w->other, EVLOOP_NONBLOCK);
1806} 2532}
1807 2533
1808static void 2534static void
1809embed_cb (EV_P_ ev_io *io, int revents) 2535embed_io_cb (EV_P_ ev_io *io, int revents)
1810{ 2536{
1811 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2537 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1812 2538
1813 if (ev_cb (w)) 2539 if (ev_cb (w))
1814 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2540 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1815 else 2541 else
1816 ev_embed_sweep (loop, w); 2542 ev_loop (w->other, EVLOOP_NONBLOCK);
1817} 2543}
2544
2545static void
2546embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2547{
2548 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2549
2550 {
2551 struct ev_loop *loop = w->other;
2552
2553 while (fdchangecnt)
2554 {
2555 fd_reify (EV_A);
2556 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2557 }
2558 }
2559}
2560
2561#if 0
2562static void
2563embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2564{
2565 ev_idle_stop (EV_A_ idle);
2566}
2567#endif
1818 2568
1819void 2569void
1820ev_embed_start (EV_P_ ev_embed *w) 2570ev_embed_start (EV_P_ ev_embed *w)
1821{ 2571{
1822 if (expect_false (ev_is_active (w))) 2572 if (expect_false (ev_is_active (w)))
1823 return; 2573 return;
1824 2574
1825 { 2575 {
1826 struct ev_loop *loop = w->loop; 2576 struct ev_loop *loop = w->other;
1827 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2577 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1828 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2578 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1829 } 2579 }
1830 2580
1831 ev_set_priority (&w->io, ev_priority (w)); 2581 ev_set_priority (&w->io, ev_priority (w));
1832 ev_io_start (EV_A_ &w->io); 2582 ev_io_start (EV_A_ &w->io);
1833 2583
2584 ev_prepare_init (&w->prepare, embed_prepare_cb);
2585 ev_set_priority (&w->prepare, EV_MINPRI);
2586 ev_prepare_start (EV_A_ &w->prepare);
2587
2588 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2589
1834 ev_start (EV_A_ (W)w, 1); 2590 ev_start (EV_A_ (W)w, 1);
1835} 2591}
1836 2592
1837void 2593void
1838ev_embed_stop (EV_P_ ev_embed *w) 2594ev_embed_stop (EV_P_ ev_embed *w)
1839{ 2595{
1840 ev_clear_pending (EV_A_ (W)w); 2596 clear_pending (EV_A_ (W)w);
1841 if (expect_false (!ev_is_active (w))) 2597 if (expect_false (!ev_is_active (w)))
1842 return; 2598 return;
1843 2599
1844 ev_io_stop (EV_A_ &w->io); 2600 ev_io_stop (EV_A_ &w->io);
2601 ev_prepare_stop (EV_A_ &w->prepare);
1845 2602
1846 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
1847} 2604}
1848#endif 2605#endif
1849 2606
… …
1860} 2617}
1861 2618
1862void 2619void
1863ev_fork_stop (EV_P_ ev_fork *w) 2620ev_fork_stop (EV_P_ ev_fork *w)
1864{ 2621{
1865 ev_clear_pending (EV_A_ (W)w); 2622 clear_pending (EV_A_ (W)w);
1866 if (expect_false (!ev_is_active (w))) 2623 if (expect_false (!ev_is_active (w)))
1867 return; 2624 return;
1868 2625
1869 { 2626 {
1870 int active = ((W)w)->active; 2627 int active = ev_active (w);
2628
1871 forks [active - 1] = forks [--forkcnt]; 2629 forks [active - 1] = forks [--forkcnt];
1872 ((W)forks [active - 1])->active = active; 2630 ev_active (forks [active - 1]) = active;
1873 } 2631 }
1874 2632
1875 ev_stop (EV_A_ (W)w); 2633 ev_stop (EV_A_ (W)w);
2634}
2635#endif
2636
2637#if EV_ASYNC_ENABLE
2638void
2639ev_async_start (EV_P_ ev_async *w)
2640{
2641 if (expect_false (ev_is_active (w)))
2642 return;
2643
2644 evpipe_init (EV_A);
2645
2646 ev_start (EV_A_ (W)w, ++asynccnt);
2647 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2648 asyncs [asynccnt - 1] = w;
2649}
2650
2651void
2652ev_async_stop (EV_P_ ev_async *w)
2653{
2654 clear_pending (EV_A_ (W)w);
2655 if (expect_false (!ev_is_active (w)))
2656 return;
2657
2658 {
2659 int active = ev_active (w);
2660
2661 asyncs [active - 1] = asyncs [--asynccnt];
2662 ev_active (asyncs [active - 1]) = active;
2663 }
2664
2665 ev_stop (EV_A_ (W)w);
2666}
2667
2668void
2669ev_async_send (EV_P_ ev_async *w)
2670{
2671 w->sent = 1;
2672 evpipe_write (EV_A_ &gotasync);
1876} 2673}
1877#endif 2674#endif
1878 2675
1879/*****************************************************************************/ 2676/*****************************************************************************/
1880 2677
… …
1938 ev_timer_set (&once->to, timeout, 0.); 2735 ev_timer_set (&once->to, timeout, 0.);
1939 ev_timer_start (EV_A_ &once->to); 2736 ev_timer_start (EV_A_ &once->to);
1940 } 2737 }
1941} 2738}
1942 2739
2740#if EV_MULTIPLICITY
2741 #include "ev_wrap.h"
2742#endif
2743
1943#ifdef __cplusplus 2744#ifdef __cplusplus
1944} 2745}
1945#endif 2746#endif
1946 2747

Diff Legend

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