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

Comparing libev/ev.c (file contents):
Revision 1.145 by root, Tue Nov 27 08:54:38 2007 UTC vs.
Revision 1.232 by root, Tue May 6 15:29:58 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
… …
51# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 61# define EV_USE_MONOTONIC 0
53# endif 62# endif
54# ifndef EV_USE_REALTIME 63# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 64# define EV_USE_REALTIME 0
65# endif
66# endif
67
68# ifndef EV_USE_NANOSLEEP
69# if HAVE_NANOSLEEP
70# define EV_USE_NANOSLEEP 1
71# else
72# define EV_USE_NANOSLEEP 0
56# endif 73# endif
57# endif 74# endif
58 75
59# ifndef EV_USE_SELECT 76# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 77# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
94# else 111# else
95# define EV_USE_PORT 0 112# define EV_USE_PORT 0
96# endif 113# endif
97# endif 114# endif
98 115
116# ifndef EV_USE_INOTIFY
117# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
118# define EV_USE_INOTIFY 1
119# else
120# define EV_USE_INOTIFY 0
121# endif
122# endif
123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
99#endif 132#endif
100 133
101#include <math.h> 134#include <math.h>
102#include <stdlib.h> 135#include <stdlib.h>
103#include <fcntl.h> 136#include <fcntl.h>
… …
109#include <errno.h> 142#include <errno.h>
110#include <sys/types.h> 143#include <sys/types.h>
111#include <time.h> 144#include <time.h>
112 145
113#include <signal.h> 146#include <signal.h>
147
148#ifdef EV_H
149# include EV_H
150#else
151# include "ev.h"
152#endif
114 153
115#ifndef _WIN32 154#ifndef _WIN32
116# include <sys/time.h> 155# include <sys/time.h>
117# include <sys/wait.h> 156# include <sys/wait.h>
118# include <unistd.h> 157# include <unistd.h>
… …
122# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
123# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
124# endif 163# endif
125#endif 164#endif
126 165
127/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
128 167
129#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
130# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
131#endif 170#endif
132 171
133#ifndef EV_USE_REALTIME 172#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0 173# define EV_USE_REALTIME 0
174#endif
175
176#ifndef EV_USE_NANOSLEEP
177# define EV_USE_NANOSLEEP 0
135#endif 178#endif
136 179
137#ifndef EV_USE_SELECT 180#ifndef EV_USE_SELECT
138# define EV_USE_SELECT 1 181# define EV_USE_SELECT 1
139#endif 182#endif
… …
145# define EV_USE_POLL 1 188# define EV_USE_POLL 1
146# endif 189# endif
147#endif 190#endif
148 191
149#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
150# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
151#endif 198#endif
152 199
153#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
154# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
155#endif 202#endif
156 203
157#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 205# define EV_USE_PORT 0
159#endif 206#endif
160 207
161/**/ 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
212# define EV_USE_INOTIFY 0
213# endif
214#endif
215
216#ifndef EV_PID_HASHSIZE
217# if EV_MINIMAL
218# define EV_PID_HASHSIZE 1
219# else
220# define EV_PID_HASHSIZE 16
221# endif
222#endif
223
224#ifndef EV_INOTIFY_HASHSIZE
225# if EV_MINIMAL
226# define EV_INOTIFY_HASHSIZE 1
227# else
228# define EV_INOTIFY_HASHSIZE 16
229# endif
230#endif
231
232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
162 241
163#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
166#endif 245#endif
… …
168#ifndef CLOCK_REALTIME 247#ifndef CLOCK_REALTIME
169# undef EV_USE_REALTIME 248# undef EV_USE_REALTIME
170# define EV_USE_REALTIME 0 249# define EV_USE_REALTIME 0
171#endif 250#endif
172 251
252#if !EV_STAT_ENABLE
253# undef EV_USE_INOTIFY
254# define EV_USE_INOTIFY 0
255#endif
256
257#if !EV_USE_NANOSLEEP
258# ifndef _WIN32
259# include <sys/select.h>
260# endif
261#endif
262
263#if EV_USE_INOTIFY
264# include <sys/inotify.h>
265#endif
266
173#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 268# include <winsock.h>
175#endif 269#endif
176 270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
281#endif
282
177/**/ 283/**/
284
285/*
286 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding
289 * errors are against us.
290 * This value is good at least till the year 4000.
291 * Better solutions welcome.
292 */
293#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
178 294
179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 295#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 296#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 297/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
183 298
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189
190#if __GNUC__ >= 3 299#if __GNUC__ >= 4
191# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
192# define inline_size static inline /* inline for codesize */
193# if EV_MINIMAL
194# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
195# define inline_speed static noinline
196# else
197# define noinline
198# define inline_speed static inline
199# endif
200#else 302#else
201# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
202# define inline_speed static
203# define inline_size static
204# define noinline 304# define noinline
305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
306# define inline
307# endif
205#endif 308#endif
206 309
207#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
208#define expect_true(expr) expect ((expr) != 0, 1) 311#define expect_true(expr) expect ((expr) != 0, 1)
312#define inline_size static inline
313
314#if EV_MINIMAL
315# define inline_speed static noinline
316#else
317# define inline_speed static inline
318#endif
209 319
210#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 320#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
211#define ABSPRI(w) ((w)->priority - EV_MINPRI) 321#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
212 322
213#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 323#define EMPTY /* required for microsofts broken pseudo-c compiler */
214#define EMPTY2(a,b) /* used to suppress some warnings */ 324#define EMPTY2(a,b) /* used to suppress some warnings */
215 325
216typedef ev_watcher *W; 326typedef ev_watcher *W;
217typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
218typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
219 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
333#if EV_USE_MONOTONIC
334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
335/* giving it a reasonably high chance of working on typical architetcures */
220static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
221 338
222#ifdef _WIN32 339#ifdef _WIN32
223# include "ev_win32.c" 340# include "ev_win32.c"
224#endif 341#endif
225 342
… …
246 perror (msg); 363 perror (msg);
247 abort (); 364 abort ();
248 } 365 }
249} 366}
250 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
251static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
252 384
253void 385void
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
255{ 387{
256 alloc = cb; 388 alloc = cb;
257} 389}
258 390
259static void * 391inline_speed void *
260ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
261{ 393{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
263 395
264 if (!ptr && size) 396 if (!ptr && size)
265 { 397 {
266 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
267 abort (); 399 abort ();
… …
288typedef struct 420typedef struct
289{ 421{
290 W w; 422 W w;
291 int events; 423 int events;
292} ANPENDING; 424} ANPENDING;
425
426#if EV_USE_INOTIFY
427typedef struct
428{
429 WL head;
430} ANFS;
431#endif
293 432
294#if EV_MULTIPLICITY 433#if EV_MULTIPLICITY
295 434
296 struct ev_loop 435 struct ev_loop
297 { 436 {
… …
354{ 493{
355 return ev_rt_now; 494 return ev_rt_now;
356} 495}
357#endif 496#endif
358 497
359#define array_roundsize(type,n) (((n) | 4) & ~3) 498void
499ev_sleep (ev_tstamp delay)
500{
501 if (delay > 0.)
502 {
503#if EV_USE_NANOSLEEP
504 struct timespec ts;
505
506 ts.tv_sec = (time_t)delay;
507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
508
509 nanosleep (&ts, 0);
510#elif defined(_WIN32)
511 Sleep ((unsigned long)(delay * 1e3));
512#else
513 struct timeval tv;
514
515 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517
518 select (0, 0, 0, 0, &tv);
519#endif
520 }
521}
522
523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 // prefer to allocate in chunks of this size, must be 2**n and >> 4 longs
526
527int inline_size
528array_nextsize (int elem, int cur, int cnt)
529{
530 int ncur = cur + 1;
531
532 do
533 ncur <<= 1;
534 while (cnt > ncur);
535
536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
538 {
539 ncur *= elem;
540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
541 ncur = ncur - sizeof (void *) * 4;
542 ncur /= elem;
543 }
544
545 return ncur;
546}
547
548static noinline void *
549array_realloc (int elem, void *base, int *cur, int cnt)
550{
551 *cur = array_nextsize (elem, *cur, cnt);
552 return ev_realloc (base, elem * *cur);
553}
360 554
361#define array_needsize(type,base,cur,cnt,init) \ 555#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 556 if (expect_false ((cnt) > (cur))) \
363 { \ 557 { \
364 int newcnt = cur; \ 558 int ocur_ = (cur); \
365 do \ 559 (base) = (type *)array_realloc \
366 { \ 560 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 561 init ((base) + (ocur_), (cur) - ocur_); \
368 } \
369 while ((cnt) > newcnt); \
370 \
371 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
372 init (base + cur, newcnt - cur); \
373 cur = newcnt; \
374 } 562 }
375 563
564#if 0
376#define array_slim(type,stem) \ 565#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 566 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 567 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 568 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 569 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 570 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 571 }
572#endif
383 573
384#define array_free(stem, idx) \ 574#define array_free(stem, idx) \
385 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 575 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
386 576
387/*****************************************************************************/ 577/*****************************************************************************/
388 578
389void noinline 579void noinline
390ev_feed_event (EV_P_ void *w, int revents) 580ev_feed_event (EV_P_ void *w, int revents)
391{ 581{
392 W w_ = (W)w; 582 W w_ = (W)w;
583 int pri = ABSPRI (w_);
393 584
394 if (expect_false (w_->pending)) 585 if (expect_false (w_->pending))
586 pendings [pri][w_->pending - 1].events |= revents;
587 else
395 { 588 {
589 w_->pending = ++pendingcnt [pri];
590 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
591 pendings [pri][w_->pending - 1].w = w_;
396 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 592 pendings [pri][w_->pending - 1].events = revents;
397 return;
398 } 593 }
399
400 w_->pending = ++pendingcnt [ABSPRI (w_)];
401 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
402 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
403 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
404} 594}
405 595
406void inline_size 596void inline_speed
407queue_events (EV_P_ W *events, int eventcnt, int type) 597queue_events (EV_P_ W *events, int eventcnt, int type)
408{ 598{
409 int i; 599 int i;
410 600
411 for (i = 0; i < eventcnt; ++i) 601 for (i = 0; i < eventcnt; ++i)
… …
443} 633}
444 634
445void 635void
446ev_feed_fd_event (EV_P_ int fd, int revents) 636ev_feed_fd_event (EV_P_ int fd, int revents)
447{ 637{
638 if (fd >= 0 && fd < anfdmax)
448 fd_event (EV_A_ fd, revents); 639 fd_event (EV_A_ fd, revents);
449} 640}
450 641
451void inline_size 642void inline_size
452fd_reify (EV_P) 643fd_reify (EV_P)
453{ 644{
… …
457 { 648 {
458 int fd = fdchanges [i]; 649 int fd = fdchanges [i];
459 ANFD *anfd = anfds + fd; 650 ANFD *anfd = anfds + fd;
460 ev_io *w; 651 ev_io *w;
461 652
462 int events = 0; 653 unsigned char events = 0;
463 654
464 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 655 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
465 events |= w->events; 656 events |= (unsigned char)w->events;
466 657
467#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
468 if (events) 659 if (events)
469 { 660 {
470 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
471 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
472 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
473 } 668 }
474#endif 669#endif
475 670
671 {
672 unsigned char o_events = anfd->events;
673 unsigned char o_reify = anfd->reify;
674
476 anfd->reify = 0; 675 anfd->reify = 0;
477
478 backend_modify (EV_A_ fd, anfd->events, events);
479 anfd->events = events; 676 anfd->events = events;
677
678 if (o_events != events || o_reify & EV_IOFDSET)
679 backend_modify (EV_A_ fd, o_events, events);
680 }
480 } 681 }
481 682
482 fdchangecnt = 0; 683 fdchangecnt = 0;
483} 684}
484 685
485void inline_size 686void inline_size
486fd_change (EV_P_ int fd) 687fd_change (EV_P_ int fd, int flags)
487{ 688{
488 if (expect_false (anfds [fd].reify)) 689 unsigned char reify = anfds [fd].reify;
489 return;
490
491 anfds [fd].reify = 1; 690 anfds [fd].reify |= flags;
492 691
692 if (expect_true (!reify))
693 {
493 ++fdchangecnt; 694 ++fdchangecnt;
494 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 695 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
495 fdchanges [fdchangecnt - 1] = fd; 696 fdchanges [fdchangecnt - 1] = fd;
697 }
496} 698}
497 699
498void inline_speed 700void inline_speed
499fd_kill (EV_P_ int fd) 701fd_kill (EV_P_ int fd)
500{ 702{
… …
547static void noinline 749static void noinline
548fd_rearm_all (EV_P) 750fd_rearm_all (EV_P)
549{ 751{
550 int fd; 752 int fd;
551 753
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 754 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 755 if (anfds [fd].events)
555 { 756 {
556 anfds [fd].events = 0; 757 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 758 fd_change (EV_A_ fd, EV_IOFDSET | 1);
558 } 759 }
559} 760}
560 761
561/*****************************************************************************/ 762/*****************************************************************************/
562 763
764/* towards the root */
563void inline_speed 765void inline_speed
564upheap (WT *heap, int k) 766upheap (WT *heap, int k)
565{ 767{
566 WT w = heap [k]; 768 WT w = heap [k];
567 769
568 while (k && heap [k >> 1]->at > w->at) 770 for (;;)
569 { 771 {
772 int p = k >> 1;
773
774 /* maybe we could use a dummy element at heap [0]? */
775 if (!p || heap [p]->at <= w->at)
776 break;
777
570 heap [k] = heap [k >> 1]; 778 heap [k] = heap [p];
571 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
572 k >>= 1; 780 k = p;
573 } 781 }
574 782
575 heap [k] = w; 783 heap [k] = w;
576 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
577
578} 785}
579 786
787/* away from the root */
580void inline_speed 788void inline_speed
581downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
582{ 790{
583 WT w = heap [k]; 791 WT w = heap [k];
584 792
585 while (k < (N >> 1)) 793 for (;;)
586 { 794 {
587 int j = k << 1; 795 int c = k << 1;
588 796
589 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 797 if (c > N)
590 ++j;
591
592 if (w->at <= heap [j]->at)
593 break; 798 break;
594 799
800 c += c < N && heap [c]->at > heap [c + 1]->at
801 ? 1 : 0;
802
803 if (w->at <= heap [c]->at)
804 break;
805
595 heap [k] = heap [j]; 806 heap [k] = heap [c];
596 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
808
597 k = j; 809 k = c;
598 } 810 }
599 811
600 heap [k] = w; 812 heap [k] = w;
601 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
602} 814}
603 815
604void inline_size 816void inline_size
605adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
606{ 818{
… …
611/*****************************************************************************/ 823/*****************************************************************************/
612 824
613typedef struct 825typedef struct
614{ 826{
615 WL head; 827 WL head;
616 sig_atomic_t volatile gotsig; 828 EV_ATOMIC_T gotsig;
617} ANSIG; 829} ANSIG;
618 830
619static ANSIG *signals; 831static ANSIG *signals;
620static int signalmax; 832static int signalmax;
621 833
622static int sigpipe [2]; 834static EV_ATOMIC_T gotsig;
623static sig_atomic_t volatile gotsig;
624static ev_io sigev;
625 835
626void inline_size 836void inline_size
627signals_init (ANSIG *base, int count) 837signals_init (ANSIG *base, int count)
628{ 838{
629 while (count--) 839 while (count--)
… …
633 843
634 ++base; 844 ++base;
635 } 845 }
636} 846}
637 847
638static void 848/*****************************************************************************/
639sighandler (int signum)
640{
641#if _WIN32
642 signal (signum, sighandler);
643#endif
644 849
645 signals [signum - 1].gotsig = 1;
646
647 if (!gotsig)
648 {
649 int old_errno = errno;
650 gotsig = 1;
651 write (sigpipe [1], &signum, 1);
652 errno = old_errno;
653 }
654}
655
656void noinline
657ev_feed_signal_event (EV_P_ int signum)
658{
659 WL w;
660
661#if EV_MULTIPLICITY
662 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
663#endif
664
665 --signum;
666
667 if (signum < 0 || signum >= signalmax)
668 return;
669
670 signals [signum].gotsig = 0;
671
672 for (w = signals [signum].head; w; w = w->next)
673 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
674}
675
676static void
677sigcb (EV_P_ ev_io *iow, int revents)
678{
679 int signum;
680
681 read (sigpipe [0], &revents, 1);
682 gotsig = 0;
683
684 for (signum = signalmax; signum--; )
685 if (signals [signum].gotsig)
686 ev_feed_signal_event (EV_A_ signum + 1);
687}
688
689void inline_size 850void inline_speed
690fd_intern (int fd) 851fd_intern (int fd)
691{ 852{
692#ifdef _WIN32 853#ifdef _WIN32
693 int arg = 1; 854 int arg = 1;
694 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 855 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
697 fcntl (fd, F_SETFL, O_NONBLOCK); 858 fcntl (fd, F_SETFL, O_NONBLOCK);
698#endif 859#endif
699} 860}
700 861
701static void noinline 862static void noinline
702siginit (EV_P) 863evpipe_init (EV_P)
703{ 864{
865 if (!ev_is_active (&pipeev))
866 {
867#if EV_USE_EVENTFD
868 if ((evfd = eventfd (0, 0)) >= 0)
869 {
870 evpipe [0] = -1;
871 fd_intern (evfd);
872 ev_io_set (&pipeev, evfd, EV_READ);
873 }
874 else
875#endif
876 {
877 while (pipe (evpipe))
878 syserr ("(libev) error creating signal/async pipe");
879
704 fd_intern (sigpipe [0]); 880 fd_intern (evpipe [0]);
705 fd_intern (sigpipe [1]); 881 fd_intern (evpipe [1]);
882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
706 884
707 ev_io_set (&sigev, sigpipe [0], EV_READ);
708 ev_io_start (EV_A_ &sigev); 885 ev_io_start (EV_A_ &pipeev);
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 886 ev_unref (EV_A); /* watcher should not keep loop alive */
887 }
888}
889
890void inline_size
891evpipe_write (EV_P_ EV_ATOMIC_T *flag)
892{
893 if (!*flag)
894 {
895 int old_errno = errno; /* save errno because write might clobber it */
896
897 *flag = 1;
898
899#if EV_USE_EVENTFD
900 if (evfd >= 0)
901 {
902 uint64_t counter = 1;
903 write (evfd, &counter, sizeof (uint64_t));
904 }
905 else
906#endif
907 write (evpipe [1], &old_errno, 1);
908
909 errno = old_errno;
910 }
911}
912
913static void
914pipecb (EV_P_ ev_io *iow, int revents)
915{
916#if EV_USE_EVENTFD
917 if (evfd >= 0)
918 {
919 uint64_t counter;
920 read (evfd, &counter, sizeof (uint64_t));
921 }
922 else
923#endif
924 {
925 char dummy;
926 read (evpipe [0], &dummy, 1);
927 }
928
929 if (gotsig && ev_is_default_loop (EV_A))
930 {
931 int signum;
932 gotsig = 0;
933
934 for (signum = signalmax; signum--; )
935 if (signals [signum].gotsig)
936 ev_feed_signal_event (EV_A_ signum + 1);
937 }
938
939#if EV_ASYNC_ENABLE
940 if (gotasync)
941 {
942 int i;
943 gotasync = 0;
944
945 for (i = asynccnt; i--; )
946 if (asyncs [i]->sent)
947 {
948 asyncs [i]->sent = 0;
949 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
950 }
951 }
952#endif
710} 953}
711 954
712/*****************************************************************************/ 955/*****************************************************************************/
713 956
957static void
958ev_sighandler (int signum)
959{
960#if EV_MULTIPLICITY
961 struct ev_loop *loop = &default_loop_struct;
962#endif
963
964#if _WIN32
965 signal (signum, ev_sighandler);
966#endif
967
968 signals [signum - 1].gotsig = 1;
969 evpipe_write (EV_A_ &gotsig);
970}
971
972void noinline
973ev_feed_signal_event (EV_P_ int signum)
974{
975 WL w;
976
977#if EV_MULTIPLICITY
978 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
979#endif
980
981 --signum;
982
983 if (signum < 0 || signum >= signalmax)
984 return;
985
986 signals [signum].gotsig = 0;
987
988 for (w = signals [signum].head; w; w = w->next)
989 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
990}
991
992/*****************************************************************************/
993
714static ev_child *childs [PID_HASHSIZE]; 994static WL childs [EV_PID_HASHSIZE];
715 995
716#ifndef _WIN32 996#ifndef _WIN32
717 997
718static ev_signal childev; 998static ev_signal childev;
719 999
1000#ifndef WIFCONTINUED
1001# define WIFCONTINUED(status) 0
1002#endif
1003
720void inline_speed 1004void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
722{ 1006{
723 ev_child *w; 1007 ev_child *w;
1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
724 1009
725 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1010 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1011 {
726 if (w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
1013 && (!traced || (w->flags & 1)))
727 { 1014 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1015 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
729 w->rpid = pid; 1016 w->rpid = pid;
730 w->rstatus = status; 1017 w->rstatus = status;
731 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
732 } 1019 }
1020 }
733} 1021}
734 1022
735#ifndef WCONTINUED 1023#ifndef WCONTINUED
736# define WCONTINUED 0 1024# define WCONTINUED 0
737#endif 1025#endif
… …
746 if (!WCONTINUED 1034 if (!WCONTINUED
747 || errno != EINVAL 1035 || errno != EINVAL
748 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
749 return; 1037 return;
750 1038
751 /* make sure we are called again until all childs have been reaped */ 1039 /* make sure we are called again until all children have been reaped */
752 /* we need to do it this way so that the callback gets called before we continue */ 1040 /* we need to do it this way so that the callback gets called before we continue */
753 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 1042
755 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
1044 if (EV_PID_HASHSIZE > 1)
756 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 1046}
758 1047
759#endif 1048#endif
760 1049
761/*****************************************************************************/ 1050/*****************************************************************************/
… …
833} 1122}
834 1123
835unsigned int 1124unsigned int
836ev_embeddable_backends (void) 1125ev_embeddable_backends (void)
837{ 1126{
838 return EVBACKEND_EPOLL 1127 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
839 | EVBACKEND_KQUEUE 1128
840 | EVBACKEND_PORT; 1129 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1130 /* please fix it and tell me how to detect the fix */
1131 flags &= ~EVBACKEND_EPOLL;
1132
1133 return flags;
841} 1134}
842 1135
843unsigned int 1136unsigned int
844ev_backend (EV_P) 1137ev_backend (EV_P)
845{ 1138{
846 return backend; 1139 return backend;
847} 1140}
848 1141
849static void 1142unsigned int
1143ev_loop_count (EV_P)
1144{
1145 return loop_count;
1146}
1147
1148void
1149ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1150{
1151 io_blocktime = interval;
1152}
1153
1154void
1155ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1156{
1157 timeout_blocktime = interval;
1158}
1159
1160static void noinline
850loop_init (EV_P_ unsigned int flags) 1161loop_init (EV_P_ unsigned int flags)
851{ 1162{
852 if (!backend) 1163 if (!backend)
853 { 1164 {
854#if EV_USE_MONOTONIC 1165#if EV_USE_MONOTONIC
… …
857 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1168 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
858 have_monotonic = 1; 1169 have_monotonic = 1;
859 } 1170 }
860#endif 1171#endif
861 1172
862 ev_rt_now = ev_time (); 1173 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 1174 mn_now = get_clock ();
864 now_floor = mn_now; 1175 now_floor = mn_now;
865 rtmn_diff = ev_rt_now - mn_now; 1176 rtmn_diff = ev_rt_now - mn_now;
1177
1178 io_blocktime = 0.;
1179 timeout_blocktime = 0.;
1180 backend = 0;
1181 backend_fd = -1;
1182 gotasync = 0;
1183#if EV_USE_INOTIFY
1184 fs_fd = -2;
1185#endif
1186
1187 /* pid check not overridable via env */
1188#ifndef _WIN32
1189 if (flags & EVFLAG_FORKCHECK)
1190 curpid = getpid ();
1191#endif
866 1192
867 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 1194 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
871 1197
872 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
873 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
874 1200
875 backend = 0;
876#if EV_USE_PORT 1201#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 1203#endif
879#if EV_USE_KQUEUE 1204#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1205 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
887#endif 1212#endif
888#if EV_USE_SELECT 1213#if EV_USE_SELECT
889 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1214 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
890#endif 1215#endif
891 1216
892 ev_init (&sigev, sigcb); 1217 ev_init (&pipeev, pipecb);
893 ev_set_priority (&sigev, EV_MAXPRI); 1218 ev_set_priority (&pipeev, EV_MAXPRI);
894 } 1219 }
895} 1220}
896 1221
897static void 1222static void noinline
898loop_destroy (EV_P) 1223loop_destroy (EV_P)
899{ 1224{
900 int i; 1225 int i;
1226
1227 if (ev_is_active (&pipeev))
1228 {
1229 ev_ref (EV_A); /* signal watcher */
1230 ev_io_stop (EV_A_ &pipeev);
1231
1232#if EV_USE_EVENTFD
1233 if (evfd >= 0)
1234 close (evfd);
1235#endif
1236
1237 if (evpipe [0] >= 0)
1238 {
1239 close (evpipe [0]);
1240 close (evpipe [1]);
1241 }
1242 }
1243
1244#if EV_USE_INOTIFY
1245 if (fs_fd >= 0)
1246 close (fs_fd);
1247#endif
1248
1249 if (backend_fd >= 0)
1250 close (backend_fd);
901 1251
902#if EV_USE_PORT 1252#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1253 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 1254#endif
905#if EV_USE_KQUEUE 1255#if EV_USE_KQUEUE
… …
914#if EV_USE_SELECT 1264#if EV_USE_SELECT
915 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1265 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
916#endif 1266#endif
917 1267
918 for (i = NUMPRI; i--; ) 1268 for (i = NUMPRI; i--; )
1269 {
919 array_free (pending, [i]); 1270 array_free (pending, [i]);
1271#if EV_IDLE_ENABLE
1272 array_free (idle, [i]);
1273#endif
1274 }
1275
1276 ev_free (anfds); anfdmax = 0;
920 1277
921 /* have to use the microsoft-never-gets-it-right macro */ 1278 /* have to use the microsoft-never-gets-it-right macro */
922 array_free (fdchange, EMPTY0); 1279 array_free (fdchange, EMPTY);
923 array_free (timer, EMPTY0); 1280 array_free (timer, EMPTY);
924#if EV_PERIODIC_ENABLE 1281#if EV_PERIODIC_ENABLE
925 array_free (periodic, EMPTY0); 1282 array_free (periodic, EMPTY);
926#endif 1283#endif
1284#if EV_FORK_ENABLE
927 array_free (idle, EMPTY0); 1285 array_free (fork, EMPTY);
1286#endif
928 array_free (prepare, EMPTY0); 1287 array_free (prepare, EMPTY);
929 array_free (check, EMPTY0); 1288 array_free (check, EMPTY);
1289#if EV_ASYNC_ENABLE
1290 array_free (async, EMPTY);
1291#endif
930 1292
931 backend = 0; 1293 backend = 0;
932} 1294}
933 1295
934static void 1296#if EV_USE_INOTIFY
1297void inline_size infy_fork (EV_P);
1298#endif
1299
1300void inline_size
935loop_fork (EV_P) 1301loop_fork (EV_P)
936{ 1302{
937#if EV_USE_PORT 1303#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1304 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1305#endif
… …
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1307 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1308#endif
943#if EV_USE_EPOLL 1309#if EV_USE_EPOLL
944 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1310 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
945#endif 1311#endif
1312#if EV_USE_INOTIFY
1313 infy_fork (EV_A);
1314#endif
946 1315
947 if (ev_is_active (&sigev)) 1316 if (ev_is_active (&pipeev))
948 { 1317 {
949 /* default loop */ 1318 /* this "locks" the handlers against writing to the pipe */
1319 /* while we modify the fd vars */
1320 gotsig = 1;
1321#if EV_ASYNC_ENABLE
1322 gotasync = 1;
1323#endif
950 1324
951 ev_ref (EV_A); 1325 ev_ref (EV_A);
952 ev_io_stop (EV_A_ &sigev); 1326 ev_io_stop (EV_A_ &pipeev);
1327
1328#if EV_USE_EVENTFD
1329 if (evfd >= 0)
1330 close (evfd);
1331#endif
1332
1333 if (evpipe [0] >= 0)
1334 {
953 close (sigpipe [0]); 1335 close (evpipe [0]);
954 close (sigpipe [1]); 1336 close (evpipe [1]);
1337 }
955 1338
956 while (pipe (sigpipe))
957 syserr ("(libev) error creating pipe");
958
959 siginit (EV_A); 1339 evpipe_init (EV_A);
1340 /* now iterate over everything, in case we missed something */
1341 pipecb (EV_A_ &pipeev, EV_READ);
960 } 1342 }
961 1343
962 postfork = 0; 1344 postfork = 0;
963} 1345}
964 1346
… …
986} 1368}
987 1369
988void 1370void
989ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
990{ 1372{
991 postfork = 1; 1373 postfork = 1; /* must be in line with ev_default_fork */
992} 1374}
993 1375
994#endif 1376#endif
995 1377
996#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
… …
999#else 1381#else
1000int 1382int
1001ev_default_loop (unsigned int flags) 1383ev_default_loop (unsigned int flags)
1002#endif 1384#endif
1003{ 1385{
1004 if (sigpipe [0] == sigpipe [1])
1005 if (pipe (sigpipe))
1006 return 0;
1007
1008 if (!ev_default_loop_ptr) 1386 if (!ev_default_loop_ptr)
1009 { 1387 {
1010#if EV_MULTIPLICITY 1388#if EV_MULTIPLICITY
1011 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1389 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1012#else 1390#else
… …
1015 1393
1016 loop_init (EV_A_ flags); 1394 loop_init (EV_A_ flags);
1017 1395
1018 if (ev_backend (EV_A)) 1396 if (ev_backend (EV_A))
1019 { 1397 {
1020 siginit (EV_A);
1021
1022#ifndef _WIN32 1398#ifndef _WIN32
1023 ev_signal_init (&childev, childcb, SIGCHLD); 1399 ev_signal_init (&childev, childcb, SIGCHLD);
1024 ev_set_priority (&childev, EV_MAXPRI); 1400 ev_set_priority (&childev, EV_MAXPRI);
1025 ev_signal_start (EV_A_ &childev); 1401 ev_signal_start (EV_A_ &childev);
1026 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1402 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1043#ifndef _WIN32 1419#ifndef _WIN32
1044 ev_ref (EV_A); /* child watcher */ 1420 ev_ref (EV_A); /* child watcher */
1045 ev_signal_stop (EV_A_ &childev); 1421 ev_signal_stop (EV_A_ &childev);
1046#endif 1422#endif
1047 1423
1048 ev_ref (EV_A); /* signal watcher */
1049 ev_io_stop (EV_A_ &sigev);
1050
1051 close (sigpipe [0]); sigpipe [0] = 0;
1052 close (sigpipe [1]); sigpipe [1] = 0;
1053
1054 loop_destroy (EV_A); 1424 loop_destroy (EV_A);
1055} 1425}
1056 1426
1057void 1427void
1058ev_default_fork (void) 1428ev_default_fork (void)
… …
1060#if EV_MULTIPLICITY 1430#if EV_MULTIPLICITY
1061 struct ev_loop *loop = ev_default_loop_ptr; 1431 struct ev_loop *loop = ev_default_loop_ptr;
1062#endif 1432#endif
1063 1433
1064 if (backend) 1434 if (backend)
1065 postfork = 1; 1435 postfork = 1; /* must be in line with ev_loop_fork */
1066} 1436}
1067 1437
1068/*****************************************************************************/ 1438/*****************************************************************************/
1069 1439
1070int inline_size 1440void
1071any_pending (EV_P) 1441ev_invoke (EV_P_ void *w, int revents)
1072{ 1442{
1073 int pri; 1443 EV_CB_INVOKE ((W)w, revents);
1074
1075 for (pri = NUMPRI; pri--; )
1076 if (pendingcnt [pri])
1077 return 1;
1078
1079 return 0;
1080} 1444}
1081 1445
1082void inline_speed 1446void inline_speed
1083call_pending (EV_P) 1447call_pending (EV_P)
1084{ 1448{
… …
1089 { 1453 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1454 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1455
1092 if (expect_true (p->w)) 1456 if (expect_true (p->w))
1093 { 1457 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1458 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1459
1096 p->w->pending = 0; 1460 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1461 EV_CB_INVOKE (p->w, p->events);
1098 } 1462 }
1099 } 1463 }
1100} 1464}
1101 1465
1102void inline_size 1466void inline_size
1103timers_reify (EV_P) 1467timers_reify (EV_P)
1104{ 1468{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1469 while (timercnt && ev_at (timers [1]) <= mn_now)
1106 { 1470 {
1107 ev_timer *w = timers [0]; 1471 ev_timer *w = (ev_timer *)timers [1];
1108 1472
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1473 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1474
1111 /* first reschedule or stop timer */ 1475 /* first reschedule or stop timer */
1112 if (w->repeat) 1476 if (w->repeat)
1113 { 1477 {
1114 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1478 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1115 1479
1116 ((WT)w)->at += w->repeat; 1480 ev_at (w) += w->repeat;
1117 if (((WT)w)->at < mn_now) 1481 if (ev_at (w) < mn_now)
1118 ((WT)w)->at = mn_now; 1482 ev_at (w) = mn_now;
1119 1483
1120 downheap ((WT *)timers, timercnt, 0); 1484 downheap (timers, timercnt, 1);
1121 } 1485 }
1122 else 1486 else
1123 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1487 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1124 1488
1125 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1489 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1128 1492
1129#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1130void inline_size 1494void inline_size
1131periodics_reify (EV_P) 1495periodics_reify (EV_P)
1132{ 1496{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1497 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1134 { 1498 {
1135 ev_periodic *w = periodics [0]; 1499 ev_periodic *w = (ev_periodic *)periodics [1];
1136 1500
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1501 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1502
1139 /* first reschedule or stop timer */ 1503 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1504 if (w->reschedule_cb)
1141 { 1505 {
1142 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1506 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1143 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1507 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1144 downheap ((WT *)periodics, periodiccnt, 0); 1508 downheap (periodics, periodiccnt, 1);
1145 } 1509 }
1146 else if (w->interval) 1510 else if (w->interval)
1147 { 1511 {
1148 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1512 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1513 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1149 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1514 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1150 downheap ((WT *)periodics, periodiccnt, 0); 1515 downheap (periodics, periodiccnt, 1);
1151 } 1516 }
1152 else 1517 else
1153 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1518 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1154 1519
1155 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1520 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1160periodics_reschedule (EV_P) 1525periodics_reschedule (EV_P)
1161{ 1526{
1162 int i; 1527 int i;
1163 1528
1164 /* adjust periodics after time jump */ 1529 /* adjust periodics after time jump */
1165 for (i = 0; i < periodiccnt; ++i) 1530 for (i = 1; i <= periodiccnt; ++i)
1166 { 1531 {
1167 ev_periodic *w = periodics [i]; 1532 ev_periodic *w = (ev_periodic *)periodics [i];
1168 1533
1169 if (w->reschedule_cb) 1534 if (w->reschedule_cb)
1170 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1535 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1171 else if (w->interval) 1536 else if (w->interval)
1172 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1537 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1173 } 1538 }
1174 1539
1175 /* now rebuild the heap */ 1540 /* now rebuild the heap */
1176 for (i = periodiccnt >> 1; i--; ) 1541 for (i = periodiccnt >> 1; i--; )
1177 downheap ((WT *)periodics, periodiccnt, i); 1542 downheap (periodics, periodiccnt, i);
1178} 1543}
1179#endif 1544#endif
1180 1545
1546#if EV_IDLE_ENABLE
1181int inline_size 1547void inline_size
1182time_update_monotonic (EV_P) 1548idle_reify (EV_P)
1183{ 1549{
1550 if (expect_false (idleall))
1551 {
1552 int pri;
1553
1554 for (pri = NUMPRI; pri--; )
1555 {
1556 if (pendingcnt [pri])
1557 break;
1558
1559 if (idlecnt [pri])
1560 {
1561 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1562 break;
1563 }
1564 }
1565 }
1566}
1567#endif
1568
1569void inline_speed
1570time_update (EV_P_ ev_tstamp max_block)
1571{
1572 int i;
1573
1574#if EV_USE_MONOTONIC
1575 if (expect_true (have_monotonic))
1576 {
1577 ev_tstamp odiff = rtmn_diff;
1578
1184 mn_now = get_clock (); 1579 mn_now = get_clock ();
1185 1580
1581 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1582 /* interpolate in the meantime */
1186 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1583 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1187 { 1584 {
1188 ev_rt_now = rtmn_diff + mn_now; 1585 ev_rt_now = rtmn_diff + mn_now;
1189 return 0; 1586 return;
1190 } 1587 }
1191 else 1588
1192 {
1193 now_floor = mn_now; 1589 now_floor = mn_now;
1194 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1195 return 1;
1196 }
1197}
1198 1591
1199void inline_size 1592 /* loop a few times, before making important decisions.
1200time_update (EV_P) 1593 * on the choice of "4": one iteration isn't enough,
1201{ 1594 * in case we get preempted during the calls to
1202 int i; 1595 * ev_time and get_clock. a second call is almost guaranteed
1203 1596 * to succeed in that case, though. and looping a few more times
1204#if EV_USE_MONOTONIC 1597 * doesn't hurt either as we only do this on time-jumps or
1205 if (expect_true (have_monotonic)) 1598 * in the unlikely event of having been preempted here.
1206 { 1599 */
1207 if (time_update_monotonic (EV_A)) 1600 for (i = 4; --i; )
1208 { 1601 {
1209 ev_tstamp odiff = rtmn_diff;
1210
1211 /* loop a few times, before making important decisions.
1212 * on the choice of "4": one iteration isn't enough,
1213 * in case we get preempted during the calls to
1214 * ev_time and get_clock. a second call is almost guarenteed
1215 * to succeed in that case, though. and looping a few more times
1216 * doesn't hurt either as we only do this on time-jumps or
1217 * in the unlikely event of getting preempted here.
1218 */
1219 for (i = 4; --i; )
1220 {
1221 rtmn_diff = ev_rt_now - mn_now; 1602 rtmn_diff = ev_rt_now - mn_now;
1222 1603
1223 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1604 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1224 return; /* all is well */ 1605 return; /* all is well */
1225 1606
1226 ev_rt_now = ev_time (); 1607 ev_rt_now = ev_time ();
1227 mn_now = get_clock (); 1608 mn_now = get_clock ();
1228 now_floor = mn_now; 1609 now_floor = mn_now;
1229 } 1610 }
1230 1611
1231# if EV_PERIODIC_ENABLE 1612# if EV_PERIODIC_ENABLE
1232 periodics_reschedule (EV_A); 1613 periodics_reschedule (EV_A);
1233# endif 1614# endif
1234 /* no timer adjustment, as the monotonic clock doesn't jump */ 1615 /* no timer adjustment, as the monotonic clock doesn't jump */
1235 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1616 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1236 }
1237 } 1617 }
1238 else 1618 else
1239#endif 1619#endif
1240 { 1620 {
1241 ev_rt_now = ev_time (); 1621 ev_rt_now = ev_time ();
1242 1622
1243 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1623 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1244 { 1624 {
1245#if EV_PERIODIC_ENABLE 1625#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1626 periodics_reschedule (EV_A);
1247#endif 1627#endif
1248
1249 /* adjust timers. this is easy, as the offset is the same for all */ 1628 /* adjust timers. this is easy, as the offset is the same for all of them */
1250 for (i = 0; i < timercnt; ++i) 1629 for (i = 1; i <= timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1630 ev_at (timers [i]) += ev_rt_now - mn_now;
1252 } 1631 }
1253 1632
1254 mn_now = ev_rt_now; 1633 mn_now = ev_rt_now;
1255 } 1634 }
1256} 1635}
… …
1270static int loop_done; 1649static int loop_done;
1271 1650
1272void 1651void
1273ev_loop (EV_P_ int flags) 1652ev_loop (EV_P_ int flags)
1274{ 1653{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1654 loop_done = EVUNLOOP_CANCEL;
1276 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL;
1278 1655
1279 while (activecnt) 1656 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1657
1658 do
1280 { 1659 {
1660#ifndef _WIN32
1661 if (expect_false (curpid)) /* penalise the forking check even more */
1662 if (expect_false (getpid () != curpid))
1663 {
1664 curpid = getpid ();
1665 postfork = 1;
1666 }
1667#endif
1668
1669#if EV_FORK_ENABLE
1670 /* we might have forked, so queue fork handlers */
1671 if (expect_false (postfork))
1672 if (forkcnt)
1673 {
1674 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1675 call_pending (EV_A);
1676 }
1677#endif
1678
1281 /* queue check watchers (and execute them) */ 1679 /* queue prepare watchers (and execute them) */
1282 if (expect_false (preparecnt)) 1680 if (expect_false (preparecnt))
1283 { 1681 {
1284 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1682 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1285 call_pending (EV_A); 1683 call_pending (EV_A);
1286 } 1684 }
1287 1685
1686 if (expect_false (!activecnt))
1687 break;
1688
1288 /* we might have forked, so reify kernel state if necessary */ 1689 /* we might have forked, so reify kernel state if necessary */
1289 if (expect_false (postfork)) 1690 if (expect_false (postfork))
1290 loop_fork (EV_A); 1691 loop_fork (EV_A);
1291 1692
1292 /* update fd-related kernel structures */ 1693 /* update fd-related kernel structures */
1293 fd_reify (EV_A); 1694 fd_reify (EV_A);
1294 1695
1295 /* calculate blocking time */ 1696 /* calculate blocking time */
1296 { 1697 {
1297 double block; 1698 ev_tstamp waittime = 0.;
1699 ev_tstamp sleeptime = 0.;
1298 1700
1299 if (flags & EVLOOP_NONBLOCK || idlecnt) 1701 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1300 block = 0.; /* do not block at all */
1301 else
1302 { 1702 {
1303 /* update time to cancel out callback processing overhead */ 1703 /* update time to cancel out callback processing overhead */
1304#if EV_USE_MONOTONIC
1305 if (expect_true (have_monotonic))
1306 time_update_monotonic (EV_A); 1704 time_update (EV_A_ 1e100);
1307 else
1308#endif
1309 {
1310 ev_rt_now = ev_time ();
1311 mn_now = ev_rt_now;
1312 }
1313 1705
1314 block = MAX_BLOCKTIME; 1706 waittime = MAX_BLOCKTIME;
1315 1707
1316 if (timercnt) 1708 if (timercnt)
1317 { 1709 {
1318 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1710 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1319 if (block > to) block = to; 1711 if (waittime > to) waittime = to;
1320 } 1712 }
1321 1713
1322#if EV_PERIODIC_ENABLE 1714#if EV_PERIODIC_ENABLE
1323 if (periodiccnt) 1715 if (periodiccnt)
1324 { 1716 {
1325 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1717 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1326 if (block > to) block = to; 1718 if (waittime > to) waittime = to;
1327 } 1719 }
1328#endif 1720#endif
1329 1721
1330 if (expect_false (block < 0.)) block = 0.; 1722 if (expect_false (waittime < timeout_blocktime))
1723 waittime = timeout_blocktime;
1724
1725 sleeptime = waittime - backend_fudge;
1726
1727 if (expect_true (sleeptime > io_blocktime))
1728 sleeptime = io_blocktime;
1729
1730 if (sleeptime)
1731 {
1732 ev_sleep (sleeptime);
1733 waittime -= sleeptime;
1734 }
1331 } 1735 }
1332 1736
1737 ++loop_count;
1333 backend_poll (EV_A_ block); 1738 backend_poll (EV_A_ waittime);
1739
1740 /* update ev_rt_now, do magic */
1741 time_update (EV_A_ waittime + sleeptime);
1334 } 1742 }
1335
1336 /* update ev_rt_now, do magic */
1337 time_update (EV_A);
1338 1743
1339 /* queue pending timers and reschedule them */ 1744 /* queue pending timers and reschedule them */
1340 timers_reify (EV_A); /* relative timers called last */ 1745 timers_reify (EV_A); /* relative timers called last */
1341#if EV_PERIODIC_ENABLE 1746#if EV_PERIODIC_ENABLE
1342 periodics_reify (EV_A); /* absolute timers called first */ 1747 periodics_reify (EV_A); /* absolute timers called first */
1343#endif 1748#endif
1344 1749
1750#if EV_IDLE_ENABLE
1345 /* queue idle watchers unless other events are pending */ 1751 /* queue idle watchers unless other events are pending */
1346 if (idlecnt && !any_pending (EV_A)) 1752 idle_reify (EV_A);
1347 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1753#endif
1348 1754
1349 /* queue check watchers, to be executed first */ 1755 /* queue check watchers, to be executed first */
1350 if (expect_false (checkcnt)) 1756 if (expect_false (checkcnt))
1351 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1757 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1352 1758
1353 call_pending (EV_A); 1759 call_pending (EV_A);
1354
1355 if (expect_false (loop_done))
1356 break;
1357 } 1760 }
1761 while (expect_true (
1762 activecnt
1763 && !loop_done
1764 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1765 ));
1358 1766
1359 if (loop_done == EVUNLOOP_ONE) 1767 if (loop_done == EVUNLOOP_ONE)
1360 loop_done = EVUNLOOP_CANCEL; 1768 loop_done = EVUNLOOP_CANCEL;
1361} 1769}
1362 1770
… …
1389 head = &(*head)->next; 1797 head = &(*head)->next;
1390 } 1798 }
1391} 1799}
1392 1800
1393void inline_speed 1801void inline_speed
1394ev_clear_pending (EV_P_ W w) 1802clear_pending (EV_P_ W w)
1395{ 1803{
1396 if (w->pending) 1804 if (w->pending)
1397 { 1805 {
1398 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1806 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1399 w->pending = 0; 1807 w->pending = 0;
1400 } 1808 }
1401} 1809}
1402 1810
1811int
1812ev_clear_pending (EV_P_ void *w)
1813{
1814 W w_ = (W)w;
1815 int pending = w_->pending;
1816
1817 if (expect_true (pending))
1818 {
1819 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1820 w_->pending = 0;
1821 p->w = 0;
1822 return p->events;
1823 }
1824 else
1825 return 0;
1826}
1827
1828void inline_size
1829pri_adjust (EV_P_ W w)
1830{
1831 int pri = w->priority;
1832 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1833 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1834 w->priority = pri;
1835}
1836
1403void inline_speed 1837void inline_speed
1404ev_start (EV_P_ W w, int active) 1838ev_start (EV_P_ W w, int active)
1405{ 1839{
1406 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1840 pri_adjust (EV_A_ w);
1407 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1408
1409 w->active = active; 1841 w->active = active;
1410 ev_ref (EV_A); 1842 ev_ref (EV_A);
1411} 1843}
1412 1844
1413void inline_size 1845void inline_size
… …
1417 w->active = 0; 1849 w->active = 0;
1418} 1850}
1419 1851
1420/*****************************************************************************/ 1852/*****************************************************************************/
1421 1853
1422void 1854void noinline
1423ev_io_start (EV_P_ ev_io *w) 1855ev_io_start (EV_P_ ev_io *w)
1424{ 1856{
1425 int fd = w->fd; 1857 int fd = w->fd;
1426 1858
1427 if (expect_false (ev_is_active (w))) 1859 if (expect_false (ev_is_active (w)))
… …
1429 1861
1430 assert (("ev_io_start called with negative fd", fd >= 0)); 1862 assert (("ev_io_start called with negative fd", fd >= 0));
1431 1863
1432 ev_start (EV_A_ (W)w, 1); 1864 ev_start (EV_A_ (W)w, 1);
1433 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1865 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1434 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1866 wlist_add (&anfds[fd].head, (WL)w);
1435 1867
1436 fd_change (EV_A_ fd); 1868 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1869 w->events &= ~EV_IOFDSET;
1437} 1870}
1438 1871
1439void 1872void noinline
1440ev_io_stop (EV_P_ ev_io *w) 1873ev_io_stop (EV_P_ ev_io *w)
1441{ 1874{
1442 ev_clear_pending (EV_A_ (W)w); 1875 clear_pending (EV_A_ (W)w);
1443 if (expect_false (!ev_is_active (w))) 1876 if (expect_false (!ev_is_active (w)))
1444 return; 1877 return;
1445 1878
1446 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1879 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1447 1880
1448 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1881 wlist_del (&anfds[w->fd].head, (WL)w);
1449 ev_stop (EV_A_ (W)w); 1882 ev_stop (EV_A_ (W)w);
1450 1883
1451 fd_change (EV_A_ w->fd); 1884 fd_change (EV_A_ w->fd, 1);
1452} 1885}
1453 1886
1454void 1887void noinline
1455ev_timer_start (EV_P_ ev_timer *w) 1888ev_timer_start (EV_P_ ev_timer *w)
1456{ 1889{
1457 if (expect_false (ev_is_active (w))) 1890 if (expect_false (ev_is_active (w)))
1458 return; 1891 return;
1459 1892
1460 ((WT)w)->at += mn_now; 1893 ev_at (w) += mn_now;
1461 1894
1462 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1895 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1463 1896
1464 ev_start (EV_A_ (W)w, ++timercnt); 1897 ev_start (EV_A_ (W)w, ++timercnt);
1465 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1898 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1466 timers [timercnt - 1] = w; 1899 timers [timercnt] = (WT)w;
1467 upheap ((WT *)timers, timercnt - 1); 1900 upheap (timers, timercnt);
1468 1901
1469 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1902 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1470} 1903}
1471 1904
1472void 1905void noinline
1473ev_timer_stop (EV_P_ ev_timer *w) 1906ev_timer_stop (EV_P_ ev_timer *w)
1474{ 1907{
1475 ev_clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1476 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1477 return; 1910 return;
1478 1911
1912 {
1913 int active = ev_active (w);
1914
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1915 assert (("internal timer heap corruption", timers [active] == (WT)w));
1480 1916
1481 if (expect_true (((W)w)->active < timercnt--)) 1917 if (expect_true (active < timercnt))
1482 { 1918 {
1483 timers [((W)w)->active - 1] = timers [timercnt]; 1919 timers [active] = timers [timercnt];
1484 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1920 adjustheap (timers, timercnt, active);
1485 } 1921 }
1486 1922
1487 ((WT)w)->at -= mn_now; 1923 --timercnt;
1924 }
1925
1926 ev_at (w) -= mn_now;
1488 1927
1489 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1490} 1929}
1491 1930
1492void 1931void noinline
1493ev_timer_again (EV_P_ ev_timer *w) 1932ev_timer_again (EV_P_ ev_timer *w)
1494{ 1933{
1495 if (ev_is_active (w)) 1934 if (ev_is_active (w))
1496 { 1935 {
1497 if (w->repeat) 1936 if (w->repeat)
1498 { 1937 {
1499 ((WT)w)->at = mn_now + w->repeat; 1938 ev_at (w) = mn_now + w->repeat;
1500 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1939 adjustheap (timers, timercnt, ev_active (w));
1501 } 1940 }
1502 else 1941 else
1503 ev_timer_stop (EV_A_ w); 1942 ev_timer_stop (EV_A_ w);
1504 } 1943 }
1505 else if (w->repeat) 1944 else if (w->repeat)
1506 { 1945 {
1507 w->at = w->repeat; 1946 ev_at (w) = w->repeat;
1508 ev_timer_start (EV_A_ w); 1947 ev_timer_start (EV_A_ w);
1509 } 1948 }
1510} 1949}
1511 1950
1512#if EV_PERIODIC_ENABLE 1951#if EV_PERIODIC_ENABLE
1513void 1952void noinline
1514ev_periodic_start (EV_P_ ev_periodic *w) 1953ev_periodic_start (EV_P_ ev_periodic *w)
1515{ 1954{
1516 if (expect_false (ev_is_active (w))) 1955 if (expect_false (ev_is_active (w)))
1517 return; 1956 return;
1518 1957
1519 if (w->reschedule_cb) 1958 if (w->reschedule_cb)
1520 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1959 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1521 else if (w->interval) 1960 else if (w->interval)
1522 { 1961 {
1523 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1962 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1524 /* this formula differs from the one in periodic_reify because we do not always round up */ 1963 /* this formula differs from the one in periodic_reify because we do not always round up */
1525 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1964 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1526 } 1965 }
1966 else
1967 ev_at (w) = w->offset;
1527 1968
1528 ev_start (EV_A_ (W)w, ++periodiccnt); 1969 ev_start (EV_A_ (W)w, ++periodiccnt);
1529 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1970 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1530 periodics [periodiccnt - 1] = w; 1971 periodics [periodiccnt] = (WT)w;
1531 upheap ((WT *)periodics, periodiccnt - 1); 1972 upheap (periodics, periodiccnt);
1532 1973
1533 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1974 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1534} 1975}
1535 1976
1536void 1977void noinline
1537ev_periodic_stop (EV_P_ ev_periodic *w) 1978ev_periodic_stop (EV_P_ ev_periodic *w)
1538{ 1979{
1539 ev_clear_pending (EV_A_ (W)w); 1980 clear_pending (EV_A_ (W)w);
1540 if (expect_false (!ev_is_active (w))) 1981 if (expect_false (!ev_is_active (w)))
1541 return; 1982 return;
1542 1983
1984 {
1985 int active = ev_active (w);
1986
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1987 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1544 1988
1545 if (expect_true (((W)w)->active < periodiccnt--)) 1989 if (expect_true (active < periodiccnt))
1546 { 1990 {
1547 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1991 periodics [active] = periodics [periodiccnt];
1548 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1992 adjustheap (periodics, periodiccnt, active);
1549 } 1993 }
1994
1995 --periodiccnt;
1996 }
1550 1997
1551 ev_stop (EV_A_ (W)w); 1998 ev_stop (EV_A_ (W)w);
1552} 1999}
1553 2000
1554void 2001void noinline
1555ev_periodic_again (EV_P_ ev_periodic *w) 2002ev_periodic_again (EV_P_ ev_periodic *w)
1556{ 2003{
1557 /* TODO: use adjustheap and recalculation */ 2004 /* TODO: use adjustheap and recalculation */
1558 ev_periodic_stop (EV_A_ w); 2005 ev_periodic_stop (EV_A_ w);
1559 ev_periodic_start (EV_A_ w); 2006 ev_periodic_start (EV_A_ w);
… …
1562 2009
1563#ifndef SA_RESTART 2010#ifndef SA_RESTART
1564# define SA_RESTART 0 2011# define SA_RESTART 0
1565#endif 2012#endif
1566 2013
1567void 2014void noinline
1568ev_signal_start (EV_P_ ev_signal *w) 2015ev_signal_start (EV_P_ ev_signal *w)
1569{ 2016{
1570#if EV_MULTIPLICITY 2017#if EV_MULTIPLICITY
1571 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2018 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1572#endif 2019#endif
1573 if (expect_false (ev_is_active (w))) 2020 if (expect_false (ev_is_active (w)))
1574 return; 2021 return;
1575 2022
1576 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2023 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1577 2024
2025 evpipe_init (EV_A);
2026
2027 {
2028#ifndef _WIN32
2029 sigset_t full, prev;
2030 sigfillset (&full);
2031 sigprocmask (SIG_SETMASK, &full, &prev);
2032#endif
2033
2034 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2035
2036#ifndef _WIN32
2037 sigprocmask (SIG_SETMASK, &prev, 0);
2038#endif
2039 }
2040
1578 ev_start (EV_A_ (W)w, 1); 2041 ev_start (EV_A_ (W)w, 1);
1579 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1580 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2042 wlist_add (&signals [w->signum - 1].head, (WL)w);
1581 2043
1582 if (!((WL)w)->next) 2044 if (!((WL)w)->next)
1583 { 2045 {
1584#if _WIN32 2046#if _WIN32
1585 signal (w->signum, sighandler); 2047 signal (w->signum, ev_sighandler);
1586#else 2048#else
1587 struct sigaction sa; 2049 struct sigaction sa;
1588 sa.sa_handler = sighandler; 2050 sa.sa_handler = ev_sighandler;
1589 sigfillset (&sa.sa_mask); 2051 sigfillset (&sa.sa_mask);
1590 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2052 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1591 sigaction (w->signum, &sa, 0); 2053 sigaction (w->signum, &sa, 0);
1592#endif 2054#endif
1593 } 2055 }
1594} 2056}
1595 2057
1596void 2058void noinline
1597ev_signal_stop (EV_P_ ev_signal *w) 2059ev_signal_stop (EV_P_ ev_signal *w)
1598{ 2060{
1599 ev_clear_pending (EV_A_ (W)w); 2061 clear_pending (EV_A_ (W)w);
1600 if (expect_false (!ev_is_active (w))) 2062 if (expect_false (!ev_is_active (w)))
1601 return; 2063 return;
1602 2064
1603 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2065 wlist_del (&signals [w->signum - 1].head, (WL)w);
1604 ev_stop (EV_A_ (W)w); 2066 ev_stop (EV_A_ (W)w);
1605 2067
1606 if (!signals [w->signum - 1].head) 2068 if (!signals [w->signum - 1].head)
1607 signal (w->signum, SIG_DFL); 2069 signal (w->signum, SIG_DFL);
1608} 2070}
… …
1615#endif 2077#endif
1616 if (expect_false (ev_is_active (w))) 2078 if (expect_false (ev_is_active (w)))
1617 return; 2079 return;
1618 2080
1619 ev_start (EV_A_ (W)w, 1); 2081 ev_start (EV_A_ (W)w, 1);
1620 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2082 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1621} 2083}
1622 2084
1623void 2085void
1624ev_child_stop (EV_P_ ev_child *w) 2086ev_child_stop (EV_P_ ev_child *w)
1625{ 2087{
1626 ev_clear_pending (EV_A_ (W)w); 2088 clear_pending (EV_A_ (W)w);
1627 if (expect_false (!ev_is_active (w))) 2089 if (expect_false (!ev_is_active (w)))
1628 return; 2090 return;
1629 2091
1630 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2092 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631 ev_stop (EV_A_ (W)w); 2093 ev_stop (EV_A_ (W)w);
1632} 2094}
1633 2095
1634#if EV_STAT_ENABLE 2096#if EV_STAT_ENABLE
1635 2097
1636# ifdef _WIN32 2098# ifdef _WIN32
2099# undef lstat
1637# define lstat(a,b) stat(a,b) 2100# define lstat(a,b) _stati64 (a,b)
1638# endif 2101# endif
1639 2102
1640#define DEF_STAT_INTERVAL 5.0074891 2103#define DEF_STAT_INTERVAL 5.0074891
1641#define MIN_STAT_INTERVAL 0.1074891 2104#define MIN_STAT_INTERVAL 0.1074891
2105
2106static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2107
2108#if EV_USE_INOTIFY
2109# define EV_INOTIFY_BUFSIZE 8192
2110
2111static void noinline
2112infy_add (EV_P_ ev_stat *w)
2113{
2114 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2115
2116 if (w->wd < 0)
2117 {
2118 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2119
2120 /* monitor some parent directory for speedup hints */
2121 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2122 {
2123 char path [4096];
2124 strcpy (path, w->path);
2125
2126 do
2127 {
2128 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2129 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2130
2131 char *pend = strrchr (path, '/');
2132
2133 if (!pend)
2134 break; /* whoops, no '/', complain to your admin */
2135
2136 *pend = 0;
2137 w->wd = inotify_add_watch (fs_fd, path, mask);
2138 }
2139 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2140 }
2141 }
2142 else
2143 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2144
2145 if (w->wd >= 0)
2146 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2147}
2148
2149static void noinline
2150infy_del (EV_P_ ev_stat *w)
2151{
2152 int slot;
2153 int wd = w->wd;
2154
2155 if (wd < 0)
2156 return;
2157
2158 w->wd = -2;
2159 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
2160 wlist_del (&fs_hash [slot].head, (WL)w);
2161
2162 /* remove this watcher, if others are watching it, they will rearm */
2163 inotify_rm_watch (fs_fd, wd);
2164}
2165
2166static void noinline
2167infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2168{
2169 if (slot < 0)
2170 /* overflow, need to check for all hahs slots */
2171 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2172 infy_wd (EV_A_ slot, wd, ev);
2173 else
2174 {
2175 WL w_;
2176
2177 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
2178 {
2179 ev_stat *w = (ev_stat *)w_;
2180 w_ = w_->next; /* lets us remove this watcher and all before it */
2181
2182 if (w->wd == wd || wd == -1)
2183 {
2184 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2185 {
2186 w->wd = -1;
2187 infy_add (EV_A_ w); /* re-add, no matter what */
2188 }
2189
2190 stat_timer_cb (EV_A_ &w->timer, 0);
2191 }
2192 }
2193 }
2194}
2195
2196static void
2197infy_cb (EV_P_ ev_io *w, int revents)
2198{
2199 char buf [EV_INOTIFY_BUFSIZE];
2200 struct inotify_event *ev = (struct inotify_event *)buf;
2201 int ofs;
2202 int len = read (fs_fd, buf, sizeof (buf));
2203
2204 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2205 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2206}
2207
2208void inline_size
2209infy_init (EV_P)
2210{
2211 if (fs_fd != -2)
2212 return;
2213
2214 fs_fd = inotify_init ();
2215
2216 if (fs_fd >= 0)
2217 {
2218 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2219 ev_set_priority (&fs_w, EV_MAXPRI);
2220 ev_io_start (EV_A_ &fs_w);
2221 }
2222}
2223
2224void inline_size
2225infy_fork (EV_P)
2226{
2227 int slot;
2228
2229 if (fs_fd < 0)
2230 return;
2231
2232 close (fs_fd);
2233 fs_fd = inotify_init ();
2234
2235 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2236 {
2237 WL w_ = fs_hash [slot].head;
2238 fs_hash [slot].head = 0;
2239
2240 while (w_)
2241 {
2242 ev_stat *w = (ev_stat *)w_;
2243 w_ = w_->next; /* lets us add this watcher */
2244
2245 w->wd = -1;
2246
2247 if (fs_fd >= 0)
2248 infy_add (EV_A_ w); /* re-add, no matter what */
2249 else
2250 ev_timer_start (EV_A_ &w->timer);
2251 }
2252
2253 }
2254}
2255
2256#endif
1642 2257
1643void 2258void
1644ev_stat_stat (EV_P_ ev_stat *w) 2259ev_stat_stat (EV_P_ ev_stat *w)
1645{ 2260{
1646 if (lstat (w->path, &w->attr) < 0) 2261 if (lstat (w->path, &w->attr) < 0)
1647 w->attr.st_nlink = 0; 2262 w->attr.st_nlink = 0;
1648 else if (!w->attr.st_nlink) 2263 else if (!w->attr.st_nlink)
1649 w->attr.st_nlink = 1; 2264 w->attr.st_nlink = 1;
1650} 2265}
1651 2266
1652static void 2267static void noinline
1653stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2268stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1654{ 2269{
1655 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2270 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1656 2271
1657 /* we copy this here each the time so that */ 2272 /* we copy this here each the time so that */
1658 /* prev has the old value when the callback gets invoked */ 2273 /* prev has the old value when the callback gets invoked */
1659 w->prev = w->attr; 2274 w->prev = w->attr;
1660 ev_stat_stat (EV_A_ w); 2275 ev_stat_stat (EV_A_ w);
1661 2276
1662 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2277 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2278 if (
2279 w->prev.st_dev != w->attr.st_dev
2280 || w->prev.st_ino != w->attr.st_ino
2281 || w->prev.st_mode != w->attr.st_mode
2282 || w->prev.st_nlink != w->attr.st_nlink
2283 || w->prev.st_uid != w->attr.st_uid
2284 || w->prev.st_gid != w->attr.st_gid
2285 || w->prev.st_rdev != w->attr.st_rdev
2286 || w->prev.st_size != w->attr.st_size
2287 || w->prev.st_atime != w->attr.st_atime
2288 || w->prev.st_mtime != w->attr.st_mtime
2289 || w->prev.st_ctime != w->attr.st_ctime
2290 ) {
2291 #if EV_USE_INOTIFY
2292 infy_del (EV_A_ w);
2293 infy_add (EV_A_ w);
2294 ev_stat_stat (EV_A_ w); /* avoid race... */
2295 #endif
2296
1663 ev_feed_event (EV_A_ w, EV_STAT); 2297 ev_feed_event (EV_A_ w, EV_STAT);
2298 }
1664} 2299}
1665 2300
1666void 2301void
1667ev_stat_start (EV_P_ ev_stat *w) 2302ev_stat_start (EV_P_ ev_stat *w)
1668{ 2303{
… …
1678 if (w->interval < MIN_STAT_INTERVAL) 2313 if (w->interval < MIN_STAT_INTERVAL)
1679 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2314 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1680 2315
1681 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2316 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1682 ev_set_priority (&w->timer, ev_priority (w)); 2317 ev_set_priority (&w->timer, ev_priority (w));
2318
2319#if EV_USE_INOTIFY
2320 infy_init (EV_A);
2321
2322 if (fs_fd >= 0)
2323 infy_add (EV_A_ w);
2324 else
2325#endif
1683 ev_timer_start (EV_A_ &w->timer); 2326 ev_timer_start (EV_A_ &w->timer);
1684 2327
1685 ev_start (EV_A_ (W)w, 1); 2328 ev_start (EV_A_ (W)w, 1);
1686} 2329}
1687 2330
1688void 2331void
1689ev_stat_stop (EV_P_ ev_stat *w) 2332ev_stat_stop (EV_P_ ev_stat *w)
1690{ 2333{
1691 ev_clear_pending (EV_A_ (W)w); 2334 clear_pending (EV_A_ (W)w);
1692 if (expect_false (!ev_is_active (w))) 2335 if (expect_false (!ev_is_active (w)))
1693 return; 2336 return;
1694 2337
2338#if EV_USE_INOTIFY
2339 infy_del (EV_A_ w);
2340#endif
1695 ev_timer_stop (EV_A_ &w->timer); 2341 ev_timer_stop (EV_A_ &w->timer);
1696 2342
1697 ev_stop (EV_A_ (W)w); 2343 ev_stop (EV_A_ (W)w);
1698} 2344}
1699#endif 2345#endif
1700 2346
2347#if EV_IDLE_ENABLE
1701void 2348void
1702ev_idle_start (EV_P_ ev_idle *w) 2349ev_idle_start (EV_P_ ev_idle *w)
1703{ 2350{
1704 if (expect_false (ev_is_active (w))) 2351 if (expect_false (ev_is_active (w)))
1705 return; 2352 return;
1706 2353
2354 pri_adjust (EV_A_ (W)w);
2355
2356 {
2357 int active = ++idlecnt [ABSPRI (w)];
2358
2359 ++idleall;
1707 ev_start (EV_A_ (W)w, ++idlecnt); 2360 ev_start (EV_A_ (W)w, active);
2361
1708 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2362 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1709 idles [idlecnt - 1] = w; 2363 idles [ABSPRI (w)][active - 1] = w;
2364 }
1710} 2365}
1711 2366
1712void 2367void
1713ev_idle_stop (EV_P_ ev_idle *w) 2368ev_idle_stop (EV_P_ ev_idle *w)
1714{ 2369{
1715 ev_clear_pending (EV_A_ (W)w); 2370 clear_pending (EV_A_ (W)w);
1716 if (expect_false (!ev_is_active (w))) 2371 if (expect_false (!ev_is_active (w)))
1717 return; 2372 return;
1718 2373
1719 { 2374 {
1720 int active = ((W)w)->active; 2375 int active = ev_active (w);
1721 idles [active - 1] = idles [--idlecnt]; 2376
1722 ((W)idles [active - 1])->active = active; 2377 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2378 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2379
2380 ev_stop (EV_A_ (W)w);
2381 --idleall;
1723 } 2382 }
1724
1725 ev_stop (EV_A_ (W)w);
1726} 2383}
2384#endif
1727 2385
1728void 2386void
1729ev_prepare_start (EV_P_ ev_prepare *w) 2387ev_prepare_start (EV_P_ ev_prepare *w)
1730{ 2388{
1731 if (expect_false (ev_is_active (w))) 2389 if (expect_false (ev_is_active (w)))
… …
1737} 2395}
1738 2396
1739void 2397void
1740ev_prepare_stop (EV_P_ ev_prepare *w) 2398ev_prepare_stop (EV_P_ ev_prepare *w)
1741{ 2399{
1742 ev_clear_pending (EV_A_ (W)w); 2400 clear_pending (EV_A_ (W)w);
1743 if (expect_false (!ev_is_active (w))) 2401 if (expect_false (!ev_is_active (w)))
1744 return; 2402 return;
1745 2403
1746 { 2404 {
1747 int active = ((W)w)->active; 2405 int active = ev_active (w);
2406
1748 prepares [active - 1] = prepares [--preparecnt]; 2407 prepares [active - 1] = prepares [--preparecnt];
1749 ((W)prepares [active - 1])->active = active; 2408 ev_active (prepares [active - 1]) = active;
1750 } 2409 }
1751 2410
1752 ev_stop (EV_A_ (W)w); 2411 ev_stop (EV_A_ (W)w);
1753} 2412}
1754 2413
… …
1764} 2423}
1765 2424
1766void 2425void
1767ev_check_stop (EV_P_ ev_check *w) 2426ev_check_stop (EV_P_ ev_check *w)
1768{ 2427{
1769 ev_clear_pending (EV_A_ (W)w); 2428 clear_pending (EV_A_ (W)w);
1770 if (expect_false (!ev_is_active (w))) 2429 if (expect_false (!ev_is_active (w)))
1771 return; 2430 return;
1772 2431
1773 { 2432 {
1774 int active = ((W)w)->active; 2433 int active = ev_active (w);
2434
1775 checks [active - 1] = checks [--checkcnt]; 2435 checks [active - 1] = checks [--checkcnt];
1776 ((W)checks [active - 1])->active = active; 2436 ev_active (checks [active - 1]) = active;
1777 } 2437 }
1778 2438
1779 ev_stop (EV_A_ (W)w); 2439 ev_stop (EV_A_ (W)w);
1780} 2440}
1781 2441
1782#if EV_EMBED_ENABLE 2442#if EV_EMBED_ENABLE
1783void noinline 2443void noinline
1784ev_embed_sweep (EV_P_ ev_embed *w) 2444ev_embed_sweep (EV_P_ ev_embed *w)
1785{ 2445{
1786 ev_loop (w->loop, EVLOOP_NONBLOCK); 2446 ev_loop (w->other, EVLOOP_NONBLOCK);
1787} 2447}
1788 2448
1789static void 2449static void
1790embed_cb (EV_P_ ev_io *io, int revents) 2450embed_io_cb (EV_P_ ev_io *io, int revents)
1791{ 2451{
1792 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2452 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1793 2453
1794 if (ev_cb (w)) 2454 if (ev_cb (w))
1795 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2455 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1796 else 2456 else
1797 ev_embed_sweep (loop, w); 2457 ev_loop (w->other, EVLOOP_NONBLOCK);
1798} 2458}
2459
2460static void
2461embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2462{
2463 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2464
2465 {
2466 struct ev_loop *loop = w->other;
2467
2468 while (fdchangecnt)
2469 {
2470 fd_reify (EV_A);
2471 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2472 }
2473 }
2474}
2475
2476#if 0
2477static void
2478embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2479{
2480 ev_idle_stop (EV_A_ idle);
2481}
2482#endif
1799 2483
1800void 2484void
1801ev_embed_start (EV_P_ ev_embed *w) 2485ev_embed_start (EV_P_ ev_embed *w)
1802{ 2486{
1803 if (expect_false (ev_is_active (w))) 2487 if (expect_false (ev_is_active (w)))
1804 return; 2488 return;
1805 2489
1806 { 2490 {
1807 struct ev_loop *loop = w->loop; 2491 struct ev_loop *loop = w->other;
1808 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2492 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1809 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2493 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1810 } 2494 }
1811 2495
1812 ev_set_priority (&w->io, ev_priority (w)); 2496 ev_set_priority (&w->io, ev_priority (w));
1813 ev_io_start (EV_A_ &w->io); 2497 ev_io_start (EV_A_ &w->io);
1814 2498
2499 ev_prepare_init (&w->prepare, embed_prepare_cb);
2500 ev_set_priority (&w->prepare, EV_MINPRI);
2501 ev_prepare_start (EV_A_ &w->prepare);
2502
2503 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2504
1815 ev_start (EV_A_ (W)w, 1); 2505 ev_start (EV_A_ (W)w, 1);
1816} 2506}
1817 2507
1818void 2508void
1819ev_embed_stop (EV_P_ ev_embed *w) 2509ev_embed_stop (EV_P_ ev_embed *w)
1820{ 2510{
1821 ev_clear_pending (EV_A_ (W)w); 2511 clear_pending (EV_A_ (W)w);
1822 if (expect_false (!ev_is_active (w))) 2512 if (expect_false (!ev_is_active (w)))
1823 return; 2513 return;
1824 2514
1825 ev_io_stop (EV_A_ &w->io); 2515 ev_io_stop (EV_A_ &w->io);
2516 ev_prepare_stop (EV_A_ &w->prepare);
1826 2517
1827 ev_stop (EV_A_ (W)w); 2518 ev_stop (EV_A_ (W)w);
2519}
2520#endif
2521
2522#if EV_FORK_ENABLE
2523void
2524ev_fork_start (EV_P_ ev_fork *w)
2525{
2526 if (expect_false (ev_is_active (w)))
2527 return;
2528
2529 ev_start (EV_A_ (W)w, ++forkcnt);
2530 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2531 forks [forkcnt - 1] = w;
2532}
2533
2534void
2535ev_fork_stop (EV_P_ ev_fork *w)
2536{
2537 clear_pending (EV_A_ (W)w);
2538 if (expect_false (!ev_is_active (w)))
2539 return;
2540
2541 {
2542 int active = ev_active (w);
2543
2544 forks [active - 1] = forks [--forkcnt];
2545 ev_active (forks [active - 1]) = active;
2546 }
2547
2548 ev_stop (EV_A_ (W)w);
2549}
2550#endif
2551
2552#if EV_ASYNC_ENABLE
2553void
2554ev_async_start (EV_P_ ev_async *w)
2555{
2556 if (expect_false (ev_is_active (w)))
2557 return;
2558
2559 evpipe_init (EV_A);
2560
2561 ev_start (EV_A_ (W)w, ++asynccnt);
2562 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2563 asyncs [asynccnt - 1] = w;
2564}
2565
2566void
2567ev_async_stop (EV_P_ ev_async *w)
2568{
2569 clear_pending (EV_A_ (W)w);
2570 if (expect_false (!ev_is_active (w)))
2571 return;
2572
2573 {
2574 int active = ev_active (w);
2575
2576 asyncs [active - 1] = asyncs [--asynccnt];
2577 ev_active (asyncs [active - 1]) = active;
2578 }
2579
2580 ev_stop (EV_A_ (W)w);
2581}
2582
2583void
2584ev_async_send (EV_P_ ev_async *w)
2585{
2586 w->sent = 1;
2587 evpipe_write (EV_A_ &gotasync);
1828} 2588}
1829#endif 2589#endif
1830 2590
1831/*****************************************************************************/ 2591/*****************************************************************************/
1832 2592
… …
1890 ev_timer_set (&once->to, timeout, 0.); 2650 ev_timer_set (&once->to, timeout, 0.);
1891 ev_timer_start (EV_A_ &once->to); 2651 ev_timer_start (EV_A_ &once->to);
1892 } 2652 }
1893} 2653}
1894 2654
2655#if EV_MULTIPLICITY
2656 #include "ev_wrap.h"
2657#endif
2658
1895#ifdef __cplusplus 2659#ifdef __cplusplus
1896} 2660}
1897#endif 2661#endif
1898 2662

Diff Legend

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