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

Diff Legend

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