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

Comparing libev/ev.c (file contents):
Revision 1.146 by root, Tue Nov 27 09:17:51 2007 UTC vs.
Revision 1.250 by root, Thu May 22 02:44:57 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#if 0 /* debugging */
241# define EV_VERIFY 3
242# define EV_USE_4HEAP 1
243# define EV_HEAP_CACHE_AT 1
244#endif
245
246#ifndef EV_VERIFY
247# define EV_VERIFY !EV_MINIMAL
248#endif
249
250#ifndef EV_USE_4HEAP
251# define EV_USE_4HEAP !EV_MINIMAL
252#endif
253
254#ifndef EV_HEAP_CACHE_AT
255# define EV_HEAP_CACHE_AT !EV_MINIMAL
256#endif
257
258/* this block fixes any misconfiguration where we know we run into trouble otherwise */
162 259
163#ifndef CLOCK_MONOTONIC 260#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 261# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 262# define EV_USE_MONOTONIC 0
166#endif 263#endif
… …
168#ifndef CLOCK_REALTIME 265#ifndef CLOCK_REALTIME
169# undef EV_USE_REALTIME 266# undef EV_USE_REALTIME
170# define EV_USE_REALTIME 0 267# define EV_USE_REALTIME 0
171#endif 268#endif
172 269
270#if !EV_STAT_ENABLE
271# undef EV_USE_INOTIFY
272# define EV_USE_INOTIFY 0
273#endif
274
275#if !EV_USE_NANOSLEEP
276# ifndef _WIN32
277# include <sys/select.h>
278# endif
279#endif
280
281#if EV_USE_INOTIFY
282# include <sys/inotify.h>
283#endif
284
173#if EV_SELECT_IS_WINSOCKET 285#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 286# include <winsock.h>
175#endif 287#endif
176 288
289#if EV_USE_EVENTFD
290/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
291# include <stdint.h>
292# ifdef __cplusplus
293extern "C" {
294# endif
295int eventfd (unsigned int initval, int flags);
296# ifdef __cplusplus
297}
298# endif
299#endif
300
177/**/ 301/**/
302
303#if EV_VERIFY >= 3
304# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
305#else
306# define EV_FREQUENT_CHECK do { } while (0)
307#endif
308
309/*
310 * This is used to avoid floating point rounding problems.
311 * It is added to ev_rt_now when scheduling periodics
312 * to ensure progress, time-wise, even when rounding
313 * errors are against us.
314 * This value is good at least till the year 4000.
315 * Better solutions welcome.
316 */
317#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
178 318
179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 319#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) */ 320#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 */ 321/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
183 322
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189
190#if __GNUC__ >= 3 323#if __GNUC__ >= 4
191# define expect(expr,value) __builtin_expect ((expr),(value)) 324# 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)) 325# 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 326#else
201# define expect(expr,value) (expr) 327# define expect(expr,value) (expr)
202# define inline_speed static
203# define inline_size static
204# define noinline 328# define noinline
329# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
330# define inline
331# endif
205#endif 332#endif
206 333
207#define expect_false(expr) expect ((expr) != 0, 0) 334#define expect_false(expr) expect ((expr) != 0, 0)
208#define expect_true(expr) expect ((expr) != 0, 1) 335#define expect_true(expr) expect ((expr) != 0, 1)
336#define inline_size static inline
337
338#if EV_MINIMAL
339# define inline_speed static noinline
340#else
341# define inline_speed static inline
342#endif
209 343
210#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 344#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
211#define ABSPRI(w) ((w)->priority - EV_MINPRI) 345#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
212 346
213#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 347#define EMPTY /* required for microsofts broken pseudo-c compiler */
214#define EMPTY2(a,b) /* used to suppress some warnings */ 348#define EMPTY2(a,b) /* used to suppress some warnings */
215 349
216typedef ev_watcher *W; 350typedef ev_watcher *W;
217typedef ev_watcher_list *WL; 351typedef ev_watcher_list *WL;
218typedef ev_watcher_time *WT; 352typedef ev_watcher_time *WT;
219 353
354#define ev_active(w) ((W)(w))->active
355#define ev_at(w) ((WT)(w))->at
356
357#if EV_USE_MONOTONIC
358/* sig_atomic_t is used to avoid per-thread variables or locking but still */
359/* giving it a reasonably high chance of working on typical architetcures */
220static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 360static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
361#endif
221 362
222#ifdef _WIN32 363#ifdef _WIN32
223# include "ev_win32.c" 364# include "ev_win32.c"
224#endif 365#endif
225 366
… …
246 perror (msg); 387 perror (msg);
247 abort (); 388 abort ();
248 } 389 }
249} 390}
250 391
392static void *
393ev_realloc_emul (void *ptr, long size)
394{
395 /* some systems, notably openbsd and darwin, fail to properly
396 * implement realloc (x, 0) (as required by both ansi c-98 and
397 * the single unix specification, so work around them here.
398 */
399
400 if (size)
401 return realloc (ptr, size);
402
403 free (ptr);
404 return 0;
405}
406
251static void *(*alloc)(void *ptr, long size); 407static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
252 408
253void 409void
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 410ev_set_allocator (void *(*cb)(void *ptr, long size))
255{ 411{
256 alloc = cb; 412 alloc = cb;
257} 413}
258 414
259static void * 415inline_speed void *
260ev_realloc (void *ptr, long size) 416ev_realloc (void *ptr, long size)
261{ 417{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 418 ptr = alloc (ptr, size);
263 419
264 if (!ptr && size) 420 if (!ptr && size)
265 { 421 {
266 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 422 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
267 abort (); 423 abort ();
… …
288typedef struct 444typedef struct
289{ 445{
290 W w; 446 W w;
291 int events; 447 int events;
292} ANPENDING; 448} ANPENDING;
449
450#if EV_USE_INOTIFY
451/* hash table entry per inotify-id */
452typedef struct
453{
454 WL head;
455} ANFS;
456#endif
457
458/* Heap Entry */
459#if EV_HEAP_CACHE_AT
460 typedef struct {
461 ev_tstamp at;
462 WT w;
463 } ANHE;
464
465 #define ANHE_w(he) (he).w /* access watcher, read-write */
466 #define ANHE_at(he) (he).at /* access cached at, read-only */
467 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
468#else
469 typedef WT ANHE;
470
471 #define ANHE_w(he) (he)
472 #define ANHE_at(he) (he)->at
473 #define ANHE_at_cache(he)
474#endif
293 475
294#if EV_MULTIPLICITY 476#if EV_MULTIPLICITY
295 477
296 struct ev_loop 478 struct ev_loop
297 { 479 {
… …
354{ 536{
355 return ev_rt_now; 537 return ev_rt_now;
356} 538}
357#endif 539#endif
358 540
359#define array_roundsize(type,n) (((n) | 4) & ~3) 541void
542ev_sleep (ev_tstamp delay)
543{
544 if (delay > 0.)
545 {
546#if EV_USE_NANOSLEEP
547 struct timespec ts;
548
549 ts.tv_sec = (time_t)delay;
550 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
551
552 nanosleep (&ts, 0);
553#elif defined(_WIN32)
554 Sleep ((unsigned long)(delay * 1e3));
555#else
556 struct timeval tv;
557
558 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560
561 select (0, 0, 0, 0, &tv);
562#endif
563 }
564}
565
566/*****************************************************************************/
567
568#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
569
570int inline_size
571array_nextsize (int elem, int cur, int cnt)
572{
573 int ncur = cur + 1;
574
575 do
576 ncur <<= 1;
577 while (cnt > ncur);
578
579 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
580 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
581 {
582 ncur *= elem;
583 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
584 ncur = ncur - sizeof (void *) * 4;
585 ncur /= elem;
586 }
587
588 return ncur;
589}
590
591static noinline void *
592array_realloc (int elem, void *base, int *cur, int cnt)
593{
594 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur);
596}
360 597
361#define array_needsize(type,base,cur,cnt,init) \ 598#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 599 if (expect_false ((cnt) > (cur))) \
363 { \ 600 { \
364 int newcnt = cur; \ 601 int ocur_ = (cur); \
365 do \ 602 (base) = (type *)array_realloc \
366 { \ 603 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 604 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 } 605 }
375 606
607#if 0
376#define array_slim(type,stem) \ 608#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 609 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 610 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 611 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 612 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 613 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 614 }
615#endif
383 616
384#define array_free(stem, idx) \ 617#define array_free(stem, idx) \
385 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 618 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
386 619
387/*****************************************************************************/ 620/*****************************************************************************/
388 621
389void noinline 622void noinline
390ev_feed_event (EV_P_ void *w, int revents) 623ev_feed_event (EV_P_ void *w, int revents)
391{ 624{
392 W w_ = (W)w; 625 W w_ = (W)w;
626 int pri = ABSPRI (w_);
393 627
394 if (expect_false (w_->pending)) 628 if (expect_false (w_->pending))
629 pendings [pri][w_->pending - 1].events |= revents;
630 else
395 { 631 {
632 w_->pending = ++pendingcnt [pri];
633 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
634 pendings [pri][w_->pending - 1].w = w_;
396 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 635 pendings [pri][w_->pending - 1].events = revents;
397 return;
398 } 636 }
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} 637}
405 638
406void inline_size 639void inline_speed
407queue_events (EV_P_ W *events, int eventcnt, int type) 640queue_events (EV_P_ W *events, int eventcnt, int type)
408{ 641{
409 int i; 642 int i;
410 643
411 for (i = 0; i < eventcnt; ++i) 644 for (i = 0; i < eventcnt; ++i)
… …
443} 676}
444 677
445void 678void
446ev_feed_fd_event (EV_P_ int fd, int revents) 679ev_feed_fd_event (EV_P_ int fd, int revents)
447{ 680{
681 if (fd >= 0 && fd < anfdmax)
448 fd_event (EV_A_ fd, revents); 682 fd_event (EV_A_ fd, revents);
449} 683}
450 684
451void inline_size 685void inline_size
452fd_reify (EV_P) 686fd_reify (EV_P)
453{ 687{
… …
457 { 691 {
458 int fd = fdchanges [i]; 692 int fd = fdchanges [i];
459 ANFD *anfd = anfds + fd; 693 ANFD *anfd = anfds + fd;
460 ev_io *w; 694 ev_io *w;
461 695
462 int events = 0; 696 unsigned char events = 0;
463 697
464 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 698 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
465 events |= w->events; 699 events |= (unsigned char)w->events;
466 700
467#if EV_SELECT_IS_WINSOCKET 701#if EV_SELECT_IS_WINSOCKET
468 if (events) 702 if (events)
469 { 703 {
470 unsigned long argp; 704 unsigned long argp;
705 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else
471 anfd->handle = _get_osfhandle (fd); 708 anfd->handle = _get_osfhandle (fd);
709 #endif
472 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
473 } 711 }
474#endif 712#endif
475 713
714 {
715 unsigned char o_events = anfd->events;
716 unsigned char o_reify = anfd->reify;
717
476 anfd->reify = 0; 718 anfd->reify = 0;
477
478 backend_modify (EV_A_ fd, anfd->events, events);
479 anfd->events = events; 719 anfd->events = events;
720
721 if (o_events != events || o_reify & EV_IOFDSET)
722 backend_modify (EV_A_ fd, o_events, events);
723 }
480 } 724 }
481 725
482 fdchangecnt = 0; 726 fdchangecnt = 0;
483} 727}
484 728
485void inline_size 729void inline_size
486fd_change (EV_P_ int fd) 730fd_change (EV_P_ int fd, int flags)
487{ 731{
488 if (expect_false (anfds [fd].reify)) 732 unsigned char reify = anfds [fd].reify;
489 return;
490
491 anfds [fd].reify = 1; 733 anfds [fd].reify |= flags;
492 734
735 if (expect_true (!reify))
736 {
493 ++fdchangecnt; 737 ++fdchangecnt;
494 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 738 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
495 fdchanges [fdchangecnt - 1] = fd; 739 fdchanges [fdchangecnt - 1] = fd;
740 }
496} 741}
497 742
498void inline_speed 743void inline_speed
499fd_kill (EV_P_ int fd) 744fd_kill (EV_P_ int fd)
500{ 745{
… …
547static void noinline 792static void noinline
548fd_rearm_all (EV_P) 793fd_rearm_all (EV_P)
549{ 794{
550 int fd; 795 int fd;
551 796
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 797 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 798 if (anfds [fd].events)
555 { 799 {
556 anfds [fd].events = 0; 800 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 801 fd_change (EV_A_ fd, EV_IOFDSET | 1);
558 } 802 }
559} 803}
560 804
561/*****************************************************************************/ 805/*****************************************************************************/
562 806
807/*
808 * the heap functions want a real array index. array index 0 uis guaranteed to not
809 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
810 * the branching factor of the d-tree.
811 */
812
813/*
814 * at the moment we allow libev the luxury of two heaps,
815 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
816 * which is more cache-efficient.
817 * the difference is about 5% with 50000+ watchers.
818 */
819#if EV_USE_4HEAP
820
821#define DHEAP 4
822#define HEAP0 (DHEAP - 1) /* index of first element in heap */
823#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
824#define UPHEAP_DONE(p,k) ((p) == (k))
825
826/* away from the root */
563void inline_speed 827void inline_speed
564upheap (WT *heap, int k) 828downheap (ANHE *heap, int N, int k)
565{ 829{
566 WT w = heap [k]; 830 ANHE he = heap [k];
831 ANHE *E = heap + N + HEAP0;
567 832
568 while (k && heap [k >> 1]->at > w->at) 833 for (;;)
569 {
570 heap [k] = heap [k >> 1];
571 ((W)heap [k])->active = k + 1;
572 k >>= 1;
573 } 834 {
835 ev_tstamp minat;
836 ANHE *minpos;
837 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
574 838
839 /* find minimum child */
840 if (expect_true (pos + DHEAP - 1 < E))
841 {
842 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
843 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
844 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
845 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
846 }
847 else if (pos < E)
848 {
849 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
850 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
851 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
852 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
853 }
854 else
855 break;
856
857 if (ANHE_at (he) <= minat)
858 break;
859
860 heap [k] = *minpos;
861 ev_active (ANHE_w (*minpos)) = k;
862
863 k = minpos - heap;
864 }
865
575 heap [k] = w; 866 heap [k] = he;
576 ((W)heap [k])->active = k + 1; 867 ev_active (ANHE_w (he)) = k;
577
578} 868}
579 869
870#else /* 4HEAP */
871
872#define HEAP0 1
873#define HPARENT(k) ((k) >> 1)
874#define UPHEAP_DONE(p,k) (!(p))
875
876/* away from the root */
580void inline_speed 877void inline_speed
581downheap (WT *heap, int N, int k) 878downheap (ANHE *heap, int N, int k)
582{ 879{
583 WT w = heap [k]; 880 ANHE he = heap [k];
584 881
585 while (k < (N >> 1)) 882 for (;;)
586 { 883 {
587 int j = k << 1; 884 int c = k << 1;
588 885
589 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 886 if (c > N + HEAP0 - 1)
590 ++j;
591
592 if (w->at <= heap [j]->at)
593 break; 887 break;
594 888
889 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
890 ? 1 : 0;
891
892 if (ANHE_at (he) <= ANHE_at (heap [c]))
893 break;
894
595 heap [k] = heap [j]; 895 heap [k] = heap [c];
596 ((W)heap [k])->active = k + 1; 896 ev_active (ANHE_w (heap [k])) = k;
897
597 k = j; 898 k = c;
598 } 899 }
599 900
600 heap [k] = w; 901 heap [k] = he;
601 ((W)heap [k])->active = k + 1; 902 ev_active (ANHE_w (he)) = k;
903}
904#endif
905
906/* towards the root */
907void inline_speed
908upheap (ANHE *heap, int k)
909{
910 ANHE he = heap [k];
911
912 for (;;)
913 {
914 int p = HPARENT (k);
915
916 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
917 break;
918
919 heap [k] = heap [p];
920 ev_active (ANHE_w (heap [k])) = k;
921 k = p;
922 }
923
924 heap [k] = he;
925 ev_active (ANHE_w (he)) = k;
602} 926}
603 927
604void inline_size 928void inline_size
605adjustheap (WT *heap, int N, int k) 929adjustheap (ANHE *heap, int N, int k)
606{ 930{
931 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
607 upheap (heap, k); 932 upheap (heap, k);
933 else
608 downheap (heap, N, k); 934 downheap (heap, N, k);
609} 935}
936
937/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size
939reheap (ANHE *heap, int N)
940{
941 int i;
942 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
943 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
944 for (i = 0; i < N; ++i)
945 upheap (heap, i + HEAP0);
946}
947
948#if EV_VERIFY
949static void
950checkheap (ANHE *heap, int N)
951{
952 int i;
953
954 for (i = HEAP0; i < N + HEAP0; ++i)
955 {
956 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
957 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
958 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
959 }
960}
961#endif
610 962
611/*****************************************************************************/ 963/*****************************************************************************/
612 964
613typedef struct 965typedef struct
614{ 966{
615 WL head; 967 WL head;
616 sig_atomic_t volatile gotsig; 968 EV_ATOMIC_T gotsig;
617} ANSIG; 969} ANSIG;
618 970
619static ANSIG *signals; 971static ANSIG *signals;
620static int signalmax; 972static int signalmax;
621 973
622static int sigpipe [2]; 974static EV_ATOMIC_T gotsig;
623static sig_atomic_t volatile gotsig;
624static ev_io sigev;
625 975
626void inline_size 976void inline_size
627signals_init (ANSIG *base, int count) 977signals_init (ANSIG *base, int count)
628{ 978{
629 while (count--) 979 while (count--)
… …
633 983
634 ++base; 984 ++base;
635 } 985 }
636} 986}
637 987
638static void 988/*****************************************************************************/
639sighandler (int signum)
640{
641#if _WIN32
642 signal (signum, sighandler);
643#endif
644 989
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 990void inline_speed
690fd_intern (int fd) 991fd_intern (int fd)
691{ 992{
692#ifdef _WIN32 993#ifdef _WIN32
693 int arg = 1; 994 int arg = 1;
694 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 995 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
697 fcntl (fd, F_SETFL, O_NONBLOCK); 998 fcntl (fd, F_SETFL, O_NONBLOCK);
698#endif 999#endif
699} 1000}
700 1001
701static void noinline 1002static void noinline
702siginit (EV_P) 1003evpipe_init (EV_P)
703{ 1004{
1005 if (!ev_is_active (&pipeev))
1006 {
1007#if EV_USE_EVENTFD
1008 if ((evfd = eventfd (0, 0)) >= 0)
1009 {
1010 evpipe [0] = -1;
1011 fd_intern (evfd);
1012 ev_io_set (&pipeev, evfd, EV_READ);
1013 }
1014 else
1015#endif
1016 {
1017 while (pipe (evpipe))
1018 syserr ("(libev) error creating signal/async pipe");
1019
704 fd_intern (sigpipe [0]); 1020 fd_intern (evpipe [0]);
705 fd_intern (sigpipe [1]); 1021 fd_intern (evpipe [1]);
1022 ev_io_set (&pipeev, evpipe [0], EV_READ);
1023 }
706 1024
707 ev_io_set (&sigev, sigpipe [0], EV_READ);
708 ev_io_start (EV_A_ &sigev); 1025 ev_io_start (EV_A_ &pipeev);
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1026 ev_unref (EV_A); /* watcher should not keep loop alive */
1027 }
1028}
1029
1030void inline_size
1031evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1032{
1033 if (!*flag)
1034 {
1035 int old_errno = errno; /* save errno because write might clobber it */
1036
1037 *flag = 1;
1038
1039#if EV_USE_EVENTFD
1040 if (evfd >= 0)
1041 {
1042 uint64_t counter = 1;
1043 write (evfd, &counter, sizeof (uint64_t));
1044 }
1045 else
1046#endif
1047 write (evpipe [1], &old_errno, 1);
1048
1049 errno = old_errno;
1050 }
1051}
1052
1053static void
1054pipecb (EV_P_ ev_io *iow, int revents)
1055{
1056#if EV_USE_EVENTFD
1057 if (evfd >= 0)
1058 {
1059 uint64_t counter;
1060 read (evfd, &counter, sizeof (uint64_t));
1061 }
1062 else
1063#endif
1064 {
1065 char dummy;
1066 read (evpipe [0], &dummy, 1);
1067 }
1068
1069 if (gotsig && ev_is_default_loop (EV_A))
1070 {
1071 int signum;
1072 gotsig = 0;
1073
1074 for (signum = signalmax; signum--; )
1075 if (signals [signum].gotsig)
1076 ev_feed_signal_event (EV_A_ signum + 1);
1077 }
1078
1079#if EV_ASYNC_ENABLE
1080 if (gotasync)
1081 {
1082 int i;
1083 gotasync = 0;
1084
1085 for (i = asynccnt; i--; )
1086 if (asyncs [i]->sent)
1087 {
1088 asyncs [i]->sent = 0;
1089 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1090 }
1091 }
1092#endif
710} 1093}
711 1094
712/*****************************************************************************/ 1095/*****************************************************************************/
713 1096
1097static void
1098ev_sighandler (int signum)
1099{
1100#if EV_MULTIPLICITY
1101 struct ev_loop *loop = &default_loop_struct;
1102#endif
1103
1104#if _WIN32
1105 signal (signum, ev_sighandler);
1106#endif
1107
1108 signals [signum - 1].gotsig = 1;
1109 evpipe_write (EV_A_ &gotsig);
1110}
1111
1112void noinline
1113ev_feed_signal_event (EV_P_ int signum)
1114{
1115 WL w;
1116
1117#if EV_MULTIPLICITY
1118 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1119#endif
1120
1121 --signum;
1122
1123 if (signum < 0 || signum >= signalmax)
1124 return;
1125
1126 signals [signum].gotsig = 0;
1127
1128 for (w = signals [signum].head; w; w = w->next)
1129 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1130}
1131
1132/*****************************************************************************/
1133
714static ev_child *childs [PID_HASHSIZE]; 1134static WL childs [EV_PID_HASHSIZE];
715 1135
716#ifndef _WIN32 1136#ifndef _WIN32
717 1137
718static ev_signal childev; 1138static ev_signal childev;
719 1139
1140#ifndef WIFCONTINUED
1141# define WIFCONTINUED(status) 0
1142#endif
1143
720void inline_speed 1144void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1145child_reap (EV_P_ int chain, int pid, int status)
722{ 1146{
723 ev_child *w; 1147 ev_child *w;
1148 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
724 1149
725 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1150 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1151 {
726 if (w->pid == pid || !w->pid) 1152 if ((w->pid == pid || !w->pid)
1153 && (!traced || (w->flags & 1)))
727 { 1154 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 1155 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; 1156 w->rpid = pid;
730 w->rstatus = status; 1157 w->rstatus = status;
731 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1158 ev_feed_event (EV_A_ (W)w, EV_CHILD);
732 } 1159 }
1160 }
733} 1161}
734 1162
735#ifndef WCONTINUED 1163#ifndef WCONTINUED
736# define WCONTINUED 0 1164# define WCONTINUED 0
737#endif 1165#endif
… …
746 if (!WCONTINUED 1174 if (!WCONTINUED
747 || errno != EINVAL 1175 || errno != EINVAL
748 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1176 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
749 return; 1177 return;
750 1178
751 /* make sure we are called again until all childs have been reaped */ 1179 /* 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 */ 1180 /* 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); 1181 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 1182
755 child_reap (EV_A_ sw, pid, pid, status); 1183 child_reap (EV_A_ pid, pid, status);
1184 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 */ 1185 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 1186}
758 1187
759#endif 1188#endif
760 1189
761/*****************************************************************************/ 1190/*****************************************************************************/
… …
833} 1262}
834 1263
835unsigned int 1264unsigned int
836ev_embeddable_backends (void) 1265ev_embeddable_backends (void)
837{ 1266{
838 return EVBACKEND_EPOLL 1267 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
839 | EVBACKEND_KQUEUE 1268
840 | EVBACKEND_PORT; 1269 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1270 /* please fix it and tell me how to detect the fix */
1271 flags &= ~EVBACKEND_EPOLL;
1272
1273 return flags;
841} 1274}
842 1275
843unsigned int 1276unsigned int
844ev_backend (EV_P) 1277ev_backend (EV_P)
845{ 1278{
846 return backend; 1279 return backend;
847} 1280}
848 1281
849static void 1282unsigned int
1283ev_loop_count (EV_P)
1284{
1285 return loop_count;
1286}
1287
1288void
1289ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1290{
1291 io_blocktime = interval;
1292}
1293
1294void
1295ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1296{
1297 timeout_blocktime = interval;
1298}
1299
1300static void noinline
850loop_init (EV_P_ unsigned int flags) 1301loop_init (EV_P_ unsigned int flags)
851{ 1302{
852 if (!backend) 1303 if (!backend)
853 { 1304 {
854#if EV_USE_MONOTONIC 1305#if EV_USE_MONOTONIC
… …
857 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1308 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
858 have_monotonic = 1; 1309 have_monotonic = 1;
859 } 1310 }
860#endif 1311#endif
861 1312
862 ev_rt_now = ev_time (); 1313 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 1314 mn_now = get_clock ();
864 now_floor = mn_now; 1315 now_floor = mn_now;
865 rtmn_diff = ev_rt_now - mn_now; 1316 rtmn_diff = ev_rt_now - mn_now;
1317
1318 io_blocktime = 0.;
1319 timeout_blocktime = 0.;
1320 backend = 0;
1321 backend_fd = -1;
1322 gotasync = 0;
1323#if EV_USE_INOTIFY
1324 fs_fd = -2;
1325#endif
1326
1327 /* pid check not overridable via env */
1328#ifndef _WIN32
1329 if (flags & EVFLAG_FORKCHECK)
1330 curpid = getpid ();
1331#endif
866 1332
867 if (!(flags & EVFLAG_NOENV) 1333 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 1334 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 1335 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 1336 flags = atoi (getenv ("LIBEV_FLAGS"));
871 1337
872 if (!(flags & 0x0000ffffUL)) 1338 if (!(flags & 0x0000ffffU))
873 flags |= ev_recommended_backends (); 1339 flags |= ev_recommended_backends ();
874 1340
875 backend = 0;
876#if EV_USE_PORT 1341#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1342 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 1343#endif
879#if EV_USE_KQUEUE 1344#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1345 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
887#endif 1352#endif
888#if EV_USE_SELECT 1353#if EV_USE_SELECT
889 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1354 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
890#endif 1355#endif
891 1356
892 ev_init (&sigev, sigcb); 1357 ev_init (&pipeev, pipecb);
893 ev_set_priority (&sigev, EV_MAXPRI); 1358 ev_set_priority (&pipeev, EV_MAXPRI);
894 } 1359 }
895} 1360}
896 1361
897static void 1362static void noinline
898loop_destroy (EV_P) 1363loop_destroy (EV_P)
899{ 1364{
900 int i; 1365 int i;
1366
1367 if (ev_is_active (&pipeev))
1368 {
1369 ev_ref (EV_A); /* signal watcher */
1370 ev_io_stop (EV_A_ &pipeev);
1371
1372#if EV_USE_EVENTFD
1373 if (evfd >= 0)
1374 close (evfd);
1375#endif
1376
1377 if (evpipe [0] >= 0)
1378 {
1379 close (evpipe [0]);
1380 close (evpipe [1]);
1381 }
1382 }
1383
1384#if EV_USE_INOTIFY
1385 if (fs_fd >= 0)
1386 close (fs_fd);
1387#endif
1388
1389 if (backend_fd >= 0)
1390 close (backend_fd);
901 1391
902#if EV_USE_PORT 1392#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1393 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 1394#endif
905#if EV_USE_KQUEUE 1395#if EV_USE_KQUEUE
… …
914#if EV_USE_SELECT 1404#if EV_USE_SELECT
915 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1405 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
916#endif 1406#endif
917 1407
918 for (i = NUMPRI; i--; ) 1408 for (i = NUMPRI; i--; )
1409 {
919 array_free (pending, [i]); 1410 array_free (pending, [i]);
1411#if EV_IDLE_ENABLE
1412 array_free (idle, [i]);
1413#endif
1414 }
1415
1416 ev_free (anfds); anfdmax = 0;
920 1417
921 /* have to use the microsoft-never-gets-it-right macro */ 1418 /* have to use the microsoft-never-gets-it-right macro */
922 array_free (fdchange, EMPTY0); 1419 array_free (fdchange, EMPTY);
923 array_free (timer, EMPTY0); 1420 array_free (timer, EMPTY);
924#if EV_PERIODIC_ENABLE 1421#if EV_PERIODIC_ENABLE
925 array_free (periodic, EMPTY0); 1422 array_free (periodic, EMPTY);
926#endif 1423#endif
1424#if EV_FORK_ENABLE
927 array_free (idle, EMPTY0); 1425 array_free (fork, EMPTY);
1426#endif
928 array_free (prepare, EMPTY0); 1427 array_free (prepare, EMPTY);
929 array_free (check, EMPTY0); 1428 array_free (check, EMPTY);
1429#if EV_ASYNC_ENABLE
1430 array_free (async, EMPTY);
1431#endif
930 1432
931 backend = 0; 1433 backend = 0;
932} 1434}
933 1435
934static void 1436#if EV_USE_INOTIFY
1437void inline_size infy_fork (EV_P);
1438#endif
1439
1440void inline_size
935loop_fork (EV_P) 1441loop_fork (EV_P)
936{ 1442{
937#if EV_USE_PORT 1443#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1444 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1445#endif
… …
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1447 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1448#endif
943#if EV_USE_EPOLL 1449#if EV_USE_EPOLL
944 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1450 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
945#endif 1451#endif
1452#if EV_USE_INOTIFY
1453 infy_fork (EV_A);
1454#endif
946 1455
947 if (ev_is_active (&sigev)) 1456 if (ev_is_active (&pipeev))
948 { 1457 {
949 /* default loop */ 1458 /* this "locks" the handlers against writing to the pipe */
1459 /* while we modify the fd vars */
1460 gotsig = 1;
1461#if EV_ASYNC_ENABLE
1462 gotasync = 1;
1463#endif
950 1464
951 ev_ref (EV_A); 1465 ev_ref (EV_A);
952 ev_io_stop (EV_A_ &sigev); 1466 ev_io_stop (EV_A_ &pipeev);
1467
1468#if EV_USE_EVENTFD
1469 if (evfd >= 0)
1470 close (evfd);
1471#endif
1472
1473 if (evpipe [0] >= 0)
1474 {
953 close (sigpipe [0]); 1475 close (evpipe [0]);
954 close (sigpipe [1]); 1476 close (evpipe [1]);
1477 }
955 1478
956 while (pipe (sigpipe))
957 syserr ("(libev) error creating pipe");
958
959 siginit (EV_A); 1479 evpipe_init (EV_A);
1480 /* now iterate over everything, in case we missed something */
1481 pipecb (EV_A_ &pipeev, EV_READ);
960 } 1482 }
961 1483
962 postfork = 0; 1484 postfork = 0;
963} 1485}
964 1486
965#if EV_MULTIPLICITY 1487#if EV_MULTIPLICITY
1488
966struct ev_loop * 1489struct ev_loop *
967ev_loop_new (unsigned int flags) 1490ev_loop_new (unsigned int flags)
968{ 1491{
969 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1492 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
970 1493
… …
986} 1509}
987 1510
988void 1511void
989ev_loop_fork (EV_P) 1512ev_loop_fork (EV_P)
990{ 1513{
991 postfork = 1; 1514 postfork = 1; /* must be in line with ev_default_fork */
992} 1515}
993 1516
1517#if EV_VERIFY
1518static void
1519array_check (W **ws, int cnt)
1520{
1521 while (cnt--)
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1523}
994#endif 1524#endif
1525
1526void
1527ev_loop_verify (EV_P)
1528{
1529#if EV_VERIFY
1530 int i;
1531
1532 checkheap (timers, timercnt);
1533#if EV_PERIODIC_ENABLE
1534 checkheap (periodics, periodiccnt);
1535#endif
1536
1537#if EV_IDLE_ENABLE
1538 for (i = NUMPRI; i--; )
1539 array_check ((W **)idles [i], idlecnt [i]);
1540#endif
1541#if EV_FORK_ENABLE
1542 array_check ((W **)forks, forkcnt);
1543#endif
1544#if EV_ASYNC_ENABLE
1545 array_check ((W **)asyncs, asynccnt);
1546#endif
1547 array_check ((W **)prepares, preparecnt);
1548 array_check ((W **)checks, checkcnt);
1549#endif
1550}
1551
1552#endif /* multiplicity */
995 1553
996#if EV_MULTIPLICITY 1554#if EV_MULTIPLICITY
997struct ev_loop * 1555struct ev_loop *
998ev_default_loop_init (unsigned int flags) 1556ev_default_loop_init (unsigned int flags)
999#else 1557#else
1000int 1558int
1001ev_default_loop (unsigned int flags) 1559ev_default_loop (unsigned int flags)
1002#endif 1560#endif
1003{ 1561{
1004 if (sigpipe [0] == sigpipe [1])
1005 if (pipe (sigpipe))
1006 return 0;
1007
1008 if (!ev_default_loop_ptr) 1562 if (!ev_default_loop_ptr)
1009 { 1563 {
1010#if EV_MULTIPLICITY 1564#if EV_MULTIPLICITY
1011 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1565 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1012#else 1566#else
… …
1015 1569
1016 loop_init (EV_A_ flags); 1570 loop_init (EV_A_ flags);
1017 1571
1018 if (ev_backend (EV_A)) 1572 if (ev_backend (EV_A))
1019 { 1573 {
1020 siginit (EV_A);
1021
1022#ifndef _WIN32 1574#ifndef _WIN32
1023 ev_signal_init (&childev, childcb, SIGCHLD); 1575 ev_signal_init (&childev, childcb, SIGCHLD);
1024 ev_set_priority (&childev, EV_MAXPRI); 1576 ev_set_priority (&childev, EV_MAXPRI);
1025 ev_signal_start (EV_A_ &childev); 1577 ev_signal_start (EV_A_ &childev);
1026 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1578 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1043#ifndef _WIN32 1595#ifndef _WIN32
1044 ev_ref (EV_A); /* child watcher */ 1596 ev_ref (EV_A); /* child watcher */
1045 ev_signal_stop (EV_A_ &childev); 1597 ev_signal_stop (EV_A_ &childev);
1046#endif 1598#endif
1047 1599
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); 1600 loop_destroy (EV_A);
1055} 1601}
1056 1602
1057void 1603void
1058ev_default_fork (void) 1604ev_default_fork (void)
… …
1060#if EV_MULTIPLICITY 1606#if EV_MULTIPLICITY
1061 struct ev_loop *loop = ev_default_loop_ptr; 1607 struct ev_loop *loop = ev_default_loop_ptr;
1062#endif 1608#endif
1063 1609
1064 if (backend) 1610 if (backend)
1065 postfork = 1; 1611 postfork = 1; /* must be in line with ev_loop_fork */
1066} 1612}
1067 1613
1068/*****************************************************************************/ 1614/*****************************************************************************/
1069 1615
1070int inline_size 1616void
1071any_pending (EV_P) 1617ev_invoke (EV_P_ void *w, int revents)
1072{ 1618{
1073 int pri; 1619 EV_CB_INVOKE ((W)w, revents);
1074
1075 for (pri = NUMPRI; pri--; )
1076 if (pendingcnt [pri])
1077 return 1;
1078
1079 return 0;
1080} 1620}
1081 1621
1082void inline_speed 1622void inline_speed
1083call_pending (EV_P) 1623call_pending (EV_P)
1084{ 1624{
… …
1089 { 1629 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1630 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1631
1092 if (expect_true (p->w)) 1632 if (expect_true (p->w))
1093 { 1633 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1634 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1635
1096 p->w->pending = 0; 1636 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1637 EV_CB_INVOKE (p->w, p->events);
1638 EV_FREQUENT_CHECK;
1098 } 1639 }
1099 } 1640 }
1100} 1641}
1101 1642
1643#if EV_IDLE_ENABLE
1644void inline_size
1645idle_reify (EV_P)
1646{
1647 if (expect_false (idleall))
1648 {
1649 int pri;
1650
1651 for (pri = NUMPRI; pri--; )
1652 {
1653 if (pendingcnt [pri])
1654 break;
1655
1656 if (idlecnt [pri])
1657 {
1658 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1659 break;
1660 }
1661 }
1662 }
1663}
1664#endif
1665
1102void inline_size 1666void inline_size
1103timers_reify (EV_P) 1667timers_reify (EV_P)
1104{ 1668{
1669 EV_FREQUENT_CHECK;
1670
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1671 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1106 { 1672 {
1107 ev_timer *w = timers [0]; 1673 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1108 1674
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1675 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1676
1111 /* first reschedule or stop timer */ 1677 /* first reschedule or stop timer */
1112 if (w->repeat) 1678 if (w->repeat)
1113 { 1679 {
1680 ev_at (w) += w->repeat;
1681 if (ev_at (w) < mn_now)
1682 ev_at (w) = mn_now;
1683
1114 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1684 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1115 1685
1116 ((WT)w)->at += w->repeat; 1686 ANHE_at_cache (timers [HEAP0]);
1117 if (((WT)w)->at < mn_now)
1118 ((WT)w)->at = mn_now;
1119
1120 downheap ((WT *)timers, timercnt, 0); 1687 downheap (timers, timercnt, HEAP0);
1121 } 1688 }
1122 else 1689 else
1123 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1690 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1124 1691
1692 EV_FREQUENT_CHECK;
1125 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1693 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1126 } 1694 }
1127} 1695}
1128 1696
1129#if EV_PERIODIC_ENABLE 1697#if EV_PERIODIC_ENABLE
1130void inline_size 1698void inline_size
1131periodics_reify (EV_P) 1699periodics_reify (EV_P)
1132{ 1700{
1701 EV_FREQUENT_CHECK;
1702
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1703 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1134 { 1704 {
1135 ev_periodic *w = periodics [0]; 1705 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1136 1706
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1707 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1708
1139 /* first reschedule or stop timer */ 1709 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1710 if (w->reschedule_cb)
1141 { 1711 {
1142 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1712 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1713
1143 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1714 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1715
1716 ANHE_at_cache (periodics [HEAP0]);
1144 downheap ((WT *)periodics, periodiccnt, 0); 1717 downheap (periodics, periodiccnt, HEAP0);
1145 } 1718 }
1146 else if (w->interval) 1719 else if (w->interval)
1147 { 1720 {
1148 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1721 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1149 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1722 /* if next trigger time is not sufficiently in the future, put it there */
1723 /* this might happen because of floating point inexactness */
1724 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1725 {
1726 ev_at (w) += w->interval;
1727
1728 /* if interval is unreasonably low we might still have a time in the past */
1729 /* so correct this. this will make the periodic very inexact, but the user */
1730 /* has effectively asked to get triggered more often than possible */
1731 if (ev_at (w) < ev_rt_now)
1732 ev_at (w) = ev_rt_now;
1733 }
1734
1735 ANHE_at_cache (periodics [HEAP0]);
1150 downheap ((WT *)periodics, periodiccnt, 0); 1736 downheap (periodics, periodiccnt, HEAP0);
1151 } 1737 }
1152 else 1738 else
1153 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1739 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1154 1740
1741 EV_FREQUENT_CHECK;
1155 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1742 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1156 } 1743 }
1157} 1744}
1158 1745
1159static void noinline 1746static void noinline
1160periodics_reschedule (EV_P) 1747periodics_reschedule (EV_P)
1161{ 1748{
1162 int i; 1749 int i;
1163 1750
1164 /* adjust periodics after time jump */ 1751 /* adjust periodics after time jump */
1165 for (i = 0; i < periodiccnt; ++i) 1752 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1166 { 1753 {
1167 ev_periodic *w = periodics [i]; 1754 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1168 1755
1169 if (w->reschedule_cb) 1756 if (w->reschedule_cb)
1170 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1757 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1171 else if (w->interval) 1758 else if (w->interval)
1172 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1759 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1760
1761 ANHE_at_cache (periodics [i]);
1762 }
1763
1764 reheap (periodics, periodiccnt);
1765}
1766#endif
1767
1768void inline_speed
1769time_update (EV_P_ ev_tstamp max_block)
1770{
1771 int i;
1772
1773#if EV_USE_MONOTONIC
1774 if (expect_true (have_monotonic))
1173 } 1775 {
1776 ev_tstamp odiff = rtmn_diff;
1174 1777
1175 /* now rebuild the heap */
1176 for (i = periodiccnt >> 1; i--; )
1177 downheap ((WT *)periodics, periodiccnt, i);
1178}
1179#endif
1180
1181int inline_size
1182time_update_monotonic (EV_P)
1183{
1184 mn_now = get_clock (); 1778 mn_now = get_clock ();
1185 1779
1780 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1781 /* interpolate in the meantime */
1186 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1782 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1187 { 1783 {
1188 ev_rt_now = rtmn_diff + mn_now; 1784 ev_rt_now = rtmn_diff + mn_now;
1189 return 0; 1785 return;
1190 } 1786 }
1191 else 1787
1192 {
1193 now_floor = mn_now; 1788 now_floor = mn_now;
1194 ev_rt_now = ev_time (); 1789 ev_rt_now = ev_time ();
1195 return 1;
1196 }
1197}
1198 1790
1199void inline_size 1791 /* loop a few times, before making important decisions.
1200time_update (EV_P) 1792 * on the choice of "4": one iteration isn't enough,
1201{ 1793 * in case we get preempted during the calls to
1202 int i; 1794 * ev_time and get_clock. a second call is almost guaranteed
1203 1795 * to succeed in that case, though. and looping a few more times
1204#if EV_USE_MONOTONIC 1796 * doesn't hurt either as we only do this on time-jumps or
1205 if (expect_true (have_monotonic)) 1797 * in the unlikely event of having been preempted here.
1206 { 1798 */
1207 if (time_update_monotonic (EV_A)) 1799 for (i = 4; --i; )
1208 { 1800 {
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; 1801 rtmn_diff = ev_rt_now - mn_now;
1222 1802
1223 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1803 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1224 return; /* all is well */ 1804 return; /* all is well */
1225 1805
1226 ev_rt_now = ev_time (); 1806 ev_rt_now = ev_time ();
1227 mn_now = get_clock (); 1807 mn_now = get_clock ();
1228 now_floor = mn_now; 1808 now_floor = mn_now;
1229 } 1809 }
1230 1810
1231# if EV_PERIODIC_ENABLE 1811# if EV_PERIODIC_ENABLE
1232 periodics_reschedule (EV_A); 1812 periodics_reschedule (EV_A);
1233# endif 1813# endif
1234 /* no timer adjustment, as the monotonic clock doesn't jump */ 1814 /* no timer adjustment, as the monotonic clock doesn't jump */
1235 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1815 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1236 }
1237 } 1816 }
1238 else 1817 else
1239#endif 1818#endif
1240 { 1819 {
1241 ev_rt_now = ev_time (); 1820 ev_rt_now = ev_time ();
1242 1821
1243 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1822 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1244 { 1823 {
1245#if EV_PERIODIC_ENABLE 1824#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1825 periodics_reschedule (EV_A);
1247#endif 1826#endif
1248
1249 /* adjust timers. this is easy, as the offset is the same for all */ 1827 /* adjust timers. this is easy, as the offset is the same for all of them */
1250 for (i = 0; i < timercnt; ++i) 1828 for (i = 0; i < timercnt; ++i)
1829 {
1830 ANHE *he = timers + i + HEAP0;
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1831 ANHE_w (*he)->at += ev_rt_now - mn_now;
1832 ANHE_at_cache (*he);
1833 }
1252 } 1834 }
1253 1835
1254 mn_now = ev_rt_now; 1836 mn_now = ev_rt_now;
1255 } 1837 }
1256} 1838}
… …
1270static int loop_done; 1852static int loop_done;
1271 1853
1272void 1854void
1273ev_loop (EV_P_ int flags) 1855ev_loop (EV_P_ int flags)
1274{ 1856{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1857 loop_done = EVUNLOOP_CANCEL;
1276 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL;
1278 1858
1279 while (activecnt) 1859 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1860
1861 do
1280 { 1862 {
1863#if EV_VERIFY >= 2
1864 ev_loop_verify (EV_A);
1865#endif
1866
1867#ifndef _WIN32
1868 if (expect_false (curpid)) /* penalise the forking check even more */
1869 if (expect_false (getpid () != curpid))
1870 {
1871 curpid = getpid ();
1872 postfork = 1;
1873 }
1874#endif
1875
1876#if EV_FORK_ENABLE
1877 /* we might have forked, so queue fork handlers */
1878 if (expect_false (postfork))
1879 if (forkcnt)
1880 {
1881 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1882 call_pending (EV_A);
1883 }
1884#endif
1885
1281 /* queue check watchers (and execute them) */ 1886 /* queue prepare watchers (and execute them) */
1282 if (expect_false (preparecnt)) 1887 if (expect_false (preparecnt))
1283 { 1888 {
1284 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1889 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1285 call_pending (EV_A); 1890 call_pending (EV_A);
1286 } 1891 }
1287 1892
1893 if (expect_false (!activecnt))
1894 break;
1895
1288 /* we might have forked, so reify kernel state if necessary */ 1896 /* we might have forked, so reify kernel state if necessary */
1289 if (expect_false (postfork)) 1897 if (expect_false (postfork))
1290 loop_fork (EV_A); 1898 loop_fork (EV_A);
1291 1899
1292 /* update fd-related kernel structures */ 1900 /* update fd-related kernel structures */
1293 fd_reify (EV_A); 1901 fd_reify (EV_A);
1294 1902
1295 /* calculate blocking time */ 1903 /* calculate blocking time */
1296 { 1904 {
1297 double block; 1905 ev_tstamp waittime = 0.;
1906 ev_tstamp sleeptime = 0.;
1298 1907
1299 if (flags & EVLOOP_NONBLOCK || idlecnt) 1908 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1300 block = 0.; /* do not block at all */
1301 else
1302 { 1909 {
1303 /* update time to cancel out callback processing overhead */ 1910 /* 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); 1911 time_update (EV_A_ 1e100);
1307 else
1308#endif
1309 {
1310 ev_rt_now = ev_time ();
1311 mn_now = ev_rt_now;
1312 }
1313 1912
1314 block = MAX_BLOCKTIME; 1913 waittime = MAX_BLOCKTIME;
1315 1914
1316 if (timercnt) 1915 if (timercnt)
1317 { 1916 {
1318 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1917 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1319 if (block > to) block = to; 1918 if (waittime > to) waittime = to;
1320 } 1919 }
1321 1920
1322#if EV_PERIODIC_ENABLE 1921#if EV_PERIODIC_ENABLE
1323 if (periodiccnt) 1922 if (periodiccnt)
1324 { 1923 {
1325 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1924 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1326 if (block > to) block = to; 1925 if (waittime > to) waittime = to;
1327 } 1926 }
1328#endif 1927#endif
1329 1928
1330 if (expect_false (block < 0.)) block = 0.; 1929 if (expect_false (waittime < timeout_blocktime))
1930 waittime = timeout_blocktime;
1931
1932 sleeptime = waittime - backend_fudge;
1933
1934 if (expect_true (sleeptime > io_blocktime))
1935 sleeptime = io_blocktime;
1936
1937 if (sleeptime)
1938 {
1939 ev_sleep (sleeptime);
1940 waittime -= sleeptime;
1941 }
1331 } 1942 }
1332 1943
1944 ++loop_count;
1333 backend_poll (EV_A_ block); 1945 backend_poll (EV_A_ waittime);
1946
1947 /* update ev_rt_now, do magic */
1948 time_update (EV_A_ waittime + sleeptime);
1334 } 1949 }
1335
1336 /* update ev_rt_now, do magic */
1337 time_update (EV_A);
1338 1950
1339 /* queue pending timers and reschedule them */ 1951 /* queue pending timers and reschedule them */
1340 timers_reify (EV_A); /* relative timers called last */ 1952 timers_reify (EV_A); /* relative timers called last */
1341#if EV_PERIODIC_ENABLE 1953#if EV_PERIODIC_ENABLE
1342 periodics_reify (EV_A); /* absolute timers called first */ 1954 periodics_reify (EV_A); /* absolute timers called first */
1343#endif 1955#endif
1344 1956
1957#if EV_IDLE_ENABLE
1345 /* queue idle watchers unless other events are pending */ 1958 /* queue idle watchers unless other events are pending */
1346 if (idlecnt && !any_pending (EV_A)) 1959 idle_reify (EV_A);
1347 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1960#endif
1348 1961
1349 /* queue check watchers, to be executed first */ 1962 /* queue check watchers, to be executed first */
1350 if (expect_false (checkcnt)) 1963 if (expect_false (checkcnt))
1351 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1964 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1352 1965
1353 call_pending (EV_A); 1966 call_pending (EV_A);
1354
1355 if (expect_false (loop_done))
1356 break;
1357 } 1967 }
1968 while (expect_true (
1969 activecnt
1970 && !loop_done
1971 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1972 ));
1358 1973
1359 if (loop_done == EVUNLOOP_ONE) 1974 if (loop_done == EVUNLOOP_ONE)
1360 loop_done = EVUNLOOP_CANCEL; 1975 loop_done = EVUNLOOP_CANCEL;
1361} 1976}
1362 1977
… …
1389 head = &(*head)->next; 2004 head = &(*head)->next;
1390 } 2005 }
1391} 2006}
1392 2007
1393void inline_speed 2008void inline_speed
1394ev_clear_pending (EV_P_ W w) 2009clear_pending (EV_P_ W w)
1395{ 2010{
1396 if (w->pending) 2011 if (w->pending)
1397 { 2012 {
1398 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2013 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1399 w->pending = 0; 2014 w->pending = 0;
1400 } 2015 }
1401} 2016}
1402 2017
2018int
2019ev_clear_pending (EV_P_ void *w)
2020{
2021 W w_ = (W)w;
2022 int pending = w_->pending;
2023
2024 if (expect_true (pending))
2025 {
2026 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2027 w_->pending = 0;
2028 p->w = 0;
2029 return p->events;
2030 }
2031 else
2032 return 0;
2033}
2034
2035void inline_size
2036pri_adjust (EV_P_ W w)
2037{
2038 int pri = w->priority;
2039 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2040 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2041 w->priority = pri;
2042}
2043
1403void inline_speed 2044void inline_speed
1404ev_start (EV_P_ W w, int active) 2045ev_start (EV_P_ W w, int active)
1405{ 2046{
1406 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 2047 pri_adjust (EV_A_ w);
1407 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1408
1409 w->active = active; 2048 w->active = active;
1410 ev_ref (EV_A); 2049 ev_ref (EV_A);
1411} 2050}
1412 2051
1413void inline_size 2052void inline_size
… …
1417 w->active = 0; 2056 w->active = 0;
1418} 2057}
1419 2058
1420/*****************************************************************************/ 2059/*****************************************************************************/
1421 2060
1422void 2061void noinline
1423ev_io_start (EV_P_ ev_io *w) 2062ev_io_start (EV_P_ ev_io *w)
1424{ 2063{
1425 int fd = w->fd; 2064 int fd = w->fd;
1426 2065
1427 if (expect_false (ev_is_active (w))) 2066 if (expect_false (ev_is_active (w)))
1428 return; 2067 return;
1429 2068
1430 assert (("ev_io_start called with negative fd", fd >= 0)); 2069 assert (("ev_io_start called with negative fd", fd >= 0));
1431 2070
2071 EV_FREQUENT_CHECK;
2072
1432 ev_start (EV_A_ (W)w, 1); 2073 ev_start (EV_A_ (W)w, 1);
1433 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2074 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1434 wlist_add ((WL *)&anfds[fd].head, (WL)w); 2075 wlist_add (&anfds[fd].head, (WL)w);
1435 2076
1436 fd_change (EV_A_ fd); 2077 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1437} 2078 w->events &= ~EV_IOFDSET;
1438 2079
1439void 2080 EV_FREQUENT_CHECK;
2081}
2082
2083void noinline
1440ev_io_stop (EV_P_ ev_io *w) 2084ev_io_stop (EV_P_ ev_io *w)
1441{ 2085{
1442 ev_clear_pending (EV_A_ (W)w); 2086 clear_pending (EV_A_ (W)w);
1443 if (expect_false (!ev_is_active (w))) 2087 if (expect_false (!ev_is_active (w)))
1444 return; 2088 return;
1445 2089
1446 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2090 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1447 2091
2092 EV_FREQUENT_CHECK;
2093
1448 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 2094 wlist_del (&anfds[w->fd].head, (WL)w);
1449 ev_stop (EV_A_ (W)w); 2095 ev_stop (EV_A_ (W)w);
1450 2096
1451 fd_change (EV_A_ w->fd); 2097 fd_change (EV_A_ w->fd, 1);
1452}
1453 2098
1454void 2099 EV_FREQUENT_CHECK;
2100}
2101
2102void noinline
1455ev_timer_start (EV_P_ ev_timer *w) 2103ev_timer_start (EV_P_ ev_timer *w)
1456{ 2104{
1457 if (expect_false (ev_is_active (w))) 2105 if (expect_false (ev_is_active (w)))
1458 return; 2106 return;
1459 2107
1460 ((WT)w)->at += mn_now; 2108 ev_at (w) += mn_now;
1461 2109
1462 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2110 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1463 2111
2112 EV_FREQUENT_CHECK;
2113
2114 ++timercnt;
1464 ev_start (EV_A_ (W)w, ++timercnt); 2115 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1465 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 2116 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1466 timers [timercnt - 1] = w; 2117 ANHE_w (timers [ev_active (w)]) = (WT)w;
1467 upheap ((WT *)timers, timercnt - 1); 2118 ANHE_at_cache (timers [ev_active (w)]);
2119 upheap (timers, ev_active (w));
1468 2120
2121 EV_FREQUENT_CHECK;
2122
1469 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 2123 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1470} 2124}
1471 2125
1472void 2126void noinline
1473ev_timer_stop (EV_P_ ev_timer *w) 2127ev_timer_stop (EV_P_ ev_timer *w)
1474{ 2128{
1475 ev_clear_pending (EV_A_ (W)w); 2129 clear_pending (EV_A_ (W)w);
1476 if (expect_false (!ev_is_active (w))) 2130 if (expect_false (!ev_is_active (w)))
1477 return; 2131 return;
1478 2132
2133 EV_FREQUENT_CHECK;
2134
2135 {
2136 int active = ev_active (w);
2137
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 2138 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1480 2139
2140 --timercnt;
2141
1481 if (expect_true (((W)w)->active < timercnt--)) 2142 if (expect_true (active < timercnt + HEAP0))
1482 { 2143 {
1483 timers [((W)w)->active - 1] = timers [timercnt]; 2144 timers [active] = timers [timercnt + HEAP0];
1484 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2145 adjustheap (timers, timercnt, active);
1485 } 2146 }
2147 }
1486 2148
1487 ((WT)w)->at -= mn_now; 2149 EV_FREQUENT_CHECK;
2150
2151 ev_at (w) -= mn_now;
1488 2152
1489 ev_stop (EV_A_ (W)w); 2153 ev_stop (EV_A_ (W)w);
1490} 2154}
1491 2155
1492void 2156void noinline
1493ev_timer_again (EV_P_ ev_timer *w) 2157ev_timer_again (EV_P_ ev_timer *w)
1494{ 2158{
2159 EV_FREQUENT_CHECK;
2160
1495 if (ev_is_active (w)) 2161 if (ev_is_active (w))
1496 { 2162 {
1497 if (w->repeat) 2163 if (w->repeat)
1498 { 2164 {
1499 ((WT)w)->at = mn_now + w->repeat; 2165 ev_at (w) = mn_now + w->repeat;
2166 ANHE_at_cache (timers [ev_active (w)]);
1500 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2167 adjustheap (timers, timercnt, ev_active (w));
1501 } 2168 }
1502 else 2169 else
1503 ev_timer_stop (EV_A_ w); 2170 ev_timer_stop (EV_A_ w);
1504 } 2171 }
1505 else if (w->repeat) 2172 else if (w->repeat)
1506 { 2173 {
1507 w->at = w->repeat; 2174 ev_at (w) = w->repeat;
1508 ev_timer_start (EV_A_ w); 2175 ev_timer_start (EV_A_ w);
1509 } 2176 }
2177
2178 EV_FREQUENT_CHECK;
1510} 2179}
1511 2180
1512#if EV_PERIODIC_ENABLE 2181#if EV_PERIODIC_ENABLE
1513void 2182void noinline
1514ev_periodic_start (EV_P_ ev_periodic *w) 2183ev_periodic_start (EV_P_ ev_periodic *w)
1515{ 2184{
1516 if (expect_false (ev_is_active (w))) 2185 if (expect_false (ev_is_active (w)))
1517 return; 2186 return;
1518 2187
1519 if (w->reschedule_cb) 2188 if (w->reschedule_cb)
1520 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2189 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1521 else if (w->interval) 2190 else if (w->interval)
1522 { 2191 {
1523 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2192 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 */ 2193 /* 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; 2194 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1526 } 2195 }
2196 else
2197 ev_at (w) = w->offset;
1527 2198
2199 EV_FREQUENT_CHECK;
2200
2201 ++periodiccnt;
1528 ev_start (EV_A_ (W)w, ++periodiccnt); 2202 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1529 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2203 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1530 periodics [periodiccnt - 1] = w; 2204 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1531 upheap ((WT *)periodics, periodiccnt - 1); 2205 ANHE_at_cache (periodics [ev_active (w)]);
2206 upheap (periodics, ev_active (w));
1532 2207
2208 EV_FREQUENT_CHECK;
2209
1533 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2210 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1534} 2211}
1535 2212
1536void 2213void noinline
1537ev_periodic_stop (EV_P_ ev_periodic *w) 2214ev_periodic_stop (EV_P_ ev_periodic *w)
1538{ 2215{
1539 ev_clear_pending (EV_A_ (W)w); 2216 clear_pending (EV_A_ (W)w);
1540 if (expect_false (!ev_is_active (w))) 2217 if (expect_false (!ev_is_active (w)))
1541 return; 2218 return;
1542 2219
2220 EV_FREQUENT_CHECK;
2221
2222 {
2223 int active = ev_active (w);
2224
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2225 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
1544 2226
2227 --periodiccnt;
2228
1545 if (expect_true (((W)w)->active < periodiccnt--)) 2229 if (expect_true (active < periodiccnt + HEAP0))
1546 { 2230 {
1547 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 2231 periodics [active] = periodics [periodiccnt + HEAP0];
1548 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 2232 adjustheap (periodics, periodiccnt, active);
1549 } 2233 }
2234 }
2235
2236 EV_FREQUENT_CHECK;
1550 2237
1551 ev_stop (EV_A_ (W)w); 2238 ev_stop (EV_A_ (W)w);
1552} 2239}
1553 2240
1554void 2241void noinline
1555ev_periodic_again (EV_P_ ev_periodic *w) 2242ev_periodic_again (EV_P_ ev_periodic *w)
1556{ 2243{
1557 /* TODO: use adjustheap and recalculation */ 2244 /* TODO: use adjustheap and recalculation */
1558 ev_periodic_stop (EV_A_ w); 2245 ev_periodic_stop (EV_A_ w);
1559 ev_periodic_start (EV_A_ w); 2246 ev_periodic_start (EV_A_ w);
… …
1562 2249
1563#ifndef SA_RESTART 2250#ifndef SA_RESTART
1564# define SA_RESTART 0 2251# define SA_RESTART 0
1565#endif 2252#endif
1566 2253
1567void 2254void noinline
1568ev_signal_start (EV_P_ ev_signal *w) 2255ev_signal_start (EV_P_ ev_signal *w)
1569{ 2256{
1570#if EV_MULTIPLICITY 2257#if EV_MULTIPLICITY
1571 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2258 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1572#endif 2259#endif
1573 if (expect_false (ev_is_active (w))) 2260 if (expect_false (ev_is_active (w)))
1574 return; 2261 return;
1575 2262
1576 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2263 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1577 2264
2265 evpipe_init (EV_A);
2266
2267 EV_FREQUENT_CHECK;
2268
2269 {
2270#ifndef _WIN32
2271 sigset_t full, prev;
2272 sigfillset (&full);
2273 sigprocmask (SIG_SETMASK, &full, &prev);
2274#endif
2275
2276 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2277
2278#ifndef _WIN32
2279 sigprocmask (SIG_SETMASK, &prev, 0);
2280#endif
2281 }
2282
1578 ev_start (EV_A_ (W)w, 1); 2283 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); 2284 wlist_add (&signals [w->signum - 1].head, (WL)w);
1581 2285
1582 if (!((WL)w)->next) 2286 if (!((WL)w)->next)
1583 { 2287 {
1584#if _WIN32 2288#if _WIN32
1585 signal (w->signum, sighandler); 2289 signal (w->signum, ev_sighandler);
1586#else 2290#else
1587 struct sigaction sa; 2291 struct sigaction sa;
1588 sa.sa_handler = sighandler; 2292 sa.sa_handler = ev_sighandler;
1589 sigfillset (&sa.sa_mask); 2293 sigfillset (&sa.sa_mask);
1590 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2294 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1591 sigaction (w->signum, &sa, 0); 2295 sigaction (w->signum, &sa, 0);
1592#endif 2296#endif
1593 } 2297 }
1594}
1595 2298
1596void 2299 EV_FREQUENT_CHECK;
2300}
2301
2302void noinline
1597ev_signal_stop (EV_P_ ev_signal *w) 2303ev_signal_stop (EV_P_ ev_signal *w)
1598{ 2304{
1599 ev_clear_pending (EV_A_ (W)w); 2305 clear_pending (EV_A_ (W)w);
1600 if (expect_false (!ev_is_active (w))) 2306 if (expect_false (!ev_is_active (w)))
1601 return; 2307 return;
1602 2308
2309 EV_FREQUENT_CHECK;
2310
1603 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2311 wlist_del (&signals [w->signum - 1].head, (WL)w);
1604 ev_stop (EV_A_ (W)w); 2312 ev_stop (EV_A_ (W)w);
1605 2313
1606 if (!signals [w->signum - 1].head) 2314 if (!signals [w->signum - 1].head)
1607 signal (w->signum, SIG_DFL); 2315 signal (w->signum, SIG_DFL);
2316
2317 EV_FREQUENT_CHECK;
1608} 2318}
1609 2319
1610void 2320void
1611ev_child_start (EV_P_ ev_child *w) 2321ev_child_start (EV_P_ ev_child *w)
1612{ 2322{
… …
1614 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2324 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1615#endif 2325#endif
1616 if (expect_false (ev_is_active (w))) 2326 if (expect_false (ev_is_active (w)))
1617 return; 2327 return;
1618 2328
2329 EV_FREQUENT_CHECK;
2330
1619 ev_start (EV_A_ (W)w, 1); 2331 ev_start (EV_A_ (W)w, 1);
1620 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2332 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2333
2334 EV_FREQUENT_CHECK;
1621} 2335}
1622 2336
1623void 2337void
1624ev_child_stop (EV_P_ ev_child *w) 2338ev_child_stop (EV_P_ ev_child *w)
1625{ 2339{
1626 ev_clear_pending (EV_A_ (W)w); 2340 clear_pending (EV_A_ (W)w);
1627 if (expect_false (!ev_is_active (w))) 2341 if (expect_false (!ev_is_active (w)))
1628 return; 2342 return;
1629 2343
2344 EV_FREQUENT_CHECK;
2345
1630 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 2346 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631 ev_stop (EV_A_ (W)w); 2347 ev_stop (EV_A_ (W)w);
2348
2349 EV_FREQUENT_CHECK;
1632} 2350}
1633 2351
1634#if EV_STAT_ENABLE 2352#if EV_STAT_ENABLE
1635 2353
1636# ifdef _WIN32 2354# ifdef _WIN32
… …
1639# endif 2357# endif
1640 2358
1641#define DEF_STAT_INTERVAL 5.0074891 2359#define DEF_STAT_INTERVAL 5.0074891
1642#define MIN_STAT_INTERVAL 0.1074891 2360#define MIN_STAT_INTERVAL 0.1074891
1643 2361
2362static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2363
2364#if EV_USE_INOTIFY
2365# define EV_INOTIFY_BUFSIZE 8192
2366
2367static void noinline
2368infy_add (EV_P_ ev_stat *w)
2369{
2370 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);
2371
2372 if (w->wd < 0)
2373 {
2374 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2375
2376 /* monitor some parent directory for speedup hints */
2377 /* note that exceeding the hardcoded limit is not a correctness issue, */
2378 /* but an efficiency issue only */
2379 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2380 {
2381 char path [4096];
2382 strcpy (path, w->path);
2383
2384 do
2385 {
2386 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2387 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2388
2389 char *pend = strrchr (path, '/');
2390
2391 if (!pend)
2392 break; /* whoops, no '/', complain to your admin */
2393
2394 *pend = 0;
2395 w->wd = inotify_add_watch (fs_fd, path, mask);
2396 }
2397 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2398 }
2399 }
2400 else
2401 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2402
2403 if (w->wd >= 0)
2404 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2405}
2406
2407static void noinline
2408infy_del (EV_P_ ev_stat *w)
2409{
2410 int slot;
2411 int wd = w->wd;
2412
2413 if (wd < 0)
2414 return;
2415
2416 w->wd = -2;
2417 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
2418 wlist_del (&fs_hash [slot].head, (WL)w);
2419
2420 /* remove this watcher, if others are watching it, they will rearm */
2421 inotify_rm_watch (fs_fd, wd);
2422}
2423
2424static void noinline
2425infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2426{
2427 if (slot < 0)
2428 /* overflow, need to check for all hahs slots */
2429 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2430 infy_wd (EV_A_ slot, wd, ev);
2431 else
2432 {
2433 WL w_;
2434
2435 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
2436 {
2437 ev_stat *w = (ev_stat *)w_;
2438 w_ = w_->next; /* lets us remove this watcher and all before it */
2439
2440 if (w->wd == wd || wd == -1)
2441 {
2442 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2443 {
2444 w->wd = -1;
2445 infy_add (EV_A_ w); /* re-add, no matter what */
2446 }
2447
2448 stat_timer_cb (EV_A_ &w->timer, 0);
2449 }
2450 }
2451 }
2452}
2453
2454static void
2455infy_cb (EV_P_ ev_io *w, int revents)
2456{
2457 char buf [EV_INOTIFY_BUFSIZE];
2458 struct inotify_event *ev = (struct inotify_event *)buf;
2459 int ofs;
2460 int len = read (fs_fd, buf, sizeof (buf));
2461
2462 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2463 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2464}
2465
2466void inline_size
2467infy_init (EV_P)
2468{
2469 if (fs_fd != -2)
2470 return;
2471
2472 fs_fd = inotify_init ();
2473
2474 if (fs_fd >= 0)
2475 {
2476 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2477 ev_set_priority (&fs_w, EV_MAXPRI);
2478 ev_io_start (EV_A_ &fs_w);
2479 }
2480}
2481
2482void inline_size
2483infy_fork (EV_P)
2484{
2485 int slot;
2486
2487 if (fs_fd < 0)
2488 return;
2489
2490 close (fs_fd);
2491 fs_fd = inotify_init ();
2492
2493 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2494 {
2495 WL w_ = fs_hash [slot].head;
2496 fs_hash [slot].head = 0;
2497
2498 while (w_)
2499 {
2500 ev_stat *w = (ev_stat *)w_;
2501 w_ = w_->next; /* lets us add this watcher */
2502
2503 w->wd = -1;
2504
2505 if (fs_fd >= 0)
2506 infy_add (EV_A_ w); /* re-add, no matter what */
2507 else
2508 ev_timer_start (EV_A_ &w->timer);
2509 }
2510
2511 }
2512}
2513
2514#endif
2515
1644void 2516void
1645ev_stat_stat (EV_P_ ev_stat *w) 2517ev_stat_stat (EV_P_ ev_stat *w)
1646{ 2518{
1647 if (lstat (w->path, &w->attr) < 0) 2519 if (lstat (w->path, &w->attr) < 0)
1648 w->attr.st_nlink = 0; 2520 w->attr.st_nlink = 0;
1649 else if (!w->attr.st_nlink) 2521 else if (!w->attr.st_nlink)
1650 w->attr.st_nlink = 1; 2522 w->attr.st_nlink = 1;
1651} 2523}
1652 2524
1653static void 2525static void noinline
1654stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2526stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1655{ 2527{
1656 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2528 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1657 2529
1658 /* we copy this here each the time so that */ 2530 /* we copy this here each the time so that */
1659 /* prev has the old value when the callback gets invoked */ 2531 /* prev has the old value when the callback gets invoked */
1660 w->prev = w->attr; 2532 w->prev = w->attr;
1661 ev_stat_stat (EV_A_ w); 2533 ev_stat_stat (EV_A_ w);
1662 2534
1663 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2535 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2536 if (
2537 w->prev.st_dev != w->attr.st_dev
2538 || w->prev.st_ino != w->attr.st_ino
2539 || w->prev.st_mode != w->attr.st_mode
2540 || w->prev.st_nlink != w->attr.st_nlink
2541 || w->prev.st_uid != w->attr.st_uid
2542 || w->prev.st_gid != w->attr.st_gid
2543 || w->prev.st_rdev != w->attr.st_rdev
2544 || w->prev.st_size != w->attr.st_size
2545 || w->prev.st_atime != w->attr.st_atime
2546 || w->prev.st_mtime != w->attr.st_mtime
2547 || w->prev.st_ctime != w->attr.st_ctime
2548 ) {
2549 #if EV_USE_INOTIFY
2550 infy_del (EV_A_ w);
2551 infy_add (EV_A_ w);
2552 ev_stat_stat (EV_A_ w); /* avoid race... */
2553 #endif
2554
1664 ev_feed_event (EV_A_ w, EV_STAT); 2555 ev_feed_event (EV_A_ w, EV_STAT);
2556 }
1665} 2557}
1666 2558
1667void 2559void
1668ev_stat_start (EV_P_ ev_stat *w) 2560ev_stat_start (EV_P_ ev_stat *w)
1669{ 2561{
… …
1679 if (w->interval < MIN_STAT_INTERVAL) 2571 if (w->interval < MIN_STAT_INTERVAL)
1680 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2572 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1681 2573
1682 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2574 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1683 ev_set_priority (&w->timer, ev_priority (w)); 2575 ev_set_priority (&w->timer, ev_priority (w));
2576
2577#if EV_USE_INOTIFY
2578 infy_init (EV_A);
2579
2580 if (fs_fd >= 0)
2581 infy_add (EV_A_ w);
2582 else
2583#endif
1684 ev_timer_start (EV_A_ &w->timer); 2584 ev_timer_start (EV_A_ &w->timer);
1685 2585
1686 ev_start (EV_A_ (W)w, 1); 2586 ev_start (EV_A_ (W)w, 1);
2587
2588 EV_FREQUENT_CHECK;
1687} 2589}
1688 2590
1689void 2591void
1690ev_stat_stop (EV_P_ ev_stat *w) 2592ev_stat_stop (EV_P_ ev_stat *w)
1691{ 2593{
1692 ev_clear_pending (EV_A_ (W)w); 2594 clear_pending (EV_A_ (W)w);
1693 if (expect_false (!ev_is_active (w))) 2595 if (expect_false (!ev_is_active (w)))
1694 return; 2596 return;
1695 2597
2598 EV_FREQUENT_CHECK;
2599
2600#if EV_USE_INOTIFY
2601 infy_del (EV_A_ w);
2602#endif
1696 ev_timer_stop (EV_A_ &w->timer); 2603 ev_timer_stop (EV_A_ &w->timer);
1697 2604
1698 ev_stop (EV_A_ (W)w); 2605 ev_stop (EV_A_ (W)w);
1699}
1700#endif
1701 2606
2607 EV_FREQUENT_CHECK;
2608}
2609#endif
2610
2611#if EV_IDLE_ENABLE
1702void 2612void
1703ev_idle_start (EV_P_ ev_idle *w) 2613ev_idle_start (EV_P_ ev_idle *w)
1704{ 2614{
1705 if (expect_false (ev_is_active (w))) 2615 if (expect_false (ev_is_active (w)))
1706 return; 2616 return;
1707 2617
2618 pri_adjust (EV_A_ (W)w);
2619
2620 EV_FREQUENT_CHECK;
2621
2622 {
2623 int active = ++idlecnt [ABSPRI (w)];
2624
2625 ++idleall;
1708 ev_start (EV_A_ (W)w, ++idlecnt); 2626 ev_start (EV_A_ (W)w, active);
2627
1709 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2628 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1710 idles [idlecnt - 1] = w; 2629 idles [ABSPRI (w)][active - 1] = w;
2630 }
2631
2632 EV_FREQUENT_CHECK;
1711} 2633}
1712 2634
1713void 2635void
1714ev_idle_stop (EV_P_ ev_idle *w) 2636ev_idle_stop (EV_P_ ev_idle *w)
1715{ 2637{
1716 ev_clear_pending (EV_A_ (W)w); 2638 clear_pending (EV_A_ (W)w);
1717 if (expect_false (!ev_is_active (w))) 2639 if (expect_false (!ev_is_active (w)))
1718 return; 2640 return;
1719 2641
2642 EV_FREQUENT_CHECK;
2643
1720 { 2644 {
1721 int active = ((W)w)->active; 2645 int active = ev_active (w);
1722 idles [active - 1] = idles [--idlecnt]; 2646
1723 ((W)idles [active - 1])->active = active; 2647 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2648 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2649
2650 ev_stop (EV_A_ (W)w);
2651 --idleall;
1724 } 2652 }
1725 2653
1726 ev_stop (EV_A_ (W)w); 2654 EV_FREQUENT_CHECK;
1727} 2655}
2656#endif
1728 2657
1729void 2658void
1730ev_prepare_start (EV_P_ ev_prepare *w) 2659ev_prepare_start (EV_P_ ev_prepare *w)
1731{ 2660{
1732 if (expect_false (ev_is_active (w))) 2661 if (expect_false (ev_is_active (w)))
1733 return; 2662 return;
2663
2664 EV_FREQUENT_CHECK;
1734 2665
1735 ev_start (EV_A_ (W)w, ++preparecnt); 2666 ev_start (EV_A_ (W)w, ++preparecnt);
1736 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2667 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1737 prepares [preparecnt - 1] = w; 2668 prepares [preparecnt - 1] = w;
2669
2670 EV_FREQUENT_CHECK;
1738} 2671}
1739 2672
1740void 2673void
1741ev_prepare_stop (EV_P_ ev_prepare *w) 2674ev_prepare_stop (EV_P_ ev_prepare *w)
1742{ 2675{
1743 ev_clear_pending (EV_A_ (W)w); 2676 clear_pending (EV_A_ (W)w);
1744 if (expect_false (!ev_is_active (w))) 2677 if (expect_false (!ev_is_active (w)))
1745 return; 2678 return;
1746 2679
2680 EV_FREQUENT_CHECK;
2681
1747 { 2682 {
1748 int active = ((W)w)->active; 2683 int active = ev_active (w);
2684
1749 prepares [active - 1] = prepares [--preparecnt]; 2685 prepares [active - 1] = prepares [--preparecnt];
1750 ((W)prepares [active - 1])->active = active; 2686 ev_active (prepares [active - 1]) = active;
1751 } 2687 }
1752 2688
1753 ev_stop (EV_A_ (W)w); 2689 ev_stop (EV_A_ (W)w);
2690
2691 EV_FREQUENT_CHECK;
1754} 2692}
1755 2693
1756void 2694void
1757ev_check_start (EV_P_ ev_check *w) 2695ev_check_start (EV_P_ ev_check *w)
1758{ 2696{
1759 if (expect_false (ev_is_active (w))) 2697 if (expect_false (ev_is_active (w)))
1760 return; 2698 return;
2699
2700 EV_FREQUENT_CHECK;
1761 2701
1762 ev_start (EV_A_ (W)w, ++checkcnt); 2702 ev_start (EV_A_ (W)w, ++checkcnt);
1763 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2703 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1764 checks [checkcnt - 1] = w; 2704 checks [checkcnt - 1] = w;
2705
2706 EV_FREQUENT_CHECK;
1765} 2707}
1766 2708
1767void 2709void
1768ev_check_stop (EV_P_ ev_check *w) 2710ev_check_stop (EV_P_ ev_check *w)
1769{ 2711{
1770 ev_clear_pending (EV_A_ (W)w); 2712 clear_pending (EV_A_ (W)w);
1771 if (expect_false (!ev_is_active (w))) 2713 if (expect_false (!ev_is_active (w)))
1772 return; 2714 return;
1773 2715
2716 EV_FREQUENT_CHECK;
2717
1774 { 2718 {
1775 int active = ((W)w)->active; 2719 int active = ev_active (w);
2720
1776 checks [active - 1] = checks [--checkcnt]; 2721 checks [active - 1] = checks [--checkcnt];
1777 ((W)checks [active - 1])->active = active; 2722 ev_active (checks [active - 1]) = active;
1778 } 2723 }
1779 2724
1780 ev_stop (EV_A_ (W)w); 2725 ev_stop (EV_A_ (W)w);
2726
2727 EV_FREQUENT_CHECK;
1781} 2728}
1782 2729
1783#if EV_EMBED_ENABLE 2730#if EV_EMBED_ENABLE
1784void noinline 2731void noinline
1785ev_embed_sweep (EV_P_ ev_embed *w) 2732ev_embed_sweep (EV_P_ ev_embed *w)
1786{ 2733{
1787 ev_loop (w->loop, EVLOOP_NONBLOCK); 2734 ev_loop (w->other, EVLOOP_NONBLOCK);
1788} 2735}
1789 2736
1790static void 2737static void
1791embed_cb (EV_P_ ev_io *io, int revents) 2738embed_io_cb (EV_P_ ev_io *io, int revents)
1792{ 2739{
1793 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2740 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1794 2741
1795 if (ev_cb (w)) 2742 if (ev_cb (w))
1796 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2743 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1797 else 2744 else
1798 ev_embed_sweep (loop, w); 2745 ev_loop (w->other, EVLOOP_NONBLOCK);
1799} 2746}
2747
2748static void
2749embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2750{
2751 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2752
2753 {
2754 struct ev_loop *loop = w->other;
2755
2756 while (fdchangecnt)
2757 {
2758 fd_reify (EV_A);
2759 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2760 }
2761 }
2762}
2763
2764#if 0
2765static void
2766embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2767{
2768 ev_idle_stop (EV_A_ idle);
2769}
2770#endif
1800 2771
1801void 2772void
1802ev_embed_start (EV_P_ ev_embed *w) 2773ev_embed_start (EV_P_ ev_embed *w)
1803{ 2774{
1804 if (expect_false (ev_is_active (w))) 2775 if (expect_false (ev_is_active (w)))
1805 return; 2776 return;
1806 2777
1807 { 2778 {
1808 struct ev_loop *loop = w->loop; 2779 struct ev_loop *loop = w->other;
1809 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2780 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1810 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2781 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1811 } 2782 }
2783
2784 EV_FREQUENT_CHECK;
1812 2785
1813 ev_set_priority (&w->io, ev_priority (w)); 2786 ev_set_priority (&w->io, ev_priority (w));
1814 ev_io_start (EV_A_ &w->io); 2787 ev_io_start (EV_A_ &w->io);
1815 2788
2789 ev_prepare_init (&w->prepare, embed_prepare_cb);
2790 ev_set_priority (&w->prepare, EV_MINPRI);
2791 ev_prepare_start (EV_A_ &w->prepare);
2792
2793 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2794
1816 ev_start (EV_A_ (W)w, 1); 2795 ev_start (EV_A_ (W)w, 1);
2796
2797 EV_FREQUENT_CHECK;
1817} 2798}
1818 2799
1819void 2800void
1820ev_embed_stop (EV_P_ ev_embed *w) 2801ev_embed_stop (EV_P_ ev_embed *w)
1821{ 2802{
1822 ev_clear_pending (EV_A_ (W)w); 2803 clear_pending (EV_A_ (W)w);
1823 if (expect_false (!ev_is_active (w))) 2804 if (expect_false (!ev_is_active (w)))
1824 return; 2805 return;
1825 2806
2807 EV_FREQUENT_CHECK;
2808
1826 ev_io_stop (EV_A_ &w->io); 2809 ev_io_stop (EV_A_ &w->io);
2810 ev_prepare_stop (EV_A_ &w->prepare);
1827 2811
1828 ev_stop (EV_A_ (W)w); 2812 ev_stop (EV_A_ (W)w);
2813
2814 EV_FREQUENT_CHECK;
2815}
2816#endif
2817
2818#if EV_FORK_ENABLE
2819void
2820ev_fork_start (EV_P_ ev_fork *w)
2821{
2822 if (expect_false (ev_is_active (w)))
2823 return;
2824
2825 EV_FREQUENT_CHECK;
2826
2827 ev_start (EV_A_ (W)w, ++forkcnt);
2828 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2829 forks [forkcnt - 1] = w;
2830
2831 EV_FREQUENT_CHECK;
2832}
2833
2834void
2835ev_fork_stop (EV_P_ ev_fork *w)
2836{
2837 clear_pending (EV_A_ (W)w);
2838 if (expect_false (!ev_is_active (w)))
2839 return;
2840
2841 EV_FREQUENT_CHECK;
2842
2843 {
2844 int active = ev_active (w);
2845
2846 forks [active - 1] = forks [--forkcnt];
2847 ev_active (forks [active - 1]) = active;
2848 }
2849
2850 ev_stop (EV_A_ (W)w);
2851
2852 EV_FREQUENT_CHECK;
2853}
2854#endif
2855
2856#if EV_ASYNC_ENABLE
2857void
2858ev_async_start (EV_P_ ev_async *w)
2859{
2860 if (expect_false (ev_is_active (w)))
2861 return;
2862
2863 evpipe_init (EV_A);
2864
2865 EV_FREQUENT_CHECK;
2866
2867 ev_start (EV_A_ (W)w, ++asynccnt);
2868 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2869 asyncs [asynccnt - 1] = w;
2870
2871 EV_FREQUENT_CHECK;
2872}
2873
2874void
2875ev_async_stop (EV_P_ ev_async *w)
2876{
2877 clear_pending (EV_A_ (W)w);
2878 if (expect_false (!ev_is_active (w)))
2879 return;
2880
2881 EV_FREQUENT_CHECK;
2882
2883 {
2884 int active = ev_active (w);
2885
2886 asyncs [active - 1] = asyncs [--asynccnt];
2887 ev_active (asyncs [active - 1]) = active;
2888 }
2889
2890 ev_stop (EV_A_ (W)w);
2891
2892 EV_FREQUENT_CHECK;
2893}
2894
2895void
2896ev_async_send (EV_P_ ev_async *w)
2897{
2898 w->sent = 1;
2899 evpipe_write (EV_A_ &gotasync);
1829} 2900}
1830#endif 2901#endif
1831 2902
1832/*****************************************************************************/ 2903/*****************************************************************************/
1833 2904
… …
1891 ev_timer_set (&once->to, timeout, 0.); 2962 ev_timer_set (&once->to, timeout, 0.);
1892 ev_timer_start (EV_A_ &once->to); 2963 ev_timer_start (EV_A_ &once->to);
1893 } 2964 }
1894} 2965}
1895 2966
2967#if EV_MULTIPLICITY
2968 #include "ev_wrap.h"
2969#endif
2970
1896#ifdef __cplusplus 2971#ifdef __cplusplus
1897} 2972}
1898#endif 2973#endif
1899 2974

Diff Legend

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