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

Comparing libev/ev.c (file contents):
Revision 1.150 by root, Tue Nov 27 19:41:52 2007 UTC vs.
Revision 1.235 by root, Wed May 7 14:45:17 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, size_t size) = realloc; 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
259 384
260void 385void
261ev_set_allocator (void *(*cb)(void *ptr, size_t size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
262{ 387{
263 alloc = cb; 388 alloc = cb;
264} 389}
265 390
266inline_speed void * 391inline_speed void *
267ev_realloc (void *ptr, size_t size) 392ev_realloc (void *ptr, long size)
268{ 393{
269 ptr = alloc (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.", (long)size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
274 abort (); 399 abort ();
275 } 400 }
276 401
277 return ptr; 402 return ptr;
278} 403}
… …
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 (minpos = pos + 0), (minat = (*minpos)->at);
814 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
815 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
816 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
817 }
818 else
819 {
820 if (pos >= E)
821 break;
598 822
823 (minpos = pos + 0), (minat = (*minpos)->at);
824 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
825 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
826 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
827 }
828
599 if (w->at <= heap [j]->at) 829 if (w->at <= minat)
600 break; 830 break;
601 831
602 heap [k] = heap [j]; 832 ev_active (*minpos) = k;
603 ((W)heap [k])->active = k + 1; 833 heap [k] = *minpos;
604 k = j; 834
835 k = minpos - heap;
605 } 836 }
606 837
607 heap [k] = w; 838 heap [k] = w;
839 ev_active (heap [k]) = k;
840}
841
842#else // 4HEAP
843
844#define HEAP0 1
845
846/* towards the root */
847void inline_speed
848upheap (WT *heap, int k)
849{
850 WT w = heap [k];
851
852 for (;;)
853 {
854 int p = k >> 1;
855
856 /* maybe we could use a dummy element at heap [0]? */
857 if (!p || heap [p]->at <= w->at)
858 break;
859
860 heap [k] = heap [p];
861 ev_active (heap [k]) = k;
862 k = p;
863 }
864
865 heap [k] = w;
866 ev_active (heap [k]) = k;
867}
868
869/* away from the root */
870void inline_speed
871downheap (WT *heap, int N, int k)
872{
873 WT w = heap [k];
874
875 for (;;)
876 {
877 int c = k << 1;
878
879 if (c > N)
880 break;
881
882 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
883 ? 1 : 0;
884
885 if (w->at <= heap [c]->at)
886 break;
887
888 heap [k] = heap [c];
608 ((W)heap [k])->active = k + 1; 889 ((W)heap [k])->active = k;
890
891 k = c;
892 }
893
894 heap [k] = w;
895 ev_active (heap [k]) = k;
609} 896}
897#endif
610 898
611void inline_size 899void inline_size
612adjustheap (WT *heap, int N, int k) 900adjustheap (WT *heap, int N, int k)
613{ 901{
614 upheap (heap, k); 902 upheap (heap, k);
… …
618/*****************************************************************************/ 906/*****************************************************************************/
619 907
620typedef struct 908typedef struct
621{ 909{
622 WL head; 910 WL head;
623 sig_atomic_t volatile gotsig; 911 EV_ATOMIC_T gotsig;
624} ANSIG; 912} ANSIG;
625 913
626static ANSIG *signals; 914static ANSIG *signals;
627static int signalmax; 915static int signalmax;
628 916
629static int sigpipe [2]; 917static EV_ATOMIC_T gotsig;
630static sig_atomic_t volatile gotsig;
631static ev_io sigev;
632 918
633void inline_size 919void inline_size
634signals_init (ANSIG *base, int count) 920signals_init (ANSIG *base, int count)
635{ 921{
636 while (count--) 922 while (count--)
… …
640 926
641 ++base; 927 ++base;
642 } 928 }
643} 929}
644 930
645static void 931/*****************************************************************************/
646sighandler (int signum)
647{
648#if _WIN32
649 signal (signum, sighandler);
650#endif
651 932
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 933void inline_speed
697fd_intern (int fd) 934fd_intern (int fd)
698{ 935{
699#ifdef _WIN32 936#ifdef _WIN32
700 int arg = 1; 937 int arg = 1;
701 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 938 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
704 fcntl (fd, F_SETFL, O_NONBLOCK); 941 fcntl (fd, F_SETFL, O_NONBLOCK);
705#endif 942#endif
706} 943}
707 944
708static void noinline 945static void noinline
709siginit (EV_P) 946evpipe_init (EV_P)
710{ 947{
948 if (!ev_is_active (&pipeev))
949 {
950#if EV_USE_EVENTFD
951 if ((evfd = eventfd (0, 0)) >= 0)
952 {
953 evpipe [0] = -1;
954 fd_intern (evfd);
955 ev_io_set (&pipeev, evfd, EV_READ);
956 }
957 else
958#endif
959 {
960 while (pipe (evpipe))
961 syserr ("(libev) error creating signal/async pipe");
962
711 fd_intern (sigpipe [0]); 963 fd_intern (evpipe [0]);
712 fd_intern (sigpipe [1]); 964 fd_intern (evpipe [1]);
965 ev_io_set (&pipeev, evpipe [0], EV_READ);
966 }
713 967
714 ev_io_set (&sigev, sigpipe [0], EV_READ);
715 ev_io_start (EV_A_ &sigev); 968 ev_io_start (EV_A_ &pipeev);
716 ev_unref (EV_A); /* child watcher should not keep loop alive */ 969 ev_unref (EV_A); /* watcher should not keep loop alive */
970 }
971}
972
973void inline_size
974evpipe_write (EV_P_ EV_ATOMIC_T *flag)
975{
976 if (!*flag)
977 {
978 int old_errno = errno; /* save errno because write might clobber it */
979
980 *flag = 1;
981
982#if EV_USE_EVENTFD
983 if (evfd >= 0)
984 {
985 uint64_t counter = 1;
986 write (evfd, &counter, sizeof (uint64_t));
987 }
988 else
989#endif
990 write (evpipe [1], &old_errno, 1);
991
992 errno = old_errno;
993 }
994}
995
996static void
997pipecb (EV_P_ ev_io *iow, int revents)
998{
999#if EV_USE_EVENTFD
1000 if (evfd >= 0)
1001 {
1002 uint64_t counter;
1003 read (evfd, &counter, sizeof (uint64_t));
1004 }
1005 else
1006#endif
1007 {
1008 char dummy;
1009 read (evpipe [0], &dummy, 1);
1010 }
1011
1012 if (gotsig && ev_is_default_loop (EV_A))
1013 {
1014 int signum;
1015 gotsig = 0;
1016
1017 for (signum = signalmax; signum--; )
1018 if (signals [signum].gotsig)
1019 ev_feed_signal_event (EV_A_ signum + 1);
1020 }
1021
1022#if EV_ASYNC_ENABLE
1023 if (gotasync)
1024 {
1025 int i;
1026 gotasync = 0;
1027
1028 for (i = asynccnt; i--; )
1029 if (asyncs [i]->sent)
1030 {
1031 asyncs [i]->sent = 0;
1032 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1033 }
1034 }
1035#endif
717} 1036}
718 1037
719/*****************************************************************************/ 1038/*****************************************************************************/
720 1039
1040static void
1041ev_sighandler (int signum)
1042{
1043#if EV_MULTIPLICITY
1044 struct ev_loop *loop = &default_loop_struct;
1045#endif
1046
1047#if _WIN32
1048 signal (signum, ev_sighandler);
1049#endif
1050
1051 signals [signum - 1].gotsig = 1;
1052 evpipe_write (EV_A_ &gotsig);
1053}
1054
1055void noinline
1056ev_feed_signal_event (EV_P_ int signum)
1057{
1058 WL w;
1059
1060#if EV_MULTIPLICITY
1061 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1062#endif
1063
1064 --signum;
1065
1066 if (signum < 0 || signum >= signalmax)
1067 return;
1068
1069 signals [signum].gotsig = 0;
1070
1071 for (w = signals [signum].head; w; w = w->next)
1072 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1073}
1074
1075/*****************************************************************************/
1076
721static ev_child *childs [EV_PID_HASHSIZE]; 1077static WL childs [EV_PID_HASHSIZE];
722 1078
723#ifndef _WIN32 1079#ifndef _WIN32
724 1080
725static ev_signal childev; 1081static ev_signal childev;
726 1082
1083#ifndef WIFCONTINUED
1084# define WIFCONTINUED(status) 0
1085#endif
1086
727void inline_speed 1087void inline_speed
728child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1088child_reap (EV_P_ int chain, int pid, int status)
729{ 1089{
730 ev_child *w; 1090 ev_child *w;
1091 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
731 1092
732 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1093 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1094 {
733 if (w->pid == pid || !w->pid) 1095 if ((w->pid == pid || !w->pid)
1096 && (!traced || (w->flags & 1)))
734 { 1097 {
735 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1098 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; 1099 w->rpid = pid;
737 w->rstatus = status; 1100 w->rstatus = status;
738 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1101 ev_feed_event (EV_A_ (W)w, EV_CHILD);
739 } 1102 }
1103 }
740} 1104}
741 1105
742#ifndef WCONTINUED 1106#ifndef WCONTINUED
743# define WCONTINUED 0 1107# define WCONTINUED 0
744#endif 1108#endif
… …
753 if (!WCONTINUED 1117 if (!WCONTINUED
754 || errno != EINVAL 1118 || errno != EINVAL
755 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1119 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
756 return; 1120 return;
757 1121
758 /* make sure we are called again until all childs have been reaped */ 1122 /* 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 */ 1123 /* 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); 1124 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
761 1125
762 child_reap (EV_A_ sw, pid, pid, status); 1126 child_reap (EV_A_ pid, pid, status);
763 if (EV_PID_HASHSIZE > 1) 1127 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 */ 1128 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
765} 1129}
766 1130
767#endif 1131#endif
768 1132
769/*****************************************************************************/ 1133/*****************************************************************************/
… …
841} 1205}
842 1206
843unsigned int 1207unsigned int
844ev_embeddable_backends (void) 1208ev_embeddable_backends (void)
845{ 1209{
846 return EVBACKEND_EPOLL 1210 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
847 | EVBACKEND_KQUEUE 1211
848 | EVBACKEND_PORT; 1212 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1213 /* please fix it and tell me how to detect the fix */
1214 flags &= ~EVBACKEND_EPOLL;
1215
1216 return flags;
849} 1217}
850 1218
851unsigned int 1219unsigned int
852ev_backend (EV_P) 1220ev_backend (EV_P)
853{ 1221{
854 return backend; 1222 return backend;
855} 1223}
856 1224
857static void 1225unsigned int
1226ev_loop_count (EV_P)
1227{
1228 return loop_count;
1229}
1230
1231void
1232ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1233{
1234 io_blocktime = interval;
1235}
1236
1237void
1238ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1239{
1240 timeout_blocktime = interval;
1241}
1242
1243static void noinline
858loop_init (EV_P_ unsigned int flags) 1244loop_init (EV_P_ unsigned int flags)
859{ 1245{
860 if (!backend) 1246 if (!backend)
861 { 1247 {
862#if EV_USE_MONOTONIC 1248#if EV_USE_MONOTONIC
… …
865 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1251 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
866 have_monotonic = 1; 1252 have_monotonic = 1;
867 } 1253 }
868#endif 1254#endif
869 1255
870 ev_rt_now = ev_time (); 1256 ev_rt_now = ev_time ();
871 mn_now = get_clock (); 1257 mn_now = get_clock ();
872 now_floor = mn_now; 1258 now_floor = mn_now;
873 rtmn_diff = ev_rt_now - mn_now; 1259 rtmn_diff = ev_rt_now - mn_now;
1260
1261 io_blocktime = 0.;
1262 timeout_blocktime = 0.;
1263 backend = 0;
1264 backend_fd = -1;
1265 gotasync = 0;
1266#if EV_USE_INOTIFY
1267 fs_fd = -2;
1268#endif
1269
1270 /* pid check not overridable via env */
1271#ifndef _WIN32
1272 if (flags & EVFLAG_FORKCHECK)
1273 curpid = getpid ();
1274#endif
874 1275
875 if (!(flags & EVFLAG_NOENV) 1276 if (!(flags & EVFLAG_NOENV)
876 && !enable_secure () 1277 && !enable_secure ()
877 && getenv ("LIBEV_FLAGS")) 1278 && getenv ("LIBEV_FLAGS"))
878 flags = atoi (getenv ("LIBEV_FLAGS")); 1279 flags = atoi (getenv ("LIBEV_FLAGS"));
879 1280
880 if (!(flags & 0x0000ffffUL)) 1281 if (!(flags & 0x0000ffffU))
881 flags |= ev_recommended_backends (); 1282 flags |= ev_recommended_backends ();
882 1283
883 backend = 0;
884#if EV_USE_PORT 1284#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1285 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 1286#endif
887#if EV_USE_KQUEUE 1287#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1288 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
895#endif 1295#endif
896#if EV_USE_SELECT 1296#if EV_USE_SELECT
897 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1297 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
898#endif 1298#endif
899 1299
900 ev_init (&sigev, sigcb); 1300 ev_init (&pipeev, pipecb);
901 ev_set_priority (&sigev, EV_MAXPRI); 1301 ev_set_priority (&pipeev, EV_MAXPRI);
902 } 1302 }
903} 1303}
904 1304
905static void 1305static void noinline
906loop_destroy (EV_P) 1306loop_destroy (EV_P)
907{ 1307{
908 int i; 1308 int i;
1309
1310 if (ev_is_active (&pipeev))
1311 {
1312 ev_ref (EV_A); /* signal watcher */
1313 ev_io_stop (EV_A_ &pipeev);
1314
1315#if EV_USE_EVENTFD
1316 if (evfd >= 0)
1317 close (evfd);
1318#endif
1319
1320 if (evpipe [0] >= 0)
1321 {
1322 close (evpipe [0]);
1323 close (evpipe [1]);
1324 }
1325 }
1326
1327#if EV_USE_INOTIFY
1328 if (fs_fd >= 0)
1329 close (fs_fd);
1330#endif
1331
1332 if (backend_fd >= 0)
1333 close (backend_fd);
909 1334
910#if EV_USE_PORT 1335#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1336 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 1337#endif
913#if EV_USE_KQUEUE 1338#if EV_USE_KQUEUE
… …
922#if EV_USE_SELECT 1347#if EV_USE_SELECT
923 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1348 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
924#endif 1349#endif
925 1350
926 for (i = NUMPRI; i--; ) 1351 for (i = NUMPRI; i--; )
1352 {
927 array_free (pending, [i]); 1353 array_free (pending, [i]);
1354#if EV_IDLE_ENABLE
1355 array_free (idle, [i]);
1356#endif
1357 }
1358
1359 ev_free (anfds); anfdmax = 0;
928 1360
929 /* have to use the microsoft-never-gets-it-right macro */ 1361 /* have to use the microsoft-never-gets-it-right macro */
930 array_free (fdchange, EMPTY0); 1362 array_free (fdchange, EMPTY);
931 array_free (timer, EMPTY0); 1363 array_free (timer, EMPTY);
932#if EV_PERIODIC_ENABLE 1364#if EV_PERIODIC_ENABLE
933 array_free (periodic, EMPTY0); 1365 array_free (periodic, EMPTY);
934#endif 1366#endif
1367#if EV_FORK_ENABLE
935 array_free (idle, EMPTY0); 1368 array_free (fork, EMPTY);
1369#endif
936 array_free (prepare, EMPTY0); 1370 array_free (prepare, EMPTY);
937 array_free (check, EMPTY0); 1371 array_free (check, EMPTY);
1372#if EV_ASYNC_ENABLE
1373 array_free (async, EMPTY);
1374#endif
938 1375
939 backend = 0; 1376 backend = 0;
940} 1377}
941 1378
942static void 1379#if EV_USE_INOTIFY
1380void inline_size infy_fork (EV_P);
1381#endif
1382
1383void inline_size
943loop_fork (EV_P) 1384loop_fork (EV_P)
944{ 1385{
945#if EV_USE_PORT 1386#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1387 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 1388#endif
… …
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1390 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1391#endif
951#if EV_USE_EPOLL 1392#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1393 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
953#endif 1394#endif
1395#if EV_USE_INOTIFY
1396 infy_fork (EV_A);
1397#endif
954 1398
955 if (ev_is_active (&sigev)) 1399 if (ev_is_active (&pipeev))
956 { 1400 {
957 /* default loop */ 1401 /* this "locks" the handlers against writing to the pipe */
1402 /* while we modify the fd vars */
1403 gotsig = 1;
1404#if EV_ASYNC_ENABLE
1405 gotasync = 1;
1406#endif
958 1407
959 ev_ref (EV_A); 1408 ev_ref (EV_A);
960 ev_io_stop (EV_A_ &sigev); 1409 ev_io_stop (EV_A_ &pipeev);
1410
1411#if EV_USE_EVENTFD
1412 if (evfd >= 0)
1413 close (evfd);
1414#endif
1415
1416 if (evpipe [0] >= 0)
1417 {
961 close (sigpipe [0]); 1418 close (evpipe [0]);
962 close (sigpipe [1]); 1419 close (evpipe [1]);
1420 }
963 1421
964 while (pipe (sigpipe))
965 syserr ("(libev) error creating pipe");
966
967 siginit (EV_A); 1422 evpipe_init (EV_A);
1423 /* now iterate over everything, in case we missed something */
1424 pipecb (EV_A_ &pipeev, EV_READ);
968 } 1425 }
969 1426
970 postfork = 0; 1427 postfork = 0;
971} 1428}
972 1429
… …
994} 1451}
995 1452
996void 1453void
997ev_loop_fork (EV_P) 1454ev_loop_fork (EV_P)
998{ 1455{
999 postfork = 1; 1456 postfork = 1; /* must be in line with ev_default_fork */
1000} 1457}
1001
1002#endif 1458#endif
1003 1459
1004#if EV_MULTIPLICITY 1460#if EV_MULTIPLICITY
1005struct ev_loop * 1461struct ev_loop *
1006ev_default_loop_init (unsigned int flags) 1462ev_default_loop_init (unsigned int flags)
1007#else 1463#else
1008int 1464int
1009ev_default_loop (unsigned int flags) 1465ev_default_loop (unsigned int flags)
1010#endif 1466#endif
1011{ 1467{
1012 if (sigpipe [0] == sigpipe [1])
1013 if (pipe (sigpipe))
1014 return 0;
1015
1016 if (!ev_default_loop_ptr) 1468 if (!ev_default_loop_ptr)
1017 { 1469 {
1018#if EV_MULTIPLICITY 1470#if EV_MULTIPLICITY
1019 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1471 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1020#else 1472#else
… …
1023 1475
1024 loop_init (EV_A_ flags); 1476 loop_init (EV_A_ flags);
1025 1477
1026 if (ev_backend (EV_A)) 1478 if (ev_backend (EV_A))
1027 { 1479 {
1028 siginit (EV_A);
1029
1030#ifndef _WIN32 1480#ifndef _WIN32
1031 ev_signal_init (&childev, childcb, SIGCHLD); 1481 ev_signal_init (&childev, childcb, SIGCHLD);
1032 ev_set_priority (&childev, EV_MAXPRI); 1482 ev_set_priority (&childev, EV_MAXPRI);
1033 ev_signal_start (EV_A_ &childev); 1483 ev_signal_start (EV_A_ &childev);
1034 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1484 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1051#ifndef _WIN32 1501#ifndef _WIN32
1052 ev_ref (EV_A); /* child watcher */ 1502 ev_ref (EV_A); /* child watcher */
1053 ev_signal_stop (EV_A_ &childev); 1503 ev_signal_stop (EV_A_ &childev);
1054#endif 1504#endif
1055 1505
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); 1506 loop_destroy (EV_A);
1063} 1507}
1064 1508
1065void 1509void
1066ev_default_fork (void) 1510ev_default_fork (void)
… …
1068#if EV_MULTIPLICITY 1512#if EV_MULTIPLICITY
1069 struct ev_loop *loop = ev_default_loop_ptr; 1513 struct ev_loop *loop = ev_default_loop_ptr;
1070#endif 1514#endif
1071 1515
1072 if (backend) 1516 if (backend)
1073 postfork = 1; 1517 postfork = 1; /* must be in line with ev_loop_fork */
1074} 1518}
1075 1519
1076/*****************************************************************************/ 1520/*****************************************************************************/
1077 1521
1078int inline_size 1522void
1079any_pending (EV_P) 1523ev_invoke (EV_P_ void *w, int revents)
1080{ 1524{
1081 int pri; 1525 EV_CB_INVOKE ((W)w, revents);
1082
1083 for (pri = NUMPRI; pri--; )
1084 if (pendingcnt [pri])
1085 return 1;
1086
1087 return 0;
1088} 1526}
1089 1527
1090void inline_speed 1528void inline_speed
1091call_pending (EV_P) 1529call_pending (EV_P)
1092{ 1530{
… …
1097 { 1535 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1536 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1537
1100 if (expect_true (p->w)) 1538 if (expect_true (p->w))
1101 { 1539 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1540 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1541
1104 p->w->pending = 0; 1542 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1543 EV_CB_INVOKE (p->w, p->events);
1106 } 1544 }
1107 } 1545 }
1108} 1546}
1109 1547
1548#if EV_IDLE_ENABLE
1549void inline_size
1550idle_reify (EV_P)
1551{
1552 if (expect_false (idleall))
1553 {
1554 int pri;
1555
1556 for (pri = NUMPRI; pri--; )
1557 {
1558 if (pendingcnt [pri])
1559 break;
1560
1561 if (idlecnt [pri])
1562 {
1563 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1564 break;
1565 }
1566 }
1567 }
1568}
1569#endif
1570
1110void inline_size 1571void inline_size
1111timers_reify (EV_P) 1572timers_reify (EV_P)
1112{ 1573{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1574 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1114 { 1575 {
1115 ev_timer *w = timers [0]; 1576 ev_timer *w = (ev_timer *)timers [HEAP0];
1116 1577
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1578 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1579
1119 /* first reschedule or stop timer */ 1580 /* first reschedule or stop timer */
1120 if (w->repeat) 1581 if (w->repeat)
1121 { 1582 {
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1583 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1123 1584
1124 ((WT)w)->at += w->repeat; 1585 ev_at (w) += w->repeat;
1125 if (((WT)w)->at < mn_now) 1586 if (ev_at (w) < mn_now)
1126 ((WT)w)->at = mn_now; 1587 ev_at (w) = mn_now;
1127 1588
1128 downheap ((WT *)timers, timercnt, 0); 1589 downheap (timers, timercnt, HEAP0);
1129 } 1590 }
1130 else 1591 else
1131 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1592 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1132 1593
1133 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1594 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1136 1597
1137#if EV_PERIODIC_ENABLE 1598#if EV_PERIODIC_ENABLE
1138void inline_size 1599void inline_size
1139periodics_reify (EV_P) 1600periodics_reify (EV_P)
1140{ 1601{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1602 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1142 { 1603 {
1143 ev_periodic *w = periodics [0]; 1604 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1144 1605
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1606 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1607
1147 /* first reschedule or stop timer */ 1608 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1609 if (w->reschedule_cb)
1149 { 1610 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1611 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)); 1612 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1152 downheap ((WT *)periodics, periodiccnt, 0); 1613 downheap (periodics, periodiccnt, 1);
1153 } 1614 }
1154 else if (w->interval) 1615 else if (w->interval)
1155 { 1616 {
1156 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1618 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)); 1619 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); 1620 downheap (periodics, periodiccnt, HEAP0);
1159 } 1621 }
1160 else 1622 else
1161 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1623 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1162 1624
1163 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1625 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1168periodics_reschedule (EV_P) 1630periodics_reschedule (EV_P)
1169{ 1631{
1170 int i; 1632 int i;
1171 1633
1172 /* adjust periodics after time jump */ 1634 /* adjust periodics after time jump */
1173 for (i = 0; i < periodiccnt; ++i) 1635 for (i = 1; i <= periodiccnt; ++i)
1174 { 1636 {
1175 ev_periodic *w = periodics [i]; 1637 ev_periodic *w = (ev_periodic *)periodics [i];
1176 1638
1177 if (w->reschedule_cb) 1639 if (w->reschedule_cb)
1178 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1640 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1179 else if (w->interval) 1641 else if (w->interval)
1180 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1181 } 1643 }
1182 1644
1183 /* now rebuild the heap */ 1645 /* now rebuild the heap */
1184 for (i = periodiccnt >> 1; i--; ) 1646 for (i = periodiccnt >> 1; --i; )
1185 downheap ((WT *)periodics, periodiccnt, i); 1647 downheap (periodics, periodiccnt, i + HEAP0);
1186} 1648}
1187#endif 1649#endif
1188 1650
1189int inline_size 1651void inline_speed
1190time_update_monotonic (EV_P) 1652time_update (EV_P_ ev_tstamp max_block)
1191{ 1653{
1654 int i;
1655
1656#if EV_USE_MONOTONIC
1657 if (expect_true (have_monotonic))
1658 {
1659 ev_tstamp odiff = rtmn_diff;
1660
1192 mn_now = get_clock (); 1661 mn_now = get_clock ();
1193 1662
1663 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1664 /* interpolate in the meantime */
1194 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1665 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1195 { 1666 {
1196 ev_rt_now = rtmn_diff + mn_now; 1667 ev_rt_now = rtmn_diff + mn_now;
1197 return 0; 1668 return;
1198 } 1669 }
1199 else 1670
1200 {
1201 now_floor = mn_now; 1671 now_floor = mn_now;
1202 ev_rt_now = ev_time (); 1672 ev_rt_now = ev_time ();
1203 return 1;
1204 }
1205}
1206 1673
1207void inline_size 1674 /* loop a few times, before making important decisions.
1208time_update (EV_P) 1675 * on the choice of "4": one iteration isn't enough,
1209{ 1676 * in case we get preempted during the calls to
1210 int i; 1677 * ev_time and get_clock. a second call is almost guaranteed
1211 1678 * to succeed in that case, though. and looping a few more times
1212#if EV_USE_MONOTONIC 1679 * doesn't hurt either as we only do this on time-jumps or
1213 if (expect_true (have_monotonic)) 1680 * in the unlikely event of having been preempted here.
1214 { 1681 */
1215 if (time_update_monotonic (EV_A)) 1682 for (i = 4; --i; )
1216 { 1683 {
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; 1684 rtmn_diff = ev_rt_now - mn_now;
1230 1685
1231 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1686 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1232 return; /* all is well */ 1687 return; /* all is well */
1233 1688
1234 ev_rt_now = ev_time (); 1689 ev_rt_now = ev_time ();
1235 mn_now = get_clock (); 1690 mn_now = get_clock ();
1236 now_floor = mn_now; 1691 now_floor = mn_now;
1237 } 1692 }
1238 1693
1239# if EV_PERIODIC_ENABLE 1694# if EV_PERIODIC_ENABLE
1240 periodics_reschedule (EV_A); 1695 periodics_reschedule (EV_A);
1241# endif 1696# endif
1242 /* no timer adjustment, as the monotonic clock doesn't jump */ 1697 /* no timer adjustment, as the monotonic clock doesn't jump */
1243 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1698 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1244 }
1245 } 1699 }
1246 else 1700 else
1247#endif 1701#endif
1248 { 1702 {
1249 ev_rt_now = ev_time (); 1703 ev_rt_now = ev_time ();
1250 1704
1251 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1705 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1252 { 1706 {
1253#if EV_PERIODIC_ENABLE 1707#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1708 periodics_reschedule (EV_A);
1255#endif 1709#endif
1256
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1710 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1711 for (i = 1; i <= timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1712 ev_at (timers [i]) += ev_rt_now - mn_now;
1260 } 1713 }
1261 1714
1262 mn_now = ev_rt_now; 1715 mn_now = ev_rt_now;
1263 } 1716 }
1264} 1717}
… …
1278static int loop_done; 1731static int loop_done;
1279 1732
1280void 1733void
1281ev_loop (EV_P_ int flags) 1734ev_loop (EV_P_ int flags)
1282{ 1735{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1736 loop_done = EVUNLOOP_CANCEL;
1284 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL;
1286 1737
1287 while (activecnt) 1738 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1739
1740 do
1288 { 1741 {
1289 /* we might have forked, so reify kernel state if necessary */ 1742#ifndef _WIN32
1743 if (expect_false (curpid)) /* penalise the forking check even more */
1744 if (expect_false (getpid () != curpid))
1745 {
1746 curpid = getpid ();
1747 postfork = 1;
1748 }
1749#endif
1750
1290 #if EV_FORK_ENABLE 1751#if EV_FORK_ENABLE
1752 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1753 if (expect_false (postfork))
1292 if (forkcnt) 1754 if (forkcnt)
1293 { 1755 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1756 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1757 call_pending (EV_A);
1296 } 1758 }
1297 #endif 1759#endif
1298 1760
1299 /* queue check watchers (and execute them) */ 1761 /* queue prepare watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1762 if (expect_false (preparecnt))
1301 { 1763 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1764 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1765 call_pending (EV_A);
1304 } 1766 }
1305 1767
1768 if (expect_false (!activecnt))
1769 break;
1770
1306 /* we might have forked, so reify kernel state if necessary */ 1771 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1772 if (expect_false (postfork))
1308 loop_fork (EV_A); 1773 loop_fork (EV_A);
1309 1774
1310 /* update fd-related kernel structures */ 1775 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1776 fd_reify (EV_A);
1312 1777
1313 /* calculate blocking time */ 1778 /* calculate blocking time */
1314 { 1779 {
1315 double block; 1780 ev_tstamp waittime = 0.;
1781 ev_tstamp sleeptime = 0.;
1316 1782
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1783 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1318 block = 0.; /* do not block at all */
1319 else
1320 { 1784 {
1321 /* update time to cancel out callback processing overhead */ 1785 /* 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); 1786 time_update (EV_A_ 1e100);
1325 else
1326#endif
1327 {
1328 ev_rt_now = ev_time ();
1329 mn_now = ev_rt_now;
1330 }
1331 1787
1332 block = MAX_BLOCKTIME; 1788 waittime = MAX_BLOCKTIME;
1333 1789
1334 if (timercnt) 1790 if (timercnt)
1335 { 1791 {
1336 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1792 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1337 if (block > to) block = to; 1793 if (waittime > to) waittime = to;
1338 } 1794 }
1339 1795
1340#if EV_PERIODIC_ENABLE 1796#if EV_PERIODIC_ENABLE
1341 if (periodiccnt) 1797 if (periodiccnt)
1342 { 1798 {
1343 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1799 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1344 if (block > to) block = to; 1800 if (waittime > to) waittime = to;
1345 } 1801 }
1346#endif 1802#endif
1347 1803
1348 if (expect_false (block < 0.)) block = 0.; 1804 if (expect_false (waittime < timeout_blocktime))
1805 waittime = timeout_blocktime;
1806
1807 sleeptime = waittime - backend_fudge;
1808
1809 if (expect_true (sleeptime > io_blocktime))
1810 sleeptime = io_blocktime;
1811
1812 if (sleeptime)
1813 {
1814 ev_sleep (sleeptime);
1815 waittime -= sleeptime;
1816 }
1349 } 1817 }
1350 1818
1819 ++loop_count;
1351 backend_poll (EV_A_ block); 1820 backend_poll (EV_A_ waittime);
1821
1822 /* update ev_rt_now, do magic */
1823 time_update (EV_A_ waittime + sleeptime);
1352 } 1824 }
1353
1354 /* update ev_rt_now, do magic */
1355 time_update (EV_A);
1356 1825
1357 /* queue pending timers and reschedule them */ 1826 /* queue pending timers and reschedule them */
1358 timers_reify (EV_A); /* relative timers called last */ 1827 timers_reify (EV_A); /* relative timers called last */
1359#if EV_PERIODIC_ENABLE 1828#if EV_PERIODIC_ENABLE
1360 periodics_reify (EV_A); /* absolute timers called first */ 1829 periodics_reify (EV_A); /* absolute timers called first */
1361#endif 1830#endif
1362 1831
1832#if EV_IDLE_ENABLE
1363 /* queue idle watchers unless other events are pending */ 1833 /* queue idle watchers unless other events are pending */
1364 if (idlecnt && !any_pending (EV_A)) 1834 idle_reify (EV_A);
1365 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1835#endif
1366 1836
1367 /* queue check watchers, to be executed first */ 1837 /* queue check watchers, to be executed first */
1368 if (expect_false (checkcnt)) 1838 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1839 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1840
1371 call_pending (EV_A); 1841 call_pending (EV_A);
1372
1373 if (expect_false (loop_done))
1374 break;
1375 } 1842 }
1843 while (expect_true (
1844 activecnt
1845 && !loop_done
1846 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1847 ));
1376 1848
1377 if (loop_done == EVUNLOOP_ONE) 1849 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1850 loop_done = EVUNLOOP_CANCEL;
1379} 1851}
1380 1852
… …
1407 head = &(*head)->next; 1879 head = &(*head)->next;
1408 } 1880 }
1409} 1881}
1410 1882
1411void inline_speed 1883void inline_speed
1412ev_clear_pending (EV_P_ W w) 1884clear_pending (EV_P_ W w)
1413{ 1885{
1414 if (w->pending) 1886 if (w->pending)
1415 { 1887 {
1416 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1888 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1417 w->pending = 0; 1889 w->pending = 0;
1418 } 1890 }
1419} 1891}
1420 1892
1893int
1894ev_clear_pending (EV_P_ void *w)
1895{
1896 W w_ = (W)w;
1897 int pending = w_->pending;
1898
1899 if (expect_true (pending))
1900 {
1901 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1902 w_->pending = 0;
1903 p->w = 0;
1904 return p->events;
1905 }
1906 else
1907 return 0;
1908}
1909
1910void inline_size
1911pri_adjust (EV_P_ W w)
1912{
1913 int pri = w->priority;
1914 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1915 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1916 w->priority = pri;
1917}
1918
1421void inline_speed 1919void inline_speed
1422ev_start (EV_P_ W w, int active) 1920ev_start (EV_P_ W w, int active)
1423{ 1921{
1424 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1922 pri_adjust (EV_A_ w);
1425 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1426
1427 w->active = active; 1923 w->active = active;
1428 ev_ref (EV_A); 1924 ev_ref (EV_A);
1429} 1925}
1430 1926
1431void inline_size 1927void inline_size
… …
1435 w->active = 0; 1931 w->active = 0;
1436} 1932}
1437 1933
1438/*****************************************************************************/ 1934/*****************************************************************************/
1439 1935
1440void 1936void noinline
1441ev_io_start (EV_P_ ev_io *w) 1937ev_io_start (EV_P_ ev_io *w)
1442{ 1938{
1443 int fd = w->fd; 1939 int fd = w->fd;
1444 1940
1445 if (expect_false (ev_is_active (w))) 1941 if (expect_false (ev_is_active (w)))
… …
1447 1943
1448 assert (("ev_io_start called with negative fd", fd >= 0)); 1944 assert (("ev_io_start called with negative fd", fd >= 0));
1449 1945
1450 ev_start (EV_A_ (W)w, 1); 1946 ev_start (EV_A_ (W)w, 1);
1451 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1947 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1452 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1948 wlist_add (&anfds[fd].head, (WL)w);
1453 1949
1454 fd_change (EV_A_ fd); 1950 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1951 w->events &= ~EV_IOFDSET;
1455} 1952}
1456 1953
1457void 1954void noinline
1458ev_io_stop (EV_P_ ev_io *w) 1955ev_io_stop (EV_P_ ev_io *w)
1459{ 1956{
1460 ev_clear_pending (EV_A_ (W)w); 1957 clear_pending (EV_A_ (W)w);
1461 if (expect_false (!ev_is_active (w))) 1958 if (expect_false (!ev_is_active (w)))
1462 return; 1959 return;
1463 1960
1464 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1961 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1465 1962
1466 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1963 wlist_del (&anfds[w->fd].head, (WL)w);
1467 ev_stop (EV_A_ (W)w); 1964 ev_stop (EV_A_ (W)w);
1468 1965
1469 fd_change (EV_A_ w->fd); 1966 fd_change (EV_A_ w->fd, 1);
1470} 1967}
1471 1968
1472void 1969void noinline
1473ev_timer_start (EV_P_ ev_timer *w) 1970ev_timer_start (EV_P_ ev_timer *w)
1474{ 1971{
1475 if (expect_false (ev_is_active (w))) 1972 if (expect_false (ev_is_active (w)))
1476 return; 1973 return;
1477 1974
1478 ((WT)w)->at += mn_now; 1975 ev_at (w) += mn_now;
1479 1976
1480 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1977 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1481 1978
1482 ev_start (EV_A_ (W)w, ++timercnt); 1979 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1980 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1484 timers [timercnt - 1] = w; 1981 timers [ev_active (w)] = (WT)w;
1485 upheap ((WT *)timers, timercnt - 1); 1982 upheap (timers, ev_active (w));
1486 1983
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1984 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1488} 1985}
1489 1986
1490void 1987void noinline
1491ev_timer_stop (EV_P_ ev_timer *w) 1988ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1989{
1493 ev_clear_pending (EV_A_ (W)w); 1990 clear_pending (EV_A_ (W)w);
1494 if (expect_false (!ev_is_active (w))) 1991 if (expect_false (!ev_is_active (w)))
1495 return; 1992 return;
1496 1993
1994 {
1995 int active = ev_active (w);
1996
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1997 assert (("internal timer heap corruption", timers [active] == (WT)w));
1498 1998
1499 if (expect_true (((W)w)->active < timercnt--)) 1999 if (expect_true (active < timercnt + HEAP0 - 1))
1500 { 2000 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 2001 timers [active] = timers [timercnt + HEAP0 - 1];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2002 adjustheap (timers, timercnt, active);
1503 } 2003 }
1504 2004
1505 ((WT)w)->at -= mn_now; 2005 --timercnt;
2006 }
2007
2008 ev_at (w) -= mn_now;
1506 2009
1507 ev_stop (EV_A_ (W)w); 2010 ev_stop (EV_A_ (W)w);
1508} 2011}
1509 2012
1510void 2013void noinline
1511ev_timer_again (EV_P_ ev_timer *w) 2014ev_timer_again (EV_P_ ev_timer *w)
1512{ 2015{
1513 if (ev_is_active (w)) 2016 if (ev_is_active (w))
1514 { 2017 {
1515 if (w->repeat) 2018 if (w->repeat)
1516 { 2019 {
1517 ((WT)w)->at = mn_now + w->repeat; 2020 ev_at (w) = mn_now + w->repeat;
1518 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2021 adjustheap (timers, timercnt, ev_active (w));
1519 } 2022 }
1520 else 2023 else
1521 ev_timer_stop (EV_A_ w); 2024 ev_timer_stop (EV_A_ w);
1522 } 2025 }
1523 else if (w->repeat) 2026 else if (w->repeat)
1524 { 2027 {
1525 w->at = w->repeat; 2028 ev_at (w) = w->repeat;
1526 ev_timer_start (EV_A_ w); 2029 ev_timer_start (EV_A_ w);
1527 } 2030 }
1528} 2031}
1529 2032
1530#if EV_PERIODIC_ENABLE 2033#if EV_PERIODIC_ENABLE
1531void 2034void noinline
1532ev_periodic_start (EV_P_ ev_periodic *w) 2035ev_periodic_start (EV_P_ ev_periodic *w)
1533{ 2036{
1534 if (expect_false (ev_is_active (w))) 2037 if (expect_false (ev_is_active (w)))
1535 return; 2038 return;
1536 2039
1537 if (w->reschedule_cb) 2040 if (w->reschedule_cb)
1538 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2041 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1539 else if (w->interval) 2042 else if (w->interval)
1540 { 2043 {
1541 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2044 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 */ 2045 /* 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; 2046 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1544 } 2047 }
2048 else
2049 ev_at (w) = w->offset;
1545 2050
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 2051 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2052 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 2053 periodics [ev_active (w)] = (WT)w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 2054 upheap (periodics, ev_active (w));
1550 2055
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2056 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1552} 2057}
1553 2058
1554void 2059void noinline
1555ev_periodic_stop (EV_P_ ev_periodic *w) 2060ev_periodic_stop (EV_P_ ev_periodic *w)
1556{ 2061{
1557 ev_clear_pending (EV_A_ (W)w); 2062 clear_pending (EV_A_ (W)w);
1558 if (expect_false (!ev_is_active (w))) 2063 if (expect_false (!ev_is_active (w)))
1559 return; 2064 return;
1560 2065
2066 {
2067 int active = ev_active (w);
2068
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2069 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1562 2070
1563 if (expect_true (((W)w)->active < periodiccnt--)) 2071 if (expect_true (active < periodiccnt + HEAP0 - 1))
1564 { 2072 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 2073 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 2074 adjustheap (periodics, periodiccnt, active);
1567 } 2075 }
2076
2077 --periodiccnt;
2078 }
1568 2079
1569 ev_stop (EV_A_ (W)w); 2080 ev_stop (EV_A_ (W)w);
1570} 2081}
1571 2082
1572void 2083void noinline
1573ev_periodic_again (EV_P_ ev_periodic *w) 2084ev_periodic_again (EV_P_ ev_periodic *w)
1574{ 2085{
1575 /* TODO: use adjustheap and recalculation */ 2086 /* TODO: use adjustheap and recalculation */
1576 ev_periodic_stop (EV_A_ w); 2087 ev_periodic_stop (EV_A_ w);
1577 ev_periodic_start (EV_A_ w); 2088 ev_periodic_start (EV_A_ w);
… …
1580 2091
1581#ifndef SA_RESTART 2092#ifndef SA_RESTART
1582# define SA_RESTART 0 2093# define SA_RESTART 0
1583#endif 2094#endif
1584 2095
1585void 2096void noinline
1586ev_signal_start (EV_P_ ev_signal *w) 2097ev_signal_start (EV_P_ ev_signal *w)
1587{ 2098{
1588#if EV_MULTIPLICITY 2099#if EV_MULTIPLICITY
1589 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2100 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1590#endif 2101#endif
1591 if (expect_false (ev_is_active (w))) 2102 if (expect_false (ev_is_active (w)))
1592 return; 2103 return;
1593 2104
1594 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2105 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1595 2106
2107 evpipe_init (EV_A);
2108
2109 {
2110#ifndef _WIN32
2111 sigset_t full, prev;
2112 sigfillset (&full);
2113 sigprocmask (SIG_SETMASK, &full, &prev);
2114#endif
2115
2116 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2117
2118#ifndef _WIN32
2119 sigprocmask (SIG_SETMASK, &prev, 0);
2120#endif
2121 }
2122
1596 ev_start (EV_A_ (W)w, 1); 2123 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); 2124 wlist_add (&signals [w->signum - 1].head, (WL)w);
1599 2125
1600 if (!((WL)w)->next) 2126 if (!((WL)w)->next)
1601 { 2127 {
1602#if _WIN32 2128#if _WIN32
1603 signal (w->signum, sighandler); 2129 signal (w->signum, ev_sighandler);
1604#else 2130#else
1605 struct sigaction sa; 2131 struct sigaction sa;
1606 sa.sa_handler = sighandler; 2132 sa.sa_handler = ev_sighandler;
1607 sigfillset (&sa.sa_mask); 2133 sigfillset (&sa.sa_mask);
1608 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2134 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1609 sigaction (w->signum, &sa, 0); 2135 sigaction (w->signum, &sa, 0);
1610#endif 2136#endif
1611 } 2137 }
1612} 2138}
1613 2139
1614void 2140void noinline
1615ev_signal_stop (EV_P_ ev_signal *w) 2141ev_signal_stop (EV_P_ ev_signal *w)
1616{ 2142{
1617 ev_clear_pending (EV_A_ (W)w); 2143 clear_pending (EV_A_ (W)w);
1618 if (expect_false (!ev_is_active (w))) 2144 if (expect_false (!ev_is_active (w)))
1619 return; 2145 return;
1620 2146
1621 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2147 wlist_del (&signals [w->signum - 1].head, (WL)w);
1622 ev_stop (EV_A_ (W)w); 2148 ev_stop (EV_A_ (W)w);
1623 2149
1624 if (!signals [w->signum - 1].head) 2150 if (!signals [w->signum - 1].head)
1625 signal (w->signum, SIG_DFL); 2151 signal (w->signum, SIG_DFL);
1626} 2152}
… …
1633#endif 2159#endif
1634 if (expect_false (ev_is_active (w))) 2160 if (expect_false (ev_is_active (w)))
1635 return; 2161 return;
1636 2162
1637 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
1638 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2164 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1639} 2165}
1640 2166
1641void 2167void
1642ev_child_stop (EV_P_ ev_child *w) 2168ev_child_stop (EV_P_ ev_child *w)
1643{ 2169{
1644 ev_clear_pending (EV_A_ (W)w); 2170 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 2171 if (expect_false (!ev_is_active (w)))
1646 return; 2172 return;
1647 2173
1648 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2174 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1649 ev_stop (EV_A_ (W)w); 2175 ev_stop (EV_A_ (W)w);
1650} 2176}
1651 2177
1652#if EV_STAT_ENABLE 2178#if EV_STAT_ENABLE
1653 2179
… …
1657# endif 2183# endif
1658 2184
1659#define DEF_STAT_INTERVAL 5.0074891 2185#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 2186#define MIN_STAT_INTERVAL 0.1074891
1661 2187
2188static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2189
2190#if EV_USE_INOTIFY
2191# define EV_INOTIFY_BUFSIZE 8192
2192
2193static void noinline
2194infy_add (EV_P_ ev_stat *w)
2195{
2196 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);
2197
2198 if (w->wd < 0)
2199 {
2200 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2201
2202 /* monitor some parent directory for speedup hints */
2203 /* note that exceeding the hardcoded limit is not a correctness issue, */
2204 /* but an efficiency issue only */
2205 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2206 {
2207 char path [4096];
2208 strcpy (path, w->path);
2209
2210 do
2211 {
2212 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2213 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2214
2215 char *pend = strrchr (path, '/');
2216
2217 if (!pend)
2218 break; /* whoops, no '/', complain to your admin */
2219
2220 *pend = 0;
2221 w->wd = inotify_add_watch (fs_fd, path, mask);
2222 }
2223 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2224 }
2225 }
2226 else
2227 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2228
2229 if (w->wd >= 0)
2230 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2231}
2232
2233static void noinline
2234infy_del (EV_P_ ev_stat *w)
2235{
2236 int slot;
2237 int wd = w->wd;
2238
2239 if (wd < 0)
2240 return;
2241
2242 w->wd = -2;
2243 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
2244 wlist_del (&fs_hash [slot].head, (WL)w);
2245
2246 /* remove this watcher, if others are watching it, they will rearm */
2247 inotify_rm_watch (fs_fd, wd);
2248}
2249
2250static void noinline
2251infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2252{
2253 if (slot < 0)
2254 /* overflow, need to check for all hahs slots */
2255 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2256 infy_wd (EV_A_ slot, wd, ev);
2257 else
2258 {
2259 WL w_;
2260
2261 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
2262 {
2263 ev_stat *w = (ev_stat *)w_;
2264 w_ = w_->next; /* lets us remove this watcher and all before it */
2265
2266 if (w->wd == wd || wd == -1)
2267 {
2268 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2269 {
2270 w->wd = -1;
2271 infy_add (EV_A_ w); /* re-add, no matter what */
2272 }
2273
2274 stat_timer_cb (EV_A_ &w->timer, 0);
2275 }
2276 }
2277 }
2278}
2279
2280static void
2281infy_cb (EV_P_ ev_io *w, int revents)
2282{
2283 char buf [EV_INOTIFY_BUFSIZE];
2284 struct inotify_event *ev = (struct inotify_event *)buf;
2285 int ofs;
2286 int len = read (fs_fd, buf, sizeof (buf));
2287
2288 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2289 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2290}
2291
2292void inline_size
2293infy_init (EV_P)
2294{
2295 if (fs_fd != -2)
2296 return;
2297
2298 fs_fd = inotify_init ();
2299
2300 if (fs_fd >= 0)
2301 {
2302 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2303 ev_set_priority (&fs_w, EV_MAXPRI);
2304 ev_io_start (EV_A_ &fs_w);
2305 }
2306}
2307
2308void inline_size
2309infy_fork (EV_P)
2310{
2311 int slot;
2312
2313 if (fs_fd < 0)
2314 return;
2315
2316 close (fs_fd);
2317 fs_fd = inotify_init ();
2318
2319 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2320 {
2321 WL w_ = fs_hash [slot].head;
2322 fs_hash [slot].head = 0;
2323
2324 while (w_)
2325 {
2326 ev_stat *w = (ev_stat *)w_;
2327 w_ = w_->next; /* lets us add this watcher */
2328
2329 w->wd = -1;
2330
2331 if (fs_fd >= 0)
2332 infy_add (EV_A_ w); /* re-add, no matter what */
2333 else
2334 ev_timer_start (EV_A_ &w->timer);
2335 }
2336
2337 }
2338}
2339
2340#endif
2341
1662void 2342void
1663ev_stat_stat (EV_P_ ev_stat *w) 2343ev_stat_stat (EV_P_ ev_stat *w)
1664{ 2344{
1665 if (lstat (w->path, &w->attr) < 0) 2345 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 2346 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 2347 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 2348 w->attr.st_nlink = 1;
1669} 2349}
1670 2350
1671static void 2351static void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2352stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 2353{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2354 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 2355
1676 /* we copy this here each the time so that */ 2356 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 2357 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 2358 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 2359 ev_stat_stat (EV_A_ w);
1680 2360
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2361 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2362 if (
2363 w->prev.st_dev != w->attr.st_dev
2364 || w->prev.st_ino != w->attr.st_ino
2365 || w->prev.st_mode != w->attr.st_mode
2366 || w->prev.st_nlink != w->attr.st_nlink
2367 || w->prev.st_uid != w->attr.st_uid
2368 || w->prev.st_gid != w->attr.st_gid
2369 || w->prev.st_rdev != w->attr.st_rdev
2370 || w->prev.st_size != w->attr.st_size
2371 || w->prev.st_atime != w->attr.st_atime
2372 || w->prev.st_mtime != w->attr.st_mtime
2373 || w->prev.st_ctime != w->attr.st_ctime
2374 ) {
2375 #if EV_USE_INOTIFY
2376 infy_del (EV_A_ w);
2377 infy_add (EV_A_ w);
2378 ev_stat_stat (EV_A_ w); /* avoid race... */
2379 #endif
2380
1682 ev_feed_event (EV_A_ w, EV_STAT); 2381 ev_feed_event (EV_A_ w, EV_STAT);
2382 }
1683} 2383}
1684 2384
1685void 2385void
1686ev_stat_start (EV_P_ ev_stat *w) 2386ev_stat_start (EV_P_ ev_stat *w)
1687{ 2387{
… …
1697 if (w->interval < MIN_STAT_INTERVAL) 2397 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2398 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 2399
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2400 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 2401 ev_set_priority (&w->timer, ev_priority (w));
2402
2403#if EV_USE_INOTIFY
2404 infy_init (EV_A);
2405
2406 if (fs_fd >= 0)
2407 infy_add (EV_A_ w);
2408 else
2409#endif
1702 ev_timer_start (EV_A_ &w->timer); 2410 ev_timer_start (EV_A_ &w->timer);
1703 2411
1704 ev_start (EV_A_ (W)w, 1); 2412 ev_start (EV_A_ (W)w, 1);
1705} 2413}
1706 2414
1707void 2415void
1708ev_stat_stop (EV_P_ ev_stat *w) 2416ev_stat_stop (EV_P_ ev_stat *w)
1709{ 2417{
1710 ev_clear_pending (EV_A_ (W)w); 2418 clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 2419 if (expect_false (!ev_is_active (w)))
1712 return; 2420 return;
1713 2421
2422#if EV_USE_INOTIFY
2423 infy_del (EV_A_ w);
2424#endif
1714 ev_timer_stop (EV_A_ &w->timer); 2425 ev_timer_stop (EV_A_ &w->timer);
1715 2426
1716 ev_stop (EV_A_ (W)w); 2427 ev_stop (EV_A_ (W)w);
1717} 2428}
1718#endif 2429#endif
1719 2430
2431#if EV_IDLE_ENABLE
1720void 2432void
1721ev_idle_start (EV_P_ ev_idle *w) 2433ev_idle_start (EV_P_ ev_idle *w)
1722{ 2434{
1723 if (expect_false (ev_is_active (w))) 2435 if (expect_false (ev_is_active (w)))
1724 return; 2436 return;
1725 2437
2438 pri_adjust (EV_A_ (W)w);
2439
2440 {
2441 int active = ++idlecnt [ABSPRI (w)];
2442
2443 ++idleall;
1726 ev_start (EV_A_ (W)w, ++idlecnt); 2444 ev_start (EV_A_ (W)w, active);
2445
1727 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2446 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1728 idles [idlecnt - 1] = w; 2447 idles [ABSPRI (w)][active - 1] = w;
2448 }
1729} 2449}
1730 2450
1731void 2451void
1732ev_idle_stop (EV_P_ ev_idle *w) 2452ev_idle_stop (EV_P_ ev_idle *w)
1733{ 2453{
1734 ev_clear_pending (EV_A_ (W)w); 2454 clear_pending (EV_A_ (W)w);
1735 if (expect_false (!ev_is_active (w))) 2455 if (expect_false (!ev_is_active (w)))
1736 return; 2456 return;
1737 2457
1738 { 2458 {
1739 int active = ((W)w)->active; 2459 int active = ev_active (w);
1740 idles [active - 1] = idles [--idlecnt]; 2460
1741 ((W)idles [active - 1])->active = active; 2461 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2462 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2463
2464 ev_stop (EV_A_ (W)w);
2465 --idleall;
1742 } 2466 }
1743
1744 ev_stop (EV_A_ (W)w);
1745} 2467}
2468#endif
1746 2469
1747void 2470void
1748ev_prepare_start (EV_P_ ev_prepare *w) 2471ev_prepare_start (EV_P_ ev_prepare *w)
1749{ 2472{
1750 if (expect_false (ev_is_active (w))) 2473 if (expect_false (ev_is_active (w)))
… …
1756} 2479}
1757 2480
1758void 2481void
1759ev_prepare_stop (EV_P_ ev_prepare *w) 2482ev_prepare_stop (EV_P_ ev_prepare *w)
1760{ 2483{
1761 ev_clear_pending (EV_A_ (W)w); 2484 clear_pending (EV_A_ (W)w);
1762 if (expect_false (!ev_is_active (w))) 2485 if (expect_false (!ev_is_active (w)))
1763 return; 2486 return;
1764 2487
1765 { 2488 {
1766 int active = ((W)w)->active; 2489 int active = ev_active (w);
2490
1767 prepares [active - 1] = prepares [--preparecnt]; 2491 prepares [active - 1] = prepares [--preparecnt];
1768 ((W)prepares [active - 1])->active = active; 2492 ev_active (prepares [active - 1]) = active;
1769 } 2493 }
1770 2494
1771 ev_stop (EV_A_ (W)w); 2495 ev_stop (EV_A_ (W)w);
1772} 2496}
1773 2497
… …
1783} 2507}
1784 2508
1785void 2509void
1786ev_check_stop (EV_P_ ev_check *w) 2510ev_check_stop (EV_P_ ev_check *w)
1787{ 2511{
1788 ev_clear_pending (EV_A_ (W)w); 2512 clear_pending (EV_A_ (W)w);
1789 if (expect_false (!ev_is_active (w))) 2513 if (expect_false (!ev_is_active (w)))
1790 return; 2514 return;
1791 2515
1792 { 2516 {
1793 int active = ((W)w)->active; 2517 int active = ev_active (w);
2518
1794 checks [active - 1] = checks [--checkcnt]; 2519 checks [active - 1] = checks [--checkcnt];
1795 ((W)checks [active - 1])->active = active; 2520 ev_active (checks [active - 1]) = active;
1796 } 2521 }
1797 2522
1798 ev_stop (EV_A_ (W)w); 2523 ev_stop (EV_A_ (W)w);
1799} 2524}
1800 2525
1801#if EV_EMBED_ENABLE 2526#if EV_EMBED_ENABLE
1802void noinline 2527void noinline
1803ev_embed_sweep (EV_P_ ev_embed *w) 2528ev_embed_sweep (EV_P_ ev_embed *w)
1804{ 2529{
1805 ev_loop (w->loop, EVLOOP_NONBLOCK); 2530 ev_loop (w->other, EVLOOP_NONBLOCK);
1806} 2531}
1807 2532
1808static void 2533static void
1809embed_cb (EV_P_ ev_io *io, int revents) 2534embed_io_cb (EV_P_ ev_io *io, int revents)
1810{ 2535{
1811 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2536 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1812 2537
1813 if (ev_cb (w)) 2538 if (ev_cb (w))
1814 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2539 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1815 else 2540 else
1816 ev_embed_sweep (loop, w); 2541 ev_loop (w->other, EVLOOP_NONBLOCK);
1817} 2542}
2543
2544static void
2545embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2546{
2547 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2548
2549 {
2550 struct ev_loop *loop = w->other;
2551
2552 while (fdchangecnt)
2553 {
2554 fd_reify (EV_A);
2555 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2556 }
2557 }
2558}
2559
2560#if 0
2561static void
2562embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2563{
2564 ev_idle_stop (EV_A_ idle);
2565}
2566#endif
1818 2567
1819void 2568void
1820ev_embed_start (EV_P_ ev_embed *w) 2569ev_embed_start (EV_P_ ev_embed *w)
1821{ 2570{
1822 if (expect_false (ev_is_active (w))) 2571 if (expect_false (ev_is_active (w)))
1823 return; 2572 return;
1824 2573
1825 { 2574 {
1826 struct ev_loop *loop = w->loop; 2575 struct ev_loop *loop = w->other;
1827 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2576 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1828 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2577 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1829 } 2578 }
1830 2579
1831 ev_set_priority (&w->io, ev_priority (w)); 2580 ev_set_priority (&w->io, ev_priority (w));
1832 ev_io_start (EV_A_ &w->io); 2581 ev_io_start (EV_A_ &w->io);
1833 2582
2583 ev_prepare_init (&w->prepare, embed_prepare_cb);
2584 ev_set_priority (&w->prepare, EV_MINPRI);
2585 ev_prepare_start (EV_A_ &w->prepare);
2586
2587 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2588
1834 ev_start (EV_A_ (W)w, 1); 2589 ev_start (EV_A_ (W)w, 1);
1835} 2590}
1836 2591
1837void 2592void
1838ev_embed_stop (EV_P_ ev_embed *w) 2593ev_embed_stop (EV_P_ ev_embed *w)
1839{ 2594{
1840 ev_clear_pending (EV_A_ (W)w); 2595 clear_pending (EV_A_ (W)w);
1841 if (expect_false (!ev_is_active (w))) 2596 if (expect_false (!ev_is_active (w)))
1842 return; 2597 return;
1843 2598
1844 ev_io_stop (EV_A_ &w->io); 2599 ev_io_stop (EV_A_ &w->io);
2600 ev_prepare_stop (EV_A_ &w->prepare);
1845 2601
1846 ev_stop (EV_A_ (W)w); 2602 ev_stop (EV_A_ (W)w);
1847} 2603}
1848#endif 2604#endif
1849 2605
… …
1860} 2616}
1861 2617
1862void 2618void
1863ev_fork_stop (EV_P_ ev_fork *w) 2619ev_fork_stop (EV_P_ ev_fork *w)
1864{ 2620{
1865 ev_clear_pending (EV_A_ (W)w); 2621 clear_pending (EV_A_ (W)w);
1866 if (expect_false (!ev_is_active (w))) 2622 if (expect_false (!ev_is_active (w)))
1867 return; 2623 return;
1868 2624
1869 { 2625 {
1870 int active = ((W)w)->active; 2626 int active = ev_active (w);
2627
1871 forks [active - 1] = forks [--forkcnt]; 2628 forks [active - 1] = forks [--forkcnt];
1872 ((W)forks [active - 1])->active = active; 2629 ev_active (forks [active - 1]) = active;
1873 } 2630 }
1874 2631
1875 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633}
2634#endif
2635
2636#if EV_ASYNC_ENABLE
2637void
2638ev_async_start (EV_P_ ev_async *w)
2639{
2640 if (expect_false (ev_is_active (w)))
2641 return;
2642
2643 evpipe_init (EV_A);
2644
2645 ev_start (EV_A_ (W)w, ++asynccnt);
2646 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2647 asyncs [asynccnt - 1] = w;
2648}
2649
2650void
2651ev_async_stop (EV_P_ ev_async *w)
2652{
2653 clear_pending (EV_A_ (W)w);
2654 if (expect_false (!ev_is_active (w)))
2655 return;
2656
2657 {
2658 int active = ev_active (w);
2659
2660 asyncs [active - 1] = asyncs [--asynccnt];
2661 ev_active (asyncs [active - 1]) = active;
2662 }
2663
2664 ev_stop (EV_A_ (W)w);
2665}
2666
2667void
2668ev_async_send (EV_P_ ev_async *w)
2669{
2670 w->sent = 1;
2671 evpipe_write (EV_A_ &gotasync);
1876} 2672}
1877#endif 2673#endif
1878 2674
1879/*****************************************************************************/ 2675/*****************************************************************************/
1880 2676
… …
1938 ev_timer_set (&once->to, timeout, 0.); 2734 ev_timer_set (&once->to, timeout, 0.);
1939 ev_timer_start (EV_A_ &once->to); 2735 ev_timer_start (EV_A_ &once->to);
1940 } 2736 }
1941} 2737}
1942 2738
2739#if EV_MULTIPLICITY
2740 #include "ev_wrap.h"
2741#endif
2742
1943#ifdef __cplusplus 2743#ifdef __cplusplus
1944} 2744}
1945#endif 2745#endif
1946 2746

Diff Legend

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