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

Comparing libev/ev.c (file contents):
Revision 1.163 by root, Wed Dec 5 13:54:36 2007 UTC vs.
Revision 1.233 by root, Tue May 6 23:34:16 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, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
287 384
288void 385void
289ev_set_allocator (void *(*cb)(void *ptr, long 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, long size) 392ev_realloc (void *ptr, long size)
296{ 393{
297 ptr = alloc ? alloc (ptr, size) : realloc (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.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
302 abort (); 399 abort ();
396{ 493{
397 return ev_rt_now; 494 return ev_rt_now;
398} 495}
399#endif 496#endif
400 497
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
401int inline_size 527int inline_size
402array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
403{ 529{
404 int ncur = cur + 1; 530 int ncur = cur + 1;
405 531
406 do 532 do
407 ncur <<= 1; 533 ncur <<= 1;
408 while (cnt > ncur); 534 while (cnt > ncur);
409 535
410 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
411 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
412 { 538 {
413 ncur *= elem; 539 ncur *= elem;
414 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
415 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
416 ncur /= elem; 542 ncur /= elem;
417 } 543 }
418 544
419 return ncur; 545 return ncur;
420} 546}
421 547
422inline_speed void * 548static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 549array_realloc (int elem, void *base, int *cur, int cnt)
424{ 550{
425 *cur = array_nextsize (elem, *cur, cnt); 551 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 552 return ev_realloc (base, elem * *cur);
427} 553}
452 578
453void noinline 579void noinline
454ev_feed_event (EV_P_ void *w, int revents) 580ev_feed_event (EV_P_ void *w, int revents)
455{ 581{
456 W w_ = (W)w; 582 W w_ = (W)w;
583 int pri = ABSPRI (w_);
457 584
458 if (expect_false (w_->pending)) 585 if (expect_false (w_->pending))
586 pendings [pri][w_->pending - 1].events |= revents;
587 else
459 { 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_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 592 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 593 }
463
464 w_->pending = ++pendingcnt [ABSPRI (w_)];
465 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468} 594}
469 595
470void inline_size 596void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 597queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 598{
473 int i; 599 int i;
474 600
475 for (i = 0; i < eventcnt; ++i) 601 for (i = 0; i < eventcnt; ++i)
507} 633}
508 634
509void 635void
510ev_feed_fd_event (EV_P_ int fd, int revents) 636ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 637{
638 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 639 fd_event (EV_A_ fd, revents);
513} 640}
514 641
515void inline_size 642void inline_size
516fd_reify (EV_P) 643fd_reify (EV_P)
517{ 644{
521 { 648 {
522 int fd = fdchanges [i]; 649 int fd = fdchanges [i];
523 ANFD *anfd = anfds + fd; 650 ANFD *anfd = anfds + fd;
524 ev_io *w; 651 ev_io *w;
525 652
526 int events = 0; 653 unsigned char events = 0;
527 654
528 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)
529 events |= w->events; 656 events |= (unsigned char)w->events;
530 657
531#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
532 if (events) 659 if (events)
533 { 660 {
534 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
535 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
536 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));
537 } 668 }
538#endif 669#endif
539 670
671 {
672 unsigned char o_events = anfd->events;
673 unsigned char o_reify = anfd->reify;
674
540 anfd->reify = 0; 675 anfd->reify = 0;
541
542 backend_modify (EV_A_ fd, anfd->events, events);
543 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 }
544 } 681 }
545 682
546 fdchangecnt = 0; 683 fdchangecnt = 0;
547} 684}
548 685
549void inline_size 686void inline_size
550fd_change (EV_P_ int fd) 687fd_change (EV_P_ int fd, int flags)
551{ 688{
552 if (expect_false (anfds [fd].reify)) 689 unsigned char reify = anfds [fd].reify;
553 return;
554
555 anfds [fd].reify = 1; 690 anfds [fd].reify |= flags;
556 691
692 if (expect_true (!reify))
693 {
557 ++fdchangecnt; 694 ++fdchangecnt;
558 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 695 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
559 fdchanges [fdchangecnt - 1] = fd; 696 fdchanges [fdchangecnt - 1] = fd;
697 }
560} 698}
561 699
562void inline_speed 700void inline_speed
563fd_kill (EV_P_ int fd) 701fd_kill (EV_P_ int fd)
564{ 702{
615 753
616 for (fd = 0; fd < anfdmax; ++fd) 754 for (fd = 0; fd < anfdmax; ++fd)
617 if (anfds [fd].events) 755 if (anfds [fd].events)
618 { 756 {
619 anfds [fd].events = 0; 757 anfds [fd].events = 0;
620 fd_change (EV_A_ fd); 758 fd_change (EV_A_ fd, EV_IOFDSET | 1);
621 } 759 }
622} 760}
623 761
624/*****************************************************************************/ 762/*****************************************************************************/
625 763
764/* towards the root */
626void inline_speed 765void inline_speed
627upheap (WT *heap, int k) 766upheap (WT *heap, int k)
628{ 767{
629 WT w = heap [k]; 768 WT w = heap [k];
630 769
631 while (k && heap [k >> 1]->at > w->at) 770 for (;;)
632 { 771 {
772 int p = k >> 1;
773
774 /* maybe we could use a dummy element at heap [0]? */
775 if (!p || heap [p]->at <= w->at)
776 break;
777
633 heap [k] = heap [k >> 1]; 778 heap [k] = heap [p];
634 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
635 k >>= 1; 780 k = p;
636 } 781 }
637 782
638 heap [k] = w; 783 heap [k] = w;
639 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
640
641} 785}
642 786
787/* away from the root */
643void inline_speed 788void inline_speed
644downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
645{ 790{
646 WT w = heap [k]; 791 WT w = heap [k];
647 792
648 while (k < (N >> 1)) 793 for (;;)
649 { 794 {
650 int j = k << 1; 795 int c = k << 1;
651 796
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 797 if (c > N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 798 break;
657 799
800 c += c < N && heap [c]->at > heap [c + 1]->at
801 ? 1 : 0;
802
803 if (w->at <= heap [c]->at)
804 break;
805
658 heap [k] = heap [j]; 806 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
808
660 k = j; 809 k = c;
661 } 810 }
662 811
663 heap [k] = w; 812 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
665} 814}
666 815
667void inline_size 816void inline_size
668adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
669{ 818{
674/*****************************************************************************/ 823/*****************************************************************************/
675 824
676typedef struct 825typedef struct
677{ 826{
678 WL head; 827 WL head;
679 sig_atomic_t volatile gotsig; 828 EV_ATOMIC_T gotsig;
680} ANSIG; 829} ANSIG;
681 830
682static ANSIG *signals; 831static ANSIG *signals;
683static int signalmax; 832static int signalmax;
684 833
685static int sigpipe [2]; 834static EV_ATOMIC_T gotsig;
686static sig_atomic_t volatile gotsig;
687static ev_io sigev;
688 835
689void inline_size 836void inline_size
690signals_init (ANSIG *base, int count) 837signals_init (ANSIG *base, int count)
691{ 838{
692 while (count--) 839 while (count--)
696 843
697 ++base; 844 ++base;
698 } 845 }
699} 846}
700 847
701static void 848/*****************************************************************************/
702sighandler (int signum)
703{
704#if _WIN32
705 signal (signum, sighandler);
706#endif
707 849
708 signals [signum - 1].gotsig = 1;
709
710 if (!gotsig)
711 {
712 int old_errno = errno;
713 gotsig = 1;
714 write (sigpipe [1], &signum, 1);
715 errno = old_errno;
716 }
717}
718
719void noinline
720ev_feed_signal_event (EV_P_ int signum)
721{
722 WL w;
723
724#if EV_MULTIPLICITY
725 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
726#endif
727
728 --signum;
729
730 if (signum < 0 || signum >= signalmax)
731 return;
732
733 signals [signum].gotsig = 0;
734
735 for (w = signals [signum].head; w; w = w->next)
736 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
737}
738
739static void
740sigcb (EV_P_ ev_io *iow, int revents)
741{
742 int signum;
743
744 read (sigpipe [0], &revents, 1);
745 gotsig = 0;
746
747 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1);
750}
751
752void inline_size 850void inline_speed
753fd_intern (int fd) 851fd_intern (int fd)
754{ 852{
755#ifdef _WIN32 853#ifdef _WIN32
756 int arg = 1; 854 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 855 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
760 fcntl (fd, F_SETFL, O_NONBLOCK); 858 fcntl (fd, F_SETFL, O_NONBLOCK);
761#endif 859#endif
762} 860}
763 861
764static void noinline 862static void noinline
765siginit (EV_P) 863evpipe_init (EV_P)
766{ 864{
865 if (!ev_is_active (&pipeev))
866 {
867#if EV_USE_EVENTFD
868 if ((evfd = eventfd (0, 0)) >= 0)
869 {
870 evpipe [0] = -1;
871 fd_intern (evfd);
872 ev_io_set (&pipeev, evfd, EV_READ);
873 }
874 else
875#endif
876 {
877 while (pipe (evpipe))
878 syserr ("(libev) error creating signal/async pipe");
879
767 fd_intern (sigpipe [0]); 880 fd_intern (evpipe [0]);
768 fd_intern (sigpipe [1]); 881 fd_intern (evpipe [1]);
882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
769 884
770 ev_io_set (&sigev, sigpipe [0], EV_READ);
771 ev_io_start (EV_A_ &sigev); 885 ev_io_start (EV_A_ &pipeev);
772 ev_unref (EV_A); /* child watcher should not keep loop alive */ 886 ev_unref (EV_A); /* watcher should not keep loop alive */
887 }
888}
889
890void inline_size
891evpipe_write (EV_P_ EV_ATOMIC_T *flag)
892{
893 if (!*flag)
894 {
895 int old_errno = errno; /* save errno because write might clobber it */
896
897 *flag = 1;
898
899#if EV_USE_EVENTFD
900 if (evfd >= 0)
901 {
902 uint64_t counter = 1;
903 write (evfd, &counter, sizeof (uint64_t));
904 }
905 else
906#endif
907 write (evpipe [1], &old_errno, 1);
908
909 errno = old_errno;
910 }
911}
912
913static void
914pipecb (EV_P_ ev_io *iow, int revents)
915{
916#if EV_USE_EVENTFD
917 if (evfd >= 0)
918 {
919 uint64_t counter;
920 read (evfd, &counter, sizeof (uint64_t));
921 }
922 else
923#endif
924 {
925 char dummy;
926 read (evpipe [0], &dummy, 1);
927 }
928
929 if (gotsig && ev_is_default_loop (EV_A))
930 {
931 int signum;
932 gotsig = 0;
933
934 for (signum = signalmax; signum--; )
935 if (signals [signum].gotsig)
936 ev_feed_signal_event (EV_A_ signum + 1);
937 }
938
939#if EV_ASYNC_ENABLE
940 if (gotasync)
941 {
942 int i;
943 gotasync = 0;
944
945 for (i = asynccnt; i--; )
946 if (asyncs [i]->sent)
947 {
948 asyncs [i]->sent = 0;
949 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
950 }
951 }
952#endif
773} 953}
774 954
775/*****************************************************************************/ 955/*****************************************************************************/
776 956
957static void
958ev_sighandler (int signum)
959{
960#if EV_MULTIPLICITY
961 struct ev_loop *loop = &default_loop_struct;
962#endif
963
964#if _WIN32
965 signal (signum, ev_sighandler);
966#endif
967
968 signals [signum - 1].gotsig = 1;
969 evpipe_write (EV_A_ &gotsig);
970}
971
972void noinline
973ev_feed_signal_event (EV_P_ int signum)
974{
975 WL w;
976
977#if EV_MULTIPLICITY
978 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
979#endif
980
981 --signum;
982
983 if (signum < 0 || signum >= signalmax)
984 return;
985
986 signals [signum].gotsig = 0;
987
988 for (w = signals [signum].head; w; w = w->next)
989 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
990}
991
992/*****************************************************************************/
993
777static ev_child *childs [EV_PID_HASHSIZE]; 994static WL childs [EV_PID_HASHSIZE];
778 995
779#ifndef _WIN32 996#ifndef _WIN32
780 997
781static ev_signal childev; 998static ev_signal childev;
782 999
1000#ifndef WIFCONTINUED
1001# define WIFCONTINUED(status) 0
1002#endif
1003
783void inline_speed 1004void inline_speed
784child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
785{ 1006{
786 ev_child *w; 1007 ev_child *w;
1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
787 1009
788 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1010 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1011 {
789 if (w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
1013 && (!traced || (w->flags & 1)))
790 { 1014 {
791 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1015 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
792 w->rpid = pid; 1016 w->rpid = pid;
793 w->rstatus = status; 1017 w->rstatus = status;
794 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
795 } 1019 }
1020 }
796} 1021}
797 1022
798#ifndef WCONTINUED 1023#ifndef WCONTINUED
799# define WCONTINUED 0 1024# define WCONTINUED 0
800#endif 1025#endif
809 if (!WCONTINUED 1034 if (!WCONTINUED
810 || errno != EINVAL 1035 || errno != EINVAL
811 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
812 return; 1037 return;
813 1038
814 /* make sure we are called again until all childs have been reaped */ 1039 /* make sure we are called again until all children have been reaped */
815 /* we need to do it this way so that the callback gets called before we continue */ 1040 /* we need to do it this way so that the callback gets called before we continue */
816 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
817 1042
818 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
819 if (EV_PID_HASHSIZE > 1) 1044 if (EV_PID_HASHSIZE > 1)
820 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
821} 1046}
822 1047
823#endif 1048#endif
824 1049
825/*****************************************************************************/ 1050/*****************************************************************************/
897} 1122}
898 1123
899unsigned int 1124unsigned int
900ev_embeddable_backends (void) 1125ev_embeddable_backends (void)
901{ 1126{
902 return EVBACKEND_EPOLL 1127 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
903 | EVBACKEND_KQUEUE 1128
904 | EVBACKEND_PORT; 1129 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1130 /* please fix it and tell me how to detect the fix */
1131 flags &= ~EVBACKEND_EPOLL;
1132
1133 return flags;
905} 1134}
906 1135
907unsigned int 1136unsigned int
908ev_backend (EV_P) 1137ev_backend (EV_P)
909{ 1138{
912 1141
913unsigned int 1142unsigned int
914ev_loop_count (EV_P) 1143ev_loop_count (EV_P)
915{ 1144{
916 return loop_count; 1145 return loop_count;
1146}
1147
1148void
1149ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1150{
1151 io_blocktime = interval;
1152}
1153
1154void
1155ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1156{
1157 timeout_blocktime = interval;
917} 1158}
918 1159
919static void noinline 1160static void noinline
920loop_init (EV_P_ unsigned int flags) 1161loop_init (EV_P_ unsigned int flags)
921{ 1162{
927 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1168 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
928 have_monotonic = 1; 1169 have_monotonic = 1;
929 } 1170 }
930#endif 1171#endif
931 1172
932 ev_rt_now = ev_time (); 1173 ev_rt_now = ev_time ();
933 mn_now = get_clock (); 1174 mn_now = get_clock ();
934 now_floor = mn_now; 1175 now_floor = mn_now;
935 rtmn_diff = ev_rt_now - mn_now; 1176 rtmn_diff = ev_rt_now - mn_now;
1177
1178 io_blocktime = 0.;
1179 timeout_blocktime = 0.;
1180 backend = 0;
1181 backend_fd = -1;
1182 gotasync = 0;
1183#if EV_USE_INOTIFY
1184 fs_fd = -2;
1185#endif
936 1186
937 /* pid check not overridable via env */ 1187 /* pid check not overridable via env */
938#ifndef _WIN32 1188#ifndef _WIN32
939 if (flags & EVFLAG_FORKCHECK) 1189 if (flags & EVFLAG_FORKCHECK)
940 curpid = getpid (); 1190 curpid = getpid ();
943 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
944 && !enable_secure () 1194 && !enable_secure ()
945 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
946 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
947 1197
948 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
949 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
950
951 backend = 0;
952 backend_fd = -1;
953#if EV_USE_INOTIFY
954 fs_fd = -2;
955#endif
956 1200
957#if EV_USE_PORT 1201#if EV_USE_PORT
958 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
959#endif 1203#endif
960#if EV_USE_KQUEUE 1204#if EV_USE_KQUEUE
968#endif 1212#endif
969#if EV_USE_SELECT 1213#if EV_USE_SELECT
970 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1214 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
971#endif 1215#endif
972 1216
973 ev_init (&sigev, sigcb); 1217 ev_init (&pipeev, pipecb);
974 ev_set_priority (&sigev, EV_MAXPRI); 1218 ev_set_priority (&pipeev, EV_MAXPRI);
975 } 1219 }
976} 1220}
977 1221
978static void noinline 1222static void noinline
979loop_destroy (EV_P) 1223loop_destroy (EV_P)
980{ 1224{
981 int i; 1225 int i;
1226
1227 if (ev_is_active (&pipeev))
1228 {
1229 ev_ref (EV_A); /* signal watcher */
1230 ev_io_stop (EV_A_ &pipeev);
1231
1232#if EV_USE_EVENTFD
1233 if (evfd >= 0)
1234 close (evfd);
1235#endif
1236
1237 if (evpipe [0] >= 0)
1238 {
1239 close (evpipe [0]);
1240 close (evpipe [1]);
1241 }
1242 }
982 1243
983#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
984 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
985 close (fs_fd); 1246 close (fs_fd);
986#endif 1247#endif
1003#if EV_USE_SELECT 1264#if EV_USE_SELECT
1004 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1265 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
1005#endif 1266#endif
1006 1267
1007 for (i = NUMPRI; i--; ) 1268 for (i = NUMPRI; i--; )
1269 {
1008 array_free (pending, [i]); 1270 array_free (pending, [i]);
1271#if EV_IDLE_ENABLE
1272 array_free (idle, [i]);
1273#endif
1274 }
1275
1276 ev_free (anfds); anfdmax = 0;
1009 1277
1010 /* have to use the microsoft-never-gets-it-right macro */ 1278 /* have to use the microsoft-never-gets-it-right macro */
1011 array_free (fdchange, EMPTY0); 1279 array_free (fdchange, EMPTY);
1012 array_free (timer, EMPTY0); 1280 array_free (timer, EMPTY);
1013#if EV_PERIODIC_ENABLE 1281#if EV_PERIODIC_ENABLE
1014 array_free (periodic, EMPTY0); 1282 array_free (periodic, EMPTY);
1015#endif 1283#endif
1284#if EV_FORK_ENABLE
1016 array_free (idle, EMPTY0); 1285 array_free (fork, EMPTY);
1286#endif
1017 array_free (prepare, EMPTY0); 1287 array_free (prepare, EMPTY);
1018 array_free (check, EMPTY0); 1288 array_free (check, EMPTY);
1289#if EV_ASYNC_ENABLE
1290 array_free (async, EMPTY);
1291#endif
1019 1292
1020 backend = 0; 1293 backend = 0;
1021} 1294}
1022 1295
1296#if EV_USE_INOTIFY
1023void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1024 1299
1025void inline_size 1300void inline_size
1026loop_fork (EV_P) 1301loop_fork (EV_P)
1027{ 1302{
1028#if EV_USE_PORT 1303#if EV_USE_PORT
1036#endif 1311#endif
1037#if EV_USE_INOTIFY 1312#if EV_USE_INOTIFY
1038 infy_fork (EV_A); 1313 infy_fork (EV_A);
1039#endif 1314#endif
1040 1315
1041 if (ev_is_active (&sigev)) 1316 if (ev_is_active (&pipeev))
1042 { 1317 {
1043 /* default loop */ 1318 /* this "locks" the handlers against writing to the pipe */
1319 /* while we modify the fd vars */
1320 gotsig = 1;
1321#if EV_ASYNC_ENABLE
1322 gotasync = 1;
1323#endif
1044 1324
1045 ev_ref (EV_A); 1325 ev_ref (EV_A);
1046 ev_io_stop (EV_A_ &sigev); 1326 ev_io_stop (EV_A_ &pipeev);
1327
1328#if EV_USE_EVENTFD
1329 if (evfd >= 0)
1330 close (evfd);
1331#endif
1332
1333 if (evpipe [0] >= 0)
1334 {
1047 close (sigpipe [0]); 1335 close (evpipe [0]);
1048 close (sigpipe [1]); 1336 close (evpipe [1]);
1337 }
1049 1338
1050 while (pipe (sigpipe))
1051 syserr ("(libev) error creating pipe");
1052
1053 siginit (EV_A); 1339 evpipe_init (EV_A);
1340 /* now iterate over everything, in case we missed something */
1341 pipecb (EV_A_ &pipeev, EV_READ);
1054 } 1342 }
1055 1343
1056 postfork = 0; 1344 postfork = 0;
1057} 1345}
1058 1346
1080} 1368}
1081 1369
1082void 1370void
1083ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1084{ 1372{
1085 postfork = 1; 1373 postfork = 1; /* must be in line with ev_default_fork */
1086} 1374}
1087 1375
1088#endif 1376#endif
1089 1377
1090#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
1093#else 1381#else
1094int 1382int
1095ev_default_loop (unsigned int flags) 1383ev_default_loop (unsigned int flags)
1096#endif 1384#endif
1097{ 1385{
1098 if (sigpipe [0] == sigpipe [1])
1099 if (pipe (sigpipe))
1100 return 0;
1101
1102 if (!ev_default_loop_ptr) 1386 if (!ev_default_loop_ptr)
1103 { 1387 {
1104#if EV_MULTIPLICITY 1388#if EV_MULTIPLICITY
1105 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1389 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1106#else 1390#else
1109 1393
1110 loop_init (EV_A_ flags); 1394 loop_init (EV_A_ flags);
1111 1395
1112 if (ev_backend (EV_A)) 1396 if (ev_backend (EV_A))
1113 { 1397 {
1114 siginit (EV_A);
1115
1116#ifndef _WIN32 1398#ifndef _WIN32
1117 ev_signal_init (&childev, childcb, SIGCHLD); 1399 ev_signal_init (&childev, childcb, SIGCHLD);
1118 ev_set_priority (&childev, EV_MAXPRI); 1400 ev_set_priority (&childev, EV_MAXPRI);
1119 ev_signal_start (EV_A_ &childev); 1401 ev_signal_start (EV_A_ &childev);
1120 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1402 ev_unref (EV_A); /* child watcher should not keep loop alive */
1137#ifndef _WIN32 1419#ifndef _WIN32
1138 ev_ref (EV_A); /* child watcher */ 1420 ev_ref (EV_A); /* child watcher */
1139 ev_signal_stop (EV_A_ &childev); 1421 ev_signal_stop (EV_A_ &childev);
1140#endif 1422#endif
1141 1423
1142 ev_ref (EV_A); /* signal watcher */
1143 ev_io_stop (EV_A_ &sigev);
1144
1145 close (sigpipe [0]); sigpipe [0] = 0;
1146 close (sigpipe [1]); sigpipe [1] = 0;
1147
1148 loop_destroy (EV_A); 1424 loop_destroy (EV_A);
1149} 1425}
1150 1426
1151void 1427void
1152ev_default_fork (void) 1428ev_default_fork (void)
1154#if EV_MULTIPLICITY 1430#if EV_MULTIPLICITY
1155 struct ev_loop *loop = ev_default_loop_ptr; 1431 struct ev_loop *loop = ev_default_loop_ptr;
1156#endif 1432#endif
1157 1433
1158 if (backend) 1434 if (backend)
1159 postfork = 1; 1435 postfork = 1; /* must be in line with ev_loop_fork */
1160} 1436}
1161 1437
1162/*****************************************************************************/ 1438/*****************************************************************************/
1163 1439
1164int inline_size 1440void
1165any_pending (EV_P) 1441ev_invoke (EV_P_ void *w, int revents)
1166{ 1442{
1167 int pri; 1443 EV_CB_INVOKE ((W)w, revents);
1168
1169 for (pri = NUMPRI; pri--; )
1170 if (pendingcnt [pri])
1171 return 1;
1172
1173 return 0;
1174} 1444}
1175 1445
1176void inline_speed 1446void inline_speed
1177call_pending (EV_P) 1447call_pending (EV_P)
1178{ 1448{
1194} 1464}
1195 1465
1196void inline_size 1466void inline_size
1197timers_reify (EV_P) 1467timers_reify (EV_P)
1198{ 1468{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1469 while (timercnt && ev_at (timers [1]) <= mn_now)
1200 { 1470 {
1201 ev_timer *w = timers [0]; 1471 ev_timer *w = (ev_timer *)timers [1];
1202 1472
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1473 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1474
1205 /* first reschedule or stop timer */ 1475 /* first reschedule or stop timer */
1206 if (w->repeat) 1476 if (w->repeat)
1207 { 1477 {
1208 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1478 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1209 1479
1210 ((WT)w)->at += w->repeat; 1480 ev_at (w) += w->repeat;
1211 if (((WT)w)->at < mn_now) 1481 if (ev_at (w) < mn_now)
1212 ((WT)w)->at = mn_now; 1482 ev_at (w) = mn_now;
1213 1483
1214 downheap ((WT *)timers, timercnt, 0); 1484 downheap (timers, timercnt, 1);
1215 } 1485 }
1216 else 1486 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1487 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1488
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1489 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1222 1492
1223#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1224void inline_size 1494void inline_size
1225periodics_reify (EV_P) 1495periodics_reify (EV_P)
1226{ 1496{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1497 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1228 { 1498 {
1229 ev_periodic *w = periodics [0]; 1499 ev_periodic *w = (ev_periodic *)periodics [1];
1230 1500
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1501 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1502
1233 /* first reschedule or stop timer */ 1503 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1504 if (w->reschedule_cb)
1235 { 1505 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1506 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1507 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1508 downheap (periodics, periodiccnt, 1);
1239 } 1509 }
1240 else if (w->interval) 1510 else if (w->interval)
1241 { 1511 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1512 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1513 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1514 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1515 downheap (periodics, periodiccnt, 1);
1245 } 1516 }
1246 else 1517 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1518 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1519
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1520 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1254periodics_reschedule (EV_P) 1525periodics_reschedule (EV_P)
1255{ 1526{
1256 int i; 1527 int i;
1257 1528
1258 /* adjust periodics after time jump */ 1529 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1530 for (i = 1; i <= periodiccnt; ++i)
1260 { 1531 {
1261 ev_periodic *w = periodics [i]; 1532 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1533
1263 if (w->reschedule_cb) 1534 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1535 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1536 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1537 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1538 }
1268 1539
1269 /* now rebuild the heap */ 1540 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1541 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1542 downheap (periodics, periodiccnt, i);
1272} 1543}
1273#endif 1544#endif
1274 1545
1546#if EV_IDLE_ENABLE
1275int inline_size 1547void inline_size
1276time_update_monotonic (EV_P) 1548idle_reify (EV_P)
1277{ 1549{
1550 if (expect_false (idleall))
1551 {
1552 int pri;
1553
1554 for (pri = NUMPRI; pri--; )
1555 {
1556 if (pendingcnt [pri])
1557 break;
1558
1559 if (idlecnt [pri])
1560 {
1561 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1562 break;
1563 }
1564 }
1565 }
1566}
1567#endif
1568
1569void inline_speed
1570time_update (EV_P_ ev_tstamp max_block)
1571{
1572 int i;
1573
1574#if EV_USE_MONOTONIC
1575 if (expect_true (have_monotonic))
1576 {
1577 ev_tstamp odiff = rtmn_diff;
1578
1278 mn_now = get_clock (); 1579 mn_now = get_clock ();
1279 1580
1581 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1582 /* interpolate in the meantime */
1280 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1583 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1281 { 1584 {
1282 ev_rt_now = rtmn_diff + mn_now; 1585 ev_rt_now = rtmn_diff + mn_now;
1283 return 0; 1586 return;
1284 } 1587 }
1285 else 1588
1286 {
1287 now_floor = mn_now; 1589 now_floor = mn_now;
1288 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1289 return 1;
1290 }
1291}
1292 1591
1293void inline_size 1592 /* loop a few times, before making important decisions.
1294time_update (EV_P) 1593 * on the choice of "4": one iteration isn't enough,
1295{ 1594 * in case we get preempted during the calls to
1296 int i; 1595 * ev_time and get_clock. a second call is almost guaranteed
1297 1596 * to succeed in that case, though. and looping a few more times
1298#if EV_USE_MONOTONIC 1597 * doesn't hurt either as we only do this on time-jumps or
1299 if (expect_true (have_monotonic)) 1598 * in the unlikely event of having been preempted here.
1300 { 1599 */
1301 if (time_update_monotonic (EV_A)) 1600 for (i = 4; --i; )
1302 { 1601 {
1303 ev_tstamp odiff = rtmn_diff;
1304
1305 /* loop a few times, before making important decisions.
1306 * on the choice of "4": one iteration isn't enough,
1307 * in case we get preempted during the calls to
1308 * ev_time and get_clock. a second call is almost guaranteed
1309 * to succeed in that case, though. and looping a few more times
1310 * doesn't hurt either as we only do this on time-jumps or
1311 * in the unlikely event of having been preempted here.
1312 */
1313 for (i = 4; --i; )
1314 {
1315 rtmn_diff = ev_rt_now - mn_now; 1602 rtmn_diff = ev_rt_now - mn_now;
1316 1603
1317 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1604 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1318 return; /* all is well */ 1605 return; /* all is well */
1319 1606
1320 ev_rt_now = ev_time (); 1607 ev_rt_now = ev_time ();
1321 mn_now = get_clock (); 1608 mn_now = get_clock ();
1322 now_floor = mn_now; 1609 now_floor = mn_now;
1323 } 1610 }
1324 1611
1325# if EV_PERIODIC_ENABLE 1612# if EV_PERIODIC_ENABLE
1326 periodics_reschedule (EV_A); 1613 periodics_reschedule (EV_A);
1327# endif 1614# endif
1328 /* no timer adjustment, as the monotonic clock doesn't jump */ 1615 /* no timer adjustment, as the monotonic clock doesn't jump */
1329 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1616 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1330 }
1331 } 1617 }
1332 else 1618 else
1333#endif 1619#endif
1334 { 1620 {
1335 ev_rt_now = ev_time (); 1621 ev_rt_now = ev_time ();
1336 1622
1337 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1623 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1338 { 1624 {
1339#if EV_PERIODIC_ENABLE 1625#if EV_PERIODIC_ENABLE
1340 periodics_reschedule (EV_A); 1626 periodics_reschedule (EV_A);
1341#endif 1627#endif
1342
1343 /* adjust timers. this is easy, as the offset is the same for all of them */ 1628 /* adjust timers. this is easy, as the offset is the same for all of them */
1344 for (i = 0; i < timercnt; ++i) 1629 for (i = 1; i <= timercnt; ++i)
1345 ((WT)timers [i])->at += ev_rt_now - mn_now; 1630 ev_at (timers [i]) += ev_rt_now - mn_now;
1346 } 1631 }
1347 1632
1348 mn_now = ev_rt_now; 1633 mn_now = ev_rt_now;
1349 } 1634 }
1350} 1635}
1364static int loop_done; 1649static int loop_done;
1365 1650
1366void 1651void
1367ev_loop (EV_P_ int flags) 1652ev_loop (EV_P_ int flags)
1368{ 1653{
1369 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1654 loop_done = EVUNLOOP_CANCEL;
1370 ? EVUNLOOP_ONE
1371 : EVUNLOOP_CANCEL;
1372 1655
1373 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1656 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1374 1657
1375 do 1658 do
1376 { 1659 {
1391 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1674 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1392 call_pending (EV_A); 1675 call_pending (EV_A);
1393 } 1676 }
1394#endif 1677#endif
1395 1678
1396 /* queue check watchers (and execute them) */ 1679 /* queue prepare watchers (and execute them) */
1397 if (expect_false (preparecnt)) 1680 if (expect_false (preparecnt))
1398 { 1681 {
1399 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1682 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1400 call_pending (EV_A); 1683 call_pending (EV_A);
1401 } 1684 }
1410 /* update fd-related kernel structures */ 1693 /* update fd-related kernel structures */
1411 fd_reify (EV_A); 1694 fd_reify (EV_A);
1412 1695
1413 /* calculate blocking time */ 1696 /* calculate blocking time */
1414 { 1697 {
1415 ev_tstamp block; 1698 ev_tstamp waittime = 0.;
1699 ev_tstamp sleeptime = 0.;
1416 1700
1417 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1701 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1418 block = 0.; /* do not block at all */
1419 else
1420 { 1702 {
1421 /* update time to cancel out callback processing overhead */ 1703 /* update time to cancel out callback processing overhead */
1422#if EV_USE_MONOTONIC
1423 if (expect_true (have_monotonic))
1424 time_update_monotonic (EV_A); 1704 time_update (EV_A_ 1e100);
1425 else
1426#endif
1427 {
1428 ev_rt_now = ev_time ();
1429 mn_now = ev_rt_now;
1430 }
1431 1705
1432 block = MAX_BLOCKTIME; 1706 waittime = MAX_BLOCKTIME;
1433 1707
1434 if (timercnt) 1708 if (timercnt)
1435 { 1709 {
1436 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1710 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1437 if (block > to) block = to; 1711 if (waittime > to) waittime = to;
1438 } 1712 }
1439 1713
1440#if EV_PERIODIC_ENABLE 1714#if EV_PERIODIC_ENABLE
1441 if (periodiccnt) 1715 if (periodiccnt)
1442 { 1716 {
1443 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1717 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1444 if (block > to) block = to; 1718 if (waittime > to) waittime = to;
1445 } 1719 }
1446#endif 1720#endif
1447 1721
1448 if (expect_false (block < 0.)) block = 0.; 1722 if (expect_false (waittime < timeout_blocktime))
1723 waittime = timeout_blocktime;
1724
1725 sleeptime = waittime - backend_fudge;
1726
1727 if (expect_true (sleeptime > io_blocktime))
1728 sleeptime = io_blocktime;
1729
1730 if (sleeptime)
1731 {
1732 ev_sleep (sleeptime);
1733 waittime -= sleeptime;
1734 }
1449 } 1735 }
1450 1736
1451 ++loop_count; 1737 ++loop_count;
1452 backend_poll (EV_A_ block); 1738 backend_poll (EV_A_ waittime);
1739
1740 /* update ev_rt_now, do magic */
1741 time_update (EV_A_ waittime + sleeptime);
1453 } 1742 }
1454
1455 /* update ev_rt_now, do magic */
1456 time_update (EV_A);
1457 1743
1458 /* queue pending timers and reschedule them */ 1744 /* queue pending timers and reschedule them */
1459 timers_reify (EV_A); /* relative timers called last */ 1745 timers_reify (EV_A); /* relative timers called last */
1460#if EV_PERIODIC_ENABLE 1746#if EV_PERIODIC_ENABLE
1461 periodics_reify (EV_A); /* absolute timers called first */ 1747 periodics_reify (EV_A); /* absolute timers called first */
1462#endif 1748#endif
1463 1749
1750#if EV_IDLE_ENABLE
1464 /* queue idle watchers unless other events are pending */ 1751 /* queue idle watchers unless other events are pending */
1465 if (idlecnt && !any_pending (EV_A)) 1752 idle_reify (EV_A);
1466 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1753#endif
1467 1754
1468 /* queue check watchers, to be executed first */ 1755 /* queue check watchers, to be executed first */
1469 if (expect_false (checkcnt)) 1756 if (expect_false (checkcnt))
1470 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1757 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1471 1758
1472 call_pending (EV_A); 1759 call_pending (EV_A);
1473
1474 } 1760 }
1475 while (expect_true (activecnt && !loop_done)); 1761 while (expect_true (
1762 activecnt
1763 && !loop_done
1764 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1765 ));
1476 1766
1477 if (loop_done == EVUNLOOP_ONE) 1767 if (loop_done == EVUNLOOP_ONE)
1478 loop_done = EVUNLOOP_CANCEL; 1768 loop_done = EVUNLOOP_CANCEL;
1479} 1769}
1480 1770
1507 head = &(*head)->next; 1797 head = &(*head)->next;
1508 } 1798 }
1509} 1799}
1510 1800
1511void inline_speed 1801void inline_speed
1512ev_clear_pending (EV_P_ W w) 1802clear_pending (EV_P_ W w)
1513{ 1803{
1514 if (w->pending) 1804 if (w->pending)
1515 { 1805 {
1516 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1806 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1517 w->pending = 0; 1807 w->pending = 0;
1518 } 1808 }
1519} 1809}
1520 1810
1811int
1812ev_clear_pending (EV_P_ void *w)
1813{
1814 W w_ = (W)w;
1815 int pending = w_->pending;
1816
1817 if (expect_true (pending))
1818 {
1819 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1820 w_->pending = 0;
1821 p->w = 0;
1822 return p->events;
1823 }
1824 else
1825 return 0;
1826}
1827
1828void inline_size
1829pri_adjust (EV_P_ W w)
1830{
1831 int pri = w->priority;
1832 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1833 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1834 w->priority = pri;
1835}
1836
1521void inline_speed 1837void inline_speed
1522ev_start (EV_P_ W w, int active) 1838ev_start (EV_P_ W w, int active)
1523{ 1839{
1524 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1840 pri_adjust (EV_A_ w);
1525 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1526
1527 w->active = active; 1841 w->active = active;
1528 ev_ref (EV_A); 1842 ev_ref (EV_A);
1529} 1843}
1530 1844
1531void inline_size 1845void inline_size
1535 w->active = 0; 1849 w->active = 0;
1536} 1850}
1537 1851
1538/*****************************************************************************/ 1852/*****************************************************************************/
1539 1853
1540void 1854void noinline
1541ev_io_start (EV_P_ ev_io *w) 1855ev_io_start (EV_P_ ev_io *w)
1542{ 1856{
1543 int fd = w->fd; 1857 int fd = w->fd;
1544 1858
1545 if (expect_false (ev_is_active (w))) 1859 if (expect_false (ev_is_active (w)))
1547 1861
1548 assert (("ev_io_start called with negative fd", fd >= 0)); 1862 assert (("ev_io_start called with negative fd", fd >= 0));
1549 1863
1550 ev_start (EV_A_ (W)w, 1); 1864 ev_start (EV_A_ (W)w, 1);
1551 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1865 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1552 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1866 wlist_add (&anfds[fd].head, (WL)w);
1553 1867
1554 fd_change (EV_A_ fd); 1868 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1869 w->events &= ~EV_IOFDSET;
1555} 1870}
1556 1871
1557void 1872void noinline
1558ev_io_stop (EV_P_ ev_io *w) 1873ev_io_stop (EV_P_ ev_io *w)
1559{ 1874{
1560 ev_clear_pending (EV_A_ (W)w); 1875 clear_pending (EV_A_ (W)w);
1561 if (expect_false (!ev_is_active (w))) 1876 if (expect_false (!ev_is_active (w)))
1562 return; 1877 return;
1563 1878
1564 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1879 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1565 1880
1566 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1881 wlist_del (&anfds[w->fd].head, (WL)w);
1567 ev_stop (EV_A_ (W)w); 1882 ev_stop (EV_A_ (W)w);
1568 1883
1569 fd_change (EV_A_ w->fd); 1884 fd_change (EV_A_ w->fd, 1);
1570} 1885}
1571 1886
1572void 1887void noinline
1573ev_timer_start (EV_P_ ev_timer *w) 1888ev_timer_start (EV_P_ ev_timer *w)
1574{ 1889{
1575 if (expect_false (ev_is_active (w))) 1890 if (expect_false (ev_is_active (w)))
1576 return; 1891 return;
1577 1892
1578 ((WT)w)->at += mn_now; 1893 ev_at (w) += mn_now;
1579 1894
1580 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1895 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1581 1896
1582 ev_start (EV_A_ (W)w, ++timercnt); 1897 ev_start (EV_A_ (W)w, ++timercnt);
1583 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1898 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1584 timers [timercnt - 1] = w; 1899 timers [timercnt] = (WT)w;
1585 upheap ((WT *)timers, timercnt - 1); 1900 upheap (timers, timercnt);
1586 1901
1587 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1902 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1588} 1903}
1589 1904
1590void 1905void noinline
1591ev_timer_stop (EV_P_ ev_timer *w) 1906ev_timer_stop (EV_P_ ev_timer *w)
1592{ 1907{
1593 ev_clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1594 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1595 return; 1910 return;
1596 1911
1597 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1598
1599 { 1912 {
1600 int active = ((W)w)->active; 1913 int active = ev_active (w);
1601 1914
1915 assert (("internal timer heap corruption", timers [active] == (WT)w));
1916
1602 if (expect_true (--active < --timercnt)) 1917 if (expect_true (active < timercnt))
1603 { 1918 {
1604 timers [active] = timers [timercnt]; 1919 timers [active] = timers [timercnt];
1605 adjustheap ((WT *)timers, timercnt, active); 1920 adjustheap (timers, timercnt, active);
1606 } 1921 }
1922
1923 --timercnt;
1607 } 1924 }
1608 1925
1609 ((WT)w)->at -= mn_now; 1926 ev_at (w) -= mn_now;
1610 1927
1611 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1612} 1929}
1613 1930
1614void 1931void noinline
1615ev_timer_again (EV_P_ ev_timer *w) 1932ev_timer_again (EV_P_ ev_timer *w)
1616{ 1933{
1617 if (ev_is_active (w)) 1934 if (ev_is_active (w))
1618 { 1935 {
1619 if (w->repeat) 1936 if (w->repeat)
1620 { 1937 {
1621 ((WT)w)->at = mn_now + w->repeat; 1938 ev_at (w) = mn_now + w->repeat;
1622 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1939 adjustheap (timers, timercnt, ev_active (w));
1623 } 1940 }
1624 else 1941 else
1625 ev_timer_stop (EV_A_ w); 1942 ev_timer_stop (EV_A_ w);
1626 } 1943 }
1627 else if (w->repeat) 1944 else if (w->repeat)
1628 { 1945 {
1629 w->at = w->repeat; 1946 ev_at (w) = w->repeat;
1630 ev_timer_start (EV_A_ w); 1947 ev_timer_start (EV_A_ w);
1631 } 1948 }
1632} 1949}
1633 1950
1634#if EV_PERIODIC_ENABLE 1951#if EV_PERIODIC_ENABLE
1635void 1952void noinline
1636ev_periodic_start (EV_P_ ev_periodic *w) 1953ev_periodic_start (EV_P_ ev_periodic *w)
1637{ 1954{
1638 if (expect_false (ev_is_active (w))) 1955 if (expect_false (ev_is_active (w)))
1639 return; 1956 return;
1640 1957
1641 if (w->reschedule_cb) 1958 if (w->reschedule_cb)
1642 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1959 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1643 else if (w->interval) 1960 else if (w->interval)
1644 { 1961 {
1645 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1962 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1646 /* this formula differs from the one in periodic_reify because we do not always round up */ 1963 /* this formula differs from the one in periodic_reify because we do not always round up */
1647 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1964 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1648 } 1965 }
1966 else
1967 ev_at (w) = w->offset;
1649 1968
1650 ev_start (EV_A_ (W)w, ++periodiccnt); 1969 ev_start (EV_A_ (W)w, ++periodiccnt);
1651 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1970 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1652 periodics [periodiccnt - 1] = w; 1971 periodics [periodiccnt] = (WT)w;
1653 upheap ((WT *)periodics, periodiccnt - 1); 1972 upheap (periodics, periodiccnt);
1654 1973
1655 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1974 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1656} 1975}
1657 1976
1658void 1977void noinline
1659ev_periodic_stop (EV_P_ ev_periodic *w) 1978ev_periodic_stop (EV_P_ ev_periodic *w)
1660{ 1979{
1661 ev_clear_pending (EV_A_ (W)w); 1980 clear_pending (EV_A_ (W)w);
1662 if (expect_false (!ev_is_active (w))) 1981 if (expect_false (!ev_is_active (w)))
1663 return; 1982 return;
1664 1983
1665 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1666
1667 { 1984 {
1668 int active = ((W)w)->active; 1985 int active = ev_active (w);
1669 1986
1987 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1988
1670 if (expect_true (--active < --periodiccnt)) 1989 if (expect_true (active < periodiccnt))
1671 { 1990 {
1672 periodics [active] = periodics [periodiccnt]; 1991 periodics [active] = periodics [periodiccnt];
1673 adjustheap ((WT *)periodics, periodiccnt, active); 1992 adjustheap (periodics, periodiccnt, active);
1674 } 1993 }
1994
1995 --periodiccnt;
1675 } 1996 }
1676 1997
1677 ev_stop (EV_A_ (W)w); 1998 ev_stop (EV_A_ (W)w);
1678} 1999}
1679 2000
1680void 2001void noinline
1681ev_periodic_again (EV_P_ ev_periodic *w) 2002ev_periodic_again (EV_P_ ev_periodic *w)
1682{ 2003{
1683 /* TODO: use adjustheap and recalculation */ 2004 /* TODO: use adjustheap and recalculation */
1684 ev_periodic_stop (EV_A_ w); 2005 ev_periodic_stop (EV_A_ w);
1685 ev_periodic_start (EV_A_ w); 2006 ev_periodic_start (EV_A_ w);
1688 2009
1689#ifndef SA_RESTART 2010#ifndef SA_RESTART
1690# define SA_RESTART 0 2011# define SA_RESTART 0
1691#endif 2012#endif
1692 2013
1693void 2014void noinline
1694ev_signal_start (EV_P_ ev_signal *w) 2015ev_signal_start (EV_P_ ev_signal *w)
1695{ 2016{
1696#if EV_MULTIPLICITY 2017#if EV_MULTIPLICITY
1697 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2018 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1698#endif 2019#endif
1699 if (expect_false (ev_is_active (w))) 2020 if (expect_false (ev_is_active (w)))
1700 return; 2021 return;
1701 2022
1702 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2023 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1703 2024
2025 evpipe_init (EV_A);
2026
2027 {
2028#ifndef _WIN32
2029 sigset_t full, prev;
2030 sigfillset (&full);
2031 sigprocmask (SIG_SETMASK, &full, &prev);
2032#endif
2033
2034 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2035
2036#ifndef _WIN32
2037 sigprocmask (SIG_SETMASK, &prev, 0);
2038#endif
2039 }
2040
1704 ev_start (EV_A_ (W)w, 1); 2041 ev_start (EV_A_ (W)w, 1);
1705 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1706 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2042 wlist_add (&signals [w->signum - 1].head, (WL)w);
1707 2043
1708 if (!((WL)w)->next) 2044 if (!((WL)w)->next)
1709 { 2045 {
1710#if _WIN32 2046#if _WIN32
1711 signal (w->signum, sighandler); 2047 signal (w->signum, ev_sighandler);
1712#else 2048#else
1713 struct sigaction sa; 2049 struct sigaction sa;
1714 sa.sa_handler = sighandler; 2050 sa.sa_handler = ev_sighandler;
1715 sigfillset (&sa.sa_mask); 2051 sigfillset (&sa.sa_mask);
1716 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2052 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1717 sigaction (w->signum, &sa, 0); 2053 sigaction (w->signum, &sa, 0);
1718#endif 2054#endif
1719 } 2055 }
1720} 2056}
1721 2057
1722void 2058void noinline
1723ev_signal_stop (EV_P_ ev_signal *w) 2059ev_signal_stop (EV_P_ ev_signal *w)
1724{ 2060{
1725 ev_clear_pending (EV_A_ (W)w); 2061 clear_pending (EV_A_ (W)w);
1726 if (expect_false (!ev_is_active (w))) 2062 if (expect_false (!ev_is_active (w)))
1727 return; 2063 return;
1728 2064
1729 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2065 wlist_del (&signals [w->signum - 1].head, (WL)w);
1730 ev_stop (EV_A_ (W)w); 2066 ev_stop (EV_A_ (W)w);
1731 2067
1732 if (!signals [w->signum - 1].head) 2068 if (!signals [w->signum - 1].head)
1733 signal (w->signum, SIG_DFL); 2069 signal (w->signum, SIG_DFL);
1734} 2070}
1741#endif 2077#endif
1742 if (expect_false (ev_is_active (w))) 2078 if (expect_false (ev_is_active (w)))
1743 return; 2079 return;
1744 2080
1745 ev_start (EV_A_ (W)w, 1); 2081 ev_start (EV_A_ (W)w, 1);
1746 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2082 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1747} 2083}
1748 2084
1749void 2085void
1750ev_child_stop (EV_P_ ev_child *w) 2086ev_child_stop (EV_P_ ev_child *w)
1751{ 2087{
1752 ev_clear_pending (EV_A_ (W)w); 2088 clear_pending (EV_A_ (W)w);
1753 if (expect_false (!ev_is_active (w))) 2089 if (expect_false (!ev_is_active (w)))
1754 return; 2090 return;
1755 2091
1756 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2092 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1757 ev_stop (EV_A_ (W)w); 2093 ev_stop (EV_A_ (W)w);
1758} 2094}
1759 2095
1760#if EV_STAT_ENABLE 2096#if EV_STAT_ENABLE
1761 2097
1780 if (w->wd < 0) 2116 if (w->wd < 0)
1781 { 2117 {
1782 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2118 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1783 2119
1784 /* monitor some parent directory for speedup hints */ 2120 /* monitor some parent directory for speedup hints */
2121 /* note that exceeding the hardcoded limit is not a correctness issue, */
2122 /* but an efficiency issue only */
1785 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2123 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1786 { 2124 {
1787 char path [4096]; 2125 char path [4096];
1788 strcpy (path, w->path); 2126 strcpy (path, w->path);
1789 2127
1993} 2331}
1994 2332
1995void 2333void
1996ev_stat_stop (EV_P_ ev_stat *w) 2334ev_stat_stop (EV_P_ ev_stat *w)
1997{ 2335{
1998 ev_clear_pending (EV_A_ (W)w); 2336 clear_pending (EV_A_ (W)w);
1999 if (expect_false (!ev_is_active (w))) 2337 if (expect_false (!ev_is_active (w)))
2000 return; 2338 return;
2001 2339
2002#if EV_USE_INOTIFY 2340#if EV_USE_INOTIFY
2003 infy_del (EV_A_ w); 2341 infy_del (EV_A_ w);
2006 2344
2007 ev_stop (EV_A_ (W)w); 2345 ev_stop (EV_A_ (W)w);
2008} 2346}
2009#endif 2347#endif
2010 2348
2349#if EV_IDLE_ENABLE
2011void 2350void
2012ev_idle_start (EV_P_ ev_idle *w) 2351ev_idle_start (EV_P_ ev_idle *w)
2013{ 2352{
2014 if (expect_false (ev_is_active (w))) 2353 if (expect_false (ev_is_active (w)))
2015 return; 2354 return;
2016 2355
2356 pri_adjust (EV_A_ (W)w);
2357
2358 {
2359 int active = ++idlecnt [ABSPRI (w)];
2360
2361 ++idleall;
2017 ev_start (EV_A_ (W)w, ++idlecnt); 2362 ev_start (EV_A_ (W)w, active);
2363
2018 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2364 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2019 idles [idlecnt - 1] = w; 2365 idles [ABSPRI (w)][active - 1] = w;
2366 }
2020} 2367}
2021 2368
2022void 2369void
2023ev_idle_stop (EV_P_ ev_idle *w) 2370ev_idle_stop (EV_P_ ev_idle *w)
2024{ 2371{
2025 ev_clear_pending (EV_A_ (W)w); 2372 clear_pending (EV_A_ (W)w);
2026 if (expect_false (!ev_is_active (w))) 2373 if (expect_false (!ev_is_active (w)))
2027 return; 2374 return;
2028 2375
2029 { 2376 {
2030 int active = ((W)w)->active; 2377 int active = ev_active (w);
2031 idles [active - 1] = idles [--idlecnt]; 2378
2032 ((W)idles [active - 1])->active = active; 2379 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2380 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2381
2382 ev_stop (EV_A_ (W)w);
2383 --idleall;
2033 } 2384 }
2034
2035 ev_stop (EV_A_ (W)w);
2036} 2385}
2386#endif
2037 2387
2038void 2388void
2039ev_prepare_start (EV_P_ ev_prepare *w) 2389ev_prepare_start (EV_P_ ev_prepare *w)
2040{ 2390{
2041 if (expect_false (ev_is_active (w))) 2391 if (expect_false (ev_is_active (w)))
2047} 2397}
2048 2398
2049void 2399void
2050ev_prepare_stop (EV_P_ ev_prepare *w) 2400ev_prepare_stop (EV_P_ ev_prepare *w)
2051{ 2401{
2052 ev_clear_pending (EV_A_ (W)w); 2402 clear_pending (EV_A_ (W)w);
2053 if (expect_false (!ev_is_active (w))) 2403 if (expect_false (!ev_is_active (w)))
2054 return; 2404 return;
2055 2405
2056 { 2406 {
2057 int active = ((W)w)->active; 2407 int active = ev_active (w);
2408
2058 prepares [active - 1] = prepares [--preparecnt]; 2409 prepares [active - 1] = prepares [--preparecnt];
2059 ((W)prepares [active - 1])->active = active; 2410 ev_active (prepares [active - 1]) = active;
2060 } 2411 }
2061 2412
2062 ev_stop (EV_A_ (W)w); 2413 ev_stop (EV_A_ (W)w);
2063} 2414}
2064 2415
2074} 2425}
2075 2426
2076void 2427void
2077ev_check_stop (EV_P_ ev_check *w) 2428ev_check_stop (EV_P_ ev_check *w)
2078{ 2429{
2079 ev_clear_pending (EV_A_ (W)w); 2430 clear_pending (EV_A_ (W)w);
2080 if (expect_false (!ev_is_active (w))) 2431 if (expect_false (!ev_is_active (w)))
2081 return; 2432 return;
2082 2433
2083 { 2434 {
2084 int active = ((W)w)->active; 2435 int active = ev_active (w);
2436
2085 checks [active - 1] = checks [--checkcnt]; 2437 checks [active - 1] = checks [--checkcnt];
2086 ((W)checks [active - 1])->active = active; 2438 ev_active (checks [active - 1]) = active;
2087 } 2439 }
2088 2440
2089 ev_stop (EV_A_ (W)w); 2441 ev_stop (EV_A_ (W)w);
2090} 2442}
2091 2443
2092#if EV_EMBED_ENABLE 2444#if EV_EMBED_ENABLE
2093void noinline 2445void noinline
2094ev_embed_sweep (EV_P_ ev_embed *w) 2446ev_embed_sweep (EV_P_ ev_embed *w)
2095{ 2447{
2096 ev_loop (w->loop, EVLOOP_NONBLOCK); 2448 ev_loop (w->other, EVLOOP_NONBLOCK);
2097} 2449}
2098 2450
2099static void 2451static void
2100embed_cb (EV_P_ ev_io *io, int revents) 2452embed_io_cb (EV_P_ ev_io *io, int revents)
2101{ 2453{
2102 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2454 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2103 2455
2104 if (ev_cb (w)) 2456 if (ev_cb (w))
2105 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2457 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2106 else 2458 else
2107 ev_embed_sweep (loop, w); 2459 ev_loop (w->other, EVLOOP_NONBLOCK);
2108} 2460}
2461
2462static void
2463embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2464{
2465 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2466
2467 {
2468 struct ev_loop *loop = w->other;
2469
2470 while (fdchangecnt)
2471 {
2472 fd_reify (EV_A);
2473 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2474 }
2475 }
2476}
2477
2478#if 0
2479static void
2480embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2481{
2482 ev_idle_stop (EV_A_ idle);
2483}
2484#endif
2109 2485
2110void 2486void
2111ev_embed_start (EV_P_ ev_embed *w) 2487ev_embed_start (EV_P_ ev_embed *w)
2112{ 2488{
2113 if (expect_false (ev_is_active (w))) 2489 if (expect_false (ev_is_active (w)))
2114 return; 2490 return;
2115 2491
2116 { 2492 {
2117 struct ev_loop *loop = w->loop; 2493 struct ev_loop *loop = w->other;
2118 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2494 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2119 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2495 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2120 } 2496 }
2121 2497
2122 ev_set_priority (&w->io, ev_priority (w)); 2498 ev_set_priority (&w->io, ev_priority (w));
2123 ev_io_start (EV_A_ &w->io); 2499 ev_io_start (EV_A_ &w->io);
2124 2500
2501 ev_prepare_init (&w->prepare, embed_prepare_cb);
2502 ev_set_priority (&w->prepare, EV_MINPRI);
2503 ev_prepare_start (EV_A_ &w->prepare);
2504
2505 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2506
2125 ev_start (EV_A_ (W)w, 1); 2507 ev_start (EV_A_ (W)w, 1);
2126} 2508}
2127 2509
2128void 2510void
2129ev_embed_stop (EV_P_ ev_embed *w) 2511ev_embed_stop (EV_P_ ev_embed *w)
2130{ 2512{
2131 ev_clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2132 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2133 return; 2515 return;
2134 2516
2135 ev_io_stop (EV_A_ &w->io); 2517 ev_io_stop (EV_A_ &w->io);
2518 ev_prepare_stop (EV_A_ &w->prepare);
2136 2519
2137 ev_stop (EV_A_ (W)w); 2520 ev_stop (EV_A_ (W)w);
2138} 2521}
2139#endif 2522#endif
2140 2523
2151} 2534}
2152 2535
2153void 2536void
2154ev_fork_stop (EV_P_ ev_fork *w) 2537ev_fork_stop (EV_P_ ev_fork *w)
2155{ 2538{
2156 ev_clear_pending (EV_A_ (W)w); 2539 clear_pending (EV_A_ (W)w);
2157 if (expect_false (!ev_is_active (w))) 2540 if (expect_false (!ev_is_active (w)))
2158 return; 2541 return;
2159 2542
2160 { 2543 {
2161 int active = ((W)w)->active; 2544 int active = ev_active (w);
2545
2162 forks [active - 1] = forks [--forkcnt]; 2546 forks [active - 1] = forks [--forkcnt];
2163 ((W)forks [active - 1])->active = active; 2547 ev_active (forks [active - 1]) = active;
2164 } 2548 }
2165 2549
2166 ev_stop (EV_A_ (W)w); 2550 ev_stop (EV_A_ (W)w);
2551}
2552#endif
2553
2554#if EV_ASYNC_ENABLE
2555void
2556ev_async_start (EV_P_ ev_async *w)
2557{
2558 if (expect_false (ev_is_active (w)))
2559 return;
2560
2561 evpipe_init (EV_A);
2562
2563 ev_start (EV_A_ (W)w, ++asynccnt);
2564 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2565 asyncs [asynccnt - 1] = w;
2566}
2567
2568void
2569ev_async_stop (EV_P_ ev_async *w)
2570{
2571 clear_pending (EV_A_ (W)w);
2572 if (expect_false (!ev_is_active (w)))
2573 return;
2574
2575 {
2576 int active = ev_active (w);
2577
2578 asyncs [active - 1] = asyncs [--asynccnt];
2579 ev_active (asyncs [active - 1]) = active;
2580 }
2581
2582 ev_stop (EV_A_ (W)w);
2583}
2584
2585void
2586ev_async_send (EV_P_ ev_async *w)
2587{
2588 w->sent = 1;
2589 evpipe_write (EV_A_ &gotasync);
2167} 2590}
2168#endif 2591#endif
2169 2592
2170/*****************************************************************************/ 2593/*****************************************************************************/
2171 2594
2229 ev_timer_set (&once->to, timeout, 0.); 2652 ev_timer_set (&once->to, timeout, 0.);
2230 ev_timer_start (EV_A_ &once->to); 2653 ev_timer_start (EV_A_ &once->to);
2231 } 2654 }
2232} 2655}
2233 2656
2657#if EV_MULTIPLICITY
2658 #include "ev_wrap.h"
2659#endif
2660
2234#ifdef __cplusplus 2661#ifdef __cplusplus
2235} 2662}
2236#endif 2663#endif
2237 2664

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines