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

Comparing libev/ev.c (file contents):
Revision 1.147 by root, Tue Nov 27 10:59:11 2007 UTC vs.
Revision 1.231 by root, Mon May 5 20:47:33 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
525int inline_size
526array_nextsize (int elem, int cur, int cnt)
527{
528 int ncur = cur + 1;
529
530 do
531 ncur <<= 1;
532 while (cnt > ncur);
533
534 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
535 if (elem * ncur > 4096)
536 {
537 ncur *= elem;
538 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
539 ncur = ncur - sizeof (void *) * 4;
540 ncur /= elem;
541 }
542
543 return ncur;
544}
545
546static noinline void *
547array_realloc (int elem, void *base, int *cur, int cnt)
548{
549 *cur = array_nextsize (elem, *cur, cnt);
550 return ev_realloc (base, elem * *cur);
551}
360 552
361#define array_needsize(type,base,cur,cnt,init) \ 553#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 554 if (expect_false ((cnt) > (cur))) \
363 { \ 555 { \
364 int newcnt = cur; \ 556 int ocur_ = (cur); \
365 do \ 557 (base) = (type *)array_realloc \
366 { \ 558 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 559 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 } 560 }
375 561
562#if 0
376#define array_slim(type,stem) \ 563#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 564 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 565 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 566 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 567 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 568 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 569 }
570#endif
383 571
384#define array_free(stem, idx) \ 572#define array_free(stem, idx) \
385 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 573 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
386 574
387/*****************************************************************************/ 575/*****************************************************************************/
388 576
389void noinline 577void noinline
390ev_feed_event (EV_P_ void *w, int revents) 578ev_feed_event (EV_P_ void *w, int revents)
391{ 579{
392 W w_ = (W)w; 580 W w_ = (W)w;
581 int pri = ABSPRI (w_);
393 582
394 if (expect_false (w_->pending)) 583 if (expect_false (w_->pending))
584 pendings [pri][w_->pending - 1].events |= revents;
585 else
395 { 586 {
587 w_->pending = ++pendingcnt [pri];
588 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
589 pendings [pri][w_->pending - 1].w = w_;
396 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 590 pendings [pri][w_->pending - 1].events = revents;
397 return;
398 } 591 }
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} 592}
405 593
406void inline_size 594void inline_speed
407queue_events (EV_P_ W *events, int eventcnt, int type) 595queue_events (EV_P_ W *events, int eventcnt, int type)
408{ 596{
409 int i; 597 int i;
410 598
411 for (i = 0; i < eventcnt; ++i) 599 for (i = 0; i < eventcnt; ++i)
… …
443} 631}
444 632
445void 633void
446ev_feed_fd_event (EV_P_ int fd, int revents) 634ev_feed_fd_event (EV_P_ int fd, int revents)
447{ 635{
636 if (fd >= 0 && fd < anfdmax)
448 fd_event (EV_A_ fd, revents); 637 fd_event (EV_A_ fd, revents);
449} 638}
450 639
451void inline_size 640void inline_size
452fd_reify (EV_P) 641fd_reify (EV_P)
453{ 642{
… …
457 { 646 {
458 int fd = fdchanges [i]; 647 int fd = fdchanges [i];
459 ANFD *anfd = anfds + fd; 648 ANFD *anfd = anfds + fd;
460 ev_io *w; 649 ev_io *w;
461 650
462 int events = 0; 651 unsigned char events = 0;
463 652
464 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 653 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
465 events |= w->events; 654 events |= (unsigned char)w->events;
466 655
467#if EV_SELECT_IS_WINSOCKET 656#if EV_SELECT_IS_WINSOCKET
468 if (events) 657 if (events)
469 { 658 {
470 unsigned long argp; 659 unsigned long argp;
660 #ifdef EV_FD_TO_WIN32_HANDLE
661 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
662 #else
471 anfd->handle = _get_osfhandle (fd); 663 anfd->handle = _get_osfhandle (fd);
664 #endif
472 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 665 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
473 } 666 }
474#endif 667#endif
475 668
669 {
670 unsigned char o_events = anfd->events;
671 unsigned char o_reify = anfd->reify;
672
476 anfd->reify = 0; 673 anfd->reify = 0;
477
478 backend_modify (EV_A_ fd, anfd->events, events);
479 anfd->events = events; 674 anfd->events = events;
675
676 if (o_events != events || o_reify & EV_IOFDSET)
677 backend_modify (EV_A_ fd, o_events, events);
678 }
480 } 679 }
481 680
482 fdchangecnt = 0; 681 fdchangecnt = 0;
483} 682}
484 683
485void inline_size 684void inline_size
486fd_change (EV_P_ int fd) 685fd_change (EV_P_ int fd, int flags)
487{ 686{
488 if (expect_false (anfds [fd].reify)) 687 unsigned char reify = anfds [fd].reify;
489 return;
490
491 anfds [fd].reify = 1; 688 anfds [fd].reify |= flags;
492 689
690 if (expect_true (!reify))
691 {
493 ++fdchangecnt; 692 ++fdchangecnt;
494 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 693 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
495 fdchanges [fdchangecnt - 1] = fd; 694 fdchanges [fdchangecnt - 1] = fd;
695 }
496} 696}
497 697
498void inline_speed 698void inline_speed
499fd_kill (EV_P_ int fd) 699fd_kill (EV_P_ int fd)
500{ 700{
… …
547static void noinline 747static void noinline
548fd_rearm_all (EV_P) 748fd_rearm_all (EV_P)
549{ 749{
550 int fd; 750 int fd;
551 751
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 752 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 753 if (anfds [fd].events)
555 { 754 {
556 anfds [fd].events = 0; 755 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 756 fd_change (EV_A_ fd, EV_IOFDSET | 1);
558 } 757 }
559} 758}
560 759
561/*****************************************************************************/ 760/*****************************************************************************/
562 761
762/* towards the root */
563void inline_speed 763void inline_speed
564upheap (WT *heap, int k) 764upheap (WT *heap, int k)
565{ 765{
566 WT w = heap [k]; 766 WT w = heap [k];
567 767
568 while (k && heap [k >> 1]->at > w->at) 768 for (;;)
569 { 769 {
770 int p = k >> 1;
771
772 /* maybe we could use a dummy element at heap [0]? */
773 if (!p || heap [p]->at <= w->at)
774 break;
775
570 heap [k] = heap [k >> 1]; 776 heap [k] = heap [p];
571 ((W)heap [k])->active = k + 1; 777 ev_active (heap [k]) = k;
572 k >>= 1; 778 k = p;
573 } 779 }
574 780
575 heap [k] = w; 781 heap [k] = w;
576 ((W)heap [k])->active = k + 1; 782 ev_active (heap [k]) = k;
577
578} 783}
579 784
785/* away from the root */
580void inline_speed 786void inline_speed
581downheap (WT *heap, int N, int k) 787downheap (WT *heap, int N, int k)
582{ 788{
583 WT w = heap [k]; 789 WT w = heap [k];
584 790
585 while (k < (N >> 1)) 791 for (;;)
586 { 792 {
587 int j = k << 1; 793 int c = k << 1;
588 794
589 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 795 if (c > N)
590 ++j;
591
592 if (w->at <= heap [j]->at)
593 break; 796 break;
594 797
798 c += c < N && heap [c]->at > heap [c + 1]->at
799 ? 1 : 0;
800
801 if (w->at <= heap [c]->at)
802 break;
803
595 heap [k] = heap [j]; 804 heap [k] = heap [c];
596 ((W)heap [k])->active = k + 1; 805 ev_active (heap [k]) = k;
806
597 k = j; 807 k = c;
598 } 808 }
599 809
600 heap [k] = w; 810 heap [k] = w;
601 ((W)heap [k])->active = k + 1; 811 ev_active (heap [k]) = k;
602} 812}
603 813
604void inline_size 814void inline_size
605adjustheap (WT *heap, int N, int k) 815adjustheap (WT *heap, int N, int k)
606{ 816{
… …
611/*****************************************************************************/ 821/*****************************************************************************/
612 822
613typedef struct 823typedef struct
614{ 824{
615 WL head; 825 WL head;
616 sig_atomic_t volatile gotsig; 826 EV_ATOMIC_T gotsig;
617} ANSIG; 827} ANSIG;
618 828
619static ANSIG *signals; 829static ANSIG *signals;
620static int signalmax; 830static int signalmax;
621 831
622static int sigpipe [2]; 832static EV_ATOMIC_T gotsig;
623static sig_atomic_t volatile gotsig;
624static ev_io sigev;
625 833
626void inline_size 834void inline_size
627signals_init (ANSIG *base, int count) 835signals_init (ANSIG *base, int count)
628{ 836{
629 while (count--) 837 while (count--)
… …
633 841
634 ++base; 842 ++base;
635 } 843 }
636} 844}
637 845
638static void 846/*****************************************************************************/
639sighandler (int signum)
640{
641#if _WIN32
642 signal (signum, sighandler);
643#endif
644 847
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 848void inline_speed
690fd_intern (int fd) 849fd_intern (int fd)
691{ 850{
692#ifdef _WIN32 851#ifdef _WIN32
693 int arg = 1; 852 int arg = 1;
694 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 853 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
697 fcntl (fd, F_SETFL, O_NONBLOCK); 856 fcntl (fd, F_SETFL, O_NONBLOCK);
698#endif 857#endif
699} 858}
700 859
701static void noinline 860static void noinline
702siginit (EV_P) 861evpipe_init (EV_P)
703{ 862{
863 if (!ev_is_active (&pipeev))
864 {
865#if EV_USE_EVENTFD
866 if ((evfd = eventfd (0, 0)) >= 0)
867 {
868 evpipe [0] = -1;
869 fd_intern (evfd);
870 ev_io_set (&pipeev, evfd, EV_READ);
871 }
872 else
873#endif
874 {
875 while (pipe (evpipe))
876 syserr ("(libev) error creating signal/async pipe");
877
704 fd_intern (sigpipe [0]); 878 fd_intern (evpipe [0]);
705 fd_intern (sigpipe [1]); 879 fd_intern (evpipe [1]);
880 ev_io_set (&pipeev, evpipe [0], EV_READ);
881 }
706 882
707 ev_io_set (&sigev, sigpipe [0], EV_READ);
708 ev_io_start (EV_A_ &sigev); 883 ev_io_start (EV_A_ &pipeev);
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 884 ev_unref (EV_A); /* watcher should not keep loop alive */
885 }
886}
887
888void inline_size
889evpipe_write (EV_P_ EV_ATOMIC_T *flag)
890{
891 if (!*flag)
892 {
893 int old_errno = errno; /* save errno because write might clobber it */
894
895 *flag = 1;
896
897#if EV_USE_EVENTFD
898 if (evfd >= 0)
899 {
900 uint64_t counter = 1;
901 write (evfd, &counter, sizeof (uint64_t));
902 }
903 else
904#endif
905 write (evpipe [1], &old_errno, 1);
906
907 errno = old_errno;
908 }
909}
910
911static void
912pipecb (EV_P_ ev_io *iow, int revents)
913{
914#if EV_USE_EVENTFD
915 if (evfd >= 0)
916 {
917 uint64_t counter = 1;
918 read (evfd, &counter, sizeof (uint64_t));
919 }
920 else
921#endif
922 {
923 char dummy;
924 read (evpipe [0], &dummy, 1);
925 }
926
927 if (gotsig && ev_is_default_loop (EV_A))
928 {
929 int signum;
930 gotsig = 0;
931
932 for (signum = signalmax; signum--; )
933 if (signals [signum].gotsig)
934 ev_feed_signal_event (EV_A_ signum + 1);
935 }
936
937#if EV_ASYNC_ENABLE
938 if (gotasync)
939 {
940 int i;
941 gotasync = 0;
942
943 for (i = asynccnt; i--; )
944 if (asyncs [i]->sent)
945 {
946 asyncs [i]->sent = 0;
947 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
948 }
949 }
950#endif
710} 951}
711 952
712/*****************************************************************************/ 953/*****************************************************************************/
713 954
955static void
956ev_sighandler (int signum)
957{
958#if EV_MULTIPLICITY
959 struct ev_loop *loop = &default_loop_struct;
960#endif
961
962#if _WIN32
963 signal (signum, ev_sighandler);
964#endif
965
966 signals [signum - 1].gotsig = 1;
967 evpipe_write (EV_A_ &gotsig);
968}
969
970void noinline
971ev_feed_signal_event (EV_P_ int signum)
972{
973 WL w;
974
975#if EV_MULTIPLICITY
976 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
977#endif
978
979 --signum;
980
981 if (signum < 0 || signum >= signalmax)
982 return;
983
984 signals [signum].gotsig = 0;
985
986 for (w = signals [signum].head; w; w = w->next)
987 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
988}
989
990/*****************************************************************************/
991
714static ev_child *childs [PID_HASHSIZE]; 992static WL childs [EV_PID_HASHSIZE];
715 993
716#ifndef _WIN32 994#ifndef _WIN32
717 995
718static ev_signal childev; 996static ev_signal childev;
719 997
998#ifndef WIFCONTINUED
999# define WIFCONTINUED(status) 0
1000#endif
1001
720void inline_speed 1002void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1003child_reap (EV_P_ int chain, int pid, int status)
722{ 1004{
723 ev_child *w; 1005 ev_child *w;
1006 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
724 1007
725 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1008 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1009 {
726 if (w->pid == pid || !w->pid) 1010 if ((w->pid == pid || !w->pid)
1011 && (!traced || (w->flags & 1)))
727 { 1012 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1013 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; 1014 w->rpid = pid;
730 w->rstatus = status; 1015 w->rstatus = status;
731 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1016 ev_feed_event (EV_A_ (W)w, EV_CHILD);
732 } 1017 }
1018 }
733} 1019}
734 1020
735#ifndef WCONTINUED 1021#ifndef WCONTINUED
736# define WCONTINUED 0 1022# define WCONTINUED 0
737#endif 1023#endif
… …
746 if (!WCONTINUED 1032 if (!WCONTINUED
747 || errno != EINVAL 1033 || errno != EINVAL
748 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1034 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
749 return; 1035 return;
750 1036
751 /* make sure we are called again until all childs have been reaped */ 1037 /* 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 */ 1038 /* 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); 1039 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 1040
755 child_reap (EV_A_ sw, pid, pid, status); 1041 child_reap (EV_A_ pid, pid, status);
1042 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 */ 1043 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 1044}
758 1045
759#endif 1046#endif
760 1047
761/*****************************************************************************/ 1048/*****************************************************************************/
… …
833} 1120}
834 1121
835unsigned int 1122unsigned int
836ev_embeddable_backends (void) 1123ev_embeddable_backends (void)
837{ 1124{
838 return EVBACKEND_EPOLL 1125 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
839 | EVBACKEND_KQUEUE 1126
840 | EVBACKEND_PORT; 1127 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1128 /* please fix it and tell me how to detect the fix */
1129 flags &= ~EVBACKEND_EPOLL;
1130
1131 return flags;
841} 1132}
842 1133
843unsigned int 1134unsigned int
844ev_backend (EV_P) 1135ev_backend (EV_P)
845{ 1136{
846 return backend; 1137 return backend;
847} 1138}
848 1139
849static void 1140unsigned int
1141ev_loop_count (EV_P)
1142{
1143 return loop_count;
1144}
1145
1146void
1147ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1148{
1149 io_blocktime = interval;
1150}
1151
1152void
1153ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1154{
1155 timeout_blocktime = interval;
1156}
1157
1158static void noinline
850loop_init (EV_P_ unsigned int flags) 1159loop_init (EV_P_ unsigned int flags)
851{ 1160{
852 if (!backend) 1161 if (!backend)
853 { 1162 {
854#if EV_USE_MONOTONIC 1163#if EV_USE_MONOTONIC
… …
857 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1166 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
858 have_monotonic = 1; 1167 have_monotonic = 1;
859 } 1168 }
860#endif 1169#endif
861 1170
862 ev_rt_now = ev_time (); 1171 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 1172 mn_now = get_clock ();
864 now_floor = mn_now; 1173 now_floor = mn_now;
865 rtmn_diff = ev_rt_now - mn_now; 1174 rtmn_diff = ev_rt_now - mn_now;
1175
1176 io_blocktime = 0.;
1177 timeout_blocktime = 0.;
1178 backend = 0;
1179 backend_fd = -1;
1180 gotasync = 0;
1181#if EV_USE_INOTIFY
1182 fs_fd = -2;
1183#endif
1184
1185 /* pid check not overridable via env */
1186#ifndef _WIN32
1187 if (flags & EVFLAG_FORKCHECK)
1188 curpid = getpid ();
1189#endif
866 1190
867 if (!(flags & EVFLAG_NOENV) 1191 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 1192 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 1193 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 1194 flags = atoi (getenv ("LIBEV_FLAGS"));
871 1195
872 if (!(flags & 0x0000ffffUL)) 1196 if (!(flags & 0x0000ffffU))
873 flags |= ev_recommended_backends (); 1197 flags |= ev_recommended_backends ();
874 1198
875 backend = 0;
876#if EV_USE_PORT 1199#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1200 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 1201#endif
879#if EV_USE_KQUEUE 1202#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1203 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
887#endif 1210#endif
888#if EV_USE_SELECT 1211#if EV_USE_SELECT
889 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1212 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
890#endif 1213#endif
891 1214
892 ev_init (&sigev, sigcb); 1215 ev_init (&pipeev, pipecb);
893 ev_set_priority (&sigev, EV_MAXPRI); 1216 ev_set_priority (&pipeev, EV_MAXPRI);
894 } 1217 }
895} 1218}
896 1219
897static void 1220static void noinline
898loop_destroy (EV_P) 1221loop_destroy (EV_P)
899{ 1222{
900 int i; 1223 int i;
1224
1225 if (ev_is_active (&pipeev))
1226 {
1227 ev_ref (EV_A); /* signal watcher */
1228 ev_io_stop (EV_A_ &pipeev);
1229
1230#if EV_USE_EVENTFD
1231 if (evfd >= 0)
1232 close (evfd);
1233#endif
1234
1235 if (evpipe [0] >= 0)
1236 {
1237 close (evpipe [0]);
1238 close (evpipe [1]);
1239 }
1240 }
1241
1242#if EV_USE_INOTIFY
1243 if (fs_fd >= 0)
1244 close (fs_fd);
1245#endif
1246
1247 if (backend_fd >= 0)
1248 close (backend_fd);
901 1249
902#if EV_USE_PORT 1250#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1251 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 1252#endif
905#if EV_USE_KQUEUE 1253#if EV_USE_KQUEUE
… …
914#if EV_USE_SELECT 1262#if EV_USE_SELECT
915 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1263 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
916#endif 1264#endif
917 1265
918 for (i = NUMPRI; i--; ) 1266 for (i = NUMPRI; i--; )
1267 {
919 array_free (pending, [i]); 1268 array_free (pending, [i]);
1269#if EV_IDLE_ENABLE
1270 array_free (idle, [i]);
1271#endif
1272 }
1273
1274 ev_free (anfds); anfdmax = 0;
920 1275
921 /* have to use the microsoft-never-gets-it-right macro */ 1276 /* have to use the microsoft-never-gets-it-right macro */
922 array_free (fdchange, EMPTY0); 1277 array_free (fdchange, EMPTY);
923 array_free (timer, EMPTY0); 1278 array_free (timer, EMPTY);
924#if EV_PERIODIC_ENABLE 1279#if EV_PERIODIC_ENABLE
925 array_free (periodic, EMPTY0); 1280 array_free (periodic, EMPTY);
926#endif 1281#endif
1282#if EV_FORK_ENABLE
927 array_free (idle, EMPTY0); 1283 array_free (fork, EMPTY);
1284#endif
928 array_free (prepare, EMPTY0); 1285 array_free (prepare, EMPTY);
929 array_free (check, EMPTY0); 1286 array_free (check, EMPTY);
1287#if EV_ASYNC_ENABLE
1288 array_free (async, EMPTY);
1289#endif
930 1290
931 backend = 0; 1291 backend = 0;
932} 1292}
933 1293
934static void 1294#if EV_USE_INOTIFY
1295void inline_size infy_fork (EV_P);
1296#endif
1297
1298void inline_size
935loop_fork (EV_P) 1299loop_fork (EV_P)
936{ 1300{
937#if EV_USE_PORT 1301#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1302 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1303#endif
… …
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1305 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1306#endif
943#if EV_USE_EPOLL 1307#if EV_USE_EPOLL
944 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1308 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
945#endif 1309#endif
1310#if EV_USE_INOTIFY
1311 infy_fork (EV_A);
1312#endif
946 1313
947 if (ev_is_active (&sigev)) 1314 if (ev_is_active (&pipeev))
948 { 1315 {
949 /* default loop */ 1316 /* this "locks" the handlers against writing to the pipe */
1317 /* while we modify the fd vars */
1318 gotsig = 1;
1319#if EV_ASYNC_ENABLE
1320 gotasync = 1;
1321#endif
950 1322
951 ev_ref (EV_A); 1323 ev_ref (EV_A);
952 ev_io_stop (EV_A_ &sigev); 1324 ev_io_stop (EV_A_ &pipeev);
1325
1326#if EV_USE_EVENTFD
1327 if (evfd >= 0)
1328 close (evfd);
1329#endif
1330
1331 if (evpipe [0] >= 0)
1332 {
953 close (sigpipe [0]); 1333 close (evpipe [0]);
954 close (sigpipe [1]); 1334 close (evpipe [1]);
1335 }
955 1336
956 while (pipe (sigpipe))
957 syserr ("(libev) error creating pipe");
958
959 siginit (EV_A); 1337 evpipe_init (EV_A);
1338 /* now iterate over everything, in case we missed something */
1339 pipecb (EV_A_ &pipeev, EV_READ);
960 } 1340 }
961 1341
962 postfork = 0; 1342 postfork = 0;
963} 1343}
964 1344
… …
986} 1366}
987 1367
988void 1368void
989ev_loop_fork (EV_P) 1369ev_loop_fork (EV_P)
990{ 1370{
991 postfork = 1; 1371 postfork = 1; /* must be in line with ev_default_fork */
992} 1372}
993 1373
994#endif 1374#endif
995 1375
996#if EV_MULTIPLICITY 1376#if EV_MULTIPLICITY
… …
999#else 1379#else
1000int 1380int
1001ev_default_loop (unsigned int flags) 1381ev_default_loop (unsigned int flags)
1002#endif 1382#endif
1003{ 1383{
1004 if (sigpipe [0] == sigpipe [1])
1005 if (pipe (sigpipe))
1006 return 0;
1007
1008 if (!ev_default_loop_ptr) 1384 if (!ev_default_loop_ptr)
1009 { 1385 {
1010#if EV_MULTIPLICITY 1386#if EV_MULTIPLICITY
1011 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1387 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1012#else 1388#else
… …
1015 1391
1016 loop_init (EV_A_ flags); 1392 loop_init (EV_A_ flags);
1017 1393
1018 if (ev_backend (EV_A)) 1394 if (ev_backend (EV_A))
1019 { 1395 {
1020 siginit (EV_A);
1021
1022#ifndef _WIN32 1396#ifndef _WIN32
1023 ev_signal_init (&childev, childcb, SIGCHLD); 1397 ev_signal_init (&childev, childcb, SIGCHLD);
1024 ev_set_priority (&childev, EV_MAXPRI); 1398 ev_set_priority (&childev, EV_MAXPRI);
1025 ev_signal_start (EV_A_ &childev); 1399 ev_signal_start (EV_A_ &childev);
1026 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1400 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1043#ifndef _WIN32 1417#ifndef _WIN32
1044 ev_ref (EV_A); /* child watcher */ 1418 ev_ref (EV_A); /* child watcher */
1045 ev_signal_stop (EV_A_ &childev); 1419 ev_signal_stop (EV_A_ &childev);
1046#endif 1420#endif
1047 1421
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); 1422 loop_destroy (EV_A);
1055} 1423}
1056 1424
1057void 1425void
1058ev_default_fork (void) 1426ev_default_fork (void)
… …
1060#if EV_MULTIPLICITY 1428#if EV_MULTIPLICITY
1061 struct ev_loop *loop = ev_default_loop_ptr; 1429 struct ev_loop *loop = ev_default_loop_ptr;
1062#endif 1430#endif
1063 1431
1064 if (backend) 1432 if (backend)
1065 postfork = 1; 1433 postfork = 1; /* must be in line with ev_loop_fork */
1066} 1434}
1067 1435
1068/*****************************************************************************/ 1436/*****************************************************************************/
1069 1437
1070int inline_size 1438void
1071any_pending (EV_P) 1439ev_invoke (EV_P_ void *w, int revents)
1072{ 1440{
1073 int pri; 1441 EV_CB_INVOKE ((W)w, revents);
1074
1075 for (pri = NUMPRI; pri--; )
1076 if (pendingcnt [pri])
1077 return 1;
1078
1079 return 0;
1080} 1442}
1081 1443
1082void inline_speed 1444void inline_speed
1083call_pending (EV_P) 1445call_pending (EV_P)
1084{ 1446{
… …
1089 { 1451 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1452 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1453
1092 if (expect_true (p->w)) 1454 if (expect_true (p->w))
1093 { 1455 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1456 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1457
1096 p->w->pending = 0; 1458 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1459 EV_CB_INVOKE (p->w, p->events);
1098 } 1460 }
1099 } 1461 }
1100} 1462}
1101 1463
1102void inline_size 1464void inline_size
1103timers_reify (EV_P) 1465timers_reify (EV_P)
1104{ 1466{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1106 { 1468 {
1107 ev_timer *w = timers [0]; 1469 ev_timer *w = (ev_timer *)timers [1];
1108 1470
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1472
1111 /* first reschedule or stop timer */ 1473 /* first reschedule or stop timer */
1112 if (w->repeat) 1474 if (w->repeat)
1113 { 1475 {
1114 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1476 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1115 1477
1116 ((WT)w)->at += w->repeat; 1478 ev_at (w) += w->repeat;
1117 if (((WT)w)->at < mn_now) 1479 if (ev_at (w) < mn_now)
1118 ((WT)w)->at = mn_now; 1480 ev_at (w) = mn_now;
1119 1481
1120 downheap ((WT *)timers, timercnt, 0); 1482 downheap (timers, timercnt, 1);
1121 } 1483 }
1122 else 1484 else
1123 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1124 1486
1125 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1128 1490
1129#if EV_PERIODIC_ENABLE 1491#if EV_PERIODIC_ENABLE
1130void inline_size 1492void inline_size
1131periodics_reify (EV_P) 1493periodics_reify (EV_P)
1132{ 1494{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1134 { 1496 {
1135 ev_periodic *w = periodics [0]; 1497 ev_periodic *w = (ev_periodic *)periodics [1];
1136 1498
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1500
1139 /* first reschedule or stop timer */ 1501 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1502 if (w->reschedule_cb)
1141 { 1503 {
1142 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1504 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)); 1505 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1144 downheap ((WT *)periodics, periodiccnt, 0); 1506 downheap (periodics, periodiccnt, 1);
1145 } 1507 }
1146 else if (w->interval) 1508 else if (w->interval)
1147 { 1509 {
1148 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1510 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1511 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)); 1512 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); 1513 downheap (periodics, periodiccnt, 1);
1151 } 1514 }
1152 else 1515 else
1153 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1154 1517
1155 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1160periodics_reschedule (EV_P) 1523periodics_reschedule (EV_P)
1161{ 1524{
1162 int i; 1525 int i;
1163 1526
1164 /* adjust periodics after time jump */ 1527 /* adjust periodics after time jump */
1165 for (i = 0; i < periodiccnt; ++i) 1528 for (i = 1; i <= periodiccnt; ++i)
1166 { 1529 {
1167 ev_periodic *w = periodics [i]; 1530 ev_periodic *w = (ev_periodic *)periodics [i];
1168 1531
1169 if (w->reschedule_cb) 1532 if (w->reschedule_cb)
1170 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1171 else if (w->interval) 1534 else if (w->interval)
1172 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1535 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1173 } 1536 }
1174 1537
1175 /* now rebuild the heap */ 1538 /* now rebuild the heap */
1176 for (i = periodiccnt >> 1; i--; ) 1539 for (i = periodiccnt >> 1; i--; )
1177 downheap ((WT *)periodics, periodiccnt, i); 1540 downheap (periodics, periodiccnt, i);
1178} 1541}
1179#endif 1542#endif
1180 1543
1544#if EV_IDLE_ENABLE
1181int inline_size 1545void inline_size
1182time_update_monotonic (EV_P) 1546idle_reify (EV_P)
1183{ 1547{
1548 if (expect_false (idleall))
1549 {
1550 int pri;
1551
1552 for (pri = NUMPRI; pri--; )
1553 {
1554 if (pendingcnt [pri])
1555 break;
1556
1557 if (idlecnt [pri])
1558 {
1559 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1560 break;
1561 }
1562 }
1563 }
1564}
1565#endif
1566
1567void inline_speed
1568time_update (EV_P_ ev_tstamp max_block)
1569{
1570 int i;
1571
1572#if EV_USE_MONOTONIC
1573 if (expect_true (have_monotonic))
1574 {
1575 ev_tstamp odiff = rtmn_diff;
1576
1184 mn_now = get_clock (); 1577 mn_now = get_clock ();
1185 1578
1579 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1580 /* interpolate in the meantime */
1186 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1581 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1187 { 1582 {
1188 ev_rt_now = rtmn_diff + mn_now; 1583 ev_rt_now = rtmn_diff + mn_now;
1189 return 0; 1584 return;
1190 } 1585 }
1191 else 1586
1192 {
1193 now_floor = mn_now; 1587 now_floor = mn_now;
1194 ev_rt_now = ev_time (); 1588 ev_rt_now = ev_time ();
1195 return 1;
1196 }
1197}
1198 1589
1199void inline_size 1590 /* loop a few times, before making important decisions.
1200time_update (EV_P) 1591 * on the choice of "4": one iteration isn't enough,
1201{ 1592 * in case we get preempted during the calls to
1202 int i; 1593 * ev_time and get_clock. a second call is almost guaranteed
1203 1594 * to succeed in that case, though. and looping a few more times
1204#if EV_USE_MONOTONIC 1595 * doesn't hurt either as we only do this on time-jumps or
1205 if (expect_true (have_monotonic)) 1596 * in the unlikely event of having been preempted here.
1206 { 1597 */
1207 if (time_update_monotonic (EV_A)) 1598 for (i = 4; --i; )
1208 { 1599 {
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; 1600 rtmn_diff = ev_rt_now - mn_now;
1222 1601
1223 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1602 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1224 return; /* all is well */ 1603 return; /* all is well */
1225 1604
1226 ev_rt_now = ev_time (); 1605 ev_rt_now = ev_time ();
1227 mn_now = get_clock (); 1606 mn_now = get_clock ();
1228 now_floor = mn_now; 1607 now_floor = mn_now;
1229 } 1608 }
1230 1609
1231# if EV_PERIODIC_ENABLE 1610# if EV_PERIODIC_ENABLE
1232 periodics_reschedule (EV_A); 1611 periodics_reschedule (EV_A);
1233# endif 1612# endif
1234 /* no timer adjustment, as the monotonic clock doesn't jump */ 1613 /* no timer adjustment, as the monotonic clock doesn't jump */
1235 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1614 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1236 }
1237 } 1615 }
1238 else 1616 else
1239#endif 1617#endif
1240 { 1618 {
1241 ev_rt_now = ev_time (); 1619 ev_rt_now = ev_time ();
1242 1620
1243 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1621 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1244 { 1622 {
1245#if EV_PERIODIC_ENABLE 1623#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1624 periodics_reschedule (EV_A);
1247#endif 1625#endif
1248
1249 /* adjust timers. this is easy, as the offset is the same for all */ 1626 /* adjust timers. this is easy, as the offset is the same for all of them */
1250 for (i = 0; i < timercnt; ++i) 1627 for (i = 1; i <= timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1628 ev_at (timers [i]) += ev_rt_now - mn_now;
1252 } 1629 }
1253 1630
1254 mn_now = ev_rt_now; 1631 mn_now = ev_rt_now;
1255 } 1632 }
1256} 1633}
… …
1270static int loop_done; 1647static int loop_done;
1271 1648
1272void 1649void
1273ev_loop (EV_P_ int flags) 1650ev_loop (EV_P_ int flags)
1274{ 1651{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1652 loop_done = EVUNLOOP_CANCEL;
1276 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL;
1278 1653
1279 while (activecnt) 1654 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1655
1656 do
1280 { 1657 {
1281 /* we might have forked, so reify kernel state if necessary */ 1658#ifndef _WIN32
1659 if (expect_false (curpid)) /* penalise the forking check even more */
1660 if (expect_false (getpid () != curpid))
1661 {
1662 curpid = getpid ();
1663 postfork = 1;
1664 }
1665#endif
1666
1667#if EV_FORK_ENABLE
1668 /* we might have forked, so queue fork handlers */
1282 if (expect_false (postfork)) 1669 if (expect_false (postfork))
1283 if (forkcnt) 1670 if (forkcnt)
1284 { 1671 {
1285 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1672 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1286 call_pending (EV_A); 1673 call_pending (EV_A);
1287 } 1674 }
1675#endif
1288 1676
1289 /* queue check watchers (and execute them) */ 1677 /* queue prepare watchers (and execute them) */
1290 if (expect_false (preparecnt)) 1678 if (expect_false (preparecnt))
1291 { 1679 {
1292 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1680 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1293 call_pending (EV_A); 1681 call_pending (EV_A);
1294 } 1682 }
1295 1683
1684 if (expect_false (!activecnt))
1685 break;
1686
1296 /* we might have forked, so reify kernel state if necessary */ 1687 /* we might have forked, so reify kernel state if necessary */
1297 if (expect_false (postfork)) 1688 if (expect_false (postfork))
1298 loop_fork (EV_A); 1689 loop_fork (EV_A);
1299 1690
1300 /* update fd-related kernel structures */ 1691 /* update fd-related kernel structures */
1301 fd_reify (EV_A); 1692 fd_reify (EV_A);
1302 1693
1303 /* calculate blocking time */ 1694 /* calculate blocking time */
1304 { 1695 {
1305 double block; 1696 ev_tstamp waittime = 0.;
1697 ev_tstamp sleeptime = 0.;
1306 1698
1307 if (flags & EVLOOP_NONBLOCK || idlecnt) 1699 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1308 block = 0.; /* do not block at all */
1309 else
1310 { 1700 {
1311 /* update time to cancel out callback processing overhead */ 1701 /* update time to cancel out callback processing overhead */
1312#if EV_USE_MONOTONIC
1313 if (expect_true (have_monotonic))
1314 time_update_monotonic (EV_A); 1702 time_update (EV_A_ 1e100);
1315 else
1316#endif
1317 {
1318 ev_rt_now = ev_time ();
1319 mn_now = ev_rt_now;
1320 }
1321 1703
1322 block = MAX_BLOCKTIME; 1704 waittime = MAX_BLOCKTIME;
1323 1705
1324 if (timercnt) 1706 if (timercnt)
1325 { 1707 {
1326 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1327 if (block > to) block = to; 1709 if (waittime > to) waittime = to;
1328 } 1710 }
1329 1711
1330#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1331 if (periodiccnt) 1713 if (periodiccnt)
1332 { 1714 {
1333 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1715 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1334 if (block > to) block = to; 1716 if (waittime > to) waittime = to;
1335 } 1717 }
1336#endif 1718#endif
1337 1719
1338 if (expect_false (block < 0.)) block = 0.; 1720 if (expect_false (waittime < timeout_blocktime))
1721 waittime = timeout_blocktime;
1722
1723 sleeptime = waittime - backend_fudge;
1724
1725 if (expect_true (sleeptime > io_blocktime))
1726 sleeptime = io_blocktime;
1727
1728 if (sleeptime)
1729 {
1730 ev_sleep (sleeptime);
1731 waittime -= sleeptime;
1732 }
1339 } 1733 }
1340 1734
1735 ++loop_count;
1341 backend_poll (EV_A_ block); 1736 backend_poll (EV_A_ waittime);
1737
1738 /* update ev_rt_now, do magic */
1739 time_update (EV_A_ waittime + sleeptime);
1342 } 1740 }
1343
1344 /* update ev_rt_now, do magic */
1345 time_update (EV_A);
1346 1741
1347 /* queue pending timers and reschedule them */ 1742 /* queue pending timers and reschedule them */
1348 timers_reify (EV_A); /* relative timers called last */ 1743 timers_reify (EV_A); /* relative timers called last */
1349#if EV_PERIODIC_ENABLE 1744#if EV_PERIODIC_ENABLE
1350 periodics_reify (EV_A); /* absolute timers called first */ 1745 periodics_reify (EV_A); /* absolute timers called first */
1351#endif 1746#endif
1352 1747
1748#if EV_IDLE_ENABLE
1353 /* queue idle watchers unless other events are pending */ 1749 /* queue idle watchers unless other events are pending */
1354 if (idlecnt && !any_pending (EV_A)) 1750 idle_reify (EV_A);
1355 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1751#endif
1356 1752
1357 /* queue check watchers, to be executed first */ 1753 /* queue check watchers, to be executed first */
1358 if (expect_false (checkcnt)) 1754 if (expect_false (checkcnt))
1359 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1755 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1360 1756
1361 call_pending (EV_A); 1757 call_pending (EV_A);
1362
1363 if (expect_false (loop_done))
1364 break;
1365 } 1758 }
1759 while (expect_true (
1760 activecnt
1761 && !loop_done
1762 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1763 ));
1366 1764
1367 if (loop_done == EVUNLOOP_ONE) 1765 if (loop_done == EVUNLOOP_ONE)
1368 loop_done = EVUNLOOP_CANCEL; 1766 loop_done = EVUNLOOP_CANCEL;
1369} 1767}
1370 1768
… …
1397 head = &(*head)->next; 1795 head = &(*head)->next;
1398 } 1796 }
1399} 1797}
1400 1798
1401void inline_speed 1799void inline_speed
1402ev_clear_pending (EV_P_ W w) 1800clear_pending (EV_P_ W w)
1403{ 1801{
1404 if (w->pending) 1802 if (w->pending)
1405 { 1803 {
1406 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1804 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1407 w->pending = 0; 1805 w->pending = 0;
1408 } 1806 }
1409} 1807}
1410 1808
1809int
1810ev_clear_pending (EV_P_ void *w)
1811{
1812 W w_ = (W)w;
1813 int pending = w_->pending;
1814
1815 if (expect_true (pending))
1816 {
1817 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1818 w_->pending = 0;
1819 p->w = 0;
1820 return p->events;
1821 }
1822 else
1823 return 0;
1824}
1825
1826void inline_size
1827pri_adjust (EV_P_ W w)
1828{
1829 int pri = w->priority;
1830 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1831 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1832 w->priority = pri;
1833}
1834
1411void inline_speed 1835void inline_speed
1412ev_start (EV_P_ W w, int active) 1836ev_start (EV_P_ W w, int active)
1413{ 1837{
1414 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1838 pri_adjust (EV_A_ w);
1415 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1416
1417 w->active = active; 1839 w->active = active;
1418 ev_ref (EV_A); 1840 ev_ref (EV_A);
1419} 1841}
1420 1842
1421void inline_size 1843void inline_size
… …
1425 w->active = 0; 1847 w->active = 0;
1426} 1848}
1427 1849
1428/*****************************************************************************/ 1850/*****************************************************************************/
1429 1851
1430void 1852void noinline
1431ev_io_start (EV_P_ ev_io *w) 1853ev_io_start (EV_P_ ev_io *w)
1432{ 1854{
1433 int fd = w->fd; 1855 int fd = w->fd;
1434 1856
1435 if (expect_false (ev_is_active (w))) 1857 if (expect_false (ev_is_active (w)))
… …
1437 1859
1438 assert (("ev_io_start called with negative fd", fd >= 0)); 1860 assert (("ev_io_start called with negative fd", fd >= 0));
1439 1861
1440 ev_start (EV_A_ (W)w, 1); 1862 ev_start (EV_A_ (W)w, 1);
1441 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1863 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1442 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1864 wlist_add (&anfds[fd].head, (WL)w);
1443 1865
1444 fd_change (EV_A_ fd); 1866 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1867 w->events &= ~EV_IOFDSET;
1445} 1868}
1446 1869
1447void 1870void noinline
1448ev_io_stop (EV_P_ ev_io *w) 1871ev_io_stop (EV_P_ ev_io *w)
1449{ 1872{
1450 ev_clear_pending (EV_A_ (W)w); 1873 clear_pending (EV_A_ (W)w);
1451 if (expect_false (!ev_is_active (w))) 1874 if (expect_false (!ev_is_active (w)))
1452 return; 1875 return;
1453 1876
1454 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1877 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1455 1878
1456 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1879 wlist_del (&anfds[w->fd].head, (WL)w);
1457 ev_stop (EV_A_ (W)w); 1880 ev_stop (EV_A_ (W)w);
1458 1881
1459 fd_change (EV_A_ w->fd); 1882 fd_change (EV_A_ w->fd, 1);
1460} 1883}
1461 1884
1462void 1885void noinline
1463ev_timer_start (EV_P_ ev_timer *w) 1886ev_timer_start (EV_P_ ev_timer *w)
1464{ 1887{
1465 if (expect_false (ev_is_active (w))) 1888 if (expect_false (ev_is_active (w)))
1466 return; 1889 return;
1467 1890
1468 ((WT)w)->at += mn_now; 1891 ev_at (w) += mn_now;
1469 1892
1470 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1893 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1471 1894
1472 ev_start (EV_A_ (W)w, ++timercnt); 1895 ev_start (EV_A_ (W)w, ++timercnt);
1473 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1474 timers [timercnt - 1] = w; 1897 timers [timercnt] = (WT)w;
1475 upheap ((WT *)timers, timercnt - 1); 1898 upheap (timers, timercnt);
1476 1899
1477 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1900 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1478} 1901}
1479 1902
1480void 1903void noinline
1481ev_timer_stop (EV_P_ ev_timer *w) 1904ev_timer_stop (EV_P_ ev_timer *w)
1482{ 1905{
1483 ev_clear_pending (EV_A_ (W)w); 1906 clear_pending (EV_A_ (W)w);
1484 if (expect_false (!ev_is_active (w))) 1907 if (expect_false (!ev_is_active (w)))
1485 return; 1908 return;
1486 1909
1910 {
1911 int active = ev_active (w);
1912
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1913 assert (("internal timer heap corruption", timers [active] == (WT)w));
1488 1914
1489 if (expect_true (((W)w)->active < timercnt--)) 1915 if (expect_true (active < timercnt))
1490 { 1916 {
1491 timers [((W)w)->active - 1] = timers [timercnt]; 1917 timers [active] = timers [timercnt];
1492 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1918 adjustheap (timers, timercnt, active);
1493 } 1919 }
1494 1920
1495 ((WT)w)->at -= mn_now; 1921 --timercnt;
1922 }
1923
1924 ev_at (w) -= mn_now;
1496 1925
1497 ev_stop (EV_A_ (W)w); 1926 ev_stop (EV_A_ (W)w);
1498} 1927}
1499 1928
1500void 1929void noinline
1501ev_timer_again (EV_P_ ev_timer *w) 1930ev_timer_again (EV_P_ ev_timer *w)
1502{ 1931{
1503 if (ev_is_active (w)) 1932 if (ev_is_active (w))
1504 { 1933 {
1505 if (w->repeat) 1934 if (w->repeat)
1506 { 1935 {
1507 ((WT)w)->at = mn_now + w->repeat; 1936 ev_at (w) = mn_now + w->repeat;
1508 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1937 adjustheap (timers, timercnt, ev_active (w));
1509 } 1938 }
1510 else 1939 else
1511 ev_timer_stop (EV_A_ w); 1940 ev_timer_stop (EV_A_ w);
1512 } 1941 }
1513 else if (w->repeat) 1942 else if (w->repeat)
1514 { 1943 {
1515 w->at = w->repeat; 1944 ev_at (w) = w->repeat;
1516 ev_timer_start (EV_A_ w); 1945 ev_timer_start (EV_A_ w);
1517 } 1946 }
1518} 1947}
1519 1948
1520#if EV_PERIODIC_ENABLE 1949#if EV_PERIODIC_ENABLE
1521void 1950void noinline
1522ev_periodic_start (EV_P_ ev_periodic *w) 1951ev_periodic_start (EV_P_ ev_periodic *w)
1523{ 1952{
1524 if (expect_false (ev_is_active (w))) 1953 if (expect_false (ev_is_active (w)))
1525 return; 1954 return;
1526 1955
1527 if (w->reschedule_cb) 1956 if (w->reschedule_cb)
1528 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1957 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1529 else if (w->interval) 1958 else if (w->interval)
1530 { 1959 {
1531 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1960 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1532 /* this formula differs from the one in periodic_reify because we do not always round up */ 1961 /* this formula differs from the one in periodic_reify because we do not always round up */
1533 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1962 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1534 } 1963 }
1964 else
1965 ev_at (w) = w->offset;
1535 1966
1536 ev_start (EV_A_ (W)w, ++periodiccnt); 1967 ev_start (EV_A_ (W)w, ++periodiccnt);
1537 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1538 periodics [periodiccnt - 1] = w; 1969 periodics [periodiccnt] = (WT)w;
1539 upheap ((WT *)periodics, periodiccnt - 1); 1970 upheap (periodics, periodiccnt);
1540 1971
1541 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1972 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1542} 1973}
1543 1974
1544void 1975void noinline
1545ev_periodic_stop (EV_P_ ev_periodic *w) 1976ev_periodic_stop (EV_P_ ev_periodic *w)
1546{ 1977{
1547 ev_clear_pending (EV_A_ (W)w); 1978 clear_pending (EV_A_ (W)w);
1548 if (expect_false (!ev_is_active (w))) 1979 if (expect_false (!ev_is_active (w)))
1549 return; 1980 return;
1550 1981
1982 {
1983 int active = ev_active (w);
1984
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1985 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1552 1986
1553 if (expect_true (((W)w)->active < periodiccnt--)) 1987 if (expect_true (active < periodiccnt))
1554 { 1988 {
1555 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1989 periodics [active] = periodics [periodiccnt];
1556 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1990 adjustheap (periodics, periodiccnt, active);
1557 } 1991 }
1992
1993 --periodiccnt;
1994 }
1558 1995
1559 ev_stop (EV_A_ (W)w); 1996 ev_stop (EV_A_ (W)w);
1560} 1997}
1561 1998
1562void 1999void noinline
1563ev_periodic_again (EV_P_ ev_periodic *w) 2000ev_periodic_again (EV_P_ ev_periodic *w)
1564{ 2001{
1565 /* TODO: use adjustheap and recalculation */ 2002 /* TODO: use adjustheap and recalculation */
1566 ev_periodic_stop (EV_A_ w); 2003 ev_periodic_stop (EV_A_ w);
1567 ev_periodic_start (EV_A_ w); 2004 ev_periodic_start (EV_A_ w);
… …
1570 2007
1571#ifndef SA_RESTART 2008#ifndef SA_RESTART
1572# define SA_RESTART 0 2009# define SA_RESTART 0
1573#endif 2010#endif
1574 2011
1575void 2012void noinline
1576ev_signal_start (EV_P_ ev_signal *w) 2013ev_signal_start (EV_P_ ev_signal *w)
1577{ 2014{
1578#if EV_MULTIPLICITY 2015#if EV_MULTIPLICITY
1579 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2016 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1580#endif 2017#endif
1581 if (expect_false (ev_is_active (w))) 2018 if (expect_false (ev_is_active (w)))
1582 return; 2019 return;
1583 2020
1584 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2021 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1585 2022
2023 evpipe_init (EV_A);
2024
2025 {
2026#ifndef _WIN32
2027 sigset_t full, prev;
2028 sigfillset (&full);
2029 sigprocmask (SIG_SETMASK, &full, &prev);
2030#endif
2031
2032 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2033
2034#ifndef _WIN32
2035 sigprocmask (SIG_SETMASK, &prev, 0);
2036#endif
2037 }
2038
1586 ev_start (EV_A_ (W)w, 1); 2039 ev_start (EV_A_ (W)w, 1);
1587 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1588 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2040 wlist_add (&signals [w->signum - 1].head, (WL)w);
1589 2041
1590 if (!((WL)w)->next) 2042 if (!((WL)w)->next)
1591 { 2043 {
1592#if _WIN32 2044#if _WIN32
1593 signal (w->signum, sighandler); 2045 signal (w->signum, ev_sighandler);
1594#else 2046#else
1595 struct sigaction sa; 2047 struct sigaction sa;
1596 sa.sa_handler = sighandler; 2048 sa.sa_handler = ev_sighandler;
1597 sigfillset (&sa.sa_mask); 2049 sigfillset (&sa.sa_mask);
1598 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2050 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1599 sigaction (w->signum, &sa, 0); 2051 sigaction (w->signum, &sa, 0);
1600#endif 2052#endif
1601 } 2053 }
1602} 2054}
1603 2055
1604void 2056void noinline
1605ev_signal_stop (EV_P_ ev_signal *w) 2057ev_signal_stop (EV_P_ ev_signal *w)
1606{ 2058{
1607 ev_clear_pending (EV_A_ (W)w); 2059 clear_pending (EV_A_ (W)w);
1608 if (expect_false (!ev_is_active (w))) 2060 if (expect_false (!ev_is_active (w)))
1609 return; 2061 return;
1610 2062
1611 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2063 wlist_del (&signals [w->signum - 1].head, (WL)w);
1612 ev_stop (EV_A_ (W)w); 2064 ev_stop (EV_A_ (W)w);
1613 2065
1614 if (!signals [w->signum - 1].head) 2066 if (!signals [w->signum - 1].head)
1615 signal (w->signum, SIG_DFL); 2067 signal (w->signum, SIG_DFL);
1616} 2068}
… …
1623#endif 2075#endif
1624 if (expect_false (ev_is_active (w))) 2076 if (expect_false (ev_is_active (w)))
1625 return; 2077 return;
1626 2078
1627 ev_start (EV_A_ (W)w, 1); 2079 ev_start (EV_A_ (W)w, 1);
1628 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2080 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1629} 2081}
1630 2082
1631void 2083void
1632ev_child_stop (EV_P_ ev_child *w) 2084ev_child_stop (EV_P_ ev_child *w)
1633{ 2085{
1634 ev_clear_pending (EV_A_ (W)w); 2086 clear_pending (EV_A_ (W)w);
1635 if (expect_false (!ev_is_active (w))) 2087 if (expect_false (!ev_is_active (w)))
1636 return; 2088 return;
1637 2089
1638 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2090 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1639 ev_stop (EV_A_ (W)w); 2091 ev_stop (EV_A_ (W)w);
1640} 2092}
1641 2093
1642#if EV_STAT_ENABLE 2094#if EV_STAT_ENABLE
1643 2095
… …
1647# endif 2099# endif
1648 2100
1649#define DEF_STAT_INTERVAL 5.0074891 2101#define DEF_STAT_INTERVAL 5.0074891
1650#define MIN_STAT_INTERVAL 0.1074891 2102#define MIN_STAT_INTERVAL 0.1074891
1651 2103
2104static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2105
2106#if EV_USE_INOTIFY
2107# define EV_INOTIFY_BUFSIZE 8192
2108
2109static void noinline
2110infy_add (EV_P_ ev_stat *w)
2111{
2112 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);
2113
2114 if (w->wd < 0)
2115 {
2116 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2117
2118 /* monitor some parent directory for speedup hints */
2119 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2120 {
2121 char path [4096];
2122 strcpy (path, w->path);
2123
2124 do
2125 {
2126 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2127 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2128
2129 char *pend = strrchr (path, '/');
2130
2131 if (!pend)
2132 break; /* whoops, no '/', complain to your admin */
2133
2134 *pend = 0;
2135 w->wd = inotify_add_watch (fs_fd, path, mask);
2136 }
2137 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2138 }
2139 }
2140 else
2141 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2142
2143 if (w->wd >= 0)
2144 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2145}
2146
2147static void noinline
2148infy_del (EV_P_ ev_stat *w)
2149{
2150 int slot;
2151 int wd = w->wd;
2152
2153 if (wd < 0)
2154 return;
2155
2156 w->wd = -2;
2157 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
2158 wlist_del (&fs_hash [slot].head, (WL)w);
2159
2160 /* remove this watcher, if others are watching it, they will rearm */
2161 inotify_rm_watch (fs_fd, wd);
2162}
2163
2164static void noinline
2165infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2166{
2167 if (slot < 0)
2168 /* overflow, need to check for all hahs slots */
2169 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2170 infy_wd (EV_A_ slot, wd, ev);
2171 else
2172 {
2173 WL w_;
2174
2175 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
2176 {
2177 ev_stat *w = (ev_stat *)w_;
2178 w_ = w_->next; /* lets us remove this watcher and all before it */
2179
2180 if (w->wd == wd || wd == -1)
2181 {
2182 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2183 {
2184 w->wd = -1;
2185 infy_add (EV_A_ w); /* re-add, no matter what */
2186 }
2187
2188 stat_timer_cb (EV_A_ &w->timer, 0);
2189 }
2190 }
2191 }
2192}
2193
2194static void
2195infy_cb (EV_P_ ev_io *w, int revents)
2196{
2197 char buf [EV_INOTIFY_BUFSIZE];
2198 struct inotify_event *ev = (struct inotify_event *)buf;
2199 int ofs;
2200 int len = read (fs_fd, buf, sizeof (buf));
2201
2202 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2203 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2204}
2205
2206void inline_size
2207infy_init (EV_P)
2208{
2209 if (fs_fd != -2)
2210 return;
2211
2212 fs_fd = inotify_init ();
2213
2214 if (fs_fd >= 0)
2215 {
2216 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2217 ev_set_priority (&fs_w, EV_MAXPRI);
2218 ev_io_start (EV_A_ &fs_w);
2219 }
2220}
2221
2222void inline_size
2223infy_fork (EV_P)
2224{
2225 int slot;
2226
2227 if (fs_fd < 0)
2228 return;
2229
2230 close (fs_fd);
2231 fs_fd = inotify_init ();
2232
2233 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2234 {
2235 WL w_ = fs_hash [slot].head;
2236 fs_hash [slot].head = 0;
2237
2238 while (w_)
2239 {
2240 ev_stat *w = (ev_stat *)w_;
2241 w_ = w_->next; /* lets us add this watcher */
2242
2243 w->wd = -1;
2244
2245 if (fs_fd >= 0)
2246 infy_add (EV_A_ w); /* re-add, no matter what */
2247 else
2248 ev_timer_start (EV_A_ &w->timer);
2249 }
2250
2251 }
2252}
2253
2254#endif
2255
1652void 2256void
1653ev_stat_stat (EV_P_ ev_stat *w) 2257ev_stat_stat (EV_P_ ev_stat *w)
1654{ 2258{
1655 if (lstat (w->path, &w->attr) < 0) 2259 if (lstat (w->path, &w->attr) < 0)
1656 w->attr.st_nlink = 0; 2260 w->attr.st_nlink = 0;
1657 else if (!w->attr.st_nlink) 2261 else if (!w->attr.st_nlink)
1658 w->attr.st_nlink = 1; 2262 w->attr.st_nlink = 1;
1659} 2263}
1660 2264
1661static void 2265static void noinline
1662stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2266stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1663{ 2267{
1664 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2268 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1665 2269
1666 /* we copy this here each the time so that */ 2270 /* we copy this here each the time so that */
1667 /* prev has the old value when the callback gets invoked */ 2271 /* prev has the old value when the callback gets invoked */
1668 w->prev = w->attr; 2272 w->prev = w->attr;
1669 ev_stat_stat (EV_A_ w); 2273 ev_stat_stat (EV_A_ w);
1670 2274
1671 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2275 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2276 if (
2277 w->prev.st_dev != w->attr.st_dev
2278 || w->prev.st_ino != w->attr.st_ino
2279 || w->prev.st_mode != w->attr.st_mode
2280 || w->prev.st_nlink != w->attr.st_nlink
2281 || w->prev.st_uid != w->attr.st_uid
2282 || w->prev.st_gid != w->attr.st_gid
2283 || w->prev.st_rdev != w->attr.st_rdev
2284 || w->prev.st_size != w->attr.st_size
2285 || w->prev.st_atime != w->attr.st_atime
2286 || w->prev.st_mtime != w->attr.st_mtime
2287 || w->prev.st_ctime != w->attr.st_ctime
2288 ) {
2289 #if EV_USE_INOTIFY
2290 infy_del (EV_A_ w);
2291 infy_add (EV_A_ w);
2292 ev_stat_stat (EV_A_ w); /* avoid race... */
2293 #endif
2294
1672 ev_feed_event (EV_A_ w, EV_STAT); 2295 ev_feed_event (EV_A_ w, EV_STAT);
2296 }
1673} 2297}
1674 2298
1675void 2299void
1676ev_stat_start (EV_P_ ev_stat *w) 2300ev_stat_start (EV_P_ ev_stat *w)
1677{ 2301{
… …
1687 if (w->interval < MIN_STAT_INTERVAL) 2311 if (w->interval < MIN_STAT_INTERVAL)
1688 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2312 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1689 2313
1690 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2314 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1691 ev_set_priority (&w->timer, ev_priority (w)); 2315 ev_set_priority (&w->timer, ev_priority (w));
2316
2317#if EV_USE_INOTIFY
2318 infy_init (EV_A);
2319
2320 if (fs_fd >= 0)
2321 infy_add (EV_A_ w);
2322 else
2323#endif
1692 ev_timer_start (EV_A_ &w->timer); 2324 ev_timer_start (EV_A_ &w->timer);
1693 2325
1694 ev_start (EV_A_ (W)w, 1); 2326 ev_start (EV_A_ (W)w, 1);
1695} 2327}
1696 2328
1697void 2329void
1698ev_stat_stop (EV_P_ ev_stat *w) 2330ev_stat_stop (EV_P_ ev_stat *w)
1699{ 2331{
1700 ev_clear_pending (EV_A_ (W)w); 2332 clear_pending (EV_A_ (W)w);
1701 if (expect_false (!ev_is_active (w))) 2333 if (expect_false (!ev_is_active (w)))
1702 return; 2334 return;
1703 2335
2336#if EV_USE_INOTIFY
2337 infy_del (EV_A_ w);
2338#endif
1704 ev_timer_stop (EV_A_ &w->timer); 2339 ev_timer_stop (EV_A_ &w->timer);
1705 2340
1706 ev_stop (EV_A_ (W)w); 2341 ev_stop (EV_A_ (W)w);
1707} 2342}
1708#endif 2343#endif
1709 2344
2345#if EV_IDLE_ENABLE
1710void 2346void
1711ev_idle_start (EV_P_ ev_idle *w) 2347ev_idle_start (EV_P_ ev_idle *w)
1712{ 2348{
1713 if (expect_false (ev_is_active (w))) 2349 if (expect_false (ev_is_active (w)))
1714 return; 2350 return;
1715 2351
2352 pri_adjust (EV_A_ (W)w);
2353
2354 {
2355 int active = ++idlecnt [ABSPRI (w)];
2356
2357 ++idleall;
1716 ev_start (EV_A_ (W)w, ++idlecnt); 2358 ev_start (EV_A_ (W)w, active);
2359
1717 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2360 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1718 idles [idlecnt - 1] = w; 2361 idles [ABSPRI (w)][active - 1] = w;
2362 }
1719} 2363}
1720 2364
1721void 2365void
1722ev_idle_stop (EV_P_ ev_idle *w) 2366ev_idle_stop (EV_P_ ev_idle *w)
1723{ 2367{
1724 ev_clear_pending (EV_A_ (W)w); 2368 clear_pending (EV_A_ (W)w);
1725 if (expect_false (!ev_is_active (w))) 2369 if (expect_false (!ev_is_active (w)))
1726 return; 2370 return;
1727 2371
1728 { 2372 {
1729 int active = ((W)w)->active; 2373 int active = ev_active (w);
1730 idles [active - 1] = idles [--idlecnt]; 2374
1731 ((W)idles [active - 1])->active = active; 2375 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2376 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2377
2378 ev_stop (EV_A_ (W)w);
2379 --idleall;
1732 } 2380 }
1733
1734 ev_stop (EV_A_ (W)w);
1735} 2381}
2382#endif
1736 2383
1737void 2384void
1738ev_prepare_start (EV_P_ ev_prepare *w) 2385ev_prepare_start (EV_P_ ev_prepare *w)
1739{ 2386{
1740 if (expect_false (ev_is_active (w))) 2387 if (expect_false (ev_is_active (w)))
… …
1746} 2393}
1747 2394
1748void 2395void
1749ev_prepare_stop (EV_P_ ev_prepare *w) 2396ev_prepare_stop (EV_P_ ev_prepare *w)
1750{ 2397{
1751 ev_clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
1752 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
1753 return; 2400 return;
1754 2401
1755 { 2402 {
1756 int active = ((W)w)->active; 2403 int active = ev_active (w);
2404
1757 prepares [active - 1] = prepares [--preparecnt]; 2405 prepares [active - 1] = prepares [--preparecnt];
1758 ((W)prepares [active - 1])->active = active; 2406 ev_active (prepares [active - 1]) = active;
1759 } 2407 }
1760 2408
1761 ev_stop (EV_A_ (W)w); 2409 ev_stop (EV_A_ (W)w);
1762} 2410}
1763 2411
… …
1773} 2421}
1774 2422
1775void 2423void
1776ev_check_stop (EV_P_ ev_check *w) 2424ev_check_stop (EV_P_ ev_check *w)
1777{ 2425{
1778 ev_clear_pending (EV_A_ (W)w); 2426 clear_pending (EV_A_ (W)w);
1779 if (expect_false (!ev_is_active (w))) 2427 if (expect_false (!ev_is_active (w)))
1780 return; 2428 return;
1781 2429
1782 { 2430 {
1783 int active = ((W)w)->active; 2431 int active = ev_active (w);
2432
1784 checks [active - 1] = checks [--checkcnt]; 2433 checks [active - 1] = checks [--checkcnt];
1785 ((W)checks [active - 1])->active = active; 2434 ev_active (checks [active - 1]) = active;
1786 } 2435 }
1787 2436
1788 ev_stop (EV_A_ (W)w); 2437 ev_stop (EV_A_ (W)w);
1789} 2438}
1790 2439
1791#if EV_EMBED_ENABLE 2440#if EV_EMBED_ENABLE
1792void noinline 2441void noinline
1793ev_embed_sweep (EV_P_ ev_embed *w) 2442ev_embed_sweep (EV_P_ ev_embed *w)
1794{ 2443{
1795 ev_loop (w->loop, EVLOOP_NONBLOCK); 2444 ev_loop (w->other, EVLOOP_NONBLOCK);
1796} 2445}
1797 2446
1798static void 2447static void
1799embed_cb (EV_P_ ev_io *io, int revents) 2448embed_io_cb (EV_P_ ev_io *io, int revents)
1800{ 2449{
1801 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2450 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1802 2451
1803 if (ev_cb (w)) 2452 if (ev_cb (w))
1804 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2453 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1805 else 2454 else
1806 ev_embed_sweep (loop, w); 2455 ev_loop (w->other, EVLOOP_NONBLOCK);
1807} 2456}
2457
2458static void
2459embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2460{
2461 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2462
2463 {
2464 struct ev_loop *loop = w->other;
2465
2466 while (fdchangecnt)
2467 {
2468 fd_reify (EV_A);
2469 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2470 }
2471 }
2472}
2473
2474#if 0
2475static void
2476embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2477{
2478 ev_idle_stop (EV_A_ idle);
2479}
2480#endif
1808 2481
1809void 2482void
1810ev_embed_start (EV_P_ ev_embed *w) 2483ev_embed_start (EV_P_ ev_embed *w)
1811{ 2484{
1812 if (expect_false (ev_is_active (w))) 2485 if (expect_false (ev_is_active (w)))
1813 return; 2486 return;
1814 2487
1815 { 2488 {
1816 struct ev_loop *loop = w->loop; 2489 struct ev_loop *loop = w->other;
1817 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2490 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1818 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2491 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1819 } 2492 }
1820 2493
1821 ev_set_priority (&w->io, ev_priority (w)); 2494 ev_set_priority (&w->io, ev_priority (w));
1822 ev_io_start (EV_A_ &w->io); 2495 ev_io_start (EV_A_ &w->io);
1823 2496
2497 ev_prepare_init (&w->prepare, embed_prepare_cb);
2498 ev_set_priority (&w->prepare, EV_MINPRI);
2499 ev_prepare_start (EV_A_ &w->prepare);
2500
2501 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2502
1824 ev_start (EV_A_ (W)w, 1); 2503 ev_start (EV_A_ (W)w, 1);
1825} 2504}
1826 2505
1827void 2506void
1828ev_embed_stop (EV_P_ ev_embed *w) 2507ev_embed_stop (EV_P_ ev_embed *w)
1829{ 2508{
1830 ev_clear_pending (EV_A_ (W)w); 2509 clear_pending (EV_A_ (W)w);
1831 if (expect_false (!ev_is_active (w))) 2510 if (expect_false (!ev_is_active (w)))
1832 return; 2511 return;
1833 2512
1834 ev_io_stop (EV_A_ &w->io); 2513 ev_io_stop (EV_A_ &w->io);
2514 ev_prepare_stop (EV_A_ &w->prepare);
1835 2515
1836 ev_stop (EV_A_ (W)w); 2516 ev_stop (EV_A_ (W)w);
1837} 2517}
1838#endif 2518#endif
1839 2519
… …
1850} 2530}
1851 2531
1852void 2532void
1853ev_fork_stop (EV_P_ ev_fork *w) 2533ev_fork_stop (EV_P_ ev_fork *w)
1854{ 2534{
1855 ev_clear_pending (EV_A_ (W)w); 2535 clear_pending (EV_A_ (W)w);
1856 if (expect_false (!ev_is_active (w))) 2536 if (expect_false (!ev_is_active (w)))
1857 return; 2537 return;
1858 2538
1859 { 2539 {
1860 int active = ((W)w)->active; 2540 int active = ev_active (w);
2541
1861 forks [active - 1] = forks [--forkcnt]; 2542 forks [active - 1] = forks [--forkcnt];
1862 ((W)forks [active - 1])->active = active; 2543 ev_active (forks [active - 1]) = active;
1863 } 2544 }
1864 2545
1865 ev_stop (EV_A_ (W)w); 2546 ev_stop (EV_A_ (W)w);
2547}
2548#endif
2549
2550#if EV_ASYNC_ENABLE
2551void
2552ev_async_start (EV_P_ ev_async *w)
2553{
2554 if (expect_false (ev_is_active (w)))
2555 return;
2556
2557 evpipe_init (EV_A);
2558
2559 ev_start (EV_A_ (W)w, ++asynccnt);
2560 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2561 asyncs [asynccnt - 1] = w;
2562}
2563
2564void
2565ev_async_stop (EV_P_ ev_async *w)
2566{
2567 clear_pending (EV_A_ (W)w);
2568 if (expect_false (!ev_is_active (w)))
2569 return;
2570
2571 {
2572 int active = ev_active (w);
2573
2574 asyncs [active - 1] = asyncs [--asynccnt];
2575 ev_active (asyncs [active - 1]) = active;
2576 }
2577
2578 ev_stop (EV_A_ (W)w);
2579}
2580
2581void
2582ev_async_send (EV_P_ ev_async *w)
2583{
2584 w->sent = 1;
2585 evpipe_write (EV_A_ &gotasync);
1866} 2586}
1867#endif 2587#endif
1868 2588
1869/*****************************************************************************/ 2589/*****************************************************************************/
1870 2590
… …
1928 ev_timer_set (&once->to, timeout, 0.); 2648 ev_timer_set (&once->to, timeout, 0.);
1929 ev_timer_start (EV_A_ &once->to); 2649 ev_timer_start (EV_A_ &once->to);
1930 } 2650 }
1931} 2651}
1932 2652
2653#if EV_MULTIPLICITY
2654 #include "ev_wrap.h"
2655#endif
2656
1933#ifdef __cplusplus 2657#ifdef __cplusplus
1934} 2658}
1935#endif 2659#endif
1936 2660

Diff Legend

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