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

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

Diff Legend

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