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

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

Diff Legend

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