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

Comparing libev/ev.c (file contents):
Revision 1.146 by root, Tue Nov 27 09:17:51 2007 UTC vs.
Revision 1.234 by root, Tue May 6 23:42:16 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
… …
51# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 61# define EV_USE_MONOTONIC 0
53# endif 62# endif
54# ifndef EV_USE_REALTIME 63# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 64# define EV_USE_REALTIME 0
65# endif
66# endif
67
68# ifndef EV_USE_NANOSLEEP
69# if HAVE_NANOSLEEP
70# define EV_USE_NANOSLEEP 1
71# else
72# define EV_USE_NANOSLEEP 0
56# endif 73# endif
57# endif 74# endif
58 75
59# ifndef EV_USE_SELECT 76# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 77# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
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
994#endif 1375#endif
995 1376
996#if EV_MULTIPLICITY 1377#if EV_MULTIPLICITY
997struct ev_loop * 1378struct ev_loop *
998ev_default_loop_init (unsigned int flags) 1379ev_default_loop_init (unsigned int flags)
999#else 1380#else
1000int 1381int
1001ev_default_loop (unsigned int flags) 1382ev_default_loop (unsigned int flags)
1002#endif 1383#endif
1003{ 1384{
1004 if (sigpipe [0] == sigpipe [1])
1005 if (pipe (sigpipe))
1006 return 0;
1007
1008 if (!ev_default_loop_ptr) 1385 if (!ev_default_loop_ptr)
1009 { 1386 {
1010#if EV_MULTIPLICITY 1387#if EV_MULTIPLICITY
1011 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1388 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1012#else 1389#else
… …
1015 1392
1016 loop_init (EV_A_ flags); 1393 loop_init (EV_A_ flags);
1017 1394
1018 if (ev_backend (EV_A)) 1395 if (ev_backend (EV_A))
1019 { 1396 {
1020 siginit (EV_A);
1021
1022#ifndef _WIN32 1397#ifndef _WIN32
1023 ev_signal_init (&childev, childcb, SIGCHLD); 1398 ev_signal_init (&childev, childcb, SIGCHLD);
1024 ev_set_priority (&childev, EV_MAXPRI); 1399 ev_set_priority (&childev, EV_MAXPRI);
1025 ev_signal_start (EV_A_ &childev); 1400 ev_signal_start (EV_A_ &childev);
1026 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1401 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1043#ifndef _WIN32 1418#ifndef _WIN32
1044 ev_ref (EV_A); /* child watcher */ 1419 ev_ref (EV_A); /* child watcher */
1045 ev_signal_stop (EV_A_ &childev); 1420 ev_signal_stop (EV_A_ &childev);
1046#endif 1421#endif
1047 1422
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); 1423 loop_destroy (EV_A);
1055} 1424}
1056 1425
1057void 1426void
1058ev_default_fork (void) 1427ev_default_fork (void)
… …
1060#if EV_MULTIPLICITY 1429#if EV_MULTIPLICITY
1061 struct ev_loop *loop = ev_default_loop_ptr; 1430 struct ev_loop *loop = ev_default_loop_ptr;
1062#endif 1431#endif
1063 1432
1064 if (backend) 1433 if (backend)
1065 postfork = 1; 1434 postfork = 1; /* must be in line with ev_loop_fork */
1066} 1435}
1067 1436
1068/*****************************************************************************/ 1437/*****************************************************************************/
1069 1438
1070int inline_size 1439void
1071any_pending (EV_P) 1440ev_invoke (EV_P_ void *w, int revents)
1072{ 1441{
1073 int pri; 1442 EV_CB_INVOKE ((W)w, revents);
1074
1075 for (pri = NUMPRI; pri--; )
1076 if (pendingcnt [pri])
1077 return 1;
1078
1079 return 0;
1080} 1443}
1081 1444
1082void inline_speed 1445void inline_speed
1083call_pending (EV_P) 1446call_pending (EV_P)
1084{ 1447{
… …
1089 { 1452 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1453 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1454
1092 if (expect_true (p->w)) 1455 if (expect_true (p->w))
1093 { 1456 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1457 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1458
1096 p->w->pending = 0; 1459 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1460 EV_CB_INVOKE (p->w, p->events);
1098 } 1461 }
1099 } 1462 }
1100} 1463}
1101 1464
1465#if EV_IDLE_ENABLE
1466void inline_size
1467idle_reify (EV_P)
1468{
1469 if (expect_false (idleall))
1470 {
1471 int pri;
1472
1473 for (pri = NUMPRI; pri--; )
1474 {
1475 if (pendingcnt [pri])
1476 break;
1477
1478 if (idlecnt [pri])
1479 {
1480 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1481 break;
1482 }
1483 }
1484 }
1485}
1486#endif
1487
1102void inline_size 1488void inline_size
1103timers_reify (EV_P) 1489timers_reify (EV_P)
1104{ 1490{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1491 while (timercnt && ev_at (timers [1]) <= mn_now)
1106 { 1492 {
1107 ev_timer *w = timers [0]; 1493 ev_timer *w = (ev_timer *)timers [1];
1108 1494
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1495 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1496
1111 /* first reschedule or stop timer */ 1497 /* first reschedule or stop timer */
1112 if (w->repeat) 1498 if (w->repeat)
1113 { 1499 {
1114 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1500 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1115 1501
1116 ((WT)w)->at += w->repeat; 1502 ev_at (w) += w->repeat;
1117 if (((WT)w)->at < mn_now) 1503 if (ev_at (w) < mn_now)
1118 ((WT)w)->at = mn_now; 1504 ev_at (w) = mn_now;
1119 1505
1120 downheap ((WT *)timers, timercnt, 0); 1506 downheap (timers, timercnt, 1);
1121 } 1507 }
1122 else 1508 else
1123 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1509 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1124 1510
1125 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1511 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1128 1514
1129#if EV_PERIODIC_ENABLE 1515#if EV_PERIODIC_ENABLE
1130void inline_size 1516void inline_size
1131periodics_reify (EV_P) 1517periodics_reify (EV_P)
1132{ 1518{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1519 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1134 { 1520 {
1135 ev_periodic *w = periodics [0]; 1521 ev_periodic *w = (ev_periodic *)periodics [1];
1136 1522
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1523 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1524
1139 /* first reschedule or stop timer */ 1525 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1526 if (w->reschedule_cb)
1141 { 1527 {
1142 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1528 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)); 1529 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1144 downheap ((WT *)periodics, periodiccnt, 0); 1530 downheap (periodics, periodiccnt, 1);
1145 } 1531 }
1146 else if (w->interval) 1532 else if (w->interval)
1147 { 1533 {
1148 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1535 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)); 1536 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); 1537 downheap (periodics, periodiccnt, 1);
1151 } 1538 }
1152 else 1539 else
1153 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1540 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1154 1541
1155 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1542 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1160periodics_reschedule (EV_P) 1547periodics_reschedule (EV_P)
1161{ 1548{
1162 int i; 1549 int i;
1163 1550
1164 /* adjust periodics after time jump */ 1551 /* adjust periodics after time jump */
1165 for (i = 0; i < periodiccnt; ++i) 1552 for (i = 1; i <= periodiccnt; ++i)
1166 { 1553 {
1167 ev_periodic *w = periodics [i]; 1554 ev_periodic *w = (ev_periodic *)periodics [i];
1168 1555
1169 if (w->reschedule_cb) 1556 if (w->reschedule_cb)
1170 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1557 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1171 else if (w->interval) 1558 else if (w->interval)
1172 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1559 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1173 } 1560 }
1174 1561
1175 /* now rebuild the heap */ 1562 /* now rebuild the heap */
1176 for (i = periodiccnt >> 1; i--; ) 1563 for (i = periodiccnt >> 1; i--; )
1177 downheap ((WT *)periodics, periodiccnt, i); 1564 downheap (periodics, periodiccnt, i);
1178} 1565}
1179#endif 1566#endif
1180 1567
1181int inline_size 1568void inline_speed
1182time_update_monotonic (EV_P) 1569time_update (EV_P_ ev_tstamp max_block)
1183{ 1570{
1571 int i;
1572
1573#if EV_USE_MONOTONIC
1574 if (expect_true (have_monotonic))
1575 {
1576 ev_tstamp odiff = rtmn_diff;
1577
1184 mn_now = get_clock (); 1578 mn_now = get_clock ();
1185 1579
1580 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1581 /* interpolate in the meantime */
1186 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1582 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1187 { 1583 {
1188 ev_rt_now = rtmn_diff + mn_now; 1584 ev_rt_now = rtmn_diff + mn_now;
1189 return 0; 1585 return;
1190 } 1586 }
1191 else 1587
1192 {
1193 now_floor = mn_now; 1588 now_floor = mn_now;
1194 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1195 return 1;
1196 }
1197}
1198 1590
1199void inline_size 1591 /* loop a few times, before making important decisions.
1200time_update (EV_P) 1592 * on the choice of "4": one iteration isn't enough,
1201{ 1593 * in case we get preempted during the calls to
1202 int i; 1594 * ev_time and get_clock. a second call is almost guaranteed
1203 1595 * to succeed in that case, though. and looping a few more times
1204#if EV_USE_MONOTONIC 1596 * doesn't hurt either as we only do this on time-jumps or
1205 if (expect_true (have_monotonic)) 1597 * in the unlikely event of having been preempted here.
1206 { 1598 */
1207 if (time_update_monotonic (EV_A)) 1599 for (i = 4; --i; )
1208 { 1600 {
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; 1601 rtmn_diff = ev_rt_now - mn_now;
1222 1602
1223 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1603 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1224 return; /* all is well */ 1604 return; /* all is well */
1225 1605
1226 ev_rt_now = ev_time (); 1606 ev_rt_now = ev_time ();
1227 mn_now = get_clock (); 1607 mn_now = get_clock ();
1228 now_floor = mn_now; 1608 now_floor = mn_now;
1229 } 1609 }
1230 1610
1231# if EV_PERIODIC_ENABLE 1611# if EV_PERIODIC_ENABLE
1232 periodics_reschedule (EV_A); 1612 periodics_reschedule (EV_A);
1233# endif 1613# endif
1234 /* no timer adjustment, as the monotonic clock doesn't jump */ 1614 /* no timer adjustment, as the monotonic clock doesn't jump */
1235 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1615 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1236 }
1237 } 1616 }
1238 else 1617 else
1239#endif 1618#endif
1240 { 1619 {
1241 ev_rt_now = ev_time (); 1620 ev_rt_now = ev_time ();
1242 1621
1243 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1622 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1244 { 1623 {
1245#if EV_PERIODIC_ENABLE 1624#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1625 periodics_reschedule (EV_A);
1247#endif 1626#endif
1248
1249 /* adjust timers. this is easy, as the offset is the same for all */ 1627 /* adjust timers. this is easy, as the offset is the same for all of them */
1250 for (i = 0; i < timercnt; ++i) 1628 for (i = 1; i <= timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1629 ev_at (timers [i]) += ev_rt_now - mn_now;
1252 } 1630 }
1253 1631
1254 mn_now = ev_rt_now; 1632 mn_now = ev_rt_now;
1255 } 1633 }
1256} 1634}
… …
1270static int loop_done; 1648static int loop_done;
1271 1649
1272void 1650void
1273ev_loop (EV_P_ int flags) 1651ev_loop (EV_P_ int flags)
1274{ 1652{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1653 loop_done = EVUNLOOP_CANCEL;
1276 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL;
1278 1654
1279 while (activecnt) 1655 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1656
1657 do
1280 { 1658 {
1659#ifndef _WIN32
1660 if (expect_false (curpid)) /* penalise the forking check even more */
1661 if (expect_false (getpid () != curpid))
1662 {
1663 curpid = getpid ();
1664 postfork = 1;
1665 }
1666#endif
1667
1668#if EV_FORK_ENABLE
1669 /* we might have forked, so queue fork handlers */
1670 if (expect_false (postfork))
1671 if (forkcnt)
1672 {
1673 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1674 call_pending (EV_A);
1675 }
1676#endif
1677
1281 /* queue check watchers (and execute them) */ 1678 /* queue prepare watchers (and execute them) */
1282 if (expect_false (preparecnt)) 1679 if (expect_false (preparecnt))
1283 { 1680 {
1284 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1681 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1285 call_pending (EV_A); 1682 call_pending (EV_A);
1286 } 1683 }
1287 1684
1685 if (expect_false (!activecnt))
1686 break;
1687
1288 /* we might have forked, so reify kernel state if necessary */ 1688 /* we might have forked, so reify kernel state if necessary */
1289 if (expect_false (postfork)) 1689 if (expect_false (postfork))
1290 loop_fork (EV_A); 1690 loop_fork (EV_A);
1291 1691
1292 /* update fd-related kernel structures */ 1692 /* update fd-related kernel structures */
1293 fd_reify (EV_A); 1693 fd_reify (EV_A);
1294 1694
1295 /* calculate blocking time */ 1695 /* calculate blocking time */
1296 { 1696 {
1297 double block; 1697 ev_tstamp waittime = 0.;
1698 ev_tstamp sleeptime = 0.;
1298 1699
1299 if (flags & EVLOOP_NONBLOCK || idlecnt) 1700 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1300 block = 0.; /* do not block at all */
1301 else
1302 { 1701 {
1303 /* update time to cancel out callback processing overhead */ 1702 /* 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); 1703 time_update (EV_A_ 1e100);
1307 else
1308#endif
1309 {
1310 ev_rt_now = ev_time ();
1311 mn_now = ev_rt_now;
1312 }
1313 1704
1314 block = MAX_BLOCKTIME; 1705 waittime = MAX_BLOCKTIME;
1315 1706
1316 if (timercnt) 1707 if (timercnt)
1317 { 1708 {
1318 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1709 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1319 if (block > to) block = to; 1710 if (waittime > to) waittime = to;
1320 } 1711 }
1321 1712
1322#if EV_PERIODIC_ENABLE 1713#if EV_PERIODIC_ENABLE
1323 if (periodiccnt) 1714 if (periodiccnt)
1324 { 1715 {
1325 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1716 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1326 if (block > to) block = to; 1717 if (waittime > to) waittime = to;
1327 } 1718 }
1328#endif 1719#endif
1329 1720
1330 if (expect_false (block < 0.)) block = 0.; 1721 if (expect_false (waittime < timeout_blocktime))
1722 waittime = timeout_blocktime;
1723
1724 sleeptime = waittime - backend_fudge;
1725
1726 if (expect_true (sleeptime > io_blocktime))
1727 sleeptime = io_blocktime;
1728
1729 if (sleeptime)
1730 {
1731 ev_sleep (sleeptime);
1732 waittime -= sleeptime;
1733 }
1331 } 1734 }
1332 1735
1736 ++loop_count;
1333 backend_poll (EV_A_ block); 1737 backend_poll (EV_A_ waittime);
1738
1739 /* update ev_rt_now, do magic */
1740 time_update (EV_A_ waittime + sleeptime);
1334 } 1741 }
1335
1336 /* update ev_rt_now, do magic */
1337 time_update (EV_A);
1338 1742
1339 /* queue pending timers and reschedule them */ 1743 /* queue pending timers and reschedule them */
1340 timers_reify (EV_A); /* relative timers called last */ 1744 timers_reify (EV_A); /* relative timers called last */
1341#if EV_PERIODIC_ENABLE 1745#if EV_PERIODIC_ENABLE
1342 periodics_reify (EV_A); /* absolute timers called first */ 1746 periodics_reify (EV_A); /* absolute timers called first */
1343#endif 1747#endif
1344 1748
1749#if EV_IDLE_ENABLE
1345 /* queue idle watchers unless other events are pending */ 1750 /* queue idle watchers unless other events are pending */
1346 if (idlecnt && !any_pending (EV_A)) 1751 idle_reify (EV_A);
1347 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1752#endif
1348 1753
1349 /* queue check watchers, to be executed first */ 1754 /* queue check watchers, to be executed first */
1350 if (expect_false (checkcnt)) 1755 if (expect_false (checkcnt))
1351 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1756 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1352 1757
1353 call_pending (EV_A); 1758 call_pending (EV_A);
1354
1355 if (expect_false (loop_done))
1356 break;
1357 } 1759 }
1760 while (expect_true (
1761 activecnt
1762 && !loop_done
1763 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1764 ));
1358 1765
1359 if (loop_done == EVUNLOOP_ONE) 1766 if (loop_done == EVUNLOOP_ONE)
1360 loop_done = EVUNLOOP_CANCEL; 1767 loop_done = EVUNLOOP_CANCEL;
1361} 1768}
1362 1769
… …
1389 head = &(*head)->next; 1796 head = &(*head)->next;
1390 } 1797 }
1391} 1798}
1392 1799
1393void inline_speed 1800void inline_speed
1394ev_clear_pending (EV_P_ W w) 1801clear_pending (EV_P_ W w)
1395{ 1802{
1396 if (w->pending) 1803 if (w->pending)
1397 { 1804 {
1398 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1805 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1399 w->pending = 0; 1806 w->pending = 0;
1400 } 1807 }
1401} 1808}
1402 1809
1810int
1811ev_clear_pending (EV_P_ void *w)
1812{
1813 W w_ = (W)w;
1814 int pending = w_->pending;
1815
1816 if (expect_true (pending))
1817 {
1818 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1819 w_->pending = 0;
1820 p->w = 0;
1821 return p->events;
1822 }
1823 else
1824 return 0;
1825}
1826
1827void inline_size
1828pri_adjust (EV_P_ W w)
1829{
1830 int pri = w->priority;
1831 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1832 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1833 w->priority = pri;
1834}
1835
1403void inline_speed 1836void inline_speed
1404ev_start (EV_P_ W w, int active) 1837ev_start (EV_P_ W w, int active)
1405{ 1838{
1406 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1839 pri_adjust (EV_A_ w);
1407 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1408
1409 w->active = active; 1840 w->active = active;
1410 ev_ref (EV_A); 1841 ev_ref (EV_A);
1411} 1842}
1412 1843
1413void inline_size 1844void inline_size
… …
1417 w->active = 0; 1848 w->active = 0;
1418} 1849}
1419 1850
1420/*****************************************************************************/ 1851/*****************************************************************************/
1421 1852
1422void 1853void noinline
1423ev_io_start (EV_P_ ev_io *w) 1854ev_io_start (EV_P_ ev_io *w)
1424{ 1855{
1425 int fd = w->fd; 1856 int fd = w->fd;
1426 1857
1427 if (expect_false (ev_is_active (w))) 1858 if (expect_false (ev_is_active (w)))
… …
1429 1860
1430 assert (("ev_io_start called with negative fd", fd >= 0)); 1861 assert (("ev_io_start called with negative fd", fd >= 0));
1431 1862
1432 ev_start (EV_A_ (W)w, 1); 1863 ev_start (EV_A_ (W)w, 1);
1433 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1864 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1434 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1865 wlist_add (&anfds[fd].head, (WL)w);
1435 1866
1436 fd_change (EV_A_ fd); 1867 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1868 w->events &= ~EV_IOFDSET;
1437} 1869}
1438 1870
1439void 1871void noinline
1440ev_io_stop (EV_P_ ev_io *w) 1872ev_io_stop (EV_P_ ev_io *w)
1441{ 1873{
1442 ev_clear_pending (EV_A_ (W)w); 1874 clear_pending (EV_A_ (W)w);
1443 if (expect_false (!ev_is_active (w))) 1875 if (expect_false (!ev_is_active (w)))
1444 return; 1876 return;
1445 1877
1446 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1878 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1447 1879
1448 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1880 wlist_del (&anfds[w->fd].head, (WL)w);
1449 ev_stop (EV_A_ (W)w); 1881 ev_stop (EV_A_ (W)w);
1450 1882
1451 fd_change (EV_A_ w->fd); 1883 fd_change (EV_A_ w->fd, 1);
1452} 1884}
1453 1885
1454void 1886void noinline
1455ev_timer_start (EV_P_ ev_timer *w) 1887ev_timer_start (EV_P_ ev_timer *w)
1456{ 1888{
1457 if (expect_false (ev_is_active (w))) 1889 if (expect_false (ev_is_active (w)))
1458 return; 1890 return;
1459 1891
1460 ((WT)w)->at += mn_now; 1892 ev_at (w) += mn_now;
1461 1893
1462 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1894 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1463 1895
1464 ev_start (EV_A_ (W)w, ++timercnt); 1896 ev_start (EV_A_ (W)w, ++timercnt);
1465 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1897 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1466 timers [timercnt - 1] = w; 1898 timers [timercnt] = (WT)w;
1467 upheap ((WT *)timers, timercnt - 1); 1899 upheap (timers, timercnt);
1468 1900
1469 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1901 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1470} 1902}
1471 1903
1472void 1904void noinline
1473ev_timer_stop (EV_P_ ev_timer *w) 1905ev_timer_stop (EV_P_ ev_timer *w)
1474{ 1906{
1475 ev_clear_pending (EV_A_ (W)w); 1907 clear_pending (EV_A_ (W)w);
1476 if (expect_false (!ev_is_active (w))) 1908 if (expect_false (!ev_is_active (w)))
1477 return; 1909 return;
1478 1910
1911 {
1912 int active = ev_active (w);
1913
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1914 assert (("internal timer heap corruption", timers [active] == (WT)w));
1480 1915
1481 if (expect_true (((W)w)->active < timercnt--)) 1916 if (expect_true (active < timercnt))
1482 { 1917 {
1483 timers [((W)w)->active - 1] = timers [timercnt]; 1918 timers [active] = timers [timercnt];
1484 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1919 adjustheap (timers, timercnt, active);
1485 } 1920 }
1486 1921
1487 ((WT)w)->at -= mn_now; 1922 --timercnt;
1923 }
1924
1925 ev_at (w) -= mn_now;
1488 1926
1489 ev_stop (EV_A_ (W)w); 1927 ev_stop (EV_A_ (W)w);
1490} 1928}
1491 1929
1492void 1930void noinline
1493ev_timer_again (EV_P_ ev_timer *w) 1931ev_timer_again (EV_P_ ev_timer *w)
1494{ 1932{
1495 if (ev_is_active (w)) 1933 if (ev_is_active (w))
1496 { 1934 {
1497 if (w->repeat) 1935 if (w->repeat)
1498 { 1936 {
1499 ((WT)w)->at = mn_now + w->repeat; 1937 ev_at (w) = mn_now + w->repeat;
1500 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1938 adjustheap (timers, timercnt, ev_active (w));
1501 } 1939 }
1502 else 1940 else
1503 ev_timer_stop (EV_A_ w); 1941 ev_timer_stop (EV_A_ w);
1504 } 1942 }
1505 else if (w->repeat) 1943 else if (w->repeat)
1506 { 1944 {
1507 w->at = w->repeat; 1945 ev_at (w) = w->repeat;
1508 ev_timer_start (EV_A_ w); 1946 ev_timer_start (EV_A_ w);
1509 } 1947 }
1510} 1948}
1511 1949
1512#if EV_PERIODIC_ENABLE 1950#if EV_PERIODIC_ENABLE
1513void 1951void noinline
1514ev_periodic_start (EV_P_ ev_periodic *w) 1952ev_periodic_start (EV_P_ ev_periodic *w)
1515{ 1953{
1516 if (expect_false (ev_is_active (w))) 1954 if (expect_false (ev_is_active (w)))
1517 return; 1955 return;
1518 1956
1519 if (w->reschedule_cb) 1957 if (w->reschedule_cb)
1520 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1958 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1521 else if (w->interval) 1959 else if (w->interval)
1522 { 1960 {
1523 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1961 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 */ 1962 /* 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; 1963 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1526 } 1964 }
1965 else
1966 ev_at (w) = w->offset;
1527 1967
1528 ev_start (EV_A_ (W)w, ++periodiccnt); 1968 ev_start (EV_A_ (W)w, ++periodiccnt);
1529 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1969 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1530 periodics [periodiccnt - 1] = w; 1970 periodics [periodiccnt] = (WT)w;
1531 upheap ((WT *)periodics, periodiccnt - 1); 1971 upheap (periodics, periodiccnt);
1532 1972
1533 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1973 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1534} 1974}
1535 1975
1536void 1976void noinline
1537ev_periodic_stop (EV_P_ ev_periodic *w) 1977ev_periodic_stop (EV_P_ ev_periodic *w)
1538{ 1978{
1539 ev_clear_pending (EV_A_ (W)w); 1979 clear_pending (EV_A_ (W)w);
1540 if (expect_false (!ev_is_active (w))) 1980 if (expect_false (!ev_is_active (w)))
1541 return; 1981 return;
1542 1982
1983 {
1984 int active = ev_active (w);
1985
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1986 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1544 1987
1545 if (expect_true (((W)w)->active < periodiccnt--)) 1988 if (expect_true (active < periodiccnt))
1546 { 1989 {
1547 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1990 periodics [active] = periodics [periodiccnt];
1548 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1991 adjustheap (periodics, periodiccnt, active);
1549 } 1992 }
1993
1994 --periodiccnt;
1995 }
1550 1996
1551 ev_stop (EV_A_ (W)w); 1997 ev_stop (EV_A_ (W)w);
1552} 1998}
1553 1999
1554void 2000void noinline
1555ev_periodic_again (EV_P_ ev_periodic *w) 2001ev_periodic_again (EV_P_ ev_periodic *w)
1556{ 2002{
1557 /* TODO: use adjustheap and recalculation */ 2003 /* TODO: use adjustheap and recalculation */
1558 ev_periodic_stop (EV_A_ w); 2004 ev_periodic_stop (EV_A_ w);
1559 ev_periodic_start (EV_A_ w); 2005 ev_periodic_start (EV_A_ w);
… …
1562 2008
1563#ifndef SA_RESTART 2009#ifndef SA_RESTART
1564# define SA_RESTART 0 2010# define SA_RESTART 0
1565#endif 2011#endif
1566 2012
1567void 2013void noinline
1568ev_signal_start (EV_P_ ev_signal *w) 2014ev_signal_start (EV_P_ ev_signal *w)
1569{ 2015{
1570#if EV_MULTIPLICITY 2016#if EV_MULTIPLICITY
1571 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2017 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1572#endif 2018#endif
1573 if (expect_false (ev_is_active (w))) 2019 if (expect_false (ev_is_active (w)))
1574 return; 2020 return;
1575 2021
1576 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2022 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1577 2023
2024 evpipe_init (EV_A);
2025
2026 {
2027#ifndef _WIN32
2028 sigset_t full, prev;
2029 sigfillset (&full);
2030 sigprocmask (SIG_SETMASK, &full, &prev);
2031#endif
2032
2033 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2034
2035#ifndef _WIN32
2036 sigprocmask (SIG_SETMASK, &prev, 0);
2037#endif
2038 }
2039
1578 ev_start (EV_A_ (W)w, 1); 2040 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); 2041 wlist_add (&signals [w->signum - 1].head, (WL)w);
1581 2042
1582 if (!((WL)w)->next) 2043 if (!((WL)w)->next)
1583 { 2044 {
1584#if _WIN32 2045#if _WIN32
1585 signal (w->signum, sighandler); 2046 signal (w->signum, ev_sighandler);
1586#else 2047#else
1587 struct sigaction sa; 2048 struct sigaction sa;
1588 sa.sa_handler = sighandler; 2049 sa.sa_handler = ev_sighandler;
1589 sigfillset (&sa.sa_mask); 2050 sigfillset (&sa.sa_mask);
1590 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2051 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1591 sigaction (w->signum, &sa, 0); 2052 sigaction (w->signum, &sa, 0);
1592#endif 2053#endif
1593 } 2054 }
1594} 2055}
1595 2056
1596void 2057void noinline
1597ev_signal_stop (EV_P_ ev_signal *w) 2058ev_signal_stop (EV_P_ ev_signal *w)
1598{ 2059{
1599 ev_clear_pending (EV_A_ (W)w); 2060 clear_pending (EV_A_ (W)w);
1600 if (expect_false (!ev_is_active (w))) 2061 if (expect_false (!ev_is_active (w)))
1601 return; 2062 return;
1602 2063
1603 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2064 wlist_del (&signals [w->signum - 1].head, (WL)w);
1604 ev_stop (EV_A_ (W)w); 2065 ev_stop (EV_A_ (W)w);
1605 2066
1606 if (!signals [w->signum - 1].head) 2067 if (!signals [w->signum - 1].head)
1607 signal (w->signum, SIG_DFL); 2068 signal (w->signum, SIG_DFL);
1608} 2069}
… …
1615#endif 2076#endif
1616 if (expect_false (ev_is_active (w))) 2077 if (expect_false (ev_is_active (w)))
1617 return; 2078 return;
1618 2079
1619 ev_start (EV_A_ (W)w, 1); 2080 ev_start (EV_A_ (W)w, 1);
1620 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2081 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1621} 2082}
1622 2083
1623void 2084void
1624ev_child_stop (EV_P_ ev_child *w) 2085ev_child_stop (EV_P_ ev_child *w)
1625{ 2086{
1626 ev_clear_pending (EV_A_ (W)w); 2087 clear_pending (EV_A_ (W)w);
1627 if (expect_false (!ev_is_active (w))) 2088 if (expect_false (!ev_is_active (w)))
1628 return; 2089 return;
1629 2090
1630 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2091 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631 ev_stop (EV_A_ (W)w); 2092 ev_stop (EV_A_ (W)w);
1632} 2093}
1633 2094
1634#if EV_STAT_ENABLE 2095#if EV_STAT_ENABLE
1635 2096
… …
1639# endif 2100# endif
1640 2101
1641#define DEF_STAT_INTERVAL 5.0074891 2102#define DEF_STAT_INTERVAL 5.0074891
1642#define MIN_STAT_INTERVAL 0.1074891 2103#define MIN_STAT_INTERVAL 0.1074891
1643 2104
2105static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2106
2107#if EV_USE_INOTIFY
2108# define EV_INOTIFY_BUFSIZE 8192
2109
2110static void noinline
2111infy_add (EV_P_ ev_stat *w)
2112{
2113 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);
2114
2115 if (w->wd < 0)
2116 {
2117 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2118
2119 /* monitor some parent directory for speedup hints */
2120 /* note that exceeding the hardcoded limit is not a correctness issue, */
2121 /* but an efficiency issue only */
2122 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2123 {
2124 char path [4096];
2125 strcpy (path, w->path);
2126
2127 do
2128 {
2129 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2130 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2131
2132 char *pend = strrchr (path, '/');
2133
2134 if (!pend)
2135 break; /* whoops, no '/', complain to your admin */
2136
2137 *pend = 0;
2138 w->wd = inotify_add_watch (fs_fd, path, mask);
2139 }
2140 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2141 }
2142 }
2143 else
2144 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2145
2146 if (w->wd >= 0)
2147 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2148}
2149
2150static void noinline
2151infy_del (EV_P_ ev_stat *w)
2152{
2153 int slot;
2154 int wd = w->wd;
2155
2156 if (wd < 0)
2157 return;
2158
2159 w->wd = -2;
2160 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
2161 wlist_del (&fs_hash [slot].head, (WL)w);
2162
2163 /* remove this watcher, if others are watching it, they will rearm */
2164 inotify_rm_watch (fs_fd, wd);
2165}
2166
2167static void noinline
2168infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2169{
2170 if (slot < 0)
2171 /* overflow, need to check for all hahs slots */
2172 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2173 infy_wd (EV_A_ slot, wd, ev);
2174 else
2175 {
2176 WL w_;
2177
2178 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
2179 {
2180 ev_stat *w = (ev_stat *)w_;
2181 w_ = w_->next; /* lets us remove this watcher and all before it */
2182
2183 if (w->wd == wd || wd == -1)
2184 {
2185 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2186 {
2187 w->wd = -1;
2188 infy_add (EV_A_ w); /* re-add, no matter what */
2189 }
2190
2191 stat_timer_cb (EV_A_ &w->timer, 0);
2192 }
2193 }
2194 }
2195}
2196
2197static void
2198infy_cb (EV_P_ ev_io *w, int revents)
2199{
2200 char buf [EV_INOTIFY_BUFSIZE];
2201 struct inotify_event *ev = (struct inotify_event *)buf;
2202 int ofs;
2203 int len = read (fs_fd, buf, sizeof (buf));
2204
2205 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2206 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2207}
2208
2209void inline_size
2210infy_init (EV_P)
2211{
2212 if (fs_fd != -2)
2213 return;
2214
2215 fs_fd = inotify_init ();
2216
2217 if (fs_fd >= 0)
2218 {
2219 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2220 ev_set_priority (&fs_w, EV_MAXPRI);
2221 ev_io_start (EV_A_ &fs_w);
2222 }
2223}
2224
2225void inline_size
2226infy_fork (EV_P)
2227{
2228 int slot;
2229
2230 if (fs_fd < 0)
2231 return;
2232
2233 close (fs_fd);
2234 fs_fd = inotify_init ();
2235
2236 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2237 {
2238 WL w_ = fs_hash [slot].head;
2239 fs_hash [slot].head = 0;
2240
2241 while (w_)
2242 {
2243 ev_stat *w = (ev_stat *)w_;
2244 w_ = w_->next; /* lets us add this watcher */
2245
2246 w->wd = -1;
2247
2248 if (fs_fd >= 0)
2249 infy_add (EV_A_ w); /* re-add, no matter what */
2250 else
2251 ev_timer_start (EV_A_ &w->timer);
2252 }
2253
2254 }
2255}
2256
2257#endif
2258
1644void 2259void
1645ev_stat_stat (EV_P_ ev_stat *w) 2260ev_stat_stat (EV_P_ ev_stat *w)
1646{ 2261{
1647 if (lstat (w->path, &w->attr) < 0) 2262 if (lstat (w->path, &w->attr) < 0)
1648 w->attr.st_nlink = 0; 2263 w->attr.st_nlink = 0;
1649 else if (!w->attr.st_nlink) 2264 else if (!w->attr.st_nlink)
1650 w->attr.st_nlink = 1; 2265 w->attr.st_nlink = 1;
1651} 2266}
1652 2267
1653static void 2268static void noinline
1654stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2269stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1655{ 2270{
1656 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2271 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1657 2272
1658 /* we copy this here each the time so that */ 2273 /* we copy this here each the time so that */
1659 /* prev has the old value when the callback gets invoked */ 2274 /* prev has the old value when the callback gets invoked */
1660 w->prev = w->attr; 2275 w->prev = w->attr;
1661 ev_stat_stat (EV_A_ w); 2276 ev_stat_stat (EV_A_ w);
1662 2277
1663 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2278 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2279 if (
2280 w->prev.st_dev != w->attr.st_dev
2281 || w->prev.st_ino != w->attr.st_ino
2282 || w->prev.st_mode != w->attr.st_mode
2283 || w->prev.st_nlink != w->attr.st_nlink
2284 || w->prev.st_uid != w->attr.st_uid
2285 || w->prev.st_gid != w->attr.st_gid
2286 || w->prev.st_rdev != w->attr.st_rdev
2287 || w->prev.st_size != w->attr.st_size
2288 || w->prev.st_atime != w->attr.st_atime
2289 || w->prev.st_mtime != w->attr.st_mtime
2290 || w->prev.st_ctime != w->attr.st_ctime
2291 ) {
2292 #if EV_USE_INOTIFY
2293 infy_del (EV_A_ w);
2294 infy_add (EV_A_ w);
2295 ev_stat_stat (EV_A_ w); /* avoid race... */
2296 #endif
2297
1664 ev_feed_event (EV_A_ w, EV_STAT); 2298 ev_feed_event (EV_A_ w, EV_STAT);
2299 }
1665} 2300}
1666 2301
1667void 2302void
1668ev_stat_start (EV_P_ ev_stat *w) 2303ev_stat_start (EV_P_ ev_stat *w)
1669{ 2304{
… …
1679 if (w->interval < MIN_STAT_INTERVAL) 2314 if (w->interval < MIN_STAT_INTERVAL)
1680 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2315 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1681 2316
1682 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2317 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1683 ev_set_priority (&w->timer, ev_priority (w)); 2318 ev_set_priority (&w->timer, ev_priority (w));
2319
2320#if EV_USE_INOTIFY
2321 infy_init (EV_A);
2322
2323 if (fs_fd >= 0)
2324 infy_add (EV_A_ w);
2325 else
2326#endif
1684 ev_timer_start (EV_A_ &w->timer); 2327 ev_timer_start (EV_A_ &w->timer);
1685 2328
1686 ev_start (EV_A_ (W)w, 1); 2329 ev_start (EV_A_ (W)w, 1);
1687} 2330}
1688 2331
1689void 2332void
1690ev_stat_stop (EV_P_ ev_stat *w) 2333ev_stat_stop (EV_P_ ev_stat *w)
1691{ 2334{
1692 ev_clear_pending (EV_A_ (W)w); 2335 clear_pending (EV_A_ (W)w);
1693 if (expect_false (!ev_is_active (w))) 2336 if (expect_false (!ev_is_active (w)))
1694 return; 2337 return;
1695 2338
2339#if EV_USE_INOTIFY
2340 infy_del (EV_A_ w);
2341#endif
1696 ev_timer_stop (EV_A_ &w->timer); 2342 ev_timer_stop (EV_A_ &w->timer);
1697 2343
1698 ev_stop (EV_A_ (W)w); 2344 ev_stop (EV_A_ (W)w);
1699} 2345}
1700#endif 2346#endif
1701 2347
2348#if EV_IDLE_ENABLE
1702void 2349void
1703ev_idle_start (EV_P_ ev_idle *w) 2350ev_idle_start (EV_P_ ev_idle *w)
1704{ 2351{
1705 if (expect_false (ev_is_active (w))) 2352 if (expect_false (ev_is_active (w)))
1706 return; 2353 return;
1707 2354
2355 pri_adjust (EV_A_ (W)w);
2356
2357 {
2358 int active = ++idlecnt [ABSPRI (w)];
2359
2360 ++idleall;
1708 ev_start (EV_A_ (W)w, ++idlecnt); 2361 ev_start (EV_A_ (W)w, active);
2362
1709 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2363 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1710 idles [idlecnt - 1] = w; 2364 idles [ABSPRI (w)][active - 1] = w;
2365 }
1711} 2366}
1712 2367
1713void 2368void
1714ev_idle_stop (EV_P_ ev_idle *w) 2369ev_idle_stop (EV_P_ ev_idle *w)
1715{ 2370{
1716 ev_clear_pending (EV_A_ (W)w); 2371 clear_pending (EV_A_ (W)w);
1717 if (expect_false (!ev_is_active (w))) 2372 if (expect_false (!ev_is_active (w)))
1718 return; 2373 return;
1719 2374
1720 { 2375 {
1721 int active = ((W)w)->active; 2376 int active = ev_active (w);
1722 idles [active - 1] = idles [--idlecnt]; 2377
1723 ((W)idles [active - 1])->active = active; 2378 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2379 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2380
2381 ev_stop (EV_A_ (W)w);
2382 --idleall;
1724 } 2383 }
1725
1726 ev_stop (EV_A_ (W)w);
1727} 2384}
2385#endif
1728 2386
1729void 2387void
1730ev_prepare_start (EV_P_ ev_prepare *w) 2388ev_prepare_start (EV_P_ ev_prepare *w)
1731{ 2389{
1732 if (expect_false (ev_is_active (w))) 2390 if (expect_false (ev_is_active (w)))
… …
1738} 2396}
1739 2397
1740void 2398void
1741ev_prepare_stop (EV_P_ ev_prepare *w) 2399ev_prepare_stop (EV_P_ ev_prepare *w)
1742{ 2400{
1743 ev_clear_pending (EV_A_ (W)w); 2401 clear_pending (EV_A_ (W)w);
1744 if (expect_false (!ev_is_active (w))) 2402 if (expect_false (!ev_is_active (w)))
1745 return; 2403 return;
1746 2404
1747 { 2405 {
1748 int active = ((W)w)->active; 2406 int active = ev_active (w);
2407
1749 prepares [active - 1] = prepares [--preparecnt]; 2408 prepares [active - 1] = prepares [--preparecnt];
1750 ((W)prepares [active - 1])->active = active; 2409 ev_active (prepares [active - 1]) = active;
1751 } 2410 }
1752 2411
1753 ev_stop (EV_A_ (W)w); 2412 ev_stop (EV_A_ (W)w);
1754} 2413}
1755 2414
… …
1765} 2424}
1766 2425
1767void 2426void
1768ev_check_stop (EV_P_ ev_check *w) 2427ev_check_stop (EV_P_ ev_check *w)
1769{ 2428{
1770 ev_clear_pending (EV_A_ (W)w); 2429 clear_pending (EV_A_ (W)w);
1771 if (expect_false (!ev_is_active (w))) 2430 if (expect_false (!ev_is_active (w)))
1772 return; 2431 return;
1773 2432
1774 { 2433 {
1775 int active = ((W)w)->active; 2434 int active = ev_active (w);
2435
1776 checks [active - 1] = checks [--checkcnt]; 2436 checks [active - 1] = checks [--checkcnt];
1777 ((W)checks [active - 1])->active = active; 2437 ev_active (checks [active - 1]) = active;
1778 } 2438 }
1779 2439
1780 ev_stop (EV_A_ (W)w); 2440 ev_stop (EV_A_ (W)w);
1781} 2441}
1782 2442
1783#if EV_EMBED_ENABLE 2443#if EV_EMBED_ENABLE
1784void noinline 2444void noinline
1785ev_embed_sweep (EV_P_ ev_embed *w) 2445ev_embed_sweep (EV_P_ ev_embed *w)
1786{ 2446{
1787 ev_loop (w->loop, EVLOOP_NONBLOCK); 2447 ev_loop (w->other, EVLOOP_NONBLOCK);
1788} 2448}
1789 2449
1790static void 2450static void
1791embed_cb (EV_P_ ev_io *io, int revents) 2451embed_io_cb (EV_P_ ev_io *io, int revents)
1792{ 2452{
1793 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2453 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1794 2454
1795 if (ev_cb (w)) 2455 if (ev_cb (w))
1796 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2456 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1797 else 2457 else
1798 ev_embed_sweep (loop, w); 2458 ev_loop (w->other, EVLOOP_NONBLOCK);
1799} 2459}
2460
2461static void
2462embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2463{
2464 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2465
2466 {
2467 struct ev_loop *loop = w->other;
2468
2469 while (fdchangecnt)
2470 {
2471 fd_reify (EV_A);
2472 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2473 }
2474 }
2475}
2476
2477#if 0
2478static void
2479embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2480{
2481 ev_idle_stop (EV_A_ idle);
2482}
2483#endif
1800 2484
1801void 2485void
1802ev_embed_start (EV_P_ ev_embed *w) 2486ev_embed_start (EV_P_ ev_embed *w)
1803{ 2487{
1804 if (expect_false (ev_is_active (w))) 2488 if (expect_false (ev_is_active (w)))
1805 return; 2489 return;
1806 2490
1807 { 2491 {
1808 struct ev_loop *loop = w->loop; 2492 struct ev_loop *loop = w->other;
1809 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2493 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1810 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2494 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1811 } 2495 }
1812 2496
1813 ev_set_priority (&w->io, ev_priority (w)); 2497 ev_set_priority (&w->io, ev_priority (w));
1814 ev_io_start (EV_A_ &w->io); 2498 ev_io_start (EV_A_ &w->io);
1815 2499
2500 ev_prepare_init (&w->prepare, embed_prepare_cb);
2501 ev_set_priority (&w->prepare, EV_MINPRI);
2502 ev_prepare_start (EV_A_ &w->prepare);
2503
2504 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2505
1816 ev_start (EV_A_ (W)w, 1); 2506 ev_start (EV_A_ (W)w, 1);
1817} 2507}
1818 2508
1819void 2509void
1820ev_embed_stop (EV_P_ ev_embed *w) 2510ev_embed_stop (EV_P_ ev_embed *w)
1821{ 2511{
1822 ev_clear_pending (EV_A_ (W)w); 2512 clear_pending (EV_A_ (W)w);
1823 if (expect_false (!ev_is_active (w))) 2513 if (expect_false (!ev_is_active (w)))
1824 return; 2514 return;
1825 2515
1826 ev_io_stop (EV_A_ &w->io); 2516 ev_io_stop (EV_A_ &w->io);
2517 ev_prepare_stop (EV_A_ &w->prepare);
1827 2518
1828 ev_stop (EV_A_ (W)w); 2519 ev_stop (EV_A_ (W)w);
2520}
2521#endif
2522
2523#if EV_FORK_ENABLE
2524void
2525ev_fork_start (EV_P_ ev_fork *w)
2526{
2527 if (expect_false (ev_is_active (w)))
2528 return;
2529
2530 ev_start (EV_A_ (W)w, ++forkcnt);
2531 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2532 forks [forkcnt - 1] = w;
2533}
2534
2535void
2536ev_fork_stop (EV_P_ ev_fork *w)
2537{
2538 clear_pending (EV_A_ (W)w);
2539 if (expect_false (!ev_is_active (w)))
2540 return;
2541
2542 {
2543 int active = ev_active (w);
2544
2545 forks [active - 1] = forks [--forkcnt];
2546 ev_active (forks [active - 1]) = active;
2547 }
2548
2549 ev_stop (EV_A_ (W)w);
2550}
2551#endif
2552
2553#if EV_ASYNC_ENABLE
2554void
2555ev_async_start (EV_P_ ev_async *w)
2556{
2557 if (expect_false (ev_is_active (w)))
2558 return;
2559
2560 evpipe_init (EV_A);
2561
2562 ev_start (EV_A_ (W)w, ++asynccnt);
2563 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2564 asyncs [asynccnt - 1] = w;
2565}
2566
2567void
2568ev_async_stop (EV_P_ ev_async *w)
2569{
2570 clear_pending (EV_A_ (W)w);
2571 if (expect_false (!ev_is_active (w)))
2572 return;
2573
2574 {
2575 int active = ev_active (w);
2576
2577 asyncs [active - 1] = asyncs [--asynccnt];
2578 ev_active (asyncs [active - 1]) = active;
2579 }
2580
2581 ev_stop (EV_A_ (W)w);
2582}
2583
2584void
2585ev_async_send (EV_P_ ev_async *w)
2586{
2587 w->sent = 1;
2588 evpipe_write (EV_A_ &gotasync);
1829} 2589}
1830#endif 2590#endif
1831 2591
1832/*****************************************************************************/ 2592/*****************************************************************************/
1833 2593
… …
1891 ev_timer_set (&once->to, timeout, 0.); 2651 ev_timer_set (&once->to, timeout, 0.);
1892 ev_timer_start (EV_A_ &once->to); 2652 ev_timer_start (EV_A_ &once->to);
1893 } 2653 }
1894} 2654}
1895 2655
2656#if EV_MULTIPLICITY
2657 #include "ev_wrap.h"
2658#endif
2659
1896#ifdef __cplusplus 2660#ifdef __cplusplus
1897} 2661}
1898#endif 2662#endif
1899 2663

Diff Legend

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