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

Comparing libev/ev.c (file contents):
Revision 1.156 by root, Wed Nov 28 17:50:13 2007 UTC vs.
Revision 1.247 by root, Wed May 21 21:22:10 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#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL
242#endif
243
244#ifndef EV_HEAP_CACHE_AT
245# define EV_HEAP_CACHE_AT !EV_MINIMAL
246#endif
247
248/* this block fixes any misconfiguration where we know we run into trouble otherwise */
196 249
197#ifndef CLOCK_MONOTONIC 250#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 251# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 252# define EV_USE_MONOTONIC 0
200#endif 253#endif
… …
202#ifndef CLOCK_REALTIME 255#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 256# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 257# define EV_USE_REALTIME 0
205#endif 258#endif
206 259
260#if !EV_STAT_ENABLE
261# undef EV_USE_INOTIFY
262# define EV_USE_INOTIFY 0
263#endif
264
265#if !EV_USE_NANOSLEEP
266# ifndef _WIN32
267# include <sys/select.h>
268# endif
269#endif
270
271#if EV_USE_INOTIFY
272# include <sys/inotify.h>
273#endif
274
207#if EV_SELECT_IS_WINSOCKET 275#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 276# include <winsock.h>
209#endif 277#endif
210 278
211#if !EV_STAT_ENABLE 279#if EV_USE_EVENTFD
212# define EV_USE_INOTIFY 0 280/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
281# include <stdint.h>
282# ifdef __cplusplus
283extern "C" {
213#endif 284# endif
214 285int eventfd (unsigned int initval, int flags);
215#if EV_USE_INOTIFY 286# ifdef __cplusplus
216# include <sys/inotify.h> 287}
288# endif
217#endif 289#endif
218 290
219/**/ 291/**/
292
293/*
294 * This is used to avoid floating point rounding problems.
295 * It is added to ev_rt_now when scheduling periodics
296 * to ensure progress, time-wise, even when rounding
297 * errors are against us.
298 * This value is good at least till the year 4000.
299 * Better solutions welcome.
300 */
301#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 302
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 303#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) */ 304#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 */ 305/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 306
225#if __GNUC__ >= 3 307#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 308# 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)) 309# 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 310#else
236# define expect(expr,value) (expr) 311# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 312# define noinline
313# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
314# define inline
315# endif
240#endif 316#endif
241 317
242#define expect_false(expr) expect ((expr) != 0, 0) 318#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 319#define expect_true(expr) expect ((expr) != 0, 1)
320#define inline_size static inline
321
322#if EV_MINIMAL
323# define inline_speed static noinline
324#else
325# define inline_speed static inline
326#endif
244 327
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 328#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 329#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 330
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 331#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 332#define EMPTY2(a,b) /* used to suppress some warnings */
250 333
251typedef ev_watcher *W; 334typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 335typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 336typedef ev_watcher_time *WT;
254 337
338#define ev_active(w) ((W)(w))->active
339#define ev_at(w) ((WT)(w))->at
340
341#if EV_USE_MONOTONIC
342/* sig_atomic_t is used to avoid per-thread variables or locking but still */
343/* giving it a reasonably high chance of working on typical architetcures */
255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 344static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
345#endif
256 346
257#ifdef _WIN32 347#ifdef _WIN32
258# include "ev_win32.c" 348# include "ev_win32.c"
259#endif 349#endif
260 350
… …
281 perror (msg); 371 perror (msg);
282 abort (); 372 abort ();
283 } 373 }
284} 374}
285 375
376static void *
377ev_realloc_emul (void *ptr, long size)
378{
379 /* some systems, notably openbsd and darwin, fail to properly
380 * implement realloc (x, 0) (as required by both ansi c-98 and
381 * the single unix specification, so work around them here.
382 */
383
384 if (size)
385 return realloc (ptr, size);
386
387 free (ptr);
388 return 0;
389}
390
286static void *(*alloc)(void *ptr, long size); 391static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
287 392
288void 393void
289ev_set_allocator (void *(*cb)(void *ptr, long size)) 394ev_set_allocator (void *(*cb)(void *ptr, long size))
290{ 395{
291 alloc = cb; 396 alloc = cb;
292} 397}
293 398
294inline_speed void * 399inline_speed void *
295ev_realloc (void *ptr, long size) 400ev_realloc (void *ptr, long size)
296{ 401{
297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 402 ptr = alloc (ptr, size);
298 403
299 if (!ptr && size) 404 if (!ptr && size)
300 { 405 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 406 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
302 abort (); 407 abort ();
… …
325 W w; 430 W w;
326 int events; 431 int events;
327} ANPENDING; 432} ANPENDING;
328 433
329#if EV_USE_INOTIFY 434#if EV_USE_INOTIFY
435/* hash table entry per inotify-id */
330typedef struct 436typedef struct
331{ 437{
332 WL head; 438 WL head;
333} ANFS; 439} ANFS;
440#endif
441
442/* Heap Entry */
443#if EV_HEAP_CACHE_AT
444 typedef struct {
445 ev_tstamp at;
446 WT w;
447 } ANHE;
448
449 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */
451 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */
452#else
453 typedef WT ANHE;
454
455 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he)
334#endif 458#endif
335 459
336#if EV_MULTIPLICITY 460#if EV_MULTIPLICITY
337 461
338 struct ev_loop 462 struct ev_loop
… …
396{ 520{
397 return ev_rt_now; 521 return ev_rt_now;
398} 522}
399#endif 523#endif
400 524
401#define array_roundsize(type,n) (((n) | 4) & ~3) 525void
526ev_sleep (ev_tstamp delay)
527{
528 if (delay > 0.)
529 {
530#if EV_USE_NANOSLEEP
531 struct timespec ts;
532
533 ts.tv_sec = (time_t)delay;
534 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
535
536 nanosleep (&ts, 0);
537#elif defined(_WIN32)
538 Sleep ((unsigned long)(delay * 1e3));
539#else
540 struct timeval tv;
541
542 tv.tv_sec = (time_t)delay;
543 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
544
545 select (0, 0, 0, 0, &tv);
546#endif
547 }
548}
549
550/*****************************************************************************/
551
552#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
553
554int inline_size
555array_nextsize (int elem, int cur, int cnt)
556{
557 int ncur = cur + 1;
558
559 do
560 ncur <<= 1;
561 while (cnt > ncur);
562
563 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
564 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
565 {
566 ncur *= elem;
567 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
568 ncur = ncur - sizeof (void *) * 4;
569 ncur /= elem;
570 }
571
572 return ncur;
573}
574
575static noinline void *
576array_realloc (int elem, void *base, int *cur, int cnt)
577{
578 *cur = array_nextsize (elem, *cur, cnt);
579 return ev_realloc (base, elem * *cur);
580}
402 581
403#define array_needsize(type,base,cur,cnt,init) \ 582#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 583 if (expect_false ((cnt) > (cur))) \
405 { \ 584 { \
406 int newcnt = cur; \ 585 int ocur_ = (cur); \
407 do \ 586 (base) = (type *)array_realloc \
408 { \ 587 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 588 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 } 589 }
417 590
591#if 0
418#define array_slim(type,stem) \ 592#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 593 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 594 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 595 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 596 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 597 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 598 }
599#endif
425 600
426#define array_free(stem, idx) \ 601#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 602 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 603
429/*****************************************************************************/ 604/*****************************************************************************/
430 605
431void noinline 606void noinline
432ev_feed_event (EV_P_ void *w, int revents) 607ev_feed_event (EV_P_ void *w, int revents)
433{ 608{
434 W w_ = (W)w; 609 W w_ = (W)w;
610 int pri = ABSPRI (w_);
435 611
436 if (expect_false (w_->pending)) 612 if (expect_false (w_->pending))
613 pendings [pri][w_->pending - 1].events |= revents;
614 else
437 { 615 {
616 w_->pending = ++pendingcnt [pri];
617 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
618 pendings [pri][w_->pending - 1].w = w_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 619 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 620 }
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} 621}
447 622
448void inline_size 623void inline_speed
449queue_events (EV_P_ W *events, int eventcnt, int type) 624queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 625{
451 int i; 626 int i;
452 627
453 for (i = 0; i < eventcnt; ++i) 628 for (i = 0; i < eventcnt; ++i)
… …
485} 660}
486 661
487void 662void
488ev_feed_fd_event (EV_P_ int fd, int revents) 663ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 664{
665 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 666 fd_event (EV_A_ fd, revents);
491} 667}
492 668
493void inline_size 669void inline_size
494fd_reify (EV_P) 670fd_reify (EV_P)
495{ 671{
… …
499 { 675 {
500 int fd = fdchanges [i]; 676 int fd = fdchanges [i];
501 ANFD *anfd = anfds + fd; 677 ANFD *anfd = anfds + fd;
502 ev_io *w; 678 ev_io *w;
503 679
504 int events = 0; 680 unsigned char events = 0;
505 681
506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 682 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
507 events |= w->events; 683 events |= (unsigned char)w->events;
508 684
509#if EV_SELECT_IS_WINSOCKET 685#if EV_SELECT_IS_WINSOCKET
510 if (events) 686 if (events)
511 { 687 {
512 unsigned long argp; 688 unsigned long argp;
689 #ifdef EV_FD_TO_WIN32_HANDLE
690 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691 #else
513 anfd->handle = _get_osfhandle (fd); 692 anfd->handle = _get_osfhandle (fd);
693 #endif
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 694 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 } 695 }
516#endif 696#endif
517 697
698 {
699 unsigned char o_events = anfd->events;
700 unsigned char o_reify = anfd->reify;
701
518 anfd->reify = 0; 702 anfd->reify = 0;
519
520 backend_modify (EV_A_ fd, anfd->events, events);
521 anfd->events = events; 703 anfd->events = events;
704
705 if (o_events != events || o_reify & EV_IOFDSET)
706 backend_modify (EV_A_ fd, o_events, events);
707 }
522 } 708 }
523 709
524 fdchangecnt = 0; 710 fdchangecnt = 0;
525} 711}
526 712
527void inline_size 713void inline_size
528fd_change (EV_P_ int fd) 714fd_change (EV_P_ int fd, int flags)
529{ 715{
530 if (expect_false (anfds [fd].reify)) 716 unsigned char reify = anfds [fd].reify;
531 return;
532
533 anfds [fd].reify = 1; 717 anfds [fd].reify |= flags;
534 718
719 if (expect_true (!reify))
720 {
535 ++fdchangecnt; 721 ++fdchangecnt;
536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 722 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
537 fdchanges [fdchangecnt - 1] = fd; 723 fdchanges [fdchangecnt - 1] = fd;
724 }
538} 725}
539 726
540void inline_speed 727void inline_speed
541fd_kill (EV_P_ int fd) 728fd_kill (EV_P_ int fd)
542{ 729{
… …
589static void noinline 776static void noinline
590fd_rearm_all (EV_P) 777fd_rearm_all (EV_P)
591{ 778{
592 int fd; 779 int fd;
593 780
594 /* this should be highly optimised to not do anything but set a flag */
595 for (fd = 0; fd < anfdmax; ++fd) 781 for (fd = 0; fd < anfdmax; ++fd)
596 if (anfds [fd].events) 782 if (anfds [fd].events)
597 { 783 {
598 anfds [fd].events = 0; 784 anfds [fd].events = 0;
599 fd_change (EV_A_ fd); 785 fd_change (EV_A_ fd, EV_IOFDSET | 1);
600 } 786 }
601} 787}
602 788
603/*****************************************************************************/ 789/*****************************************************************************/
604 790
791/*
792 * the heap functions want a real array index. array index 0 uis guaranteed to not
793 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
794 * the branching factor of the d-tree.
795 */
796
797/*
798 * at the moment we allow libev the luxury of two heaps,
799 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
800 * which is more cache-efficient.
801 * the difference is about 5% with 50000+ watchers.
802 */
803#if EV_USE_4HEAP
804
805#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808
809/* towards the root */
605void inline_speed 810void inline_speed
606upheap (WT *heap, int k) 811upheap (ANHE *heap, int k)
607{ 812{
608 WT w = heap [k]; 813 ANHE he = heap [k];
609 814
610 while (k && heap [k >> 1]->at > w->at) 815 for (;;)
611 { 816 {
817 int p = HPARENT (k);
818
819 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
820 break;
821
612 heap [k] = heap [k >> 1]; 822 heap [k] = heap [p];
613 ((W)heap [k])->active = k + 1; 823 ev_active (ANHE_w (heap [k])) = k;
614 k >>= 1; 824 k = p;
615 } 825 }
616 826
617 heap [k] = w; 827 heap [k] = he;
618 ((W)heap [k])->active = k + 1; 828 ev_active (ANHE_w (he)) = k;
619
620} 829}
621 830
831/* away from the root */
622void inline_speed 832void inline_speed
623downheap (WT *heap, int N, int k) 833downheap (ANHE *heap, int N, int k)
624{ 834{
625 WT w = heap [k]; 835 ANHE he = heap [k];
836 ANHE *E = heap + N + HEAP0;
626 837
627 while (k < (N >> 1)) 838 for (;;)
628 { 839 {
629 int j = k << 1; 840 ev_tstamp minat;
841 ANHE *minpos;
842 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
630 843
631 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 844 // find minimum child
845 if (expect_true (pos + DHEAP - 1 < E))
632 ++j; 846 {
633 847 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
634 if (w->at <= heap [j]->at) 848 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
849 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
850 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
851 }
852 else if (pos < E)
853 {
854 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
855 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
856 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
857 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
858 }
859 else
635 break; 860 break;
636 861
862 if (ANHE_at (he) <= minat)
863 break;
864
865 heap [k] = *minpos;
866 ev_active (ANHE_w (*minpos)) = k;
867
868 k = minpos - heap;
869 }
870
871 heap [k] = he;
872 ev_active (ANHE_w (he)) = k;
873}
874
875#else // 4HEAP
876
877#define HEAP0 1
878#define HPARENT(k) ((k) >> 1)
879
880/* towards the root */
881void inline_speed
882upheap (ANHE *heap, int k)
883{
884 ANHE he = heap [k];
885
886 for (;;)
887 {
888 int p = HPARENT (k);
889
890 /* maybe we could use a dummy element at heap [0]? */
891 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
892 break;
893
637 heap [k] = heap [j]; 894 heap [k] = heap [p];
638 ((W)heap [k])->active = k + 1; 895 ev_active (ANHE_w (heap [k])) = k;
639 k = j; 896 k = p;
640 } 897 }
641 898
642 heap [k] = w; 899 heap [k] = he;
643 ((W)heap [k])->active = k + 1; 900 ev_active (ANHE_w (heap [k])) = k;
644} 901}
902
903/* away from the root */
904void inline_speed
905downheap (ANHE *heap, int N, int k)
906{
907 ANHE he = heap [k];
908
909 for (;;)
910 {
911 int c = k << 1;
912
913 if (c > N)
914 break;
915
916 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
917 ? 1 : 0;
918
919 if (ANHE_at (he) <= ANHE_at (heap [c]))
920 break;
921
922 heap [k] = heap [c];
923 ev_active (ANHE_w (heap [k])) = k;
924
925 k = c;
926 }
927
928 heap [k] = he;
929 ev_active (ANHE_w (he)) = k;
930}
931#endif
645 932
646void inline_size 933void inline_size
647adjustheap (WT *heap, int N, int k) 934adjustheap (ANHE *heap, int N, int k)
648{ 935{
936 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
649 upheap (heap, k); 937 upheap (heap, k);
938 else
650 downheap (heap, N, k); 939 downheap (heap, N, k);
651} 940}
652 941
653/*****************************************************************************/ 942/*****************************************************************************/
654 943
655typedef struct 944typedef struct
656{ 945{
657 WL head; 946 WL head;
658 sig_atomic_t volatile gotsig; 947 EV_ATOMIC_T gotsig;
659} ANSIG; 948} ANSIG;
660 949
661static ANSIG *signals; 950static ANSIG *signals;
662static int signalmax; 951static int signalmax;
663 952
664static int sigpipe [2]; 953static EV_ATOMIC_T gotsig;
665static sig_atomic_t volatile gotsig;
666static ev_io sigev;
667 954
668void inline_size 955void inline_size
669signals_init (ANSIG *base, int count) 956signals_init (ANSIG *base, int count)
670{ 957{
671 while (count--) 958 while (count--)
… …
675 962
676 ++base; 963 ++base;
677 } 964 }
678} 965}
679 966
680static void 967/*****************************************************************************/
681sighandler (int signum)
682{
683#if _WIN32
684 signal (signum, sighandler);
685#endif
686 968
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 969void inline_speed
732fd_intern (int fd) 970fd_intern (int fd)
733{ 971{
734#ifdef _WIN32 972#ifdef _WIN32
735 int arg = 1; 973 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 974 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
739 fcntl (fd, F_SETFL, O_NONBLOCK); 977 fcntl (fd, F_SETFL, O_NONBLOCK);
740#endif 978#endif
741} 979}
742 980
743static void noinline 981static void noinline
744siginit (EV_P) 982evpipe_init (EV_P)
745{ 983{
984 if (!ev_is_active (&pipeev))
985 {
986#if EV_USE_EVENTFD
987 if ((evfd = eventfd (0, 0)) >= 0)
988 {
989 evpipe [0] = -1;
990 fd_intern (evfd);
991 ev_io_set (&pipeev, evfd, EV_READ);
992 }
993 else
994#endif
995 {
996 while (pipe (evpipe))
997 syserr ("(libev) error creating signal/async pipe");
998
746 fd_intern (sigpipe [0]); 999 fd_intern (evpipe [0]);
747 fd_intern (sigpipe [1]); 1000 fd_intern (evpipe [1]);
1001 ev_io_set (&pipeev, evpipe [0], EV_READ);
1002 }
748 1003
749 ev_io_set (&sigev, sigpipe [0], EV_READ);
750 ev_io_start (EV_A_ &sigev); 1004 ev_io_start (EV_A_ &pipeev);
751 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1005 ev_unref (EV_A); /* watcher should not keep loop alive */
1006 }
1007}
1008
1009void inline_size
1010evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1011{
1012 if (!*flag)
1013 {
1014 int old_errno = errno; /* save errno because write might clobber it */
1015
1016 *flag = 1;
1017
1018#if EV_USE_EVENTFD
1019 if (evfd >= 0)
1020 {
1021 uint64_t counter = 1;
1022 write (evfd, &counter, sizeof (uint64_t));
1023 }
1024 else
1025#endif
1026 write (evpipe [1], &old_errno, 1);
1027
1028 errno = old_errno;
1029 }
1030}
1031
1032static void
1033pipecb (EV_P_ ev_io *iow, int revents)
1034{
1035#if EV_USE_EVENTFD
1036 if (evfd >= 0)
1037 {
1038 uint64_t counter;
1039 read (evfd, &counter, sizeof (uint64_t));
1040 }
1041 else
1042#endif
1043 {
1044 char dummy;
1045 read (evpipe [0], &dummy, 1);
1046 }
1047
1048 if (gotsig && ev_is_default_loop (EV_A))
1049 {
1050 int signum;
1051 gotsig = 0;
1052
1053 for (signum = signalmax; signum--; )
1054 if (signals [signum].gotsig)
1055 ev_feed_signal_event (EV_A_ signum + 1);
1056 }
1057
1058#if EV_ASYNC_ENABLE
1059 if (gotasync)
1060 {
1061 int i;
1062 gotasync = 0;
1063
1064 for (i = asynccnt; i--; )
1065 if (asyncs [i]->sent)
1066 {
1067 asyncs [i]->sent = 0;
1068 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1069 }
1070 }
1071#endif
752} 1072}
753 1073
754/*****************************************************************************/ 1074/*****************************************************************************/
755 1075
1076static void
1077ev_sighandler (int signum)
1078{
1079#if EV_MULTIPLICITY
1080 struct ev_loop *loop = &default_loop_struct;
1081#endif
1082
1083#if _WIN32
1084 signal (signum, ev_sighandler);
1085#endif
1086
1087 signals [signum - 1].gotsig = 1;
1088 evpipe_write (EV_A_ &gotsig);
1089}
1090
1091void noinline
1092ev_feed_signal_event (EV_P_ int signum)
1093{
1094 WL w;
1095
1096#if EV_MULTIPLICITY
1097 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1098#endif
1099
1100 --signum;
1101
1102 if (signum < 0 || signum >= signalmax)
1103 return;
1104
1105 signals [signum].gotsig = 0;
1106
1107 for (w = signals [signum].head; w; w = w->next)
1108 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1109}
1110
1111/*****************************************************************************/
1112
756static ev_child *childs [EV_PID_HASHSIZE]; 1113static WL childs [EV_PID_HASHSIZE];
757 1114
758#ifndef _WIN32 1115#ifndef _WIN32
759 1116
760static ev_signal childev; 1117static ev_signal childev;
761 1118
1119#ifndef WIFCONTINUED
1120# define WIFCONTINUED(status) 0
1121#endif
1122
762void inline_speed 1123void inline_speed
763child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1124child_reap (EV_P_ int chain, int pid, int status)
764{ 1125{
765 ev_child *w; 1126 ev_child *w;
1127 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
766 1128
767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1129 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1130 {
768 if (w->pid == pid || !w->pid) 1131 if ((w->pid == pid || !w->pid)
1132 && (!traced || (w->flags & 1)))
769 { 1133 {
770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1134 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; 1135 w->rpid = pid;
772 w->rstatus = status; 1136 w->rstatus = status;
773 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1137 ev_feed_event (EV_A_ (W)w, EV_CHILD);
774 } 1138 }
1139 }
775} 1140}
776 1141
777#ifndef WCONTINUED 1142#ifndef WCONTINUED
778# define WCONTINUED 0 1143# define WCONTINUED 0
779#endif 1144#endif
… …
788 if (!WCONTINUED 1153 if (!WCONTINUED
789 || errno != EINVAL 1154 || errno != EINVAL
790 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1155 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
791 return; 1156 return;
792 1157
793 /* make sure we are called again until all childs have been reaped */ 1158 /* 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 */ 1159 /* 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); 1160 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
796 1161
797 child_reap (EV_A_ sw, pid, pid, status); 1162 child_reap (EV_A_ pid, pid, status);
798 if (EV_PID_HASHSIZE > 1) 1163 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 */ 1164 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
800} 1165}
801 1166
802#endif 1167#endif
803 1168
804/*****************************************************************************/ 1169/*****************************************************************************/
… …
876} 1241}
877 1242
878unsigned int 1243unsigned int
879ev_embeddable_backends (void) 1244ev_embeddable_backends (void)
880{ 1245{
881 return EVBACKEND_EPOLL 1246 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
882 | EVBACKEND_KQUEUE 1247
883 | EVBACKEND_PORT; 1248 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1249 /* please fix it and tell me how to detect the fix */
1250 flags &= ~EVBACKEND_EPOLL;
1251
1252 return flags;
884} 1253}
885 1254
886unsigned int 1255unsigned int
887ev_backend (EV_P) 1256ev_backend (EV_P)
888{ 1257{
889 return backend; 1258 return backend;
1259}
1260
1261unsigned int
1262ev_loop_count (EV_P)
1263{
1264 return loop_count;
1265}
1266
1267void
1268ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1269{
1270 io_blocktime = interval;
1271}
1272
1273void
1274ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1275{
1276 timeout_blocktime = interval;
890} 1277}
891 1278
892static void noinline 1279static void noinline
893loop_init (EV_P_ unsigned int flags) 1280loop_init (EV_P_ unsigned int flags)
894{ 1281{
… …
900 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1287 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
901 have_monotonic = 1; 1288 have_monotonic = 1;
902 } 1289 }
903#endif 1290#endif
904 1291
905 ev_rt_now = ev_time (); 1292 ev_rt_now = ev_time ();
906 mn_now = get_clock (); 1293 mn_now = get_clock ();
907 now_floor = mn_now; 1294 now_floor = mn_now;
908 rtmn_diff = ev_rt_now - mn_now; 1295 rtmn_diff = ev_rt_now - mn_now;
1296
1297 io_blocktime = 0.;
1298 timeout_blocktime = 0.;
1299 backend = 0;
1300 backend_fd = -1;
1301 gotasync = 0;
1302#if EV_USE_INOTIFY
1303 fs_fd = -2;
1304#endif
1305
1306 /* pid check not overridable via env */
1307#ifndef _WIN32
1308 if (flags & EVFLAG_FORKCHECK)
1309 curpid = getpid ();
1310#endif
909 1311
910 if (!(flags & EVFLAG_NOENV) 1312 if (!(flags & EVFLAG_NOENV)
911 && !enable_secure () 1313 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS")) 1314 && getenv ("LIBEV_FLAGS"))
913 flags = atoi (getenv ("LIBEV_FLAGS")); 1315 flags = atoi (getenv ("LIBEV_FLAGS"));
914 1316
915 if (!(flags & 0x0000ffffUL)) 1317 if (!(flags & 0x0000ffffU))
916 flags |= ev_recommended_backends (); 1318 flags |= ev_recommended_backends ();
917
918 backend = 0;
919 backend_fd = -1;
920#if EV_USE_INOTIFY
921 fs_fd = -2;
922#endif
923 1319
924#if EV_USE_PORT 1320#if EV_USE_PORT
925 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1321 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
926#endif 1322#endif
927#if EV_USE_KQUEUE 1323#if EV_USE_KQUEUE
… …
935#endif 1331#endif
936#if EV_USE_SELECT 1332#if EV_USE_SELECT
937 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1333 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
938#endif 1334#endif
939 1335
940 ev_init (&sigev, sigcb); 1336 ev_init (&pipeev, pipecb);
941 ev_set_priority (&sigev, EV_MAXPRI); 1337 ev_set_priority (&pipeev, EV_MAXPRI);
942 } 1338 }
943} 1339}
944 1340
945static void noinline 1341static void noinline
946loop_destroy (EV_P) 1342loop_destroy (EV_P)
947{ 1343{
948 int i; 1344 int i;
1345
1346 if (ev_is_active (&pipeev))
1347 {
1348 ev_ref (EV_A); /* signal watcher */
1349 ev_io_stop (EV_A_ &pipeev);
1350
1351#if EV_USE_EVENTFD
1352 if (evfd >= 0)
1353 close (evfd);
1354#endif
1355
1356 if (evpipe [0] >= 0)
1357 {
1358 close (evpipe [0]);
1359 close (evpipe [1]);
1360 }
1361 }
949 1362
950#if EV_USE_INOTIFY 1363#if EV_USE_INOTIFY
951 if (fs_fd >= 0) 1364 if (fs_fd >= 0)
952 close (fs_fd); 1365 close (fs_fd);
953#endif 1366#endif
… …
970#if EV_USE_SELECT 1383#if EV_USE_SELECT
971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1384 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
972#endif 1385#endif
973 1386
974 for (i = NUMPRI; i--; ) 1387 for (i = NUMPRI; i--; )
1388 {
975 array_free (pending, [i]); 1389 array_free (pending, [i]);
1390#if EV_IDLE_ENABLE
1391 array_free (idle, [i]);
1392#endif
1393 }
1394
1395 ev_free (anfds); anfdmax = 0;
976 1396
977 /* have to use the microsoft-never-gets-it-right macro */ 1397 /* have to use the microsoft-never-gets-it-right macro */
978 array_free (fdchange, EMPTY0); 1398 array_free (fdchange, EMPTY);
979 array_free (timer, EMPTY0); 1399 array_free (timer, EMPTY);
980#if EV_PERIODIC_ENABLE 1400#if EV_PERIODIC_ENABLE
981 array_free (periodic, EMPTY0); 1401 array_free (periodic, EMPTY);
982#endif 1402#endif
1403#if EV_FORK_ENABLE
983 array_free (idle, EMPTY0); 1404 array_free (fork, EMPTY);
1405#endif
984 array_free (prepare, EMPTY0); 1406 array_free (prepare, EMPTY);
985 array_free (check, EMPTY0); 1407 array_free (check, EMPTY);
1408#if EV_ASYNC_ENABLE
1409 array_free (async, EMPTY);
1410#endif
986 1411
987 backend = 0; 1412 backend = 0;
988} 1413}
989 1414
1415#if EV_USE_INOTIFY
990void inline_size infy_fork (EV_P); 1416void inline_size infy_fork (EV_P);
1417#endif
991 1418
992void inline_size 1419void inline_size
993loop_fork (EV_P) 1420loop_fork (EV_P)
994{ 1421{
995#if EV_USE_PORT 1422#if EV_USE_PORT
… …
1003#endif 1430#endif
1004#if EV_USE_INOTIFY 1431#if EV_USE_INOTIFY
1005 infy_fork (EV_A); 1432 infy_fork (EV_A);
1006#endif 1433#endif
1007 1434
1008 if (ev_is_active (&sigev)) 1435 if (ev_is_active (&pipeev))
1009 { 1436 {
1010 /* default loop */ 1437 /* this "locks" the handlers against writing to the pipe */
1438 /* while we modify the fd vars */
1439 gotsig = 1;
1440#if EV_ASYNC_ENABLE
1441 gotasync = 1;
1442#endif
1011 1443
1012 ev_ref (EV_A); 1444 ev_ref (EV_A);
1013 ev_io_stop (EV_A_ &sigev); 1445 ev_io_stop (EV_A_ &pipeev);
1446
1447#if EV_USE_EVENTFD
1448 if (evfd >= 0)
1449 close (evfd);
1450#endif
1451
1452 if (evpipe [0] >= 0)
1453 {
1014 close (sigpipe [0]); 1454 close (evpipe [0]);
1015 close (sigpipe [1]); 1455 close (evpipe [1]);
1456 }
1016 1457
1017 while (pipe (sigpipe))
1018 syserr ("(libev) error creating pipe");
1019
1020 siginit (EV_A); 1458 evpipe_init (EV_A);
1459 /* now iterate over everything, in case we missed something */
1460 pipecb (EV_A_ &pipeev, EV_READ);
1021 } 1461 }
1022 1462
1023 postfork = 0; 1463 postfork = 0;
1024} 1464}
1025 1465
… …
1047} 1487}
1048 1488
1049void 1489void
1050ev_loop_fork (EV_P) 1490ev_loop_fork (EV_P)
1051{ 1491{
1052 postfork = 1; 1492 postfork = 1; /* must be in line with ev_default_fork */
1053} 1493}
1054
1055#endif 1494#endif
1056 1495
1057#if EV_MULTIPLICITY 1496#if EV_MULTIPLICITY
1058struct ev_loop * 1497struct ev_loop *
1059ev_default_loop_init (unsigned int flags) 1498ev_default_loop_init (unsigned int flags)
1060#else 1499#else
1061int 1500int
1062ev_default_loop (unsigned int flags) 1501ev_default_loop (unsigned int flags)
1063#endif 1502#endif
1064{ 1503{
1065 if (sigpipe [0] == sigpipe [1])
1066 if (pipe (sigpipe))
1067 return 0;
1068
1069 if (!ev_default_loop_ptr) 1504 if (!ev_default_loop_ptr)
1070 { 1505 {
1071#if EV_MULTIPLICITY 1506#if EV_MULTIPLICITY
1072 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1507 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1073#else 1508#else
… …
1076 1511
1077 loop_init (EV_A_ flags); 1512 loop_init (EV_A_ flags);
1078 1513
1079 if (ev_backend (EV_A)) 1514 if (ev_backend (EV_A))
1080 { 1515 {
1081 siginit (EV_A);
1082
1083#ifndef _WIN32 1516#ifndef _WIN32
1084 ev_signal_init (&childev, childcb, SIGCHLD); 1517 ev_signal_init (&childev, childcb, SIGCHLD);
1085 ev_set_priority (&childev, EV_MAXPRI); 1518 ev_set_priority (&childev, EV_MAXPRI);
1086 ev_signal_start (EV_A_ &childev); 1519 ev_signal_start (EV_A_ &childev);
1087 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1520 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1104#ifndef _WIN32 1537#ifndef _WIN32
1105 ev_ref (EV_A); /* child watcher */ 1538 ev_ref (EV_A); /* child watcher */
1106 ev_signal_stop (EV_A_ &childev); 1539 ev_signal_stop (EV_A_ &childev);
1107#endif 1540#endif
1108 1541
1109 ev_ref (EV_A); /* signal watcher */
1110 ev_io_stop (EV_A_ &sigev);
1111
1112 close (sigpipe [0]); sigpipe [0] = 0;
1113 close (sigpipe [1]); sigpipe [1] = 0;
1114
1115 loop_destroy (EV_A); 1542 loop_destroy (EV_A);
1116} 1543}
1117 1544
1118void 1545void
1119ev_default_fork (void) 1546ev_default_fork (void)
… …
1121#if EV_MULTIPLICITY 1548#if EV_MULTIPLICITY
1122 struct ev_loop *loop = ev_default_loop_ptr; 1549 struct ev_loop *loop = ev_default_loop_ptr;
1123#endif 1550#endif
1124 1551
1125 if (backend) 1552 if (backend)
1126 postfork = 1; 1553 postfork = 1; /* must be in line with ev_loop_fork */
1127} 1554}
1128 1555
1129/*****************************************************************************/ 1556/*****************************************************************************/
1130 1557
1131int inline_size 1558void
1132any_pending (EV_P) 1559ev_invoke (EV_P_ void *w, int revents)
1133{ 1560{
1134 int pri; 1561 EV_CB_INVOKE ((W)w, revents);
1135
1136 for (pri = NUMPRI; pri--; )
1137 if (pendingcnt [pri])
1138 return 1;
1139
1140 return 0;
1141} 1562}
1142 1563
1143void inline_speed 1564void inline_speed
1144call_pending (EV_P) 1565call_pending (EV_P)
1145{ 1566{
… …
1158 EV_CB_INVOKE (p->w, p->events); 1579 EV_CB_INVOKE (p->w, p->events);
1159 } 1580 }
1160 } 1581 }
1161} 1582}
1162 1583
1584#if EV_IDLE_ENABLE
1585void inline_size
1586idle_reify (EV_P)
1587{
1588 if (expect_false (idleall))
1589 {
1590 int pri;
1591
1592 for (pri = NUMPRI; pri--; )
1593 {
1594 if (pendingcnt [pri])
1595 break;
1596
1597 if (idlecnt [pri])
1598 {
1599 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1600 break;
1601 }
1602 }
1603 }
1604}
1605#endif
1606
1163void inline_size 1607void inline_size
1164timers_reify (EV_P) 1608timers_reify (EV_P)
1165{ 1609{
1166 while (timercnt && ((WT)timers [0])->at <= mn_now) 1610 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1167 { 1611 {
1168 ev_timer *w = timers [0]; 1612 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1169 1613
1170 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1614 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1171 1615
1172 /* first reschedule or stop timer */ 1616 /* first reschedule or stop timer */
1173 if (w->repeat) 1617 if (w->repeat)
1174 { 1618 {
1619 ev_at (w) += w->repeat;
1620 if (ev_at (w) < mn_now)
1621 ev_at (w) = mn_now;
1622
1175 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1623 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1176 1624
1177 ((WT)w)->at += w->repeat; 1625 ANHE_at_set (timers [HEAP0]);
1178 if (((WT)w)->at < mn_now)
1179 ((WT)w)->at = mn_now;
1180
1181 downheap ((WT *)timers, timercnt, 0); 1626 downheap (timers, timercnt, HEAP0);
1182 } 1627 }
1183 else 1628 else
1184 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1629 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1185 1630
1186 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1631 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1189 1634
1190#if EV_PERIODIC_ENABLE 1635#if EV_PERIODIC_ENABLE
1191void inline_size 1636void inline_size
1192periodics_reify (EV_P) 1637periodics_reify (EV_P)
1193{ 1638{
1194 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1639 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1195 { 1640 {
1196 ev_periodic *w = periodics [0]; 1641 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1197 1642
1198 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1643 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1199 1644
1200 /* first reschedule or stop timer */ 1645 /* first reschedule or stop timer */
1201 if (w->reschedule_cb) 1646 if (w->reschedule_cb)
1202 { 1647 {
1203 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1648 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649
1204 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1650 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1651
1652 ANHE_at_set (periodics [HEAP0]);
1205 downheap ((WT *)periodics, periodiccnt, 0); 1653 downheap (periodics, periodiccnt, HEAP0);
1206 } 1654 }
1207 else if (w->interval) 1655 else if (w->interval)
1208 { 1656 {
1209 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1657 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1210 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1658 /* if next trigger time is not sufficiently in the future, put it there */
1659 /* this might happen because of floating point inexactness */
1660 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1661 {
1662 ev_at (w) += w->interval;
1663
1664 /* if interval is unreasonably low we might still have a time in the past */
1665 /* so correct this. this will make the periodic very inexact, but the user */
1666 /* has effectively asked to get triggered more often than possible */
1667 if (ev_at (w) < ev_rt_now)
1668 ev_at (w) = ev_rt_now;
1669 }
1670
1671 ANHE_at_set (periodics [HEAP0]);
1211 downheap ((WT *)periodics, periodiccnt, 0); 1672 downheap (periodics, periodiccnt, HEAP0);
1212 } 1673 }
1213 else 1674 else
1214 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1675 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1215 1676
1216 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1677 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1221periodics_reschedule (EV_P) 1682periodics_reschedule (EV_P)
1222{ 1683{
1223 int i; 1684 int i;
1224 1685
1225 /* adjust periodics after time jump */ 1686 /* adjust periodics after time jump */
1687 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1688 {
1689 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1690
1691 if (w->reschedule_cb)
1692 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693 else if (w->interval)
1694 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695
1696 ANHE_at_set (periodics [i]);
1697 }
1698
1699 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */
1700 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1226 for (i = 0; i < periodiccnt; ++i) 1701 for (i = 0; i < periodiccnt; ++i)
1227 { 1702 upheap (periodics, i + HEAP0);
1228 ev_periodic *w = periodics [i]; 1703}
1704#endif
1229 1705
1230 if (w->reschedule_cb) 1706void inline_speed
1231 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1707time_update (EV_P_ ev_tstamp max_block)
1232 else if (w->interval) 1708{
1233 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1709 int i;
1710
1711#if EV_USE_MONOTONIC
1712 if (expect_true (have_monotonic))
1234 } 1713 {
1714 ev_tstamp odiff = rtmn_diff;
1235 1715
1236 /* now rebuild the heap */
1237 for (i = periodiccnt >> 1; i--; )
1238 downheap ((WT *)periodics, periodiccnt, i);
1239}
1240#endif
1241
1242int inline_size
1243time_update_monotonic (EV_P)
1244{
1245 mn_now = get_clock (); 1716 mn_now = get_clock ();
1246 1717
1718 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1719 /* interpolate in the meantime */
1247 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1720 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1248 { 1721 {
1249 ev_rt_now = rtmn_diff + mn_now; 1722 ev_rt_now = rtmn_diff + mn_now;
1250 return 0; 1723 return;
1251 } 1724 }
1252 else 1725
1253 {
1254 now_floor = mn_now; 1726 now_floor = mn_now;
1255 ev_rt_now = ev_time (); 1727 ev_rt_now = ev_time ();
1256 return 1;
1257 }
1258}
1259 1728
1260void inline_size 1729 /* loop a few times, before making important decisions.
1261time_update (EV_P) 1730 * on the choice of "4": one iteration isn't enough,
1262{ 1731 * in case we get preempted during the calls to
1263 int i; 1732 * ev_time and get_clock. a second call is almost guaranteed
1264 1733 * to succeed in that case, though. and looping a few more times
1265#if EV_USE_MONOTONIC 1734 * doesn't hurt either as we only do this on time-jumps or
1266 if (expect_true (have_monotonic)) 1735 * in the unlikely event of having been preempted here.
1267 { 1736 */
1268 if (time_update_monotonic (EV_A)) 1737 for (i = 4; --i; )
1269 { 1738 {
1270 ev_tstamp odiff = rtmn_diff;
1271
1272 /* loop a few times, before making important decisions.
1273 * on the choice of "4": one iteration isn't enough,
1274 * in case we get preempted during the calls to
1275 * ev_time and get_clock. a second call is almost guarenteed
1276 * to succeed in that case, though. and looping a few more times
1277 * doesn't hurt either as we only do this on time-jumps or
1278 * in the unlikely event of getting preempted here.
1279 */
1280 for (i = 4; --i; )
1281 {
1282 rtmn_diff = ev_rt_now - mn_now; 1739 rtmn_diff = ev_rt_now - mn_now;
1283 1740
1284 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1741 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1285 return; /* all is well */ 1742 return; /* all is well */
1286 1743
1287 ev_rt_now = ev_time (); 1744 ev_rt_now = ev_time ();
1288 mn_now = get_clock (); 1745 mn_now = get_clock ();
1289 now_floor = mn_now; 1746 now_floor = mn_now;
1290 } 1747 }
1291 1748
1292# if EV_PERIODIC_ENABLE 1749# if EV_PERIODIC_ENABLE
1293 periodics_reschedule (EV_A); 1750 periodics_reschedule (EV_A);
1294# endif 1751# endif
1295 /* no timer adjustment, as the monotonic clock doesn't jump */ 1752 /* no timer adjustment, as the monotonic clock doesn't jump */
1296 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1753 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1297 }
1298 } 1754 }
1299 else 1755 else
1300#endif 1756#endif
1301 { 1757 {
1302 ev_rt_now = ev_time (); 1758 ev_rt_now = ev_time ();
1303 1759
1304 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1760 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1305 { 1761 {
1306#if EV_PERIODIC_ENABLE 1762#if EV_PERIODIC_ENABLE
1307 periodics_reschedule (EV_A); 1763 periodics_reschedule (EV_A);
1308#endif 1764#endif
1309
1310 /* adjust timers. this is easy, as the offset is the same for all */ 1765 /* adjust timers. this is easy, as the offset is the same for all of them */
1311 for (i = 0; i < timercnt; ++i) 1766 for (i = 0; i < timercnt; ++i)
1767 {
1768 ANHE *he = timers + i + HEAP0;
1312 ((WT)timers [i])->at += ev_rt_now - mn_now; 1769 ANHE_w (*he)->at += ev_rt_now - mn_now;
1770 ANHE_at_set (*he);
1771 }
1313 } 1772 }
1314 1773
1315 mn_now = ev_rt_now; 1774 mn_now = ev_rt_now;
1316 } 1775 }
1317} 1776}
… …
1331static int loop_done; 1790static int loop_done;
1332 1791
1333void 1792void
1334ev_loop (EV_P_ int flags) 1793ev_loop (EV_P_ int flags)
1335{ 1794{
1336 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1795 loop_done = EVUNLOOP_CANCEL;
1337 ? EVUNLOOP_ONE
1338 : EVUNLOOP_CANCEL;
1339 1796
1340 while (activecnt) 1797 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1798
1799 do
1341 { 1800 {
1342 /* we might have forked, so reify kernel state if necessary */ 1801#ifndef _WIN32
1802 if (expect_false (curpid)) /* penalise the forking check even more */
1803 if (expect_false (getpid () != curpid))
1804 {
1805 curpid = getpid ();
1806 postfork = 1;
1807 }
1808#endif
1809
1343 #if EV_FORK_ENABLE 1810#if EV_FORK_ENABLE
1811 /* we might have forked, so queue fork handlers */
1344 if (expect_false (postfork)) 1812 if (expect_false (postfork))
1345 if (forkcnt) 1813 if (forkcnt)
1346 { 1814 {
1347 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1815 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1348 call_pending (EV_A); 1816 call_pending (EV_A);
1349 } 1817 }
1350 #endif 1818#endif
1351 1819
1352 /* queue check watchers (and execute them) */ 1820 /* queue prepare watchers (and execute them) */
1353 if (expect_false (preparecnt)) 1821 if (expect_false (preparecnt))
1354 { 1822 {
1355 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1823 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1356 call_pending (EV_A); 1824 call_pending (EV_A);
1357 } 1825 }
1358 1826
1827 if (expect_false (!activecnt))
1828 break;
1829
1359 /* we might have forked, so reify kernel state if necessary */ 1830 /* we might have forked, so reify kernel state if necessary */
1360 if (expect_false (postfork)) 1831 if (expect_false (postfork))
1361 loop_fork (EV_A); 1832 loop_fork (EV_A);
1362 1833
1363 /* update fd-related kernel structures */ 1834 /* update fd-related kernel structures */
1364 fd_reify (EV_A); 1835 fd_reify (EV_A);
1365 1836
1366 /* calculate blocking time */ 1837 /* calculate blocking time */
1367 { 1838 {
1368 double block; 1839 ev_tstamp waittime = 0.;
1840 ev_tstamp sleeptime = 0.;
1369 1841
1370 if (flags & EVLOOP_NONBLOCK || idlecnt) 1842 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1371 block = 0.; /* do not block at all */
1372 else
1373 { 1843 {
1374 /* update time to cancel out callback processing overhead */ 1844 /* update time to cancel out callback processing overhead */
1375#if EV_USE_MONOTONIC
1376 if (expect_true (have_monotonic))
1377 time_update_monotonic (EV_A); 1845 time_update (EV_A_ 1e100);
1378 else
1379#endif
1380 {
1381 ev_rt_now = ev_time ();
1382 mn_now = ev_rt_now;
1383 }
1384 1846
1385 block = MAX_BLOCKTIME; 1847 waittime = MAX_BLOCKTIME;
1386 1848
1387 if (timercnt) 1849 if (timercnt)
1388 { 1850 {
1389 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1851 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1390 if (block > to) block = to; 1852 if (waittime > to) waittime = to;
1391 } 1853 }
1392 1854
1393#if EV_PERIODIC_ENABLE 1855#if EV_PERIODIC_ENABLE
1394 if (periodiccnt) 1856 if (periodiccnt)
1395 { 1857 {
1396 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1858 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1397 if (block > to) block = to; 1859 if (waittime > to) waittime = to;
1398 } 1860 }
1399#endif 1861#endif
1400 1862
1401 if (expect_false (block < 0.)) block = 0.; 1863 if (expect_false (waittime < timeout_blocktime))
1864 waittime = timeout_blocktime;
1865
1866 sleeptime = waittime - backend_fudge;
1867
1868 if (expect_true (sleeptime > io_blocktime))
1869 sleeptime = io_blocktime;
1870
1871 if (sleeptime)
1872 {
1873 ev_sleep (sleeptime);
1874 waittime -= sleeptime;
1875 }
1402 } 1876 }
1403 1877
1878 ++loop_count;
1404 backend_poll (EV_A_ block); 1879 backend_poll (EV_A_ waittime);
1880
1881 /* update ev_rt_now, do magic */
1882 time_update (EV_A_ waittime + sleeptime);
1405 } 1883 }
1406
1407 /* update ev_rt_now, do magic */
1408 time_update (EV_A);
1409 1884
1410 /* queue pending timers and reschedule them */ 1885 /* queue pending timers and reschedule them */
1411 timers_reify (EV_A); /* relative timers called last */ 1886 timers_reify (EV_A); /* relative timers called last */
1412#if EV_PERIODIC_ENABLE 1887#if EV_PERIODIC_ENABLE
1413 periodics_reify (EV_A); /* absolute timers called first */ 1888 periodics_reify (EV_A); /* absolute timers called first */
1414#endif 1889#endif
1415 1890
1891#if EV_IDLE_ENABLE
1416 /* queue idle watchers unless other events are pending */ 1892 /* queue idle watchers unless other events are pending */
1417 if (idlecnt && !any_pending (EV_A)) 1893 idle_reify (EV_A);
1418 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1894#endif
1419 1895
1420 /* queue check watchers, to be executed first */ 1896 /* queue check watchers, to be executed first */
1421 if (expect_false (checkcnt)) 1897 if (expect_false (checkcnt))
1422 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1898 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1423 1899
1424 call_pending (EV_A); 1900 call_pending (EV_A);
1425
1426 if (expect_false (loop_done))
1427 break;
1428 } 1901 }
1902 while (expect_true (
1903 activecnt
1904 && !loop_done
1905 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1906 ));
1429 1907
1430 if (loop_done == EVUNLOOP_ONE) 1908 if (loop_done == EVUNLOOP_ONE)
1431 loop_done = EVUNLOOP_CANCEL; 1909 loop_done = EVUNLOOP_CANCEL;
1432} 1910}
1433 1911
… …
1460 head = &(*head)->next; 1938 head = &(*head)->next;
1461 } 1939 }
1462} 1940}
1463 1941
1464void inline_speed 1942void inline_speed
1465ev_clear_pending (EV_P_ W w) 1943clear_pending (EV_P_ W w)
1466{ 1944{
1467 if (w->pending) 1945 if (w->pending)
1468 { 1946 {
1469 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1947 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1470 w->pending = 0; 1948 w->pending = 0;
1471 } 1949 }
1472} 1950}
1473 1951
1952int
1953ev_clear_pending (EV_P_ void *w)
1954{
1955 W w_ = (W)w;
1956 int pending = w_->pending;
1957
1958 if (expect_true (pending))
1959 {
1960 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1961 w_->pending = 0;
1962 p->w = 0;
1963 return p->events;
1964 }
1965 else
1966 return 0;
1967}
1968
1969void inline_size
1970pri_adjust (EV_P_ W w)
1971{
1972 int pri = w->priority;
1973 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1974 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1975 w->priority = pri;
1976}
1977
1474void inline_speed 1978void inline_speed
1475ev_start (EV_P_ W w, int active) 1979ev_start (EV_P_ W w, int active)
1476{ 1980{
1477 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1981 pri_adjust (EV_A_ w);
1478 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1479
1480 w->active = active; 1982 w->active = active;
1481 ev_ref (EV_A); 1983 ev_ref (EV_A);
1482} 1984}
1483 1985
1484void inline_size 1986void inline_size
… …
1488 w->active = 0; 1990 w->active = 0;
1489} 1991}
1490 1992
1491/*****************************************************************************/ 1993/*****************************************************************************/
1492 1994
1493void 1995void noinline
1494ev_io_start (EV_P_ ev_io *w) 1996ev_io_start (EV_P_ ev_io *w)
1495{ 1997{
1496 int fd = w->fd; 1998 int fd = w->fd;
1497 1999
1498 if (expect_false (ev_is_active (w))) 2000 if (expect_false (ev_is_active (w)))
… …
1500 2002
1501 assert (("ev_io_start called with negative fd", fd >= 0)); 2003 assert (("ev_io_start called with negative fd", fd >= 0));
1502 2004
1503 ev_start (EV_A_ (W)w, 1); 2005 ev_start (EV_A_ (W)w, 1);
1504 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2006 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1505 wlist_add ((WL *)&anfds[fd].head, (WL)w); 2007 wlist_add (&anfds[fd].head, (WL)w);
1506 2008
1507 fd_change (EV_A_ fd); 2009 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2010 w->events &= ~EV_IOFDSET;
1508} 2011}
1509 2012
1510void 2013void noinline
1511ev_io_stop (EV_P_ ev_io *w) 2014ev_io_stop (EV_P_ ev_io *w)
1512{ 2015{
1513 ev_clear_pending (EV_A_ (W)w); 2016 clear_pending (EV_A_ (W)w);
1514 if (expect_false (!ev_is_active (w))) 2017 if (expect_false (!ev_is_active (w)))
1515 return; 2018 return;
1516 2019
1517 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2020 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1518 2021
1519 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 2022 wlist_del (&anfds[w->fd].head, (WL)w);
1520 ev_stop (EV_A_ (W)w); 2023 ev_stop (EV_A_ (W)w);
1521 2024
1522 fd_change (EV_A_ w->fd); 2025 fd_change (EV_A_ w->fd, 1);
1523} 2026}
1524 2027
1525void 2028void noinline
1526ev_timer_start (EV_P_ ev_timer *w) 2029ev_timer_start (EV_P_ ev_timer *w)
1527{ 2030{
1528 if (expect_false (ev_is_active (w))) 2031 if (expect_false (ev_is_active (w)))
1529 return; 2032 return;
1530 2033
1531 ((WT)w)->at += mn_now; 2034 ev_at (w) += mn_now;
1532 2035
1533 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2036 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1534 2037
1535 ev_start (EV_A_ (W)w, ++timercnt); 2038 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1536 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 2039 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1537 timers [timercnt - 1] = w; 2040 ANHE_w (timers [ev_active (w)]) = (WT)w;
1538 upheap ((WT *)timers, timercnt - 1); 2041 ANHE_at_set (timers [ev_active (w)]);
2042 upheap (timers, ev_active (w));
1539 2043
1540 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2044 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1541} 2045}
1542 2046
1543void 2047void noinline
1544ev_timer_stop (EV_P_ ev_timer *w) 2048ev_timer_stop (EV_P_ ev_timer *w)
1545{ 2049{
1546 ev_clear_pending (EV_A_ (W)w); 2050 clear_pending (EV_A_ (W)w);
1547 if (expect_false (!ev_is_active (w))) 2051 if (expect_false (!ev_is_active (w)))
1548 return; 2052 return;
1549 2053
1550 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1551
1552 { 2054 {
1553 int active = ((W)w)->active; 2055 int active = ev_active (w);
1554 2056
2057 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2058
1555 if (expect_true (--active < --timercnt)) 2059 if (expect_true (active < timercnt + HEAP0 - 1))
1556 { 2060 {
1557 timers [active] = timers [timercnt]; 2061 timers [active] = timers [timercnt + HEAP0 - 1];
1558 adjustheap ((WT *)timers, timercnt, active); 2062 adjustheap (timers, timercnt, active);
1559 } 2063 }
2064
2065 --timercnt;
1560 } 2066 }
1561 2067
1562 ((WT)w)->at -= mn_now; 2068 ev_at (w) -= mn_now;
1563 2069
1564 ev_stop (EV_A_ (W)w); 2070 ev_stop (EV_A_ (W)w);
1565} 2071}
1566 2072
1567void 2073void noinline
1568ev_timer_again (EV_P_ ev_timer *w) 2074ev_timer_again (EV_P_ ev_timer *w)
1569{ 2075{
1570 if (ev_is_active (w)) 2076 if (ev_is_active (w))
1571 { 2077 {
1572 if (w->repeat) 2078 if (w->repeat)
1573 { 2079 {
1574 ((WT)w)->at = mn_now + w->repeat; 2080 ev_at (w) = mn_now + w->repeat;
2081 ANHE_at_set (timers [ev_active (w)]);
1575 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2082 adjustheap (timers, timercnt, ev_active (w));
1576 } 2083 }
1577 else 2084 else
1578 ev_timer_stop (EV_A_ w); 2085 ev_timer_stop (EV_A_ w);
1579 } 2086 }
1580 else if (w->repeat) 2087 else if (w->repeat)
1581 { 2088 {
1582 w->at = w->repeat; 2089 ev_at (w) = w->repeat;
1583 ev_timer_start (EV_A_ w); 2090 ev_timer_start (EV_A_ w);
1584 } 2091 }
1585} 2092}
1586 2093
1587#if EV_PERIODIC_ENABLE 2094#if EV_PERIODIC_ENABLE
1588void 2095void noinline
1589ev_periodic_start (EV_P_ ev_periodic *w) 2096ev_periodic_start (EV_P_ ev_periodic *w)
1590{ 2097{
1591 if (expect_false (ev_is_active (w))) 2098 if (expect_false (ev_is_active (w)))
1592 return; 2099 return;
1593 2100
1594 if (w->reschedule_cb) 2101 if (w->reschedule_cb)
1595 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2102 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1596 else if (w->interval) 2103 else if (w->interval)
1597 { 2104 {
1598 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2105 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1599 /* this formula differs from the one in periodic_reify because we do not always round up */ 2106 /* this formula differs from the one in periodic_reify because we do not always round up */
1600 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 2107 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1601 } 2108 }
2109 else
2110 ev_at (w) = w->offset;
1602 2111
1603 ev_start (EV_A_ (W)w, ++periodiccnt); 2112 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1604 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2113 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1605 periodics [periodiccnt - 1] = w; 2114 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1606 upheap ((WT *)periodics, periodiccnt - 1); 2115 ANHE_at_set (periodics [ev_active (w)]);
2116 upheap (periodics, ev_active (w));
1607 2117
1608 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2118 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1609} 2119}
1610 2120
1611void 2121void noinline
1612ev_periodic_stop (EV_P_ ev_periodic *w) 2122ev_periodic_stop (EV_P_ ev_periodic *w)
1613{ 2123{
1614 ev_clear_pending (EV_A_ (W)w); 2124 clear_pending (EV_A_ (W)w);
1615 if (expect_false (!ev_is_active (w))) 2125 if (expect_false (!ev_is_active (w)))
1616 return; 2126 return;
1617 2127
1618 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1619
1620 { 2128 {
1621 int active = ((W)w)->active; 2129 int active = ev_active (w);
1622 2130
2131 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2132
1623 if (expect_true (--active < --periodiccnt)) 2133 if (expect_true (active < periodiccnt + HEAP0 - 1))
1624 { 2134 {
1625 periodics [active] = periodics [periodiccnt]; 2135 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1626 adjustheap ((WT *)periodics, periodiccnt, active); 2136 adjustheap (periodics, periodiccnt, active);
1627 } 2137 }
2138
2139 --periodiccnt;
1628 } 2140 }
1629 2141
1630 ev_stop (EV_A_ (W)w); 2142 ev_stop (EV_A_ (W)w);
1631} 2143}
1632 2144
1633void 2145void noinline
1634ev_periodic_again (EV_P_ ev_periodic *w) 2146ev_periodic_again (EV_P_ ev_periodic *w)
1635{ 2147{
1636 /* TODO: use adjustheap and recalculation */ 2148 /* TODO: use adjustheap and recalculation */
1637 ev_periodic_stop (EV_A_ w); 2149 ev_periodic_stop (EV_A_ w);
1638 ev_periodic_start (EV_A_ w); 2150 ev_periodic_start (EV_A_ w);
… …
1641 2153
1642#ifndef SA_RESTART 2154#ifndef SA_RESTART
1643# define SA_RESTART 0 2155# define SA_RESTART 0
1644#endif 2156#endif
1645 2157
1646void 2158void noinline
1647ev_signal_start (EV_P_ ev_signal *w) 2159ev_signal_start (EV_P_ ev_signal *w)
1648{ 2160{
1649#if EV_MULTIPLICITY 2161#if EV_MULTIPLICITY
1650 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2162 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1651#endif 2163#endif
1652 if (expect_false (ev_is_active (w))) 2164 if (expect_false (ev_is_active (w)))
1653 return; 2165 return;
1654 2166
1655 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2167 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1656 2168
2169 evpipe_init (EV_A);
2170
2171 {
2172#ifndef _WIN32
2173 sigset_t full, prev;
2174 sigfillset (&full);
2175 sigprocmask (SIG_SETMASK, &full, &prev);
2176#endif
2177
2178 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2179
2180#ifndef _WIN32
2181 sigprocmask (SIG_SETMASK, &prev, 0);
2182#endif
2183 }
2184
1657 ev_start (EV_A_ (W)w, 1); 2185 ev_start (EV_A_ (W)w, 1);
1658 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1659 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2186 wlist_add (&signals [w->signum - 1].head, (WL)w);
1660 2187
1661 if (!((WL)w)->next) 2188 if (!((WL)w)->next)
1662 { 2189 {
1663#if _WIN32 2190#if _WIN32
1664 signal (w->signum, sighandler); 2191 signal (w->signum, ev_sighandler);
1665#else 2192#else
1666 struct sigaction sa; 2193 struct sigaction sa;
1667 sa.sa_handler = sighandler; 2194 sa.sa_handler = ev_sighandler;
1668 sigfillset (&sa.sa_mask); 2195 sigfillset (&sa.sa_mask);
1669 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2196 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1670 sigaction (w->signum, &sa, 0); 2197 sigaction (w->signum, &sa, 0);
1671#endif 2198#endif
1672 } 2199 }
1673} 2200}
1674 2201
1675void 2202void noinline
1676ev_signal_stop (EV_P_ ev_signal *w) 2203ev_signal_stop (EV_P_ ev_signal *w)
1677{ 2204{
1678 ev_clear_pending (EV_A_ (W)w); 2205 clear_pending (EV_A_ (W)w);
1679 if (expect_false (!ev_is_active (w))) 2206 if (expect_false (!ev_is_active (w)))
1680 return; 2207 return;
1681 2208
1682 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2209 wlist_del (&signals [w->signum - 1].head, (WL)w);
1683 ev_stop (EV_A_ (W)w); 2210 ev_stop (EV_A_ (W)w);
1684 2211
1685 if (!signals [w->signum - 1].head) 2212 if (!signals [w->signum - 1].head)
1686 signal (w->signum, SIG_DFL); 2213 signal (w->signum, SIG_DFL);
1687} 2214}
… …
1694#endif 2221#endif
1695 if (expect_false (ev_is_active (w))) 2222 if (expect_false (ev_is_active (w)))
1696 return; 2223 return;
1697 2224
1698 ev_start (EV_A_ (W)w, 1); 2225 ev_start (EV_A_ (W)w, 1);
1699 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2226 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1700} 2227}
1701 2228
1702void 2229void
1703ev_child_stop (EV_P_ ev_child *w) 2230ev_child_stop (EV_P_ ev_child *w)
1704{ 2231{
1705 ev_clear_pending (EV_A_ (W)w); 2232 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w))) 2233 if (expect_false (!ev_is_active (w)))
1707 return; 2234 return;
1708 2235
1709 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2236 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1710 ev_stop (EV_A_ (W)w); 2237 ev_stop (EV_A_ (W)w);
1711} 2238}
1712 2239
1713#if EV_STAT_ENABLE 2240#if EV_STAT_ENABLE
1714 2241
… …
1718# endif 2245# endif
1719 2246
1720#define DEF_STAT_INTERVAL 5.0074891 2247#define DEF_STAT_INTERVAL 5.0074891
1721#define MIN_STAT_INTERVAL 0.1074891 2248#define MIN_STAT_INTERVAL 0.1074891
1722 2249
1723void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2250static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1724 2251
1725#if EV_USE_INOTIFY 2252#if EV_USE_INOTIFY
1726# define EV_INOTIFY_BUFSIZE 8192 2253# define EV_INOTIFY_BUFSIZE 8192
1727 2254
1728static void noinline 2255static void noinline
… …
1733 if (w->wd < 0) 2260 if (w->wd < 0)
1734 { 2261 {
1735 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2262 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1736 2263
1737 /* monitor some parent directory for speedup hints */ 2264 /* monitor some parent directory for speedup hints */
2265 /* note that exceeding the hardcoded limit is not a correctness issue, */
2266 /* but an efficiency issue only */
1738 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2267 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1739 { 2268 {
1740 char path [4096]; 2269 char path [4096];
1741 strcpy (path, w->path); 2270 strcpy (path, w->path);
1742 2271
… …
1879 w->attr.st_nlink = 0; 2408 w->attr.st_nlink = 0;
1880 else if (!w->attr.st_nlink) 2409 else if (!w->attr.st_nlink)
1881 w->attr.st_nlink = 1; 2410 w->attr.st_nlink = 1;
1882} 2411}
1883 2412
1884void noinline 2413static void noinline
1885stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2414stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1886{ 2415{
1887 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2416 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1888 2417
1889 /* we copy this here each the time so that */ 2418 /* we copy this here each the time so that */
… …
1946} 2475}
1947 2476
1948void 2477void
1949ev_stat_stop (EV_P_ ev_stat *w) 2478ev_stat_stop (EV_P_ ev_stat *w)
1950{ 2479{
1951 ev_clear_pending (EV_A_ (W)w); 2480 clear_pending (EV_A_ (W)w);
1952 if (expect_false (!ev_is_active (w))) 2481 if (expect_false (!ev_is_active (w)))
1953 return; 2482 return;
1954 2483
1955#if EV_USE_INOTIFY 2484#if EV_USE_INOTIFY
1956 infy_del (EV_A_ w); 2485 infy_del (EV_A_ w);
… …
1959 2488
1960 ev_stop (EV_A_ (W)w); 2489 ev_stop (EV_A_ (W)w);
1961} 2490}
1962#endif 2491#endif
1963 2492
2493#if EV_IDLE_ENABLE
1964void 2494void
1965ev_idle_start (EV_P_ ev_idle *w) 2495ev_idle_start (EV_P_ ev_idle *w)
1966{ 2496{
1967 if (expect_false (ev_is_active (w))) 2497 if (expect_false (ev_is_active (w)))
1968 return; 2498 return;
1969 2499
2500 pri_adjust (EV_A_ (W)w);
2501
2502 {
2503 int active = ++idlecnt [ABSPRI (w)];
2504
2505 ++idleall;
1970 ev_start (EV_A_ (W)w, ++idlecnt); 2506 ev_start (EV_A_ (W)w, active);
2507
1971 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2508 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1972 idles [idlecnt - 1] = w; 2509 idles [ABSPRI (w)][active - 1] = w;
2510 }
1973} 2511}
1974 2512
1975void 2513void
1976ev_idle_stop (EV_P_ ev_idle *w) 2514ev_idle_stop (EV_P_ ev_idle *w)
1977{ 2515{
1978 ev_clear_pending (EV_A_ (W)w); 2516 clear_pending (EV_A_ (W)w);
1979 if (expect_false (!ev_is_active (w))) 2517 if (expect_false (!ev_is_active (w)))
1980 return; 2518 return;
1981 2519
1982 { 2520 {
1983 int active = ((W)w)->active; 2521 int active = ev_active (w);
1984 idles [active - 1] = idles [--idlecnt]; 2522
1985 ((W)idles [active - 1])->active = active; 2523 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2524 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2525
2526 ev_stop (EV_A_ (W)w);
2527 --idleall;
1986 } 2528 }
1987
1988 ev_stop (EV_A_ (W)w);
1989} 2529}
2530#endif
1990 2531
1991void 2532void
1992ev_prepare_start (EV_P_ ev_prepare *w) 2533ev_prepare_start (EV_P_ ev_prepare *w)
1993{ 2534{
1994 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
… …
2000} 2541}
2001 2542
2002void 2543void
2003ev_prepare_stop (EV_P_ ev_prepare *w) 2544ev_prepare_stop (EV_P_ ev_prepare *w)
2004{ 2545{
2005 ev_clear_pending (EV_A_ (W)w); 2546 clear_pending (EV_A_ (W)w);
2006 if (expect_false (!ev_is_active (w))) 2547 if (expect_false (!ev_is_active (w)))
2007 return; 2548 return;
2008 2549
2009 { 2550 {
2010 int active = ((W)w)->active; 2551 int active = ev_active (w);
2552
2011 prepares [active - 1] = prepares [--preparecnt]; 2553 prepares [active - 1] = prepares [--preparecnt];
2012 ((W)prepares [active - 1])->active = active; 2554 ev_active (prepares [active - 1]) = active;
2013 } 2555 }
2014 2556
2015 ev_stop (EV_A_ (W)w); 2557 ev_stop (EV_A_ (W)w);
2016} 2558}
2017 2559
… …
2027} 2569}
2028 2570
2029void 2571void
2030ev_check_stop (EV_P_ ev_check *w) 2572ev_check_stop (EV_P_ ev_check *w)
2031{ 2573{
2032 ev_clear_pending (EV_A_ (W)w); 2574 clear_pending (EV_A_ (W)w);
2033 if (expect_false (!ev_is_active (w))) 2575 if (expect_false (!ev_is_active (w)))
2034 return; 2576 return;
2035 2577
2036 { 2578 {
2037 int active = ((W)w)->active; 2579 int active = ev_active (w);
2580
2038 checks [active - 1] = checks [--checkcnt]; 2581 checks [active - 1] = checks [--checkcnt];
2039 ((W)checks [active - 1])->active = active; 2582 ev_active (checks [active - 1]) = active;
2040 } 2583 }
2041 2584
2042 ev_stop (EV_A_ (W)w); 2585 ev_stop (EV_A_ (W)w);
2043} 2586}
2044 2587
2045#if EV_EMBED_ENABLE 2588#if EV_EMBED_ENABLE
2046void noinline 2589void noinline
2047ev_embed_sweep (EV_P_ ev_embed *w) 2590ev_embed_sweep (EV_P_ ev_embed *w)
2048{ 2591{
2049 ev_loop (w->loop, EVLOOP_NONBLOCK); 2592 ev_loop (w->other, EVLOOP_NONBLOCK);
2050} 2593}
2051 2594
2052static void 2595static void
2053embed_cb (EV_P_ ev_io *io, int revents) 2596embed_io_cb (EV_P_ ev_io *io, int revents)
2054{ 2597{
2055 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2598 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2056 2599
2057 if (ev_cb (w)) 2600 if (ev_cb (w))
2058 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2601 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2059 else 2602 else
2060 ev_embed_sweep (loop, w); 2603 ev_loop (w->other, EVLOOP_NONBLOCK);
2061} 2604}
2605
2606static void
2607embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2608{
2609 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2610
2611 {
2612 struct ev_loop *loop = w->other;
2613
2614 while (fdchangecnt)
2615 {
2616 fd_reify (EV_A);
2617 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2618 }
2619 }
2620}
2621
2622#if 0
2623static void
2624embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2625{
2626 ev_idle_stop (EV_A_ idle);
2627}
2628#endif
2062 2629
2063void 2630void
2064ev_embed_start (EV_P_ ev_embed *w) 2631ev_embed_start (EV_P_ ev_embed *w)
2065{ 2632{
2066 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
2067 return; 2634 return;
2068 2635
2069 { 2636 {
2070 struct ev_loop *loop = w->loop; 2637 struct ev_loop *loop = w->other;
2071 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2638 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2072 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2639 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2073 } 2640 }
2074 2641
2075 ev_set_priority (&w->io, ev_priority (w)); 2642 ev_set_priority (&w->io, ev_priority (w));
2076 ev_io_start (EV_A_ &w->io); 2643 ev_io_start (EV_A_ &w->io);
2077 2644
2645 ev_prepare_init (&w->prepare, embed_prepare_cb);
2646 ev_set_priority (&w->prepare, EV_MINPRI);
2647 ev_prepare_start (EV_A_ &w->prepare);
2648
2649 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2650
2078 ev_start (EV_A_ (W)w, 1); 2651 ev_start (EV_A_ (W)w, 1);
2079} 2652}
2080 2653
2081void 2654void
2082ev_embed_stop (EV_P_ ev_embed *w) 2655ev_embed_stop (EV_P_ ev_embed *w)
2083{ 2656{
2084 ev_clear_pending (EV_A_ (W)w); 2657 clear_pending (EV_A_ (W)w);
2085 if (expect_false (!ev_is_active (w))) 2658 if (expect_false (!ev_is_active (w)))
2086 return; 2659 return;
2087 2660
2088 ev_io_stop (EV_A_ &w->io); 2661 ev_io_stop (EV_A_ &w->io);
2662 ev_prepare_stop (EV_A_ &w->prepare);
2089 2663
2090 ev_stop (EV_A_ (W)w); 2664 ev_stop (EV_A_ (W)w);
2091} 2665}
2092#endif 2666#endif
2093 2667
… …
2104} 2678}
2105 2679
2106void 2680void
2107ev_fork_stop (EV_P_ ev_fork *w) 2681ev_fork_stop (EV_P_ ev_fork *w)
2108{ 2682{
2109 ev_clear_pending (EV_A_ (W)w); 2683 clear_pending (EV_A_ (W)w);
2110 if (expect_false (!ev_is_active (w))) 2684 if (expect_false (!ev_is_active (w)))
2111 return; 2685 return;
2112 2686
2113 { 2687 {
2114 int active = ((W)w)->active; 2688 int active = ev_active (w);
2689
2115 forks [active - 1] = forks [--forkcnt]; 2690 forks [active - 1] = forks [--forkcnt];
2116 ((W)forks [active - 1])->active = active; 2691 ev_active (forks [active - 1]) = active;
2117 } 2692 }
2118 2693
2119 ev_stop (EV_A_ (W)w); 2694 ev_stop (EV_A_ (W)w);
2695}
2696#endif
2697
2698#if EV_ASYNC_ENABLE
2699void
2700ev_async_start (EV_P_ ev_async *w)
2701{
2702 if (expect_false (ev_is_active (w)))
2703 return;
2704
2705 evpipe_init (EV_A);
2706
2707 ev_start (EV_A_ (W)w, ++asynccnt);
2708 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2709 asyncs [asynccnt - 1] = w;
2710}
2711
2712void
2713ev_async_stop (EV_P_ ev_async *w)
2714{
2715 clear_pending (EV_A_ (W)w);
2716 if (expect_false (!ev_is_active (w)))
2717 return;
2718
2719 {
2720 int active = ev_active (w);
2721
2722 asyncs [active - 1] = asyncs [--asynccnt];
2723 ev_active (asyncs [active - 1]) = active;
2724 }
2725
2726 ev_stop (EV_A_ (W)w);
2727}
2728
2729void
2730ev_async_send (EV_P_ ev_async *w)
2731{
2732 w->sent = 1;
2733 evpipe_write (EV_A_ &gotasync);
2120} 2734}
2121#endif 2735#endif
2122 2736
2123/*****************************************************************************/ 2737/*****************************************************************************/
2124 2738
… …
2182 ev_timer_set (&once->to, timeout, 0.); 2796 ev_timer_set (&once->to, timeout, 0.);
2183 ev_timer_start (EV_A_ &once->to); 2797 ev_timer_start (EV_A_ &once->to);
2184 } 2798 }
2185} 2799}
2186 2800
2801#if EV_MULTIPLICITY
2802 #include "ev_wrap.h"
2803#endif
2804
2187#ifdef __cplusplus 2805#ifdef __cplusplus
2188} 2806}
2189#endif 2807#endif
2190 2808

Diff Legend

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