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

Comparing libev/ev.c (file contents):
Revision 1.161 by root, Sat Dec 1 23:43:45 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{
… …
593 780
594 for (fd = 0; fd < anfdmax; ++fd) 781 for (fd = 0; fd < anfdmax; ++fd)
595 if (anfds [fd].events) 782 if (anfds [fd].events)
596 { 783 {
597 anfds [fd].events = 0; 784 anfds [fd].events = 0;
598 fd_change (EV_A_ fd); 785 fd_change (EV_A_ fd, EV_IOFDSET | 1);
599 } 786 }
600} 787}
601 788
602/*****************************************************************************/ 789/*****************************************************************************/
603 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 */
604void inline_speed 810void inline_speed
605upheap (WT *heap, int k) 811upheap (ANHE *heap, int k)
606{ 812{
607 WT w = heap [k]; 813 ANHE he = heap [k];
608 814
609 while (k && heap [k >> 1]->at > w->at) 815 for (;;)
610 { 816 {
817 int p = HPARENT (k);
818
819 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
820 break;
821
611 heap [k] = heap [k >> 1]; 822 heap [k] = heap [p];
612 ((W)heap [k])->active = k + 1; 823 ev_active (ANHE_w (heap [k])) = k;
613 k >>= 1; 824 k = p;
614 } 825 }
615 826
616 heap [k] = w; 827 heap [k] = he;
617 ((W)heap [k])->active = k + 1; 828 ev_active (ANHE_w (he)) = k;
618
619} 829}
620 830
831/* away from the root */
621void inline_speed 832void inline_speed
622downheap (WT *heap, int N, int k) 833downheap (ANHE *heap, int N, int k)
623{ 834{
624 WT w = heap [k]; 835 ANHE he = heap [k];
836 ANHE *E = heap + N + HEAP0;
625 837
626 while (k < (N >> 1)) 838 for (;;)
627 { 839 {
628 int j = k << 1; 840 ev_tstamp minat;
841 ANHE *minpos;
842 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
629 843
630 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 844 // find minimum child
845 if (expect_true (pos + DHEAP - 1 < E))
631 ++j; 846 {
632 847 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
633 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
634 break; 860 break;
635 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
636 heap [k] = heap [j]; 894 heap [k] = heap [p];
637 ((W)heap [k])->active = k + 1; 895 ev_active (ANHE_w (heap [k])) = k;
638 k = j; 896 k = p;
639 } 897 }
640 898
641 heap [k] = w; 899 heap [k] = he;
642 ((W)heap [k])->active = k + 1; 900 ev_active (ANHE_w (heap [k])) = k;
643} 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
644 932
645void inline_size 933void inline_size
646adjustheap (WT *heap, int N, int k) 934adjustheap (ANHE *heap, int N, int k)
647{ 935{
936 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
648 upheap (heap, k); 937 upheap (heap, k);
938 else
649 downheap (heap, N, k); 939 downheap (heap, N, k);
650} 940}
651 941
652/*****************************************************************************/ 942/*****************************************************************************/
653 943
654typedef struct 944typedef struct
655{ 945{
656 WL head; 946 WL head;
657 sig_atomic_t volatile gotsig; 947 EV_ATOMIC_T gotsig;
658} ANSIG; 948} ANSIG;
659 949
660static ANSIG *signals; 950static ANSIG *signals;
661static int signalmax; 951static int signalmax;
662 952
663static int sigpipe [2]; 953static EV_ATOMIC_T gotsig;
664static sig_atomic_t volatile gotsig;
665static ev_io sigev;
666 954
667void inline_size 955void inline_size
668signals_init (ANSIG *base, int count) 956signals_init (ANSIG *base, int count)
669{ 957{
670 while (count--) 958 while (count--)
… …
674 962
675 ++base; 963 ++base;
676 } 964 }
677} 965}
678 966
679static void 967/*****************************************************************************/
680sighandler (int signum)
681{
682#if _WIN32
683 signal (signum, sighandler);
684#endif
685 968
686 signals [signum - 1].gotsig = 1;
687
688 if (!gotsig)
689 {
690 int old_errno = errno;
691 gotsig = 1;
692 write (sigpipe [1], &signum, 1);
693 errno = old_errno;
694 }
695}
696
697void noinline
698ev_feed_signal_event (EV_P_ int signum)
699{
700 WL w;
701
702#if EV_MULTIPLICITY
703 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
704#endif
705
706 --signum;
707
708 if (signum < 0 || signum >= signalmax)
709 return;
710
711 signals [signum].gotsig = 0;
712
713 for (w = signals [signum].head; w; w = w->next)
714 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
715}
716
717static void
718sigcb (EV_P_ ev_io *iow, int revents)
719{
720 int signum;
721
722 read (sigpipe [0], &revents, 1);
723 gotsig = 0;
724
725 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1);
728}
729
730void inline_size 969void inline_speed
731fd_intern (int fd) 970fd_intern (int fd)
732{ 971{
733#ifdef _WIN32 972#ifdef _WIN32
734 int arg = 1; 973 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 974 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
738 fcntl (fd, F_SETFL, O_NONBLOCK); 977 fcntl (fd, F_SETFL, O_NONBLOCK);
739#endif 978#endif
740} 979}
741 980
742static void noinline 981static void noinline
743siginit (EV_P) 982evpipe_init (EV_P)
744{ 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
745 fd_intern (sigpipe [0]); 999 fd_intern (evpipe [0]);
746 fd_intern (sigpipe [1]); 1000 fd_intern (evpipe [1]);
1001 ev_io_set (&pipeev, evpipe [0], EV_READ);
1002 }
747 1003
748 ev_io_set (&sigev, sigpipe [0], EV_READ);
749 ev_io_start (EV_A_ &sigev); 1004 ev_io_start (EV_A_ &pipeev);
750 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
751} 1072}
752 1073
753/*****************************************************************************/ 1074/*****************************************************************************/
754 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
755static ev_child *childs [EV_PID_HASHSIZE]; 1113static WL childs [EV_PID_HASHSIZE];
756 1114
757#ifndef _WIN32 1115#ifndef _WIN32
758 1116
759static ev_signal childev; 1117static ev_signal childev;
760 1118
1119#ifndef WIFCONTINUED
1120# define WIFCONTINUED(status) 0
1121#endif
1122
761void inline_speed 1123void inline_speed
762child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1124child_reap (EV_P_ int chain, int pid, int status)
763{ 1125{
764 ev_child *w; 1126 ev_child *w;
1127 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
765 1128
766 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 {
767 if (w->pid == pid || !w->pid) 1131 if ((w->pid == pid || !w->pid)
1132 && (!traced || (w->flags & 1)))
768 { 1133 {
769 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 */
770 w->rpid = pid; 1135 w->rpid = pid;
771 w->rstatus = status; 1136 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1137 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 1138 }
1139 }
774} 1140}
775 1141
776#ifndef WCONTINUED 1142#ifndef WCONTINUED
777# define WCONTINUED 0 1143# define WCONTINUED 0
778#endif 1144#endif
… …
787 if (!WCONTINUED 1153 if (!WCONTINUED
788 || errno != EINVAL 1154 || errno != EINVAL
789 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1155 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
790 return; 1156 return;
791 1157
792 /* 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 */
793 /* 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 */
794 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1160 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
795 1161
796 child_reap (EV_A_ sw, pid, pid, status); 1162 child_reap (EV_A_ pid, pid, status);
797 if (EV_PID_HASHSIZE > 1) 1163 if (EV_PID_HASHSIZE > 1)
798 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 */
799} 1165}
800 1166
801#endif 1167#endif
802 1168
803/*****************************************************************************/ 1169/*****************************************************************************/
… …
875} 1241}
876 1242
877unsigned int 1243unsigned int
878ev_embeddable_backends (void) 1244ev_embeddable_backends (void)
879{ 1245{
880 return EVBACKEND_EPOLL 1246 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
881 | EVBACKEND_KQUEUE 1247
882 | 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;
883} 1253}
884 1254
885unsigned int 1255unsigned int
886ev_backend (EV_P) 1256ev_backend (EV_P)
887{ 1257{
888 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;
889} 1277}
890 1278
891static void noinline 1279static void noinline
892loop_init (EV_P_ unsigned int flags) 1280loop_init (EV_P_ unsigned int flags)
893{ 1281{
… …
899 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1287 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
900 have_monotonic = 1; 1288 have_monotonic = 1;
901 } 1289 }
902#endif 1290#endif
903 1291
904 ev_rt_now = ev_time (); 1292 ev_rt_now = ev_time ();
905 mn_now = get_clock (); 1293 mn_now = get_clock ();
906 now_floor = mn_now; 1294 now_floor = mn_now;
907 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
908 1305
909 /* pid check not overridable via env */ 1306 /* pid check not overridable via env */
910#ifndef _WIN32 1307#ifndef _WIN32
911 if (flags & EVFLAG_FORKCHECK) 1308 if (flags & EVFLAG_FORKCHECK)
912 curpid = getpid (); 1309 curpid = getpid ();
… …
915 if (!(flags & EVFLAG_NOENV) 1312 if (!(flags & EVFLAG_NOENV)
916 && !enable_secure () 1313 && !enable_secure ()
917 && getenv ("LIBEV_FLAGS")) 1314 && getenv ("LIBEV_FLAGS"))
918 flags = atoi (getenv ("LIBEV_FLAGS")); 1315 flags = atoi (getenv ("LIBEV_FLAGS"));
919 1316
920 if (!(flags & 0x0000ffffUL)) 1317 if (!(flags & 0x0000ffffU))
921 flags |= ev_recommended_backends (); 1318 flags |= ev_recommended_backends ();
922
923 backend = 0;
924 backend_fd = -1;
925#if EV_USE_INOTIFY
926 fs_fd = -2;
927#endif
928 1319
929#if EV_USE_PORT 1320#if EV_USE_PORT
930 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1321 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
931#endif 1322#endif
932#if EV_USE_KQUEUE 1323#if EV_USE_KQUEUE
… …
940#endif 1331#endif
941#if EV_USE_SELECT 1332#if EV_USE_SELECT
942 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1333 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
943#endif 1334#endif
944 1335
945 ev_init (&sigev, sigcb); 1336 ev_init (&pipeev, pipecb);
946 ev_set_priority (&sigev, EV_MAXPRI); 1337 ev_set_priority (&pipeev, EV_MAXPRI);
947 } 1338 }
948} 1339}
949 1340
950static void noinline 1341static void noinline
951loop_destroy (EV_P) 1342loop_destroy (EV_P)
952{ 1343{
953 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 }
954 1362
955#if EV_USE_INOTIFY 1363#if EV_USE_INOTIFY
956 if (fs_fd >= 0) 1364 if (fs_fd >= 0)
957 close (fs_fd); 1365 close (fs_fd);
958#endif 1366#endif
… …
975#if EV_USE_SELECT 1383#if EV_USE_SELECT
976 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1384 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
977#endif 1385#endif
978 1386
979 for (i = NUMPRI; i--; ) 1387 for (i = NUMPRI; i--; )
1388 {
980 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;
981 1396
982 /* have to use the microsoft-never-gets-it-right macro */ 1397 /* have to use the microsoft-never-gets-it-right macro */
983 array_free (fdchange, EMPTY0); 1398 array_free (fdchange, EMPTY);
984 array_free (timer, EMPTY0); 1399 array_free (timer, EMPTY);
985#if EV_PERIODIC_ENABLE 1400#if EV_PERIODIC_ENABLE
986 array_free (periodic, EMPTY0); 1401 array_free (periodic, EMPTY);
987#endif 1402#endif
1403#if EV_FORK_ENABLE
988 array_free (idle, EMPTY0); 1404 array_free (fork, EMPTY);
1405#endif
989 array_free (prepare, EMPTY0); 1406 array_free (prepare, EMPTY);
990 array_free (check, EMPTY0); 1407 array_free (check, EMPTY);
1408#if EV_ASYNC_ENABLE
1409 array_free (async, EMPTY);
1410#endif
991 1411
992 backend = 0; 1412 backend = 0;
993} 1413}
994 1414
1415#if EV_USE_INOTIFY
995void inline_size infy_fork (EV_P); 1416void inline_size infy_fork (EV_P);
1417#endif
996 1418
997void inline_size 1419void inline_size
998loop_fork (EV_P) 1420loop_fork (EV_P)
999{ 1421{
1000#if EV_USE_PORT 1422#if EV_USE_PORT
… …
1008#endif 1430#endif
1009#if EV_USE_INOTIFY 1431#if EV_USE_INOTIFY
1010 infy_fork (EV_A); 1432 infy_fork (EV_A);
1011#endif 1433#endif
1012 1434
1013 if (ev_is_active (&sigev)) 1435 if (ev_is_active (&pipeev))
1014 { 1436 {
1015 /* 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
1016 1443
1017 ev_ref (EV_A); 1444 ev_ref (EV_A);
1018 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 {
1019 close (sigpipe [0]); 1454 close (evpipe [0]);
1020 close (sigpipe [1]); 1455 close (evpipe [1]);
1456 }
1021 1457
1022 while (pipe (sigpipe))
1023 syserr ("(libev) error creating pipe");
1024
1025 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);
1026 } 1461 }
1027 1462
1028 postfork = 0; 1463 postfork = 0;
1029} 1464}
1030 1465
… …
1052} 1487}
1053 1488
1054void 1489void
1055ev_loop_fork (EV_P) 1490ev_loop_fork (EV_P)
1056{ 1491{
1057 postfork = 1; 1492 postfork = 1; /* must be in line with ev_default_fork */
1058} 1493}
1059
1060#endif 1494#endif
1061 1495
1062#if EV_MULTIPLICITY 1496#if EV_MULTIPLICITY
1063struct ev_loop * 1497struct ev_loop *
1064ev_default_loop_init (unsigned int flags) 1498ev_default_loop_init (unsigned int flags)
1065#else 1499#else
1066int 1500int
1067ev_default_loop (unsigned int flags) 1501ev_default_loop (unsigned int flags)
1068#endif 1502#endif
1069{ 1503{
1070 if (sigpipe [0] == sigpipe [1])
1071 if (pipe (sigpipe))
1072 return 0;
1073
1074 if (!ev_default_loop_ptr) 1504 if (!ev_default_loop_ptr)
1075 { 1505 {
1076#if EV_MULTIPLICITY 1506#if EV_MULTIPLICITY
1077 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1507 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1078#else 1508#else
… …
1081 1511
1082 loop_init (EV_A_ flags); 1512 loop_init (EV_A_ flags);
1083 1513
1084 if (ev_backend (EV_A)) 1514 if (ev_backend (EV_A))
1085 { 1515 {
1086 siginit (EV_A);
1087
1088#ifndef _WIN32 1516#ifndef _WIN32
1089 ev_signal_init (&childev, childcb, SIGCHLD); 1517 ev_signal_init (&childev, childcb, SIGCHLD);
1090 ev_set_priority (&childev, EV_MAXPRI); 1518 ev_set_priority (&childev, EV_MAXPRI);
1091 ev_signal_start (EV_A_ &childev); 1519 ev_signal_start (EV_A_ &childev);
1092 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1520 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1109#ifndef _WIN32 1537#ifndef _WIN32
1110 ev_ref (EV_A); /* child watcher */ 1538 ev_ref (EV_A); /* child watcher */
1111 ev_signal_stop (EV_A_ &childev); 1539 ev_signal_stop (EV_A_ &childev);
1112#endif 1540#endif
1113 1541
1114 ev_ref (EV_A); /* signal watcher */
1115 ev_io_stop (EV_A_ &sigev);
1116
1117 close (sigpipe [0]); sigpipe [0] = 0;
1118 close (sigpipe [1]); sigpipe [1] = 0;
1119
1120 loop_destroy (EV_A); 1542 loop_destroy (EV_A);
1121} 1543}
1122 1544
1123void 1545void
1124ev_default_fork (void) 1546ev_default_fork (void)
… …
1126#if EV_MULTIPLICITY 1548#if EV_MULTIPLICITY
1127 struct ev_loop *loop = ev_default_loop_ptr; 1549 struct ev_loop *loop = ev_default_loop_ptr;
1128#endif 1550#endif
1129 1551
1130 if (backend) 1552 if (backend)
1131 postfork = 1; 1553 postfork = 1; /* must be in line with ev_loop_fork */
1132} 1554}
1133 1555
1134/*****************************************************************************/ 1556/*****************************************************************************/
1135 1557
1136int inline_size 1558void
1137any_pending (EV_P) 1559ev_invoke (EV_P_ void *w, int revents)
1138{ 1560{
1139 int pri; 1561 EV_CB_INVOKE ((W)w, revents);
1140
1141 for (pri = NUMPRI; pri--; )
1142 if (pendingcnt [pri])
1143 return 1;
1144
1145 return 0;
1146} 1562}
1147 1563
1148void inline_speed 1564void inline_speed
1149call_pending (EV_P) 1565call_pending (EV_P)
1150{ 1566{
… …
1163 EV_CB_INVOKE (p->w, p->events); 1579 EV_CB_INVOKE (p->w, p->events);
1164 } 1580 }
1165 } 1581 }
1166} 1582}
1167 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
1168void inline_size 1607void inline_size
1169timers_reify (EV_P) 1608timers_reify (EV_P)
1170{ 1609{
1171 while (timercnt && ((WT)timers [0])->at <= mn_now) 1610 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1172 { 1611 {
1173 ev_timer *w = timers [0]; 1612 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1174 1613
1175 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1614 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1176 1615
1177 /* first reschedule or stop timer */ 1616 /* first reschedule or stop timer */
1178 if (w->repeat) 1617 if (w->repeat)
1179 { 1618 {
1619 ev_at (w) += w->repeat;
1620 if (ev_at (w) < mn_now)
1621 ev_at (w) = mn_now;
1622
1180 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.));
1181 1624
1182 ((WT)w)->at += w->repeat; 1625 ANHE_at_set (timers [HEAP0]);
1183 if (((WT)w)->at < mn_now)
1184 ((WT)w)->at = mn_now;
1185
1186 downheap ((WT *)timers, timercnt, 0); 1626 downheap (timers, timercnt, HEAP0);
1187 } 1627 }
1188 else 1628 else
1189 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1629 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1190 1630
1191 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1631 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1194 1634
1195#if EV_PERIODIC_ENABLE 1635#if EV_PERIODIC_ENABLE
1196void inline_size 1636void inline_size
1197periodics_reify (EV_P) 1637periodics_reify (EV_P)
1198{ 1638{
1199 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1639 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1200 { 1640 {
1201 ev_periodic *w = periodics [0]; 1641 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1202 1642
1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1643 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1204 1644
1205 /* first reschedule or stop timer */ 1645 /* first reschedule or stop timer */
1206 if (w->reschedule_cb) 1646 if (w->reschedule_cb)
1207 { 1647 {
1208 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1648 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649
1209 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]);
1210 downheap ((WT *)periodics, periodiccnt, 0); 1653 downheap (periodics, periodiccnt, HEAP0);
1211 } 1654 }
1212 else if (w->interval) 1655 else if (w->interval)
1213 { 1656 {
1214 ((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;
1215 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]);
1216 downheap ((WT *)periodics, periodiccnt, 0); 1672 downheap (periodics, periodiccnt, HEAP0);
1217 } 1673 }
1218 else 1674 else
1219 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1675 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1220 1676
1221 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1677 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1226periodics_reschedule (EV_P) 1682periodics_reschedule (EV_P)
1227{ 1683{
1228 int i; 1684 int i;
1229 1685
1230 /* 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 */
1231 for (i = 0; i < periodiccnt; ++i) 1701 for (i = 0; i < periodiccnt; ++i)
1232 { 1702 upheap (periodics, i + HEAP0);
1233 ev_periodic *w = periodics [i]; 1703}
1704#endif
1234 1705
1235 if (w->reschedule_cb) 1706void inline_speed
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1707time_update (EV_P_ ev_tstamp max_block)
1237 else if (w->interval) 1708{
1238 ((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))
1239 } 1713 {
1714 ev_tstamp odiff = rtmn_diff;
1240 1715
1241 /* now rebuild the heap */
1242 for (i = periodiccnt >> 1; i--; )
1243 downheap ((WT *)periodics, periodiccnt, i);
1244}
1245#endif
1246
1247int inline_size
1248time_update_monotonic (EV_P)
1249{
1250 mn_now = get_clock (); 1716 mn_now = get_clock ();
1251 1717
1718 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1719 /* interpolate in the meantime */
1252 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1720 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1253 { 1721 {
1254 ev_rt_now = rtmn_diff + mn_now; 1722 ev_rt_now = rtmn_diff + mn_now;
1255 return 0; 1723 return;
1256 } 1724 }
1257 else 1725
1258 {
1259 now_floor = mn_now; 1726 now_floor = mn_now;
1260 ev_rt_now = ev_time (); 1727 ev_rt_now = ev_time ();
1261 return 1;
1262 }
1263}
1264 1728
1265void inline_size 1729 /* loop a few times, before making important decisions.
1266time_update (EV_P) 1730 * on the choice of "4": one iteration isn't enough,
1267{ 1731 * in case we get preempted during the calls to
1268 int i; 1732 * ev_time and get_clock. a second call is almost guaranteed
1269 1733 * to succeed in that case, though. and looping a few more times
1270#if EV_USE_MONOTONIC 1734 * doesn't hurt either as we only do this on time-jumps or
1271 if (expect_true (have_monotonic)) 1735 * in the unlikely event of having been preempted here.
1272 { 1736 */
1273 if (time_update_monotonic (EV_A)) 1737 for (i = 4; --i; )
1274 { 1738 {
1275 ev_tstamp odiff = rtmn_diff;
1276
1277 /* loop a few times, before making important decisions.
1278 * on the choice of "4": one iteration isn't enough,
1279 * in case we get preempted during the calls to
1280 * ev_time and get_clock. a second call is almost guaranteed
1281 * to succeed in that case, though. and looping a few more times
1282 * doesn't hurt either as we only do this on time-jumps or
1283 * in the unlikely event of having been preempted here.
1284 */
1285 for (i = 4; --i; )
1286 {
1287 rtmn_diff = ev_rt_now - mn_now; 1739 rtmn_diff = ev_rt_now - mn_now;
1288 1740
1289 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1741 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1290 return; /* all is well */ 1742 return; /* all is well */
1291 1743
1292 ev_rt_now = ev_time (); 1744 ev_rt_now = ev_time ();
1293 mn_now = get_clock (); 1745 mn_now = get_clock ();
1294 now_floor = mn_now; 1746 now_floor = mn_now;
1295 } 1747 }
1296 1748
1297# if EV_PERIODIC_ENABLE 1749# if EV_PERIODIC_ENABLE
1298 periodics_reschedule (EV_A); 1750 periodics_reschedule (EV_A);
1299# endif 1751# endif
1300 /* no timer adjustment, as the monotonic clock doesn't jump */ 1752 /* no timer adjustment, as the monotonic clock doesn't jump */
1301 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1753 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1302 }
1303 } 1754 }
1304 else 1755 else
1305#endif 1756#endif
1306 { 1757 {
1307 ev_rt_now = ev_time (); 1758 ev_rt_now = ev_time ();
1308 1759
1309 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))
1310 { 1761 {
1311#if EV_PERIODIC_ENABLE 1762#if EV_PERIODIC_ENABLE
1312 periodics_reschedule (EV_A); 1763 periodics_reschedule (EV_A);
1313#endif 1764#endif
1314
1315 /* adjust timers. this is easy, as the offset is the same for all of them */ 1765 /* adjust timers. this is easy, as the offset is the same for all of them */
1316 for (i = 0; i < timercnt; ++i) 1766 for (i = 0; i < timercnt; ++i)
1767 {
1768 ANHE *he = timers + i + HEAP0;
1317 ((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 }
1318 } 1772 }
1319 1773
1320 mn_now = ev_rt_now; 1774 mn_now = ev_rt_now;
1321 } 1775 }
1322} 1776}
… …
1336static int loop_done; 1790static int loop_done;
1337 1791
1338void 1792void
1339ev_loop (EV_P_ int flags) 1793ev_loop (EV_P_ int flags)
1340{ 1794{
1341 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1795 loop_done = EVUNLOOP_CANCEL;
1342 ? EVUNLOOP_ONE
1343 : EVUNLOOP_CANCEL;
1344 1796
1345 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1797 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346 1798
1347 do 1799 do
1348 { 1800 {
… …
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1815 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A); 1816 call_pending (EV_A);
1365 } 1817 }
1366#endif 1818#endif
1367 1819
1368 /* queue check watchers (and execute them) */ 1820 /* queue prepare watchers (and execute them) */
1369 if (expect_false (preparecnt)) 1821 if (expect_false (preparecnt))
1370 { 1822 {
1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1823 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1372 call_pending (EV_A); 1824 call_pending (EV_A);
1373 } 1825 }
… …
1382 /* update fd-related kernel structures */ 1834 /* update fd-related kernel structures */
1383 fd_reify (EV_A); 1835 fd_reify (EV_A);
1384 1836
1385 /* calculate blocking time */ 1837 /* calculate blocking time */
1386 { 1838 {
1387 ev_tstamp block; 1839 ev_tstamp waittime = 0.;
1840 ev_tstamp sleeptime = 0.;
1388 1841
1389 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1842 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1390 block = 0.; /* do not block at all */
1391 else
1392 { 1843 {
1393 /* update time to cancel out callback processing overhead */ 1844 /* update time to cancel out callback processing overhead */
1394#if EV_USE_MONOTONIC
1395 if (expect_true (have_monotonic))
1396 time_update_monotonic (EV_A); 1845 time_update (EV_A_ 1e100);
1397 else
1398#endif
1399 {
1400 ev_rt_now = ev_time ();
1401 mn_now = ev_rt_now;
1402 }
1403 1846
1404 block = MAX_BLOCKTIME; 1847 waittime = MAX_BLOCKTIME;
1405 1848
1406 if (timercnt) 1849 if (timercnt)
1407 { 1850 {
1408 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1851 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1409 if (block > to) block = to; 1852 if (waittime > to) waittime = to;
1410 } 1853 }
1411 1854
1412#if EV_PERIODIC_ENABLE 1855#if EV_PERIODIC_ENABLE
1413 if (periodiccnt) 1856 if (periodiccnt)
1414 { 1857 {
1415 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;
1416 if (block > to) block = to; 1859 if (waittime > to) waittime = to;
1417 } 1860 }
1418#endif 1861#endif
1419 1862
1420 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 }
1421 } 1876 }
1422 1877
1878 ++loop_count;
1423 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);
1424 } 1883 }
1425
1426 /* update ev_rt_now, do magic */
1427 time_update (EV_A);
1428 1884
1429 /* queue pending timers and reschedule them */ 1885 /* queue pending timers and reschedule them */
1430 timers_reify (EV_A); /* relative timers called last */ 1886 timers_reify (EV_A); /* relative timers called last */
1431#if EV_PERIODIC_ENABLE 1887#if EV_PERIODIC_ENABLE
1432 periodics_reify (EV_A); /* absolute timers called first */ 1888 periodics_reify (EV_A); /* absolute timers called first */
1433#endif 1889#endif
1434 1890
1891#if EV_IDLE_ENABLE
1435 /* queue idle watchers unless other events are pending */ 1892 /* queue idle watchers unless other events are pending */
1436 if (idlecnt && !any_pending (EV_A)) 1893 idle_reify (EV_A);
1437 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1894#endif
1438 1895
1439 /* queue check watchers, to be executed first */ 1896 /* queue check watchers, to be executed first */
1440 if (expect_false (checkcnt)) 1897 if (expect_false (checkcnt))
1441 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1898 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1442 1899
1443 call_pending (EV_A); 1900 call_pending (EV_A);
1444
1445 } 1901 }
1446 while (expect_true (activecnt && !loop_done)); 1902 while (expect_true (
1903 activecnt
1904 && !loop_done
1905 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1906 ));
1447 1907
1448 if (loop_done == EVUNLOOP_ONE) 1908 if (loop_done == EVUNLOOP_ONE)
1449 loop_done = EVUNLOOP_CANCEL; 1909 loop_done = EVUNLOOP_CANCEL;
1450} 1910}
1451 1911
… …
1478 head = &(*head)->next; 1938 head = &(*head)->next;
1479 } 1939 }
1480} 1940}
1481 1941
1482void inline_speed 1942void inline_speed
1483ev_clear_pending (EV_P_ W w) 1943clear_pending (EV_P_ W w)
1484{ 1944{
1485 if (w->pending) 1945 if (w->pending)
1486 { 1946 {
1487 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1947 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1488 w->pending = 0; 1948 w->pending = 0;
1489 } 1949 }
1490} 1950}
1491 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
1492void inline_speed 1978void inline_speed
1493ev_start (EV_P_ W w, int active) 1979ev_start (EV_P_ W w, int active)
1494{ 1980{
1495 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1981 pri_adjust (EV_A_ w);
1496 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1497
1498 w->active = active; 1982 w->active = active;
1499 ev_ref (EV_A); 1983 ev_ref (EV_A);
1500} 1984}
1501 1985
1502void inline_size 1986void inline_size
… …
1506 w->active = 0; 1990 w->active = 0;
1507} 1991}
1508 1992
1509/*****************************************************************************/ 1993/*****************************************************************************/
1510 1994
1511void 1995void noinline
1512ev_io_start (EV_P_ ev_io *w) 1996ev_io_start (EV_P_ ev_io *w)
1513{ 1997{
1514 int fd = w->fd; 1998 int fd = w->fd;
1515 1999
1516 if (expect_false (ev_is_active (w))) 2000 if (expect_false (ev_is_active (w)))
… …
1518 2002
1519 assert (("ev_io_start called with negative fd", fd >= 0)); 2003 assert (("ev_io_start called with negative fd", fd >= 0));
1520 2004
1521 ev_start (EV_A_ (W)w, 1); 2005 ev_start (EV_A_ (W)w, 1);
1522 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2006 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1523 wlist_add ((WL *)&anfds[fd].head, (WL)w); 2007 wlist_add (&anfds[fd].head, (WL)w);
1524 2008
1525 fd_change (EV_A_ fd); 2009 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2010 w->events &= ~EV_IOFDSET;
1526} 2011}
1527 2012
1528void 2013void noinline
1529ev_io_stop (EV_P_ ev_io *w) 2014ev_io_stop (EV_P_ ev_io *w)
1530{ 2015{
1531 ev_clear_pending (EV_A_ (W)w); 2016 clear_pending (EV_A_ (W)w);
1532 if (expect_false (!ev_is_active (w))) 2017 if (expect_false (!ev_is_active (w)))
1533 return; 2018 return;
1534 2019
1535 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));
1536 2021
1537 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 2022 wlist_del (&anfds[w->fd].head, (WL)w);
1538 ev_stop (EV_A_ (W)w); 2023 ev_stop (EV_A_ (W)w);
1539 2024
1540 fd_change (EV_A_ w->fd); 2025 fd_change (EV_A_ w->fd, 1);
1541} 2026}
1542 2027
1543void 2028void noinline
1544ev_timer_start (EV_P_ ev_timer *w) 2029ev_timer_start (EV_P_ ev_timer *w)
1545{ 2030{
1546 if (expect_false (ev_is_active (w))) 2031 if (expect_false (ev_is_active (w)))
1547 return; 2032 return;
1548 2033
1549 ((WT)w)->at += mn_now; 2034 ev_at (w) += mn_now;
1550 2035
1551 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.));
1552 2037
1553 ev_start (EV_A_ (W)w, ++timercnt); 2038 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1554 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 2039 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1555 timers [timercnt - 1] = w; 2040 ANHE_w (timers [ev_active (w)]) = (WT)w;
1556 upheap ((WT *)timers, timercnt - 1); 2041 ANHE_at_set (timers [ev_active (w)]);
2042 upheap (timers, ev_active (w));
1557 2043
1558 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2044 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1559} 2045}
1560 2046
1561void 2047void noinline
1562ev_timer_stop (EV_P_ ev_timer *w) 2048ev_timer_stop (EV_P_ ev_timer *w)
1563{ 2049{
1564 ev_clear_pending (EV_A_ (W)w); 2050 clear_pending (EV_A_ (W)w);
1565 if (expect_false (!ev_is_active (w))) 2051 if (expect_false (!ev_is_active (w)))
1566 return; 2052 return;
1567 2053
1568 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1569
1570 { 2054 {
1571 int active = ((W)w)->active; 2055 int active = ev_active (w);
1572 2056
2057 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2058
1573 if (expect_true (--active < --timercnt)) 2059 if (expect_true (active < timercnt + HEAP0 - 1))
1574 { 2060 {
1575 timers [active] = timers [timercnt]; 2061 timers [active] = timers [timercnt + HEAP0 - 1];
1576 adjustheap ((WT *)timers, timercnt, active); 2062 adjustheap (timers, timercnt, active);
1577 } 2063 }
2064
2065 --timercnt;
1578 } 2066 }
1579 2067
1580 ((WT)w)->at -= mn_now; 2068 ev_at (w) -= mn_now;
1581 2069
1582 ev_stop (EV_A_ (W)w); 2070 ev_stop (EV_A_ (W)w);
1583} 2071}
1584 2072
1585void 2073void noinline
1586ev_timer_again (EV_P_ ev_timer *w) 2074ev_timer_again (EV_P_ ev_timer *w)
1587{ 2075{
1588 if (ev_is_active (w)) 2076 if (ev_is_active (w))
1589 { 2077 {
1590 if (w->repeat) 2078 if (w->repeat)
1591 { 2079 {
1592 ((WT)w)->at = mn_now + w->repeat; 2080 ev_at (w) = mn_now + w->repeat;
2081 ANHE_at_set (timers [ev_active (w)]);
1593 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2082 adjustheap (timers, timercnt, ev_active (w));
1594 } 2083 }
1595 else 2084 else
1596 ev_timer_stop (EV_A_ w); 2085 ev_timer_stop (EV_A_ w);
1597 } 2086 }
1598 else if (w->repeat) 2087 else if (w->repeat)
1599 { 2088 {
1600 w->at = w->repeat; 2089 ev_at (w) = w->repeat;
1601 ev_timer_start (EV_A_ w); 2090 ev_timer_start (EV_A_ w);
1602 } 2091 }
1603} 2092}
1604 2093
1605#if EV_PERIODIC_ENABLE 2094#if EV_PERIODIC_ENABLE
1606void 2095void noinline
1607ev_periodic_start (EV_P_ ev_periodic *w) 2096ev_periodic_start (EV_P_ ev_periodic *w)
1608{ 2097{
1609 if (expect_false (ev_is_active (w))) 2098 if (expect_false (ev_is_active (w)))
1610 return; 2099 return;
1611 2100
1612 if (w->reschedule_cb) 2101 if (w->reschedule_cb)
1613 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2102 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1614 else if (w->interval) 2103 else if (w->interval)
1615 { 2104 {
1616 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.));
1617 /* 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 */
1618 ((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;
1619 } 2108 }
2109 else
2110 ev_at (w) = w->offset;
1620 2111
1621 ev_start (EV_A_ (W)w, ++periodiccnt); 2112 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1622 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2113 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1623 periodics [periodiccnt - 1] = w; 2114 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1624 upheap ((WT *)periodics, periodiccnt - 1); 2115 ANHE_at_set (periodics [ev_active (w)]);
2116 upheap (periodics, ev_active (w));
1625 2117
1626 /*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));*/
1627} 2119}
1628 2120
1629void 2121void noinline
1630ev_periodic_stop (EV_P_ ev_periodic *w) 2122ev_periodic_stop (EV_P_ ev_periodic *w)
1631{ 2123{
1632 ev_clear_pending (EV_A_ (W)w); 2124 clear_pending (EV_A_ (W)w);
1633 if (expect_false (!ev_is_active (w))) 2125 if (expect_false (!ev_is_active (w)))
1634 return; 2126 return;
1635 2127
1636 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1637
1638 { 2128 {
1639 int active = ((W)w)->active; 2129 int active = ev_active (w);
1640 2130
2131 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2132
1641 if (expect_true (--active < --periodiccnt)) 2133 if (expect_true (active < periodiccnt + HEAP0 - 1))
1642 { 2134 {
1643 periodics [active] = periodics [periodiccnt]; 2135 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1644 adjustheap ((WT *)periodics, periodiccnt, active); 2136 adjustheap (periodics, periodiccnt, active);
1645 } 2137 }
2138
2139 --periodiccnt;
1646 } 2140 }
1647 2141
1648 ev_stop (EV_A_ (W)w); 2142 ev_stop (EV_A_ (W)w);
1649} 2143}
1650 2144
1651void 2145void noinline
1652ev_periodic_again (EV_P_ ev_periodic *w) 2146ev_periodic_again (EV_P_ ev_periodic *w)
1653{ 2147{
1654 /* TODO: use adjustheap and recalculation */ 2148 /* TODO: use adjustheap and recalculation */
1655 ev_periodic_stop (EV_A_ w); 2149 ev_periodic_stop (EV_A_ w);
1656 ev_periodic_start (EV_A_ w); 2150 ev_periodic_start (EV_A_ w);
… …
1659 2153
1660#ifndef SA_RESTART 2154#ifndef SA_RESTART
1661# define SA_RESTART 0 2155# define SA_RESTART 0
1662#endif 2156#endif
1663 2157
1664void 2158void noinline
1665ev_signal_start (EV_P_ ev_signal *w) 2159ev_signal_start (EV_P_ ev_signal *w)
1666{ 2160{
1667#if EV_MULTIPLICITY 2161#if EV_MULTIPLICITY
1668 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));
1669#endif 2163#endif
1670 if (expect_false (ev_is_active (w))) 2164 if (expect_false (ev_is_active (w)))
1671 return; 2165 return;
1672 2166
1673 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));
1674 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
1675 ev_start (EV_A_ (W)w, 1); 2185 ev_start (EV_A_ (W)w, 1);
1676 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1677 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2186 wlist_add (&signals [w->signum - 1].head, (WL)w);
1678 2187
1679 if (!((WL)w)->next) 2188 if (!((WL)w)->next)
1680 { 2189 {
1681#if _WIN32 2190#if _WIN32
1682 signal (w->signum, sighandler); 2191 signal (w->signum, ev_sighandler);
1683#else 2192#else
1684 struct sigaction sa; 2193 struct sigaction sa;
1685 sa.sa_handler = sighandler; 2194 sa.sa_handler = ev_sighandler;
1686 sigfillset (&sa.sa_mask); 2195 sigfillset (&sa.sa_mask);
1687 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 */
1688 sigaction (w->signum, &sa, 0); 2197 sigaction (w->signum, &sa, 0);
1689#endif 2198#endif
1690 } 2199 }
1691} 2200}
1692 2201
1693void 2202void noinline
1694ev_signal_stop (EV_P_ ev_signal *w) 2203ev_signal_stop (EV_P_ ev_signal *w)
1695{ 2204{
1696 ev_clear_pending (EV_A_ (W)w); 2205 clear_pending (EV_A_ (W)w);
1697 if (expect_false (!ev_is_active (w))) 2206 if (expect_false (!ev_is_active (w)))
1698 return; 2207 return;
1699 2208
1700 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2209 wlist_del (&signals [w->signum - 1].head, (WL)w);
1701 ev_stop (EV_A_ (W)w); 2210 ev_stop (EV_A_ (W)w);
1702 2211
1703 if (!signals [w->signum - 1].head) 2212 if (!signals [w->signum - 1].head)
1704 signal (w->signum, SIG_DFL); 2213 signal (w->signum, SIG_DFL);
1705} 2214}
… …
1712#endif 2221#endif
1713 if (expect_false (ev_is_active (w))) 2222 if (expect_false (ev_is_active (w)))
1714 return; 2223 return;
1715 2224
1716 ev_start (EV_A_ (W)w, 1); 2225 ev_start (EV_A_ (W)w, 1);
1717 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2226 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1718} 2227}
1719 2228
1720void 2229void
1721ev_child_stop (EV_P_ ev_child *w) 2230ev_child_stop (EV_P_ ev_child *w)
1722{ 2231{
1723 ev_clear_pending (EV_A_ (W)w); 2232 clear_pending (EV_A_ (W)w);
1724 if (expect_false (!ev_is_active (w))) 2233 if (expect_false (!ev_is_active (w)))
1725 return; 2234 return;
1726 2235
1727 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2236 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1728 ev_stop (EV_A_ (W)w); 2237 ev_stop (EV_A_ (W)w);
1729} 2238}
1730 2239
1731#if EV_STAT_ENABLE 2240#if EV_STAT_ENABLE
1732 2241
… …
1751 if (w->wd < 0) 2260 if (w->wd < 0)
1752 { 2261 {
1753 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 */
1754 2263
1755 /* 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 */
1756 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2267 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1757 { 2268 {
1758 char path [4096]; 2269 char path [4096];
1759 strcpy (path, w->path); 2270 strcpy (path, w->path);
1760 2271
… …
1964} 2475}
1965 2476
1966void 2477void
1967ev_stat_stop (EV_P_ ev_stat *w) 2478ev_stat_stop (EV_P_ ev_stat *w)
1968{ 2479{
1969 ev_clear_pending (EV_A_ (W)w); 2480 clear_pending (EV_A_ (W)w);
1970 if (expect_false (!ev_is_active (w))) 2481 if (expect_false (!ev_is_active (w)))
1971 return; 2482 return;
1972 2483
1973#if EV_USE_INOTIFY 2484#if EV_USE_INOTIFY
1974 infy_del (EV_A_ w); 2485 infy_del (EV_A_ w);
… …
1977 2488
1978 ev_stop (EV_A_ (W)w); 2489 ev_stop (EV_A_ (W)w);
1979} 2490}
1980#endif 2491#endif
1981 2492
2493#if EV_IDLE_ENABLE
1982void 2494void
1983ev_idle_start (EV_P_ ev_idle *w) 2495ev_idle_start (EV_P_ ev_idle *w)
1984{ 2496{
1985 if (expect_false (ev_is_active (w))) 2497 if (expect_false (ev_is_active (w)))
1986 return; 2498 return;
1987 2499
2500 pri_adjust (EV_A_ (W)w);
2501
2502 {
2503 int active = ++idlecnt [ABSPRI (w)];
2504
2505 ++idleall;
1988 ev_start (EV_A_ (W)w, ++idlecnt); 2506 ev_start (EV_A_ (W)w, active);
2507
1989 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2508 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1990 idles [idlecnt - 1] = w; 2509 idles [ABSPRI (w)][active - 1] = w;
2510 }
1991} 2511}
1992 2512
1993void 2513void
1994ev_idle_stop (EV_P_ ev_idle *w) 2514ev_idle_stop (EV_P_ ev_idle *w)
1995{ 2515{
1996 ev_clear_pending (EV_A_ (W)w); 2516 clear_pending (EV_A_ (W)w);
1997 if (expect_false (!ev_is_active (w))) 2517 if (expect_false (!ev_is_active (w)))
1998 return; 2518 return;
1999 2519
2000 { 2520 {
2001 int active = ((W)w)->active; 2521 int active = ev_active (w);
2002 idles [active - 1] = idles [--idlecnt]; 2522
2003 ((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;
2004 } 2528 }
2005
2006 ev_stop (EV_A_ (W)w);
2007} 2529}
2530#endif
2008 2531
2009void 2532void
2010ev_prepare_start (EV_P_ ev_prepare *w) 2533ev_prepare_start (EV_P_ ev_prepare *w)
2011{ 2534{
2012 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
… …
2018} 2541}
2019 2542
2020void 2543void
2021ev_prepare_stop (EV_P_ ev_prepare *w) 2544ev_prepare_stop (EV_P_ ev_prepare *w)
2022{ 2545{
2023 ev_clear_pending (EV_A_ (W)w); 2546 clear_pending (EV_A_ (W)w);
2024 if (expect_false (!ev_is_active (w))) 2547 if (expect_false (!ev_is_active (w)))
2025 return; 2548 return;
2026 2549
2027 { 2550 {
2028 int active = ((W)w)->active; 2551 int active = ev_active (w);
2552
2029 prepares [active - 1] = prepares [--preparecnt]; 2553 prepares [active - 1] = prepares [--preparecnt];
2030 ((W)prepares [active - 1])->active = active; 2554 ev_active (prepares [active - 1]) = active;
2031 } 2555 }
2032 2556
2033 ev_stop (EV_A_ (W)w); 2557 ev_stop (EV_A_ (W)w);
2034} 2558}
2035 2559
… …
2045} 2569}
2046 2570
2047void 2571void
2048ev_check_stop (EV_P_ ev_check *w) 2572ev_check_stop (EV_P_ ev_check *w)
2049{ 2573{
2050 ev_clear_pending (EV_A_ (W)w); 2574 clear_pending (EV_A_ (W)w);
2051 if (expect_false (!ev_is_active (w))) 2575 if (expect_false (!ev_is_active (w)))
2052 return; 2576 return;
2053 2577
2054 { 2578 {
2055 int active = ((W)w)->active; 2579 int active = ev_active (w);
2580
2056 checks [active - 1] = checks [--checkcnt]; 2581 checks [active - 1] = checks [--checkcnt];
2057 ((W)checks [active - 1])->active = active; 2582 ev_active (checks [active - 1]) = active;
2058 } 2583 }
2059 2584
2060 ev_stop (EV_A_ (W)w); 2585 ev_stop (EV_A_ (W)w);
2061} 2586}
2062 2587
2063#if EV_EMBED_ENABLE 2588#if EV_EMBED_ENABLE
2064void noinline 2589void noinline
2065ev_embed_sweep (EV_P_ ev_embed *w) 2590ev_embed_sweep (EV_P_ ev_embed *w)
2066{ 2591{
2067 ev_loop (w->loop, EVLOOP_NONBLOCK); 2592 ev_loop (w->other, EVLOOP_NONBLOCK);
2068} 2593}
2069 2594
2070static void 2595static void
2071embed_cb (EV_P_ ev_io *io, int revents) 2596embed_io_cb (EV_P_ ev_io *io, int revents)
2072{ 2597{
2073 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2598 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2074 2599
2075 if (ev_cb (w)) 2600 if (ev_cb (w))
2076 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2601 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2077 else 2602 else
2078 ev_embed_sweep (loop, w); 2603 ev_loop (w->other, EVLOOP_NONBLOCK);
2079} 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
2080 2629
2081void 2630void
2082ev_embed_start (EV_P_ ev_embed *w) 2631ev_embed_start (EV_P_ ev_embed *w)
2083{ 2632{
2084 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
2085 return; 2634 return;
2086 2635
2087 { 2636 {
2088 struct ev_loop *loop = w->loop; 2637 struct ev_loop *loop = w->other;
2089 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 ()));
2090 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2639 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2091 } 2640 }
2092 2641
2093 ev_set_priority (&w->io, ev_priority (w)); 2642 ev_set_priority (&w->io, ev_priority (w));
2094 ev_io_start (EV_A_ &w->io); 2643 ev_io_start (EV_A_ &w->io);
2095 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
2096 ev_start (EV_A_ (W)w, 1); 2651 ev_start (EV_A_ (W)w, 1);
2097} 2652}
2098 2653
2099void 2654void
2100ev_embed_stop (EV_P_ ev_embed *w) 2655ev_embed_stop (EV_P_ ev_embed *w)
2101{ 2656{
2102 ev_clear_pending (EV_A_ (W)w); 2657 clear_pending (EV_A_ (W)w);
2103 if (expect_false (!ev_is_active (w))) 2658 if (expect_false (!ev_is_active (w)))
2104 return; 2659 return;
2105 2660
2106 ev_io_stop (EV_A_ &w->io); 2661 ev_io_stop (EV_A_ &w->io);
2662 ev_prepare_stop (EV_A_ &w->prepare);
2107 2663
2108 ev_stop (EV_A_ (W)w); 2664 ev_stop (EV_A_ (W)w);
2109} 2665}
2110#endif 2666#endif
2111 2667
… …
2122} 2678}
2123 2679
2124void 2680void
2125ev_fork_stop (EV_P_ ev_fork *w) 2681ev_fork_stop (EV_P_ ev_fork *w)
2126{ 2682{
2127 ev_clear_pending (EV_A_ (W)w); 2683 clear_pending (EV_A_ (W)w);
2128 if (expect_false (!ev_is_active (w))) 2684 if (expect_false (!ev_is_active (w)))
2129 return; 2685 return;
2130 2686
2131 { 2687 {
2132 int active = ((W)w)->active; 2688 int active = ev_active (w);
2689
2133 forks [active - 1] = forks [--forkcnt]; 2690 forks [active - 1] = forks [--forkcnt];
2134 ((W)forks [active - 1])->active = active; 2691 ev_active (forks [active - 1]) = active;
2135 } 2692 }
2136 2693
2137 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);
2138} 2734}
2139#endif 2735#endif
2140 2736
2141/*****************************************************************************/ 2737/*****************************************************************************/
2142 2738
… …
2200 ev_timer_set (&once->to, timeout, 0.); 2796 ev_timer_set (&once->to, timeout, 0.);
2201 ev_timer_start (EV_A_ &once->to); 2797 ev_timer_start (EV_A_ &once->to);
2202 } 2798 }
2203} 2799}
2204 2800
2801#if EV_MULTIPLICITY
2802 #include "ev_wrap.h"
2803#endif
2804
2205#ifdef __cplusplus 2805#ifdef __cplusplus
2206} 2806}
2207#endif 2807#endif
2208 2808

Diff Legend

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