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

Comparing libev/ev.c (file contents):
Revision 1.201 by root, Thu Dec 27 08:00:18 2007 UTC vs.
Revision 1.342 by root, Mon Mar 29 12:40:57 2010 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,2009,2010 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 modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
39 39
40#ifdef __cplusplus 40#ifdef __cplusplus
41extern "C" { 41extern "C" {
42#endif 42#endif
43 43
44/* this big block deduces configuration from config.h */
44#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
45# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
46# include EV_CONFIG_H 47# include EV_CONFIG_H
47# else 48# else
48# include "config.h" 49# include "config.h"
49# endif 50# endif
50 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
51# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
52# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
53# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
54# endif 69# endif
55# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
57# endif 72# endif
58# else 73# else
59# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
60# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
61# endif 76# endif
… …
64# endif 79# endif
65# endif 80# endif
66 81
67# ifndef EV_USE_NANOSLEEP 82# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP 83# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
70# else 85# else
71# define EV_USE_NANOSLEEP 0 86# define EV_USE_NANOSLEEP 0
72# endif 87# endif
73# endif 88# endif
74 89
75# ifndef EV_USE_SELECT 90# ifndef EV_USE_SELECT
76# if HAVE_SELECT && HAVE_SYS_SELECT_H 91# if HAVE_SELECT && HAVE_SYS_SELECT_H
77# define EV_USE_SELECT 1 92# define EV_USE_SELECT EV_FEATURE_BACKENDS
78# else 93# else
79# define EV_USE_SELECT 0 94# define EV_USE_SELECT 0
80# endif 95# endif
81# endif 96# endif
82 97
83# ifndef EV_USE_POLL 98# ifndef EV_USE_POLL
84# if HAVE_POLL && HAVE_POLL_H 99# if HAVE_POLL && HAVE_POLL_H
85# define EV_USE_POLL 1 100# define EV_USE_POLL EV_FEATURE_BACKENDS
86# else 101# else
87# define EV_USE_POLL 0 102# define EV_USE_POLL 0
88# endif 103# endif
89# endif 104# endif
90 105
91# ifndef EV_USE_EPOLL 106# ifndef EV_USE_EPOLL
92# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
93# define EV_USE_EPOLL 1 108# define EV_USE_EPOLL EV_FEATURE_BACKENDS
94# else 109# else
95# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
96# endif 111# endif
97# endif 112# endif
98 113
99# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
100# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
101# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
102# else 117# else
103# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
104# endif 119# endif
105# endif 120# endif
106 121
107# ifndef EV_USE_PORT 122# ifndef EV_USE_PORT
108# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
109# define EV_USE_PORT 1 124# define EV_USE_PORT EV_FEATURE_BACKENDS
110# else 125# else
111# define EV_USE_PORT 0 126# define EV_USE_PORT 0
112# endif 127# endif
113# endif 128# endif
114 129
115# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
116# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
117# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY EV_FEATURE_OS
118# else 133# else
119# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
120# endif 135# endif
121# endif 136# endif
122 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
146# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif
152# endif
153
123#endif 154#endif
124 155
125#include <math.h> 156#include <math.h>
126#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
127#include <fcntl.h> 159#include <fcntl.h>
128#include <stddef.h> 160#include <stddef.h>
129 161
130#include <stdio.h> 162#include <stdio.h>
131 163
132#include <assert.h> 164#include <assert.h>
133#include <errno.h> 165#include <errno.h>
134#include <sys/types.h> 166#include <sys/types.h>
135#include <time.h> 167#include <time.h>
168#include <limits.h>
136 169
137#include <signal.h> 170#include <signal.h>
138 171
139#ifdef EV_H 172#ifdef EV_H
140# include EV_H 173# include EV_H
… …
145#ifndef _WIN32 178#ifndef _WIN32
146# include <sys/time.h> 179# include <sys/time.h>
147# include <sys/wait.h> 180# include <sys/wait.h>
148# include <unistd.h> 181# include <unistd.h>
149#else 182#else
183# include <io.h>
150# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
151# include <windows.h> 185# include <windows.h>
152# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
153# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
154# endif 188# endif
189# undef EV_AVOID_STDIO
190#endif
191
192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
219# define EV_NSIG 65
220#endif
221
222#ifndef EV_USE_CLOCK_SYSCALL
223# if __linux && __GLIBC__ >= 2
224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
225# else
226# define EV_USE_CLOCK_SYSCALL 0
155#endif 227# endif
156 228#endif
157/**/
158 229
159#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
232# define EV_USE_MONOTONIC EV_FEATURE_OS
233# else
160# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
235# endif
161#endif 236#endif
162 237
163#ifndef EV_USE_REALTIME 238#ifndef EV_USE_REALTIME
164# define EV_USE_REALTIME 0 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
165#endif 240#endif
166 241
167#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
243# if _POSIX_C_SOURCE >= 199309L
244# define EV_USE_NANOSLEEP EV_FEATURE_OS
245# else
168# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
247# endif
169#endif 248#endif
170 249
171#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
172# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
173#endif 252#endif
174 253
175#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
176# ifdef _WIN32 255# ifdef _WIN32
177# define EV_USE_POLL 0 256# define EV_USE_POLL 0
178# else 257# else
179# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
180# endif 259# endif
181#endif 260#endif
182 261
183#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
265# else
184# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
267# endif
185#endif 268#endif
186 269
187#ifndef EV_USE_KQUEUE 270#ifndef EV_USE_KQUEUE
188# define EV_USE_KQUEUE 0 271# define EV_USE_KQUEUE 0
189#endif 272#endif
… …
191#ifndef EV_USE_PORT 274#ifndef EV_USE_PORT
192# define EV_USE_PORT 0 275# define EV_USE_PORT 0
193#endif 276#endif
194 277
195#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
280# define EV_USE_INOTIFY EV_FEATURE_OS
281# else
196# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
283# endif
197#endif 284#endif
198 285
199#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
200# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
201# define EV_PID_HASHSIZE 1 288#endif
289
290#ifndef EV_INOTIFY_HASHSIZE
291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292#endif
293
294#ifndef EV_USE_EVENTFD
295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
296# define EV_USE_EVENTFD EV_FEATURE_OS
202# else 297# else
203# define EV_PID_HASHSIZE 16 298# define EV_USE_EVENTFD 0
204# endif
205#endif 299# endif
300#endif
206 301
207#ifndef EV_INOTIFY_HASHSIZE 302#ifndef EV_USE_SIGNALFD
208# if EV_MINIMAL 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
209# define EV_INOTIFY_HASHSIZE 1 304# define EV_USE_SIGNALFD EV_FEATURE_OS
210# else 305# else
211# define EV_INOTIFY_HASHSIZE 16 306# define EV_USE_SIGNALFD 0
212# endif
213#endif 307# endif
308#endif
214 309
215/**/ 310#if 0 /* debugging */
311# define EV_VERIFY 3
312# define EV_USE_4HEAP 1
313# define EV_HEAP_CACHE_AT 1
314#endif
315
316#ifndef EV_VERIFY
317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
318#endif
319
320#ifndef EV_USE_4HEAP
321# define EV_USE_4HEAP EV_FEATURE_DATA
322#endif
323
324#ifndef EV_HEAP_CACHE_AT
325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
326#endif
327
328/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
329/* which makes programs even slower. might work on other unices, too. */
330#if EV_USE_CLOCK_SYSCALL
331# include <syscall.h>
332# ifdef SYS_clock_gettime
333# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
334# undef EV_USE_MONOTONIC
335# define EV_USE_MONOTONIC 1
336# else
337# undef EV_USE_CLOCK_SYSCALL
338# define EV_USE_CLOCK_SYSCALL 0
339# endif
340#endif
341
342/* this block fixes any misconfiguration where we know we run into trouble otherwise */
343
344#ifdef _AIX
345/* AIX has a completely broken poll.h header */
346# undef EV_USE_POLL
347# define EV_USE_POLL 0
348#endif
216 349
217#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
218# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
219# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
220#endif 353#endif
… …
234# include <sys/select.h> 367# include <sys/select.h>
235# endif 368# endif
236#endif 369#endif
237 370
238#if EV_USE_INOTIFY 371#if EV_USE_INOTIFY
372# include <sys/utsname.h>
373# include <sys/statfs.h>
239# include <sys/inotify.h> 374# include <sys/inotify.h>
375/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
376# ifndef IN_DONT_FOLLOW
377# undef EV_USE_INOTIFY
378# define EV_USE_INOTIFY 0
379# endif
240#endif 380#endif
241 381
242#if EV_SELECT_IS_WINSOCKET 382#if EV_SELECT_IS_WINSOCKET
243# include <winsock.h> 383# include <winsock.h>
244#endif 384#endif
245 385
386#if EV_USE_EVENTFD
387/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
388# include <stdint.h>
389# ifndef EFD_NONBLOCK
390# define EFD_NONBLOCK O_NONBLOCK
391# endif
392# ifndef EFD_CLOEXEC
393# ifdef O_CLOEXEC
394# define EFD_CLOEXEC O_CLOEXEC
395# else
396# define EFD_CLOEXEC 02000000
397# endif
398# endif
399# ifdef __cplusplus
400extern "C" {
401# endif
402int (eventfd) (unsigned int initval, int flags);
403# ifdef __cplusplus
404}
405# endif
406#endif
407
408#if EV_USE_SIGNALFD
409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h>
411# ifndef SFD_NONBLOCK
412# define SFD_NONBLOCK O_NONBLOCK
413# endif
414# ifndef SFD_CLOEXEC
415# ifdef O_CLOEXEC
416# define SFD_CLOEXEC O_CLOEXEC
417# else
418# define SFD_CLOEXEC 02000000
419# endif
420# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags);
425
426struct signalfd_siginfo
427{
428 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)];
430};
431# ifdef __cplusplus
432}
433# endif
434#endif
435
436
246/**/ 437/**/
438
439#if EV_VERIFY >= 3
440# define EV_FREQUENT_CHECK ev_verify (EV_A)
441#else
442# define EV_FREQUENT_CHECK do { } while (0)
443#endif
247 444
248/* 445/*
249 * This is used to avoid floating point rounding problems. 446 * This is used to avoid floating point rounding problems.
250 * It is added to ev_rt_now when scheduling periodics 447 * It is added to ev_rt_now when scheduling periodics
251 * to ensure progress, time-wise, even when rounding 448 * to ensure progress, time-wise, even when rounding
… …
255 */ 452 */
256#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
257 454
258#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
259#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
260/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
261 457
262#if __GNUC__ >= 4 458#if __GNUC__ >= 4
263# define expect(expr,value) __builtin_expect ((expr),(value)) 459# define expect(expr,value) __builtin_expect ((expr),(value))
264# define noinline __attribute__ ((noinline)) 460# define noinline __attribute__ ((noinline))
265#else 461#else
266# define expect(expr,value) (expr) 462# define expect(expr,value) (expr)
267# define noinline 463# define noinline
268# if __STDC_VERSION__ < 199901L 464# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
269# define inline 465# define inline
270# endif 466# endif
271#endif 467#endif
272 468
273#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
274#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
275#define inline_size static inline 471#define inline_size static inline
276 472
277#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
278# define inline_speed static noinline 476# define inline_speed static noinline
477#endif
478
479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
480
481#if EV_MINPRI == EV_MAXPRI
482# define ABSPRI(w) (((W)w), 0)
279#else 483#else
280# define inline_speed static inline
281#endif
282
283#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
284#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 484# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
485#endif
285 486
286#define EMPTY /* required for microsofts broken pseudo-c compiler */ 487#define EMPTY /* required for microsofts broken pseudo-c compiler */
287#define EMPTY2(a,b) /* used to suppress some warnings */ 488#define EMPTY2(a,b) /* used to suppress some warnings */
288 489
289typedef ev_watcher *W; 490typedef ev_watcher *W;
290typedef ev_watcher_list *WL; 491typedef ev_watcher_list *WL;
291typedef ev_watcher_time *WT; 492typedef ev_watcher_time *WT;
292 493
293#if EV_USE_MONOTONIC 494#define ev_active(w) ((W)(w))->active
495#define ev_at(w) ((WT)(w))->at
496
497#if EV_USE_REALTIME
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 498/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */ 499/* giving it a reasonably high chance of working on typical architetcures */
500static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
501#endif
502
503#if EV_USE_MONOTONIC
296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
505#endif
506
507#ifndef EV_FD_TO_WIN32_HANDLE
508# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
509#endif
510#ifndef EV_WIN32_HANDLE_TO_FD
511# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
512#endif
513#ifndef EV_WIN32_CLOSE_FD
514# define EV_WIN32_CLOSE_FD(fd) close (fd)
297#endif 515#endif
298 516
299#ifdef _WIN32 517#ifdef _WIN32
300# include "ev_win32.c" 518# include "ev_win32.c"
301#endif 519#endif
302 520
303/*****************************************************************************/ 521/*****************************************************************************/
304 522
523#if EV_AVOID_STDIO
524static void noinline
525ev_printerr (const char *msg)
526{
527 write (STDERR_FILENO, msg, strlen (msg));
528}
529#endif
530
305static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
306 532
307void 533void
308ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
309{ 535{
310 syserr_cb = cb; 536 syserr_cb = cb;
311} 537}
312 538
313static void noinline 539static void noinline
314syserr (const char *msg) 540ev_syserr (const char *msg)
315{ 541{
316 if (!msg) 542 if (!msg)
317 msg = "(libev) system error"; 543 msg = "(libev) system error";
318 544
319 if (syserr_cb) 545 if (syserr_cb)
320 syserr_cb (msg); 546 syserr_cb (msg);
321 else 547 else
322 { 548 {
549#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg);
553 ev_printerr (": ");
554 ev_printerr (err);
555 ev_printerr ("\n");
556#else
323 perror (msg); 557 perror (msg);
558#endif
324 abort (); 559 abort ();
325 } 560 }
326} 561}
327 562
563static void *
564ev_realloc_emul (void *ptr, long size)
565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
569 /* some systems, notably openbsd and darwin, fail to properly
570 * implement realloc (x, 0) (as required by both ansi c-89 and
571 * the single unix specification, so work around them here.
572 */
573
574 if (size)
575 return realloc (ptr, size);
576
577 free (ptr);
578 return 0;
579#endif
580}
581
328static void *(*alloc)(void *ptr, long size); 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
329 583
330void 584void
331ev_set_allocator (void *(*cb)(void *ptr, long size)) 585ev_set_allocator (void *(*cb)(void *ptr, long size))
332{ 586{
333 alloc = cb; 587 alloc = cb;
334} 588}
335 589
336inline_speed void * 590inline_speed void *
337ev_realloc (void *ptr, long size) 591ev_realloc (void *ptr, long size)
338{ 592{
339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 593 ptr = alloc (ptr, size);
340 594
341 if (!ptr && size) 595 if (!ptr && size)
342 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
343 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
344 abort (); 602 abort ();
345 } 603 }
346 604
347 return ptr; 605 return ptr;
348} 606}
… …
350#define ev_malloc(size) ev_realloc (0, (size)) 608#define ev_malloc(size) ev_realloc (0, (size))
351#define ev_free(ptr) ev_realloc ((ptr), 0) 609#define ev_free(ptr) ev_realloc ((ptr), 0)
352 610
353/*****************************************************************************/ 611/*****************************************************************************/
354 612
613/* set in reify when reification needed */
614#define EV_ANFD_REIFY 1
615
616/* file descriptor info structure */
355typedef struct 617typedef struct
356{ 618{
357 WL head; 619 WL head;
358 unsigned char events; 620 unsigned char events; /* the events watched for */
621 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
622 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
359 unsigned char reify; 623 unsigned char unused;
624#if EV_USE_EPOLL
625 unsigned int egen; /* generation counter to counter epoll bugs */
626#endif
360#if EV_SELECT_IS_WINSOCKET 627#if EV_SELECT_IS_WINSOCKET
361 SOCKET handle; 628 SOCKET handle;
362#endif 629#endif
363} ANFD; 630} ANFD;
364 631
632/* stores the pending event set for a given watcher */
365typedef struct 633typedef struct
366{ 634{
367 W w; 635 W w;
368 int events; 636 int events; /* the pending event set for the given watcher */
369} ANPENDING; 637} ANPENDING;
370 638
371#if EV_USE_INOTIFY 639#if EV_USE_INOTIFY
640/* hash table entry per inotify-id */
372typedef struct 641typedef struct
373{ 642{
374 WL head; 643 WL head;
375} ANFS; 644} ANFS;
645#endif
646
647/* Heap Entry */
648#if EV_HEAP_CACHE_AT
649 /* a heap element */
650 typedef struct {
651 ev_tstamp at;
652 WT w;
653 } ANHE;
654
655 #define ANHE_w(he) (he).w /* access watcher, read-write */
656 #define ANHE_at(he) (he).at /* access cached at, read-only */
657 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
658#else
659 /* a heap element */
660 typedef WT ANHE;
661
662 #define ANHE_w(he) (he)
663 #define ANHE_at(he) (he)->at
664 #define ANHE_at_cache(he)
376#endif 665#endif
377 666
378#if EV_MULTIPLICITY 667#if EV_MULTIPLICITY
379 668
380 struct ev_loop 669 struct ev_loop
… …
399 688
400 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
401 690
402#endif 691#endif
403 692
693#if EV_FEATURE_API
694# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
695# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
696# define EV_INVOKE_PENDING invoke_cb (EV_A)
697#else
698# define EV_RELEASE_CB (void)0
699# define EV_ACQUIRE_CB (void)0
700# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
701#endif
702
703#define EVUNLOOP_RECURSE 0x80
704
404/*****************************************************************************/ 705/*****************************************************************************/
405 706
707#ifndef EV_HAVE_EV_TIME
406ev_tstamp 708ev_tstamp
407ev_time (void) 709ev_time (void)
408{ 710{
409#if EV_USE_REALTIME 711#if EV_USE_REALTIME
712 if (expect_true (have_realtime))
713 {
410 struct timespec ts; 714 struct timespec ts;
411 clock_gettime (CLOCK_REALTIME, &ts); 715 clock_gettime (CLOCK_REALTIME, &ts);
412 return ts.tv_sec + ts.tv_nsec * 1e-9; 716 return ts.tv_sec + ts.tv_nsec * 1e-9;
413#else 717 }
718#endif
719
414 struct timeval tv; 720 struct timeval tv;
415 gettimeofday (&tv, 0); 721 gettimeofday (&tv, 0);
416 return tv.tv_sec + tv.tv_usec * 1e-6; 722 return tv.tv_sec + tv.tv_usec * 1e-6;
417#endif
418} 723}
724#endif
419 725
420ev_tstamp inline_size 726inline_size ev_tstamp
421get_clock (void) 727get_clock (void)
422{ 728{
423#if EV_USE_MONOTONIC 729#if EV_USE_MONOTONIC
424 if (expect_true (have_monotonic)) 730 if (expect_true (have_monotonic))
425 { 731 {
… …
451 ts.tv_sec = (time_t)delay; 757 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 758 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 759
454 nanosleep (&ts, 0); 760 nanosleep (&ts, 0);
455#elif defined(_WIN32) 761#elif defined(_WIN32)
456 Sleep (delay * 1e3); 762 Sleep ((unsigned long)(delay * 1e3));
457#else 763#else
458 struct timeval tv; 764 struct timeval tv;
459 765
460 tv.tv_sec = (time_t)delay; 766 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
462 768
769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
770 /* something not guaranteed by newer posix versions, but guaranteed */
771 /* by older ones */
463 select (0, 0, 0, 0, &tv); 772 select (0, 0, 0, 0, &tv);
464#endif 773#endif
465 } 774 }
466} 775}
467 776
468/*****************************************************************************/ 777/*****************************************************************************/
469 778
470int inline_size 779#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
780
781/* find a suitable new size for the given array, */
782/* hopefully by rounding to a ncie-to-malloc size */
783inline_size int
471array_nextsize (int elem, int cur, int cnt) 784array_nextsize (int elem, int cur, int cnt)
472{ 785{
473 int ncur = cur + 1; 786 int ncur = cur + 1;
474 787
475 do 788 do
476 ncur <<= 1; 789 ncur <<= 1;
477 while (cnt > ncur); 790 while (cnt > ncur);
478 791
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 792 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096) 793 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
481 { 794 {
482 ncur *= elem; 795 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 796 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
484 ncur = ncur - sizeof (void *) * 4; 797 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem; 798 ncur /= elem;
486 } 799 }
487 800
488 return ncur; 801 return ncur;
… …
492array_realloc (int elem, void *base, int *cur, int cnt) 805array_realloc (int elem, void *base, int *cur, int cnt)
493{ 806{
494 *cur = array_nextsize (elem, *cur, cnt); 807 *cur = array_nextsize (elem, *cur, cnt);
495 return ev_realloc (base, elem * *cur); 808 return ev_realloc (base, elem * *cur);
496} 809}
810
811#define array_init_zero(base,count) \
812 memset ((void *)(base), 0, sizeof (*(base)) * (count))
497 813
498#define array_needsize(type,base,cur,cnt,init) \ 814#define array_needsize(type,base,cur,cnt,init) \
499 if (expect_false ((cnt) > (cur))) \ 815 if (expect_false ((cnt) > (cur))) \
500 { \ 816 { \
501 int ocur_ = (cur); \ 817 int ocur_ = (cur); \
… …
513 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 829 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
514 } 830 }
515#endif 831#endif
516 832
517#define array_free(stem, idx) \ 833#define array_free(stem, idx) \
518 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 834 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
519 835
520/*****************************************************************************/ 836/*****************************************************************************/
837
838/* dummy callback for pending events */
839static void noinline
840pendingcb (EV_P_ ev_prepare *w, int revents)
841{
842}
521 843
522void noinline 844void noinline
523ev_feed_event (EV_P_ void *w, int revents) 845ev_feed_event (EV_P_ void *w, int revents)
524{ 846{
525 W w_ = (W)w; 847 W w_ = (W)w;
… …
534 pendings [pri][w_->pending - 1].w = w_; 856 pendings [pri][w_->pending - 1].w = w_;
535 pendings [pri][w_->pending - 1].events = revents; 857 pendings [pri][w_->pending - 1].events = revents;
536 } 858 }
537} 859}
538 860
539void inline_speed 861inline_speed void
862feed_reverse (EV_P_ W w)
863{
864 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
865 rfeeds [rfeedcnt++] = w;
866}
867
868inline_size void
869feed_reverse_done (EV_P_ int revents)
870{
871 do
872 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
873 while (rfeedcnt);
874}
875
876inline_speed void
540queue_events (EV_P_ W *events, int eventcnt, int type) 877queue_events (EV_P_ W *events, int eventcnt, int type)
541{ 878{
542 int i; 879 int i;
543 880
544 for (i = 0; i < eventcnt; ++i) 881 for (i = 0; i < eventcnt; ++i)
545 ev_feed_event (EV_A_ events [i], type); 882 ev_feed_event (EV_A_ events [i], type);
546} 883}
547 884
548/*****************************************************************************/ 885/*****************************************************************************/
549 886
550void inline_size 887inline_speed void
551anfds_init (ANFD *base, int count)
552{
553 while (count--)
554 {
555 base->head = 0;
556 base->events = EV_NONE;
557 base->reify = 0;
558
559 ++base;
560 }
561}
562
563void inline_speed
564fd_event (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
565{ 889{
566 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
567 ev_io *w; 891 ev_io *w;
568 892
569 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 893 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
573 if (ev) 897 if (ev)
574 ev_feed_event (EV_A_ (W)w, ev); 898 ev_feed_event (EV_A_ (W)w, ev);
575 } 899 }
576} 900}
577 901
902/* do not submit kernel events for fds that have reify set */
903/* because that means they changed while we were polling for new events */
904inline_speed void
905fd_event (EV_P_ int fd, int revents)
906{
907 ANFD *anfd = anfds + fd;
908
909 if (expect_true (!anfd->reify))
910 fd_event_nocheck (EV_A_ fd, revents);
911}
912
578void 913void
579ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
580{ 915{
581 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
582 fd_event (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
583} 918}
584 919
585void inline_size 920/* make sure the external fd watch events are in-sync */
921/* with the kernel/libev internal state */
922inline_size void
586fd_reify (EV_P) 923fd_reify (EV_P)
587{ 924{
588 int i; 925 int i;
589 926
590 for (i = 0; i < fdchangecnt; ++i) 927 for (i = 0; i < fdchangecnt; ++i)
… …
599 events |= (unsigned char)w->events; 936 events |= (unsigned char)w->events;
600 937
601#if EV_SELECT_IS_WINSOCKET 938#if EV_SELECT_IS_WINSOCKET
602 if (events) 939 if (events)
603 { 940 {
604 unsigned long argp; 941 unsigned long arg;
605 #ifdef EV_FD_TO_WIN32_HANDLE
606 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
607 #else
608 anfd->handle = _get_osfhandle (fd);
609 #endif
610 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
611 } 944 }
612#endif 945#endif
613 946
614 { 947 {
615 unsigned char o_events = anfd->events; 948 unsigned char o_events = anfd->events;
616 unsigned char o_reify = anfd->reify; 949 unsigned char o_reify = anfd->reify;
617 950
618 anfd->reify = 0; 951 anfd->reify = 0;
619 anfd->events = events; 952 anfd->events = events;
620 953
621 if (o_events != events || o_reify & EV_IOFDSET) 954 if (o_events != events || o_reify & EV__IOFDSET)
622 backend_modify (EV_A_ fd, o_events, events); 955 backend_modify (EV_A_ fd, o_events, events);
623 } 956 }
624 } 957 }
625 958
626 fdchangecnt = 0; 959 fdchangecnt = 0;
627} 960}
628 961
629void inline_size 962/* something about the given fd changed */
963inline_size void
630fd_change (EV_P_ int fd, int flags) 964fd_change (EV_P_ int fd, int flags)
631{ 965{
632 unsigned char reify = anfds [fd].reify; 966 unsigned char reify = anfds [fd].reify;
633 anfds [fd].reify |= flags; 967 anfds [fd].reify |= flags;
634 968
… …
638 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 972 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
639 fdchanges [fdchangecnt - 1] = fd; 973 fdchanges [fdchangecnt - 1] = fd;
640 } 974 }
641} 975}
642 976
643void inline_speed 977/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
978inline_speed void
644fd_kill (EV_P_ int fd) 979fd_kill (EV_P_ int fd)
645{ 980{
646 ev_io *w; 981 ev_io *w;
647 982
648 while ((w = (ev_io *)anfds [fd].head)) 983 while ((w = (ev_io *)anfds [fd].head))
… …
650 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
651 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 986 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
652 } 987 }
653} 988}
654 989
655int inline_size 990/* check whether the given fd is actually valid, for error recovery */
991inline_size int
656fd_valid (int fd) 992fd_valid (int fd)
657{ 993{
658#ifdef _WIN32 994#ifdef _WIN32
659 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
660#else 996#else
661 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
662#endif 998#endif
663} 999}
664 1000
… …
668{ 1004{
669 int fd; 1005 int fd;
670 1006
671 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
672 if (anfds [fd].events) 1008 if (anfds [fd].events)
673 if (!fd_valid (fd) == -1 && errno == EBADF) 1009 if (!fd_valid (fd) && errno == EBADF)
674 fd_kill (EV_A_ fd); 1010 fd_kill (EV_A_ fd);
675} 1011}
676 1012
677/* called on ENOMEM in select/poll to kill some fds and retry */ 1013/* called on ENOMEM in select/poll to kill some fds and retry */
678static void noinline 1014static void noinline
… …
682 1018
683 for (fd = anfdmax; fd--; ) 1019 for (fd = anfdmax; fd--; )
684 if (anfds [fd].events) 1020 if (anfds [fd].events)
685 { 1021 {
686 fd_kill (EV_A_ fd); 1022 fd_kill (EV_A_ fd);
687 return; 1023 break;
688 } 1024 }
689} 1025}
690 1026
691/* usually called after fork if backend needs to re-arm all fds from scratch */ 1027/* usually called after fork if backend needs to re-arm all fds from scratch */
692static void noinline 1028static void noinline
… …
696 1032
697 for (fd = 0; fd < anfdmax; ++fd) 1033 for (fd = 0; fd < anfdmax; ++fd)
698 if (anfds [fd].events) 1034 if (anfds [fd].events)
699 { 1035 {
700 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
1037 anfds [fd].emask = 0;
701 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
702 } 1039 }
703} 1040}
704 1041
705/*****************************************************************************/ 1042/* used to prepare libev internal fd's */
706 1043/* this is not fork-safe */
707void inline_speed 1044inline_speed void
708upheap (WT *heap, int k)
709{
710 WT w = heap [k];
711
712 while (k)
713 {
714 int p = (k - 1) >> 1;
715
716 if (heap [p]->at <= w->at)
717 break;
718
719 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1;
721 k = p;
722 }
723
724 heap [k] = w;
725 ((W)heap [k])->active = k + 1;
726}
727
728void inline_speed
729downheap (WT *heap, int N, int k)
730{
731 WT w = heap [k];
732
733 for (;;)
734 {
735 int c = (k << 1) + 1;
736
737 if (c >= N)
738 break;
739
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0;
742
743 if (w->at <= heap [c]->at)
744 break;
745
746 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1;
748
749 k = c;
750 }
751
752 heap [k] = w;
753 ((W)heap [k])->active = k + 1;
754}
755
756void inline_size
757adjustheap (WT *heap, int N, int k)
758{
759 upheap (heap, k);
760 downheap (heap, N, k);
761}
762
763/*****************************************************************************/
764
765typedef struct
766{
767 WL head;
768 sig_atomic_t volatile gotsig;
769} ANSIG;
770
771static ANSIG *signals;
772static int signalmax;
773
774static int sigpipe [2];
775static sig_atomic_t volatile gotsig;
776static ev_io sigev;
777
778void inline_size
779signals_init (ANSIG *base, int count)
780{
781 while (count--)
782 {
783 base->head = 0;
784 base->gotsig = 0;
785
786 ++base;
787 }
788}
789
790static void
791sighandler (int signum)
792{
793#if _WIN32
794 signal (signum, sighandler);
795#endif
796
797 signals [signum - 1].gotsig = 1;
798
799 if (!gotsig)
800 {
801 int old_errno = errno;
802 gotsig = 1;
803 write (sigpipe [1], &signum, 1);
804 errno = old_errno;
805 }
806}
807
808void noinline
809ev_feed_signal_event (EV_P_ int signum)
810{
811 WL w;
812
813#if EV_MULTIPLICITY
814 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
815#endif
816
817 --signum;
818
819 if (signum < 0 || signum >= signalmax)
820 return;
821
822 signals [signum].gotsig = 0;
823
824 for (w = signals [signum].head; w; w = w->next)
825 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
826}
827
828static void
829sigcb (EV_P_ ev_io *iow, int revents)
830{
831 int signum;
832
833 read (sigpipe [0], &revents, 1);
834 gotsig = 0;
835
836 for (signum = signalmax; signum--; )
837 if (signals [signum].gotsig)
838 ev_feed_signal_event (EV_A_ signum + 1);
839}
840
841void inline_speed
842fd_intern (int fd) 1045fd_intern (int fd)
843{ 1046{
844#ifdef _WIN32 1047#ifdef _WIN32
845 int arg = 1; 1048 unsigned long arg = 1;
846 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1049 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
847#else 1050#else
848 fcntl (fd, F_SETFD, FD_CLOEXEC); 1051 fcntl (fd, F_SETFD, FD_CLOEXEC);
849 fcntl (fd, F_SETFL, O_NONBLOCK); 1052 fcntl (fd, F_SETFL, O_NONBLOCK);
850#endif 1053#endif
851} 1054}
852 1055
1056/*****************************************************************************/
1057
1058/*
1059 * the heap functions want a real array index. array index 0 uis guaranteed to not
1060 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1061 * the branching factor of the d-tree.
1062 */
1063
1064/*
1065 * at the moment we allow libev the luxury of two heaps,
1066 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
1067 * which is more cache-efficient.
1068 * the difference is about 5% with 50000+ watchers.
1069 */
1070#if EV_USE_4HEAP
1071
1072#define DHEAP 4
1073#define HEAP0 (DHEAP - 1) /* index of first element in heap */
1074#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
1075#define UPHEAP_DONE(p,k) ((p) == (k))
1076
1077/* away from the root */
1078inline_speed void
1079downheap (ANHE *heap, int N, int k)
1080{
1081 ANHE he = heap [k];
1082 ANHE *E = heap + N + HEAP0;
1083
1084 for (;;)
1085 {
1086 ev_tstamp minat;
1087 ANHE *minpos;
1088 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
1089
1090 /* find minimum child */
1091 if (expect_true (pos + DHEAP - 1 < E))
1092 {
1093 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
1094 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
1095 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
1096 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
1097 }
1098 else if (pos < E)
1099 {
1100 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
1101 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
1102 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
1103 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
1104 }
1105 else
1106 break;
1107
1108 if (ANHE_at (he) <= minat)
1109 break;
1110
1111 heap [k] = *minpos;
1112 ev_active (ANHE_w (*minpos)) = k;
1113
1114 k = minpos - heap;
1115 }
1116
1117 heap [k] = he;
1118 ev_active (ANHE_w (he)) = k;
1119}
1120
1121#else /* 4HEAP */
1122
1123#define HEAP0 1
1124#define HPARENT(k) ((k) >> 1)
1125#define UPHEAP_DONE(p,k) (!(p))
1126
1127/* away from the root */
1128inline_speed void
1129downheap (ANHE *heap, int N, int k)
1130{
1131 ANHE he = heap [k];
1132
1133 for (;;)
1134 {
1135 int c = k << 1;
1136
1137 if (c >= N + HEAP0)
1138 break;
1139
1140 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1141 ? 1 : 0;
1142
1143 if (ANHE_at (he) <= ANHE_at (heap [c]))
1144 break;
1145
1146 heap [k] = heap [c];
1147 ev_active (ANHE_w (heap [k])) = k;
1148
1149 k = c;
1150 }
1151
1152 heap [k] = he;
1153 ev_active (ANHE_w (he)) = k;
1154}
1155#endif
1156
1157/* towards the root */
1158inline_speed void
1159upheap (ANHE *heap, int k)
1160{
1161 ANHE he = heap [k];
1162
1163 for (;;)
1164 {
1165 int p = HPARENT (k);
1166
1167 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
1168 break;
1169
1170 heap [k] = heap [p];
1171 ev_active (ANHE_w (heap [k])) = k;
1172 k = p;
1173 }
1174
1175 heap [k] = he;
1176 ev_active (ANHE_w (he)) = k;
1177}
1178
1179/* move an element suitably so it is in a correct place */
1180inline_size void
1181adjustheap (ANHE *heap, int N, int k)
1182{
1183 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1184 upheap (heap, k);
1185 else
1186 downheap (heap, N, k);
1187}
1188
1189/* rebuild the heap: this function is used only once and executed rarely */
1190inline_size void
1191reheap (ANHE *heap, int N)
1192{
1193 int i;
1194
1195 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
1196 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
1197 for (i = 0; i < N; ++i)
1198 upheap (heap, i + HEAP0);
1199}
1200
1201/*****************************************************************************/
1202
1203/* associate signal watchers to a signal signal */
1204typedef struct
1205{
1206 EV_ATOMIC_T pending;
1207#if EV_MULTIPLICITY
1208 EV_P;
1209#endif
1210 WL head;
1211} ANSIG;
1212
1213static ANSIG signals [EV_NSIG - 1];
1214
1215/*****************************************************************************/
1216
1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1218
853static void noinline 1219static void noinline
854siginit (EV_P) 1220evpipe_init (EV_P)
855{ 1221{
1222 if (!ev_is_active (&pipe_w))
1223 {
1224# if EV_USE_EVENTFD
1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1226 if (evfd < 0 && errno == EINVAL)
1227 evfd = eventfd (0, 0);
1228
1229 if (evfd >= 0)
1230 {
1231 evpipe [0] = -1;
1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1233 ev_io_set (&pipe_w, evfd, EV_READ);
1234 }
1235 else
1236# endif
1237 {
1238 while (pipe (evpipe))
1239 ev_syserr ("(libev) error creating signal/async pipe");
1240
856 fd_intern (sigpipe [0]); 1241 fd_intern (evpipe [0]);
857 fd_intern (sigpipe [1]); 1242 fd_intern (evpipe [1]);
1243 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1244 }
858 1245
859 ev_io_set (&sigev, sigpipe [0], EV_READ);
860 ev_io_start (EV_A_ &sigev); 1246 ev_io_start (EV_A_ &pipe_w);
861 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1247 ev_unref (EV_A); /* watcher should not keep loop alive */
1248 }
1249}
1250
1251inline_size void
1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1253{
1254 if (!*flag)
1255 {
1256 int old_errno = errno; /* save errno because write might clobber it */
1257 char dummy;
1258
1259 *flag = 1;
1260
1261#if EV_USE_EVENTFD
1262 if (evfd >= 0)
1263 {
1264 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t));
1266 }
1267 else
1268#endif
1269 write (evpipe [1], &dummy, 1);
1270
1271 errno = old_errno;
1272 }
1273}
1274
1275/* called whenever the libev signal pipe */
1276/* got some events (signal, async) */
1277static void
1278pipecb (EV_P_ ev_io *iow, int revents)
1279{
1280 int i;
1281
1282#if EV_USE_EVENTFD
1283 if (evfd >= 0)
1284 {
1285 uint64_t counter;
1286 read (evfd, &counter, sizeof (uint64_t));
1287 }
1288 else
1289#endif
1290 {
1291 char dummy;
1292 read (evpipe [0], &dummy, 1);
1293 }
1294
1295 if (sig_pending)
1296 {
1297 sig_pending = 0;
1298
1299 for (i = EV_NSIG - 1; i--; )
1300 if (expect_false (signals [i].pending))
1301 ev_feed_signal_event (EV_A_ i + 1);
1302 }
1303
1304#if EV_ASYNC_ENABLE
1305 if (async_pending)
1306 {
1307 async_pending = 0;
1308
1309 for (i = asynccnt; i--; )
1310 if (asyncs [i]->sent)
1311 {
1312 asyncs [i]->sent = 0;
1313 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1314 }
1315 }
1316#endif
862} 1317}
863 1318
864/*****************************************************************************/ 1319/*****************************************************************************/
865 1320
1321static void
1322ev_sighandler (int signum)
1323{
1324#if EV_MULTIPLICITY
1325 EV_P = signals [signum - 1].loop;
1326#endif
1327
1328#ifdef _WIN32
1329 signal (signum, ev_sighandler);
1330#endif
1331
1332 signals [signum - 1].pending = 1;
1333 evpipe_write (EV_A_ &sig_pending);
1334}
1335
1336void noinline
1337ev_feed_signal_event (EV_P_ int signum)
1338{
1339 WL w;
1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1346#if EV_MULTIPLICITY
1347 /* it is permissible to try to feed a signal to the wrong loop */
1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1349
1350 if (expect_false (signals [signum].loop != EV_A))
1351 return;
1352#endif
1353
1354 signals [signum].pending = 0;
1355
1356 for (w = signals [signum].head; w; w = w->next)
1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1358}
1359
1360#if EV_USE_SIGNALFD
1361static void
1362sigfdcb (EV_P_ ev_io *iow, int revents)
1363{
1364 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1365
1366 for (;;)
1367 {
1368 ssize_t res = read (sigfd, si, sizeof (si));
1369
1370 /* not ISO-C, as res might be -1, but works with SuS */
1371 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1372 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1373
1374 if (res < (ssize_t)sizeof (si))
1375 break;
1376 }
1377}
1378#endif
1379
1380#endif
1381
1382/*****************************************************************************/
1383
1384#if EV_CHILD_ENABLE
866static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
867 1386
868#ifndef _WIN32
869
870static ev_signal childev; 1387static ev_signal childev;
871 1388
872void inline_speed 1389#ifndef WIFCONTINUED
1390# define WIFCONTINUED(status) 0
1391#endif
1392
1393/* handle a single child status event */
1394inline_speed void
873child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
874{ 1396{
875 ev_child *w; 1397 ev_child *w;
1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
876 1399
877 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1400 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1401 {
878 if (w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1403 && (!traced || (w->flags & 1)))
879 { 1404 {
880 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1405 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
881 w->rpid = pid; 1406 w->rpid = pid;
882 w->rstatus = status; 1407 w->rstatus = status;
883 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1408 ev_feed_event (EV_A_ (W)w, EV_CHILD);
884 } 1409 }
1410 }
885} 1411}
886 1412
887#ifndef WCONTINUED 1413#ifndef WCONTINUED
888# define WCONTINUED 0 1414# define WCONTINUED 0
889#endif 1415#endif
890 1416
1417/* called on sigchld etc., calls waitpid */
891static void 1418static void
892childcb (EV_P_ ev_signal *sw, int revents) 1419childcb (EV_P_ ev_signal *sw, int revents)
893{ 1420{
894 int pid, status; 1421 int pid, status;
895 1422
… …
898 if (!WCONTINUED 1425 if (!WCONTINUED
899 || errno != EINVAL 1426 || errno != EINVAL
900 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1427 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
901 return; 1428 return;
902 1429
903 /* make sure we are called again until all childs have been reaped */ 1430 /* make sure we are called again until all children have been reaped */
904 /* we need to do it this way so that the callback gets called before we continue */ 1431 /* we need to do it this way so that the callback gets called before we continue */
905 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
906 1433
907 child_reap (EV_A_ sw, pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
908 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
909 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1436 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
910} 1437}
911 1438
912#endif 1439#endif
913 1440
914/*****************************************************************************/ 1441/*****************************************************************************/
… …
976 /* kqueue is borked on everything but netbsd apparently */ 1503 /* kqueue is borked on everything but netbsd apparently */
977 /* it usually doesn't work correctly on anything but sockets and pipes */ 1504 /* it usually doesn't work correctly on anything but sockets and pipes */
978 flags &= ~EVBACKEND_KQUEUE; 1505 flags &= ~EVBACKEND_KQUEUE;
979#endif 1506#endif
980#ifdef __APPLE__ 1507#ifdef __APPLE__
981 // flags &= ~EVBACKEND_KQUEUE; for documentation 1508 /* only select works correctly on that "unix-certified" platform */
982 flags &= ~EVBACKEND_POLL; 1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1510 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1511#endif
1512#ifdef __FreeBSD__
1513 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
983#endif 1514#endif
984 1515
985 return flags; 1516 return flags;
986} 1517}
987 1518
… …
1001ev_backend (EV_P) 1532ev_backend (EV_P)
1002{ 1533{
1003 return backend; 1534 return backend;
1004} 1535}
1005 1536
1537#if EV_FEATURE_API
1006unsigned int 1538unsigned int
1007ev_loop_count (EV_P) 1539ev_iteration (EV_P)
1008{ 1540{
1009 return loop_count; 1541 return loop_count;
1010} 1542}
1011 1543
1544unsigned int
1545ev_depth (EV_P)
1546{
1547 return loop_depth;
1548}
1549
1012void 1550void
1013ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1551ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1014{ 1552{
1015 io_blocktime = interval; 1553 io_blocktime = interval;
1016} 1554}
… …
1019ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1557ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1020{ 1558{
1021 timeout_blocktime = interval; 1559 timeout_blocktime = interval;
1022} 1560}
1023 1561
1562void
1563ev_set_userdata (EV_P_ void *data)
1564{
1565 userdata = data;
1566}
1567
1568void *
1569ev_userdata (EV_P)
1570{
1571 return userdata;
1572}
1573
1574void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1575{
1576 invoke_cb = invoke_pending_cb;
1577}
1578
1579void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1580{
1581 release_cb = release;
1582 acquire_cb = acquire;
1583}
1584#endif
1585
1586/* initialise a loop structure, must be zero-initialised */
1024static void noinline 1587static void noinline
1025loop_init (EV_P_ unsigned int flags) 1588loop_init (EV_P_ unsigned int flags)
1026{ 1589{
1027 if (!backend) 1590 if (!backend)
1028 { 1591 {
1592#if EV_USE_REALTIME
1593 if (!have_realtime)
1594 {
1595 struct timespec ts;
1596
1597 if (!clock_gettime (CLOCK_REALTIME, &ts))
1598 have_realtime = 1;
1599 }
1600#endif
1601
1029#if EV_USE_MONOTONIC 1602#if EV_USE_MONOTONIC
1603 if (!have_monotonic)
1030 { 1604 {
1031 struct timespec ts; 1605 struct timespec ts;
1606
1032 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1607 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1033 have_monotonic = 1; 1608 have_monotonic = 1;
1034 } 1609 }
1035#endif 1610#endif
1036
1037 ev_rt_now = ev_time ();
1038 mn_now = get_clock ();
1039 now_floor = mn_now;
1040 rtmn_diff = ev_rt_now - mn_now;
1041
1042 io_blocktime = 0.;
1043 timeout_blocktime = 0.;
1044 1611
1045 /* pid check not overridable via env */ 1612 /* pid check not overridable via env */
1046#ifndef _WIN32 1613#ifndef _WIN32
1047 if (flags & EVFLAG_FORKCHECK) 1614 if (flags & EVFLAG_FORKCHECK)
1048 curpid = getpid (); 1615 curpid = getpid ();
… …
1051 if (!(flags & EVFLAG_NOENV) 1618 if (!(flags & EVFLAG_NOENV)
1052 && !enable_secure () 1619 && !enable_secure ()
1053 && getenv ("LIBEV_FLAGS")) 1620 && getenv ("LIBEV_FLAGS"))
1054 flags = atoi (getenv ("LIBEV_FLAGS")); 1621 flags = atoi (getenv ("LIBEV_FLAGS"));
1055 1622
1623 ev_rt_now = ev_time ();
1624 mn_now = get_clock ();
1625 now_floor = mn_now;
1626 rtmn_diff = ev_rt_now - mn_now;
1627#if EV_FEATURE_API
1628 invoke_cb = ev_invoke_pending;
1629#endif
1630
1631 io_blocktime = 0.;
1632 timeout_blocktime = 0.;
1633 backend = 0;
1634 backend_fd = -1;
1635 sig_pending = 0;
1636#if EV_ASYNC_ENABLE
1637 async_pending = 0;
1638#endif
1639#if EV_USE_INOTIFY
1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1641#endif
1642#if EV_USE_SIGNALFD
1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1644#endif
1645
1056 if (!(flags & 0x0000ffffUL)) 1646 if (!(flags & 0x0000ffffU))
1057 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1058
1059 backend = 0;
1060 backend_fd = -1;
1061#if EV_USE_INOTIFY
1062 fs_fd = -2;
1063#endif
1064 1648
1065#if EV_USE_PORT 1649#if EV_USE_PORT
1066 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1650 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1067#endif 1651#endif
1068#if EV_USE_KQUEUE 1652#if EV_USE_KQUEUE
… …
1076#endif 1660#endif
1077#if EV_USE_SELECT 1661#if EV_USE_SELECT
1078 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1662 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1079#endif 1663#endif
1080 1664
1665 ev_prepare_init (&pending_w, pendingcb);
1666
1667#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1081 ev_init (&sigev, sigcb); 1668 ev_init (&pipe_w, pipecb);
1082 ev_set_priority (&sigev, EV_MAXPRI); 1669 ev_set_priority (&pipe_w, EV_MAXPRI);
1670#endif
1083 } 1671 }
1084} 1672}
1085 1673
1674/* free up a loop structure */
1086static void noinline 1675static void noinline
1087loop_destroy (EV_P) 1676loop_destroy (EV_P)
1088{ 1677{
1089 int i; 1678 int i;
1679
1680 if (ev_is_active (&pipe_w))
1681 {
1682 /*ev_ref (EV_A);*/
1683 /*ev_io_stop (EV_A_ &pipe_w);*/
1684
1685#if EV_USE_EVENTFD
1686 if (evfd >= 0)
1687 close (evfd);
1688#endif
1689
1690 if (evpipe [0] >= 0)
1691 {
1692 EV_WIN32_CLOSE_FD (evpipe [0]);
1693 EV_WIN32_CLOSE_FD (evpipe [1]);
1694 }
1695 }
1696
1697#if EV_USE_SIGNALFD
1698 if (ev_is_active (&sigfd_w))
1699 close (sigfd);
1700#endif
1090 1701
1091#if EV_USE_INOTIFY 1702#if EV_USE_INOTIFY
1092 if (fs_fd >= 0) 1703 if (fs_fd >= 0)
1093 close (fs_fd); 1704 close (fs_fd);
1094#endif 1705#endif
… …
1118#if EV_IDLE_ENABLE 1729#if EV_IDLE_ENABLE
1119 array_free (idle, [i]); 1730 array_free (idle, [i]);
1120#endif 1731#endif
1121 } 1732 }
1122 1733
1123 ev_free (anfds); anfdmax = 0; 1734 ev_free (anfds); anfds = 0; anfdmax = 0;
1124 1735
1125 /* have to use the microsoft-never-gets-it-right macro */ 1736 /* have to use the microsoft-never-gets-it-right macro */
1737 array_free (rfeed, EMPTY);
1126 array_free (fdchange, EMPTY); 1738 array_free (fdchange, EMPTY);
1127 array_free (timer, EMPTY); 1739 array_free (timer, EMPTY);
1128#if EV_PERIODIC_ENABLE 1740#if EV_PERIODIC_ENABLE
1129 array_free (periodic, EMPTY); 1741 array_free (periodic, EMPTY);
1130#endif 1742#endif
1131#if EV_FORK_ENABLE 1743#if EV_FORK_ENABLE
1132 array_free (fork, EMPTY); 1744 array_free (fork, EMPTY);
1133#endif 1745#endif
1134 array_free (prepare, EMPTY); 1746 array_free (prepare, EMPTY);
1135 array_free (check, EMPTY); 1747 array_free (check, EMPTY);
1748#if EV_ASYNC_ENABLE
1749 array_free (async, EMPTY);
1750#endif
1136 1751
1137 backend = 0; 1752 backend = 0;
1138} 1753}
1139 1754
1755#if EV_USE_INOTIFY
1140void inline_size infy_fork (EV_P); 1756inline_size void infy_fork (EV_P);
1757#endif
1141 1758
1142void inline_size 1759inline_size void
1143loop_fork (EV_P) 1760loop_fork (EV_P)
1144{ 1761{
1145#if EV_USE_PORT 1762#if EV_USE_PORT
1146 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1763 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1147#endif 1764#endif
… …
1153#endif 1770#endif
1154#if EV_USE_INOTIFY 1771#if EV_USE_INOTIFY
1155 infy_fork (EV_A); 1772 infy_fork (EV_A);
1156#endif 1773#endif
1157 1774
1158 if (ev_is_active (&sigev)) 1775 if (ev_is_active (&pipe_w))
1159 { 1776 {
1160 /* default loop */ 1777 /* this "locks" the handlers against writing to the pipe */
1778 /* while we modify the fd vars */
1779 sig_pending = 1;
1780#if EV_ASYNC_ENABLE
1781 async_pending = 1;
1782#endif
1161 1783
1162 ev_ref (EV_A); 1784 ev_ref (EV_A);
1163 ev_io_stop (EV_A_ &sigev); 1785 ev_io_stop (EV_A_ &pipe_w);
1164 close (sigpipe [0]);
1165 close (sigpipe [1]);
1166 1786
1167 while (pipe (sigpipe)) 1787#if EV_USE_EVENTFD
1168 syserr ("(libev) error creating pipe"); 1788 if (evfd >= 0)
1789 close (evfd);
1790#endif
1169 1791
1792 if (evpipe [0] >= 0)
1793 {
1794 EV_WIN32_CLOSE_FD (evpipe [0]);
1795 EV_WIN32_CLOSE_FD (evpipe [1]);
1796 }
1797
1798#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1170 siginit (EV_A); 1799 evpipe_init (EV_A);
1800 /* now iterate over everything, in case we missed something */
1801 pipecb (EV_A_ &pipe_w, EV_READ);
1802#endif
1171 } 1803 }
1172 1804
1173 postfork = 0; 1805 postfork = 0;
1174} 1806}
1175 1807
1176#if EV_MULTIPLICITY 1808#if EV_MULTIPLICITY
1809
1177struct ev_loop * 1810struct ev_loop *
1178ev_loop_new (unsigned int flags) 1811ev_loop_new (unsigned int flags)
1179{ 1812{
1180 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1813 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1181 1814
1182 memset (loop, 0, sizeof (struct ev_loop)); 1815 memset (EV_A, 0, sizeof (struct ev_loop));
1183
1184 loop_init (EV_A_ flags); 1816 loop_init (EV_A_ flags);
1185 1817
1186 if (ev_backend (EV_A)) 1818 if (ev_backend (EV_A))
1187 return loop; 1819 return EV_A;
1188 1820
1189 return 0; 1821 return 0;
1190} 1822}
1191 1823
1192void 1824void
… …
1197} 1829}
1198 1830
1199void 1831void
1200ev_loop_fork (EV_P) 1832ev_loop_fork (EV_P)
1201{ 1833{
1202 postfork = 1; 1834 postfork = 1; /* must be in line with ev_default_fork */
1203} 1835}
1836#endif /* multiplicity */
1204 1837
1838#if EV_VERIFY
1839static void noinline
1840verify_watcher (EV_P_ W w)
1841{
1842 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1843
1844 if (w->pending)
1845 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1846}
1847
1848static void noinline
1849verify_heap (EV_P_ ANHE *heap, int N)
1850{
1851 int i;
1852
1853 for (i = HEAP0; i < N + HEAP0; ++i)
1854 {
1855 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1856 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1857 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1858
1859 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1860 }
1861}
1862
1863static void noinline
1864array_verify (EV_P_ W *ws, int cnt)
1865{
1866 while (cnt--)
1867 {
1868 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1869 verify_watcher (EV_A_ ws [cnt]);
1870 }
1871}
1872#endif
1873
1874#if EV_FEATURE_API
1875void
1876ev_verify (EV_P)
1877{
1878#if EV_VERIFY
1879 int i;
1880 WL w;
1881
1882 assert (activecnt >= -1);
1883
1884 assert (fdchangemax >= fdchangecnt);
1885 for (i = 0; i < fdchangecnt; ++i)
1886 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1887
1888 assert (anfdmax >= 0);
1889 for (i = 0; i < anfdmax; ++i)
1890 for (w = anfds [i].head; w; w = w->next)
1891 {
1892 verify_watcher (EV_A_ (W)w);
1893 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1894 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1895 }
1896
1897 assert (timermax >= timercnt);
1898 verify_heap (EV_A_ timers, timercnt);
1899
1900#if EV_PERIODIC_ENABLE
1901 assert (periodicmax >= periodiccnt);
1902 verify_heap (EV_A_ periodics, periodiccnt);
1903#endif
1904
1905 for (i = NUMPRI; i--; )
1906 {
1907 assert (pendingmax [i] >= pendingcnt [i]);
1908#if EV_IDLE_ENABLE
1909 assert (idleall >= 0);
1910 assert (idlemax [i] >= idlecnt [i]);
1911 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1912#endif
1913 }
1914
1915#if EV_FORK_ENABLE
1916 assert (forkmax >= forkcnt);
1917 array_verify (EV_A_ (W *)forks, forkcnt);
1918#endif
1919
1920#if EV_ASYNC_ENABLE
1921 assert (asyncmax >= asynccnt);
1922 array_verify (EV_A_ (W *)asyncs, asynccnt);
1923#endif
1924
1925#if EV_PREPARE_ENABLE
1926 assert (preparemax >= preparecnt);
1927 array_verify (EV_A_ (W *)prepares, preparecnt);
1928#endif
1929
1930#if EV_CHECK_ENABLE
1931 assert (checkmax >= checkcnt);
1932 array_verify (EV_A_ (W *)checks, checkcnt);
1933#endif
1934
1935# if 0
1936#if EV_CHILD_ENABLE
1937 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1938 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1939#endif
1940# endif
1941#endif
1942}
1205#endif 1943#endif
1206 1944
1207#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1208struct ev_loop * 1946struct ev_loop *
1209ev_default_loop_init (unsigned int flags) 1947ev_default_loop_init (unsigned int flags)
1210#else 1948#else
1211int 1949int
1212ev_default_loop (unsigned int flags) 1950ev_default_loop (unsigned int flags)
1213#endif 1951#endif
1214{ 1952{
1215 if (sigpipe [0] == sigpipe [1])
1216 if (pipe (sigpipe))
1217 return 0;
1218
1219 if (!ev_default_loop_ptr) 1953 if (!ev_default_loop_ptr)
1220 { 1954 {
1221#if EV_MULTIPLICITY 1955#if EV_MULTIPLICITY
1222 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1956 EV_P = ev_default_loop_ptr = &default_loop_struct;
1223#else 1957#else
1224 ev_default_loop_ptr = 1; 1958 ev_default_loop_ptr = 1;
1225#endif 1959#endif
1226 1960
1227 loop_init (EV_A_ flags); 1961 loop_init (EV_A_ flags);
1228 1962
1229 if (ev_backend (EV_A)) 1963 if (ev_backend (EV_A))
1230 { 1964 {
1231 siginit (EV_A); 1965#if EV_CHILD_ENABLE
1232
1233#ifndef _WIN32
1234 ev_signal_init (&childev, childcb, SIGCHLD); 1966 ev_signal_init (&childev, childcb, SIGCHLD);
1235 ev_set_priority (&childev, EV_MAXPRI); 1967 ev_set_priority (&childev, EV_MAXPRI);
1236 ev_signal_start (EV_A_ &childev); 1968 ev_signal_start (EV_A_ &childev);
1237 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1969 ev_unref (EV_A); /* child watcher should not keep loop alive */
1238#endif 1970#endif
… …
1246 1978
1247void 1979void
1248ev_default_destroy (void) 1980ev_default_destroy (void)
1249{ 1981{
1250#if EV_MULTIPLICITY 1982#if EV_MULTIPLICITY
1251 struct ev_loop *loop = ev_default_loop_ptr; 1983 EV_P = ev_default_loop_ptr;
1252#endif 1984#endif
1253 1985
1254#ifndef _WIN32 1986 ev_default_loop_ptr = 0;
1987
1988#if EV_CHILD_ENABLE
1255 ev_ref (EV_A); /* child watcher */ 1989 ev_ref (EV_A); /* child watcher */
1256 ev_signal_stop (EV_A_ &childev); 1990 ev_signal_stop (EV_A_ &childev);
1257#endif 1991#endif
1258 1992
1259 ev_ref (EV_A); /* signal watcher */
1260 ev_io_stop (EV_A_ &sigev);
1261
1262 close (sigpipe [0]); sigpipe [0] = 0;
1263 close (sigpipe [1]); sigpipe [1] = 0;
1264
1265 loop_destroy (EV_A); 1993 loop_destroy (EV_A);
1266} 1994}
1267 1995
1268void 1996void
1269ev_default_fork (void) 1997ev_default_fork (void)
1270{ 1998{
1271#if EV_MULTIPLICITY 1999#if EV_MULTIPLICITY
1272 struct ev_loop *loop = ev_default_loop_ptr; 2000 EV_P = ev_default_loop_ptr;
1273#endif 2001#endif
1274 2002
1275 if (backend) 2003 postfork = 1; /* must be in line with ev_loop_fork */
1276 postfork = 1;
1277} 2004}
1278 2005
1279/*****************************************************************************/ 2006/*****************************************************************************/
1280 2007
1281void 2008void
1282ev_invoke (EV_P_ void *w, int revents) 2009ev_invoke (EV_P_ void *w, int revents)
1283{ 2010{
1284 EV_CB_INVOKE ((W)w, revents); 2011 EV_CB_INVOKE ((W)w, revents);
1285} 2012}
1286 2013
1287void inline_speed 2014unsigned int
1288call_pending (EV_P) 2015ev_pending_count (EV_P)
2016{
2017 int pri;
2018 unsigned int count = 0;
2019
2020 for (pri = NUMPRI; pri--; )
2021 count += pendingcnt [pri];
2022
2023 return count;
2024}
2025
2026void noinline
2027ev_invoke_pending (EV_P)
1289{ 2028{
1290 int pri; 2029 int pri;
1291 2030
1292 for (pri = NUMPRI; pri--; ) 2031 for (pri = NUMPRI; pri--; )
1293 while (pendingcnt [pri]) 2032 while (pendingcnt [pri])
1294 { 2033 {
1295 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2034 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1296 2035
1297 if (expect_true (p->w))
1298 {
1299 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 2036 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2037 /* ^ this is no longer true, as pending_w could be here */
1300 2038
1301 p->w->pending = 0; 2039 p->w->pending = 0;
1302 EV_CB_INVOKE (p->w, p->events); 2040 EV_CB_INVOKE (p->w, p->events);
1303 } 2041 EV_FREQUENT_CHECK;
1304 } 2042 }
1305} 2043}
1306 2044
1307void inline_size
1308timers_reify (EV_P)
1309{
1310 while (timercnt && ((WT)timers [0])->at <= mn_now)
1311 {
1312 ev_timer *w = (ev_timer *)timers [0];
1313
1314 assert (("inactive timer on timer heap detected", ev_is_active (w)));
1315
1316 /* first reschedule or stop timer */
1317 if (w->repeat)
1318 {
1319 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1320
1321 ((WT)w)->at += w->repeat;
1322 if (((WT)w)->at < mn_now)
1323 ((WT)w)->at = mn_now;
1324
1325 downheap (timers, timercnt, 0);
1326 }
1327 else
1328 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1329
1330 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1331 }
1332}
1333
1334#if EV_PERIODIC_ENABLE
1335void inline_size
1336periodics_reify (EV_P)
1337{
1338 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1339 {
1340 ev_periodic *w = (ev_periodic *)periodics [0];
1341
1342 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1343
1344 /* first reschedule or stop timer */
1345 if (w->reschedule_cb)
1346 {
1347 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1348 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1349 downheap (periodics, periodiccnt, 0);
1350 }
1351 else if (w->interval)
1352 {
1353 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1354 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1355 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1356 downheap (periodics, periodiccnt, 0);
1357 }
1358 else
1359 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1360
1361 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1362 }
1363}
1364
1365static void noinline
1366periodics_reschedule (EV_P)
1367{
1368 int i;
1369
1370 /* adjust periodics after time jump */
1371 for (i = 0; i < periodiccnt; ++i)
1372 {
1373 ev_periodic *w = (ev_periodic *)periodics [i];
1374
1375 if (w->reschedule_cb)
1376 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1377 else if (w->interval)
1378 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1379 }
1380
1381 /* now rebuild the heap */
1382 for (i = periodiccnt >> 1; i--; )
1383 downheap (periodics, periodiccnt, i);
1384}
1385#endif
1386
1387#if EV_IDLE_ENABLE 2045#if EV_IDLE_ENABLE
1388void inline_size 2046/* make idle watchers pending. this handles the "call-idle */
2047/* only when higher priorities are idle" logic */
2048inline_size void
1389idle_reify (EV_P) 2049idle_reify (EV_P)
1390{ 2050{
1391 if (expect_false (idleall)) 2051 if (expect_false (idleall))
1392 { 2052 {
1393 int pri; 2053 int pri;
… …
1405 } 2065 }
1406 } 2066 }
1407} 2067}
1408#endif 2068#endif
1409 2069
1410void inline_speed 2070/* make timers pending */
2071inline_size void
2072timers_reify (EV_P)
2073{
2074 EV_FREQUENT_CHECK;
2075
2076 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
2077 {
2078 do
2079 {
2080 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2081
2082 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2083
2084 /* first reschedule or stop timer */
2085 if (w->repeat)
2086 {
2087 ev_at (w) += w->repeat;
2088 if (ev_at (w) < mn_now)
2089 ev_at (w) = mn_now;
2090
2091 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
2092
2093 ANHE_at_cache (timers [HEAP0]);
2094 downheap (timers, timercnt, HEAP0);
2095 }
2096 else
2097 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2098
2099 EV_FREQUENT_CHECK;
2100 feed_reverse (EV_A_ (W)w);
2101 }
2102 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2103
2104 feed_reverse_done (EV_A_ EV_TIMER);
2105 }
2106}
2107
2108#if EV_PERIODIC_ENABLE
2109/* make periodics pending */
2110inline_size void
2111periodics_reify (EV_P)
2112{
2113 EV_FREQUENT_CHECK;
2114
2115 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2116 {
2117 int feed_count = 0;
2118
2119 do
2120 {
2121 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2122
2123 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2124
2125 /* first reschedule or stop timer */
2126 if (w->reschedule_cb)
2127 {
2128 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2129
2130 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
2131
2132 ANHE_at_cache (periodics [HEAP0]);
2133 downheap (periodics, periodiccnt, HEAP0);
2134 }
2135 else if (w->interval)
2136 {
2137 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2138 /* if next trigger time is not sufficiently in the future, put it there */
2139 /* this might happen because of floating point inexactness */
2140 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2141 {
2142 ev_at (w) += w->interval;
2143
2144 /* if interval is unreasonably low we might still have a time in the past */
2145 /* so correct this. this will make the periodic very inexact, but the user */
2146 /* has effectively asked to get triggered more often than possible */
2147 if (ev_at (w) < ev_rt_now)
2148 ev_at (w) = ev_rt_now;
2149 }
2150
2151 ANHE_at_cache (periodics [HEAP0]);
2152 downheap (periodics, periodiccnt, HEAP0);
2153 }
2154 else
2155 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2156
2157 EV_FREQUENT_CHECK;
2158 feed_reverse (EV_A_ (W)w);
2159 }
2160 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
2161
2162 feed_reverse_done (EV_A_ EV_PERIODIC);
2163 }
2164}
2165
2166/* simply recalculate all periodics */
2167/* TODO: maybe ensure that at leats one event happens when jumping forward? */
2168static void noinline
2169periodics_reschedule (EV_P)
2170{
2171 int i;
2172
2173 /* adjust periodics after time jump */
2174 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
2175 {
2176 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2177
2178 if (w->reschedule_cb)
2179 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2180 else if (w->interval)
2181 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2182
2183 ANHE_at_cache (periodics [i]);
2184 }
2185
2186 reheap (periodics, periodiccnt);
2187}
2188#endif
2189
2190/* adjust all timers by a given offset */
2191static void noinline
2192timers_reschedule (EV_P_ ev_tstamp adjust)
2193{
2194 int i;
2195
2196 for (i = 0; i < timercnt; ++i)
2197 {
2198 ANHE *he = timers + i + HEAP0;
2199 ANHE_w (*he)->at += adjust;
2200 ANHE_at_cache (*he);
2201 }
2202}
2203
2204/* fetch new monotonic and realtime times from the kernel */
2205/* also detect if there was a timejump, and act accordingly */
2206inline_speed void
1411time_update (EV_P_ ev_tstamp max_block) 2207time_update (EV_P_ ev_tstamp max_block)
1412{ 2208{
1413 int i;
1414
1415#if EV_USE_MONOTONIC 2209#if EV_USE_MONOTONIC
1416 if (expect_true (have_monotonic)) 2210 if (expect_true (have_monotonic))
1417 { 2211 {
2212 int i;
1418 ev_tstamp odiff = rtmn_diff; 2213 ev_tstamp odiff = rtmn_diff;
1419 2214
1420 mn_now = get_clock (); 2215 mn_now = get_clock ();
1421 2216
1422 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2217 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1440 */ 2235 */
1441 for (i = 4; --i; ) 2236 for (i = 4; --i; )
1442 { 2237 {
1443 rtmn_diff = ev_rt_now - mn_now; 2238 rtmn_diff = ev_rt_now - mn_now;
1444 2239
1445 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 2240 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1446 return; /* all is well */ 2241 return; /* all is well */
1447 2242
1448 ev_rt_now = ev_time (); 2243 ev_rt_now = ev_time ();
1449 mn_now = get_clock (); 2244 mn_now = get_clock ();
1450 now_floor = mn_now; 2245 now_floor = mn_now;
1451 } 2246 }
1452 2247
2248 /* no timer adjustment, as the monotonic clock doesn't jump */
2249 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1453# if EV_PERIODIC_ENABLE 2250# if EV_PERIODIC_ENABLE
1454 periodics_reschedule (EV_A); 2251 periodics_reschedule (EV_A);
1455# endif 2252# endif
1456 /* no timer adjustment, as the monotonic clock doesn't jump */
1457 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1458 } 2253 }
1459 else 2254 else
1460#endif 2255#endif
1461 { 2256 {
1462 ev_rt_now = ev_time (); 2257 ev_rt_now = ev_time ();
1463 2258
1464 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2259 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1465 { 2260 {
2261 /* adjust timers. this is easy, as the offset is the same for all of them */
2262 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1466#if EV_PERIODIC_ENABLE 2263#if EV_PERIODIC_ENABLE
1467 periodics_reschedule (EV_A); 2264 periodics_reschedule (EV_A);
1468#endif 2265#endif
1469 /* adjust timers. this is easy, as the offset is the same for all of them */
1470 for (i = 0; i < timercnt; ++i)
1471 ((WT)timers [i])->at += ev_rt_now - mn_now;
1472 } 2266 }
1473 2267
1474 mn_now = ev_rt_now; 2268 mn_now = ev_rt_now;
1475 } 2269 }
1476} 2270}
1477 2271
1478void 2272void
1479ev_ref (EV_P)
1480{
1481 ++activecnt;
1482}
1483
1484void
1485ev_unref (EV_P)
1486{
1487 --activecnt;
1488}
1489
1490static int loop_done;
1491
1492void
1493ev_loop (EV_P_ int flags) 2273ev_loop (EV_P_ int flags)
1494{ 2274{
1495 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 2275#if EV_FEATURE_API
1496 ? EVUNLOOP_ONE 2276 ++loop_depth;
1497 : EVUNLOOP_CANCEL; 2277#endif
1498 2278
2279 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2280
2281 loop_done = EVUNLOOP_CANCEL;
2282
1499 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2283 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1500 2284
1501 do 2285 do
1502 { 2286 {
2287#if EV_VERIFY >= 2
2288 ev_verify (EV_A);
2289#endif
2290
1503#ifndef _WIN32 2291#ifndef _WIN32
1504 if (expect_false (curpid)) /* penalise the forking check even more */ 2292 if (expect_false (curpid)) /* penalise the forking check even more */
1505 if (expect_false (getpid () != curpid)) 2293 if (expect_false (getpid () != curpid))
1506 { 2294 {
1507 curpid = getpid (); 2295 curpid = getpid ();
… …
1513 /* we might have forked, so queue fork handlers */ 2301 /* we might have forked, so queue fork handlers */
1514 if (expect_false (postfork)) 2302 if (expect_false (postfork))
1515 if (forkcnt) 2303 if (forkcnt)
1516 { 2304 {
1517 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2305 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1518 call_pending (EV_A); 2306 EV_INVOKE_PENDING;
1519 } 2307 }
1520#endif 2308#endif
1521 2309
2310#if EV_PREPARE_ENABLE
1522 /* queue prepare watchers (and execute them) */ 2311 /* queue prepare watchers (and execute them) */
1523 if (expect_false (preparecnt)) 2312 if (expect_false (preparecnt))
1524 { 2313 {
1525 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2314 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1526 call_pending (EV_A); 2315 EV_INVOKE_PENDING;
1527 } 2316 }
2317#endif
1528 2318
1529 if (expect_false (!activecnt)) 2319 if (expect_false (loop_done))
1530 break; 2320 break;
1531 2321
1532 /* we might have forked, so reify kernel state if necessary */ 2322 /* we might have forked, so reify kernel state if necessary */
1533 if (expect_false (postfork)) 2323 if (expect_false (postfork))
1534 loop_fork (EV_A); 2324 loop_fork (EV_A);
… …
1541 ev_tstamp waittime = 0.; 2331 ev_tstamp waittime = 0.;
1542 ev_tstamp sleeptime = 0.; 2332 ev_tstamp sleeptime = 0.;
1543 2333
1544 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2334 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1545 { 2335 {
2336 /* remember old timestamp for io_blocktime calculation */
2337 ev_tstamp prev_mn_now = mn_now;
2338
1546 /* update time to cancel out callback processing overhead */ 2339 /* update time to cancel out callback processing overhead */
1547 time_update (EV_A_ 1e100); 2340 time_update (EV_A_ 1e100);
1548 2341
1549 waittime = MAX_BLOCKTIME; 2342 waittime = MAX_BLOCKTIME;
1550 2343
1551 if (timercnt) 2344 if (timercnt)
1552 { 2345 {
1553 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 2346 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1554 if (waittime > to) waittime = to; 2347 if (waittime > to) waittime = to;
1555 } 2348 }
1556 2349
1557#if EV_PERIODIC_ENABLE 2350#if EV_PERIODIC_ENABLE
1558 if (periodiccnt) 2351 if (periodiccnt)
1559 { 2352 {
1560 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 2353 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1561 if (waittime > to) waittime = to; 2354 if (waittime > to) waittime = to;
1562 } 2355 }
1563#endif 2356#endif
1564 2357
2358 /* don't let timeouts decrease the waittime below timeout_blocktime */
1565 if (expect_false (waittime < timeout_blocktime)) 2359 if (expect_false (waittime < timeout_blocktime))
1566 waittime = timeout_blocktime; 2360 waittime = timeout_blocktime;
1567 2361
1568 sleeptime = waittime - backend_fudge; 2362 /* extra check because io_blocktime is commonly 0 */
1569
1570 if (expect_true (sleeptime > io_blocktime)) 2363 if (expect_false (io_blocktime))
1571 sleeptime = io_blocktime;
1572
1573 if (sleeptime)
1574 { 2364 {
2365 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2366
2367 if (sleeptime > waittime - backend_fudge)
2368 sleeptime = waittime - backend_fudge;
2369
2370 if (expect_true (sleeptime > 0.))
2371 {
1575 ev_sleep (sleeptime); 2372 ev_sleep (sleeptime);
1576 waittime -= sleeptime; 2373 waittime -= sleeptime;
2374 }
1577 } 2375 }
1578 } 2376 }
1579 2377
2378#if EV_FEATURE_API
1580 ++loop_count; 2379 ++loop_count;
2380#endif
2381 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
1581 backend_poll (EV_A_ waittime); 2382 backend_poll (EV_A_ waittime);
2383 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
1582 2384
1583 /* update ev_rt_now, do magic */ 2385 /* update ev_rt_now, do magic */
1584 time_update (EV_A_ waittime + sleeptime); 2386 time_update (EV_A_ waittime + sleeptime);
1585 } 2387 }
1586 2388
… …
1593#if EV_IDLE_ENABLE 2395#if EV_IDLE_ENABLE
1594 /* queue idle watchers unless other events are pending */ 2396 /* queue idle watchers unless other events are pending */
1595 idle_reify (EV_A); 2397 idle_reify (EV_A);
1596#endif 2398#endif
1597 2399
2400#if EV_CHECK_ENABLE
1598 /* queue check watchers, to be executed first */ 2401 /* queue check watchers, to be executed first */
1599 if (expect_false (checkcnt)) 2402 if (expect_false (checkcnt))
1600 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2403 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2404#endif
1601 2405
1602 call_pending (EV_A); 2406 EV_INVOKE_PENDING;
1603
1604 } 2407 }
1605 while (expect_true (activecnt && !loop_done)); 2408 while (expect_true (
2409 activecnt
2410 && !loop_done
2411 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2412 ));
1606 2413
1607 if (loop_done == EVUNLOOP_ONE) 2414 if (loop_done == EVUNLOOP_ONE)
1608 loop_done = EVUNLOOP_CANCEL; 2415 loop_done = EVUNLOOP_CANCEL;
2416
2417#if EV_FEATURE_API
2418 --loop_depth;
2419#endif
1609} 2420}
1610 2421
1611void 2422void
1612ev_unloop (EV_P_ int how) 2423ev_unloop (EV_P_ int how)
1613{ 2424{
1614 loop_done = how; 2425 loop_done = how;
1615} 2426}
1616 2427
2428void
2429ev_ref (EV_P)
2430{
2431 ++activecnt;
2432}
2433
2434void
2435ev_unref (EV_P)
2436{
2437 --activecnt;
2438}
2439
2440void
2441ev_now_update (EV_P)
2442{
2443 time_update (EV_A_ 1e100);
2444}
2445
2446void
2447ev_suspend (EV_P)
2448{
2449 ev_now_update (EV_A);
2450}
2451
2452void
2453ev_resume (EV_P)
2454{
2455 ev_tstamp mn_prev = mn_now;
2456
2457 ev_now_update (EV_A);
2458 timers_reschedule (EV_A_ mn_now - mn_prev);
2459#if EV_PERIODIC_ENABLE
2460 /* TODO: really do this? */
2461 periodics_reschedule (EV_A);
2462#endif
2463}
2464
1617/*****************************************************************************/ 2465/*****************************************************************************/
2466/* singly-linked list management, used when the expected list length is short */
1618 2467
1619void inline_size 2468inline_size void
1620wlist_add (WL *head, WL elem) 2469wlist_add (WL *head, WL elem)
1621{ 2470{
1622 elem->next = *head; 2471 elem->next = *head;
1623 *head = elem; 2472 *head = elem;
1624} 2473}
1625 2474
1626void inline_size 2475inline_size void
1627wlist_del (WL *head, WL elem) 2476wlist_del (WL *head, WL elem)
1628{ 2477{
1629 while (*head) 2478 while (*head)
1630 { 2479 {
1631 if (*head == elem) 2480 if (expect_true (*head == elem))
1632 { 2481 {
1633 *head = elem->next; 2482 *head = elem->next;
1634 return; 2483 break;
1635 } 2484 }
1636 2485
1637 head = &(*head)->next; 2486 head = &(*head)->next;
1638 } 2487 }
1639} 2488}
1640 2489
1641void inline_speed 2490/* internal, faster, version of ev_clear_pending */
2491inline_speed void
1642clear_pending (EV_P_ W w) 2492clear_pending (EV_P_ W w)
1643{ 2493{
1644 if (w->pending) 2494 if (w->pending)
1645 { 2495 {
1646 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2496 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
1647 w->pending = 0; 2497 w->pending = 0;
1648 } 2498 }
1649} 2499}
1650 2500
1651int 2501int
… …
1655 int pending = w_->pending; 2505 int pending = w_->pending;
1656 2506
1657 if (expect_true (pending)) 2507 if (expect_true (pending))
1658 { 2508 {
1659 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2509 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2510 p->w = (W)&pending_w;
1660 w_->pending = 0; 2511 w_->pending = 0;
1661 p->w = 0;
1662 return p->events; 2512 return p->events;
1663 } 2513 }
1664 else 2514 else
1665 return 0; 2515 return 0;
1666} 2516}
1667 2517
1668void inline_size 2518inline_size void
1669pri_adjust (EV_P_ W w) 2519pri_adjust (EV_P_ W w)
1670{ 2520{
1671 int pri = w->priority; 2521 int pri = ev_priority (w);
1672 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2522 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1673 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2523 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1674 w->priority = pri; 2524 ev_set_priority (w, pri);
1675} 2525}
1676 2526
1677void inline_speed 2527inline_speed void
1678ev_start (EV_P_ W w, int active) 2528ev_start (EV_P_ W w, int active)
1679{ 2529{
1680 pri_adjust (EV_A_ w); 2530 pri_adjust (EV_A_ w);
1681 w->active = active; 2531 w->active = active;
1682 ev_ref (EV_A); 2532 ev_ref (EV_A);
1683} 2533}
1684 2534
1685void inline_size 2535inline_size void
1686ev_stop (EV_P_ W w) 2536ev_stop (EV_P_ W w)
1687{ 2537{
1688 ev_unref (EV_A); 2538 ev_unref (EV_A);
1689 w->active = 0; 2539 w->active = 0;
1690} 2540}
… …
1697 int fd = w->fd; 2547 int fd = w->fd;
1698 2548
1699 if (expect_false (ev_is_active (w))) 2549 if (expect_false (ev_is_active (w)))
1700 return; 2550 return;
1701 2551
1702 assert (("ev_io_start called with negative fd", fd >= 0)); 2552 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2553 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2554
2555 EV_FREQUENT_CHECK;
1703 2556
1704 ev_start (EV_A_ (W)w, 1); 2557 ev_start (EV_A_ (W)w, 1);
1705 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2558 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1706 wlist_add (&anfds[fd].head, (WL)w); 2559 wlist_add (&anfds[fd].head, (WL)w);
1707 2560
1708 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2561 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
1709 w->events &= ~EV_IOFDSET; 2562 w->events &= ~EV__IOFDSET;
2563
2564 EV_FREQUENT_CHECK;
1710} 2565}
1711 2566
1712void noinline 2567void noinline
1713ev_io_stop (EV_P_ ev_io *w) 2568ev_io_stop (EV_P_ ev_io *w)
1714{ 2569{
1715 clear_pending (EV_A_ (W)w); 2570 clear_pending (EV_A_ (W)w);
1716 if (expect_false (!ev_is_active (w))) 2571 if (expect_false (!ev_is_active (w)))
1717 return; 2572 return;
1718 2573
1719 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2574 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2575
2576 EV_FREQUENT_CHECK;
1720 2577
1721 wlist_del (&anfds[w->fd].head, (WL)w); 2578 wlist_del (&anfds[w->fd].head, (WL)w);
1722 ev_stop (EV_A_ (W)w); 2579 ev_stop (EV_A_ (W)w);
1723 2580
1724 fd_change (EV_A_ w->fd, 1); 2581 fd_change (EV_A_ w->fd, 1);
2582
2583 EV_FREQUENT_CHECK;
1725} 2584}
1726 2585
1727void noinline 2586void noinline
1728ev_timer_start (EV_P_ ev_timer *w) 2587ev_timer_start (EV_P_ ev_timer *w)
1729{ 2588{
1730 if (expect_false (ev_is_active (w))) 2589 if (expect_false (ev_is_active (w)))
1731 return; 2590 return;
1732 2591
1733 ((WT)w)->at += mn_now; 2592 ev_at (w) += mn_now;
1734 2593
1735 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2594 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1736 2595
2596 EV_FREQUENT_CHECK;
2597
2598 ++timercnt;
1737 ev_start (EV_A_ (W)w, ++timercnt); 2599 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1738 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2600 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1739 timers [timercnt - 1] = (WT)w; 2601 ANHE_w (timers [ev_active (w)]) = (WT)w;
1740 upheap (timers, timercnt - 1); 2602 ANHE_at_cache (timers [ev_active (w)]);
2603 upheap (timers, ev_active (w));
1741 2604
2605 EV_FREQUENT_CHECK;
2606
1742 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2607 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1743} 2608}
1744 2609
1745void noinline 2610void noinline
1746ev_timer_stop (EV_P_ ev_timer *w) 2611ev_timer_stop (EV_P_ ev_timer *w)
1747{ 2612{
1748 clear_pending (EV_A_ (W)w); 2613 clear_pending (EV_A_ (W)w);
1749 if (expect_false (!ev_is_active (w))) 2614 if (expect_false (!ev_is_active (w)))
1750 return; 2615 return;
1751 2616
1752 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 2617 EV_FREQUENT_CHECK;
1753 2618
1754 { 2619 {
1755 int active = ((W)w)->active; 2620 int active = ev_active (w);
1756 2621
2622 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2623
2624 --timercnt;
2625
1757 if (expect_true (--active < --timercnt)) 2626 if (expect_true (active < timercnt + HEAP0))
1758 { 2627 {
1759 timers [active] = timers [timercnt]; 2628 timers [active] = timers [timercnt + HEAP0];
1760 adjustheap (timers, timercnt, active); 2629 adjustheap (timers, timercnt, active);
1761 } 2630 }
1762 } 2631 }
1763 2632
1764 ((WT)w)->at -= mn_now; 2633 ev_at (w) -= mn_now;
1765 2634
1766 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2636
2637 EV_FREQUENT_CHECK;
1767} 2638}
1768 2639
1769void noinline 2640void noinline
1770ev_timer_again (EV_P_ ev_timer *w) 2641ev_timer_again (EV_P_ ev_timer *w)
1771{ 2642{
2643 EV_FREQUENT_CHECK;
2644
1772 if (ev_is_active (w)) 2645 if (ev_is_active (w))
1773 { 2646 {
1774 if (w->repeat) 2647 if (w->repeat)
1775 { 2648 {
1776 ((WT)w)->at = mn_now + w->repeat; 2649 ev_at (w) = mn_now + w->repeat;
2650 ANHE_at_cache (timers [ev_active (w)]);
1777 adjustheap (timers, timercnt, ((W)w)->active - 1); 2651 adjustheap (timers, timercnt, ev_active (w));
1778 } 2652 }
1779 else 2653 else
1780 ev_timer_stop (EV_A_ w); 2654 ev_timer_stop (EV_A_ w);
1781 } 2655 }
1782 else if (w->repeat) 2656 else if (w->repeat)
1783 { 2657 {
1784 w->at = w->repeat; 2658 ev_at (w) = w->repeat;
1785 ev_timer_start (EV_A_ w); 2659 ev_timer_start (EV_A_ w);
1786 } 2660 }
2661
2662 EV_FREQUENT_CHECK;
2663}
2664
2665ev_tstamp
2666ev_timer_remaining (EV_P_ ev_timer *w)
2667{
2668 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
1787} 2669}
1788 2670
1789#if EV_PERIODIC_ENABLE 2671#if EV_PERIODIC_ENABLE
1790void noinline 2672void noinline
1791ev_periodic_start (EV_P_ ev_periodic *w) 2673ev_periodic_start (EV_P_ ev_periodic *w)
1792{ 2674{
1793 if (expect_false (ev_is_active (w))) 2675 if (expect_false (ev_is_active (w)))
1794 return; 2676 return;
1795 2677
1796 if (w->reschedule_cb) 2678 if (w->reschedule_cb)
1797 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2679 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1798 else if (w->interval) 2680 else if (w->interval)
1799 { 2681 {
1800 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2682 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
1801 /* this formula differs from the one in periodic_reify because we do not always round up */ 2683 /* this formula differs from the one in periodic_reify because we do not always round up */
1802 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2684 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1803 } 2685 }
1804 else 2686 else
1805 ((WT)w)->at = w->offset; 2687 ev_at (w) = w->offset;
1806 2688
2689 EV_FREQUENT_CHECK;
2690
2691 ++periodiccnt;
1807 ev_start (EV_A_ (W)w, ++periodiccnt); 2692 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1808 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2693 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1809 periodics [periodiccnt - 1] = (WT)w; 2694 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1810 upheap (periodics, periodiccnt - 1); 2695 ANHE_at_cache (periodics [ev_active (w)]);
2696 upheap (periodics, ev_active (w));
1811 2697
2698 EV_FREQUENT_CHECK;
2699
1812 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2700 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1813} 2701}
1814 2702
1815void noinline 2703void noinline
1816ev_periodic_stop (EV_P_ ev_periodic *w) 2704ev_periodic_stop (EV_P_ ev_periodic *w)
1817{ 2705{
1818 clear_pending (EV_A_ (W)w); 2706 clear_pending (EV_A_ (W)w);
1819 if (expect_false (!ev_is_active (w))) 2707 if (expect_false (!ev_is_active (w)))
1820 return; 2708 return;
1821 2709
1822 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 2710 EV_FREQUENT_CHECK;
1823 2711
1824 { 2712 {
1825 int active = ((W)w)->active; 2713 int active = ev_active (w);
1826 2714
2715 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2716
2717 --periodiccnt;
2718
1827 if (expect_true (--active < --periodiccnt)) 2719 if (expect_true (active < periodiccnt + HEAP0))
1828 { 2720 {
1829 periodics [active] = periodics [periodiccnt]; 2721 periodics [active] = periodics [periodiccnt + HEAP0];
1830 adjustheap (periodics, periodiccnt, active); 2722 adjustheap (periodics, periodiccnt, active);
1831 } 2723 }
1832 } 2724 }
1833 2725
1834 ev_stop (EV_A_ (W)w); 2726 ev_stop (EV_A_ (W)w);
2727
2728 EV_FREQUENT_CHECK;
1835} 2729}
1836 2730
1837void noinline 2731void noinline
1838ev_periodic_again (EV_P_ ev_periodic *w) 2732ev_periodic_again (EV_P_ ev_periodic *w)
1839{ 2733{
… …
1845 2739
1846#ifndef SA_RESTART 2740#ifndef SA_RESTART
1847# define SA_RESTART 0 2741# define SA_RESTART 0
1848#endif 2742#endif
1849 2743
2744#if EV_SIGNAL_ENABLE
2745
1850void noinline 2746void noinline
1851ev_signal_start (EV_P_ ev_signal *w) 2747ev_signal_start (EV_P_ ev_signal *w)
1852{ 2748{
1853#if EV_MULTIPLICITY
1854 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1855#endif
1856 if (expect_false (ev_is_active (w))) 2749 if (expect_false (ev_is_active (w)))
1857 return; 2750 return;
1858 2751
1859 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2752 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
1860 2753
2754#if EV_MULTIPLICITY
2755 assert (("libev: a signal must not be attached to two different loops",
2756 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2757
2758 signals [w->signum - 1].loop = EV_A;
2759#endif
2760
2761 EV_FREQUENT_CHECK;
2762
2763#if EV_USE_SIGNALFD
2764 if (sigfd == -2)
1861 { 2765 {
1862#ifndef _WIN32 2766 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
1863 sigset_t full, prev; 2767 if (sigfd < 0 && errno == EINVAL)
1864 sigfillset (&full); 2768 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
1865 sigprocmask (SIG_SETMASK, &full, &prev);
1866#endif
1867 2769
1868 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2770 if (sigfd >= 0)
2771 {
2772 fd_intern (sigfd); /* doing it twice will not hurt */
1869 2773
1870#ifndef _WIN32 2774 sigemptyset (&sigfd_set);
1871 sigprocmask (SIG_SETMASK, &prev, 0); 2775
1872#endif 2776 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2777 ev_set_priority (&sigfd_w, EV_MAXPRI);
2778 ev_io_start (EV_A_ &sigfd_w);
2779 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2780 }
1873 } 2781 }
2782
2783 if (sigfd >= 0)
2784 {
2785 /* TODO: check .head */
2786 sigaddset (&sigfd_set, w->signum);
2787 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2788
2789 signalfd (sigfd, &sigfd_set, 0);
2790 }
2791#endif
1874 2792
1875 ev_start (EV_A_ (W)w, 1); 2793 ev_start (EV_A_ (W)w, 1);
1876 wlist_add (&signals [w->signum - 1].head, (WL)w); 2794 wlist_add (&signals [w->signum - 1].head, (WL)w);
1877 2795
1878 if (!((WL)w)->next) 2796 if (!((WL)w)->next)
2797# if EV_USE_SIGNALFD
2798 if (sigfd < 0) /*TODO*/
2799# endif
1879 { 2800 {
1880#if _WIN32 2801# ifdef _WIN32
2802 evpipe_init (EV_A);
2803
1881 signal (w->signum, sighandler); 2804 signal (w->signum, ev_sighandler);
1882#else 2805# else
1883 struct sigaction sa; 2806 struct sigaction sa;
2807
2808 evpipe_init (EV_A);
2809
1884 sa.sa_handler = sighandler; 2810 sa.sa_handler = ev_sighandler;
1885 sigfillset (&sa.sa_mask); 2811 sigfillset (&sa.sa_mask);
1886 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2812 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1887 sigaction (w->signum, &sa, 0); 2813 sigaction (w->signum, &sa, 0);
2814
2815 sigemptyset (&sa.sa_mask);
2816 sigaddset (&sa.sa_mask, w->signum);
2817 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
1888#endif 2818#endif
1889 } 2819 }
2820
2821 EV_FREQUENT_CHECK;
1890} 2822}
1891 2823
1892void noinline 2824void noinline
1893ev_signal_stop (EV_P_ ev_signal *w) 2825ev_signal_stop (EV_P_ ev_signal *w)
1894{ 2826{
1895 clear_pending (EV_A_ (W)w); 2827 clear_pending (EV_A_ (W)w);
1896 if (expect_false (!ev_is_active (w))) 2828 if (expect_false (!ev_is_active (w)))
1897 return; 2829 return;
1898 2830
2831 EV_FREQUENT_CHECK;
2832
1899 wlist_del (&signals [w->signum - 1].head, (WL)w); 2833 wlist_del (&signals [w->signum - 1].head, (WL)w);
1900 ev_stop (EV_A_ (W)w); 2834 ev_stop (EV_A_ (W)w);
1901 2835
1902 if (!signals [w->signum - 1].head) 2836 if (!signals [w->signum - 1].head)
2837 {
2838#if EV_MULTIPLICITY
2839 signals [w->signum - 1].loop = 0; /* unattach from signal */
2840#endif
2841#if EV_USE_SIGNALFD
2842 if (sigfd >= 0)
2843 {
2844 sigset_t ss;
2845
2846 sigemptyset (&ss);
2847 sigaddset (&ss, w->signum);
2848 sigdelset (&sigfd_set, w->signum);
2849
2850 signalfd (sigfd, &sigfd_set, 0);
2851 sigprocmask (SIG_UNBLOCK, &ss, 0);
2852 }
2853 else
2854#endif
1903 signal (w->signum, SIG_DFL); 2855 signal (w->signum, SIG_DFL);
2856 }
2857
2858 EV_FREQUENT_CHECK;
1904} 2859}
2860
2861#endif
2862
2863#if EV_CHILD_ENABLE
1905 2864
1906void 2865void
1907ev_child_start (EV_P_ ev_child *w) 2866ev_child_start (EV_P_ ev_child *w)
1908{ 2867{
1909#if EV_MULTIPLICITY 2868#if EV_MULTIPLICITY
1910 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2869 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1911#endif 2870#endif
1912 if (expect_false (ev_is_active (w))) 2871 if (expect_false (ev_is_active (w)))
1913 return; 2872 return;
1914 2873
2874 EV_FREQUENT_CHECK;
2875
1915 ev_start (EV_A_ (W)w, 1); 2876 ev_start (EV_A_ (W)w, 1);
1916 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2877 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2878
2879 EV_FREQUENT_CHECK;
1917} 2880}
1918 2881
1919void 2882void
1920ev_child_stop (EV_P_ ev_child *w) 2883ev_child_stop (EV_P_ ev_child *w)
1921{ 2884{
1922 clear_pending (EV_A_ (W)w); 2885 clear_pending (EV_A_ (W)w);
1923 if (expect_false (!ev_is_active (w))) 2886 if (expect_false (!ev_is_active (w)))
1924 return; 2887 return;
1925 2888
2889 EV_FREQUENT_CHECK;
2890
1926 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2891 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
1927 ev_stop (EV_A_ (W)w); 2892 ev_stop (EV_A_ (W)w);
2893
2894 EV_FREQUENT_CHECK;
1928} 2895}
2896
2897#endif
1929 2898
1930#if EV_STAT_ENABLE 2899#if EV_STAT_ENABLE
1931 2900
1932# ifdef _WIN32 2901# ifdef _WIN32
1933# undef lstat 2902# undef lstat
1934# define lstat(a,b) _stati64 (a,b) 2903# define lstat(a,b) _stati64 (a,b)
1935# endif 2904# endif
1936 2905
1937#define DEF_STAT_INTERVAL 5.0074891 2906#define DEF_STAT_INTERVAL 5.0074891
2907#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
1938#define MIN_STAT_INTERVAL 0.1074891 2908#define MIN_STAT_INTERVAL 0.1074891
1939 2909
1940static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2910static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1941 2911
1942#if EV_USE_INOTIFY 2912#if EV_USE_INOTIFY
1943# define EV_INOTIFY_BUFSIZE 8192 2913
2914/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2915# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
1944 2916
1945static void noinline 2917static void noinline
1946infy_add (EV_P_ ev_stat *w) 2918infy_add (EV_P_ ev_stat *w)
1947{ 2919{
1948 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); 2920 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);
1949 2921
1950 if (w->wd < 0) 2922 if (w->wd >= 0)
2923 {
2924 struct statfs sfs;
2925
2926 /* now local changes will be tracked by inotify, but remote changes won't */
2927 /* unless the filesystem is known to be local, we therefore still poll */
2928 /* also do poll on <2.6.25, but with normal frequency */
2929
2930 if (!fs_2625)
2931 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2932 else if (!statfs (w->path, &sfs)
2933 && (sfs.f_type == 0x1373 /* devfs */
2934 || sfs.f_type == 0xEF53 /* ext2/3 */
2935 || sfs.f_type == 0x3153464a /* jfs */
2936 || sfs.f_type == 0x52654973 /* reiser3 */
2937 || sfs.f_type == 0x01021994 /* tempfs */
2938 || sfs.f_type == 0x58465342 /* xfs */))
2939 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2940 else
2941 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
1951 { 2942 }
1952 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2943 else
2944 {
2945 /* can't use inotify, continue to stat */
2946 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
1953 2947
1954 /* monitor some parent directory for speedup hints */ 2948 /* if path is not there, monitor some parent directory for speedup hints */
2949 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2950 /* but an efficiency issue only */
1955 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2951 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1956 { 2952 {
1957 char path [4096]; 2953 char path [4096];
1958 strcpy (path, w->path); 2954 strcpy (path, w->path);
1959 2955
… …
1962 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2958 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1963 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2959 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1964 2960
1965 char *pend = strrchr (path, '/'); 2961 char *pend = strrchr (path, '/');
1966 2962
1967 if (!pend) 2963 if (!pend || pend == path)
1968 break; /* whoops, no '/', complain to your admin */ 2964 break;
1969 2965
1970 *pend = 0; 2966 *pend = 0;
1971 w->wd = inotify_add_watch (fs_fd, path, mask); 2967 w->wd = inotify_add_watch (fs_fd, path, mask);
1972 } 2968 }
1973 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2969 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1974 } 2970 }
1975 } 2971 }
1976 else
1977 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1978 2972
1979 if (w->wd >= 0) 2973 if (w->wd >= 0)
1980 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2974 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2975
2976 /* now re-arm timer, if required */
2977 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2978 ev_timer_again (EV_A_ &w->timer);
2979 if (ev_is_active (&w->timer)) ev_unref (EV_A);
1981} 2980}
1982 2981
1983static void noinline 2982static void noinline
1984infy_del (EV_P_ ev_stat *w) 2983infy_del (EV_P_ ev_stat *w)
1985{ 2984{
… …
1988 2987
1989 if (wd < 0) 2988 if (wd < 0)
1990 return; 2989 return;
1991 2990
1992 w->wd = -2; 2991 w->wd = -2;
1993 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2992 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
1994 wlist_del (&fs_hash [slot].head, (WL)w); 2993 wlist_del (&fs_hash [slot].head, (WL)w);
1995 2994
1996 /* remove this watcher, if others are watching it, they will rearm */ 2995 /* remove this watcher, if others are watching it, they will rearm */
1997 inotify_rm_watch (fs_fd, wd); 2996 inotify_rm_watch (fs_fd, wd);
1998} 2997}
1999 2998
2000static void noinline 2999static void noinline
2001infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3000infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2002{ 3001{
2003 if (slot < 0) 3002 if (slot < 0)
2004 /* overflow, need to check for all hahs slots */ 3003 /* overflow, need to check for all hash slots */
2005 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3004 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2006 infy_wd (EV_A_ slot, wd, ev); 3005 infy_wd (EV_A_ slot, wd, ev);
2007 else 3006 else
2008 { 3007 {
2009 WL w_; 3008 WL w_;
2010 3009
2011 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3010 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2012 { 3011 {
2013 ev_stat *w = (ev_stat *)w_; 3012 ev_stat *w = (ev_stat *)w_;
2014 w_ = w_->next; /* lets us remove this watcher and all before it */ 3013 w_ = w_->next; /* lets us remove this watcher and all before it */
2015 3014
2016 if (w->wd == wd || wd == -1) 3015 if (w->wd == wd || wd == -1)
2017 { 3016 {
2018 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3017 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2019 { 3018 {
3019 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2020 w->wd = -1; 3020 w->wd = -1;
2021 infy_add (EV_A_ w); /* re-add, no matter what */ 3021 infy_add (EV_A_ w); /* re-add, no matter what */
2022 } 3022 }
2023 3023
2024 stat_timer_cb (EV_A_ &w->timer, 0); 3024 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2029 3029
2030static void 3030static void
2031infy_cb (EV_P_ ev_io *w, int revents) 3031infy_cb (EV_P_ ev_io *w, int revents)
2032{ 3032{
2033 char buf [EV_INOTIFY_BUFSIZE]; 3033 char buf [EV_INOTIFY_BUFSIZE];
2034 struct inotify_event *ev = (struct inotify_event *)buf;
2035 int ofs; 3034 int ofs;
2036 int len = read (fs_fd, buf, sizeof (buf)); 3035 int len = read (fs_fd, buf, sizeof (buf));
2037 3036
2038 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3037 for (ofs = 0; ofs < len; )
3038 {
3039 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2039 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3040 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3041 ofs += sizeof (struct inotify_event) + ev->len;
3042 }
2040} 3043}
2041 3044
2042void inline_size 3045inline_size unsigned int
3046ev_linux_version (void)
3047{
3048 struct utsname buf;
3049 unsigned int v;
3050 int i;
3051 char *p = buf.release;
3052
3053 if (uname (&buf))
3054 return 0;
3055
3056 for (i = 3+1; --i; )
3057 {
3058 unsigned int c = 0;
3059
3060 for (;;)
3061 {
3062 if (*p >= '0' && *p <= '9')
3063 c = c * 10 + *p++ - '0';
3064 else
3065 {
3066 p += *p == '.';
3067 break;
3068 }
3069 }
3070
3071 v = (v << 8) | c;
3072 }
3073
3074 return v;
3075}
3076
3077inline_size void
3078ev_check_2625 (EV_P)
3079{
3080 /* kernels < 2.6.25 are borked
3081 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3082 */
3083 if (ev_linux_version () < 0x020619)
3084 return;
3085
3086 fs_2625 = 1;
3087}
3088
3089inline_size int
3090infy_newfd (void)
3091{
3092#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3093 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3094 if (fd >= 0)
3095 return fd;
3096#endif
3097 return inotify_init ();
3098}
3099
3100inline_size void
2043infy_init (EV_P) 3101infy_init (EV_P)
2044{ 3102{
2045 if (fs_fd != -2) 3103 if (fs_fd != -2)
2046 return; 3104 return;
2047 3105
3106 fs_fd = -1;
3107
3108 ev_check_2625 (EV_A);
3109
2048 fs_fd = inotify_init (); 3110 fs_fd = infy_newfd ();
2049 3111
2050 if (fs_fd >= 0) 3112 if (fs_fd >= 0)
2051 { 3113 {
3114 fd_intern (fs_fd);
2052 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3115 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2053 ev_set_priority (&fs_w, EV_MAXPRI); 3116 ev_set_priority (&fs_w, EV_MAXPRI);
2054 ev_io_start (EV_A_ &fs_w); 3117 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A);
2055 } 3119 }
2056} 3120}
2057 3121
2058void inline_size 3122inline_size void
2059infy_fork (EV_P) 3123infy_fork (EV_P)
2060{ 3124{
2061 int slot; 3125 int slot;
2062 3126
2063 if (fs_fd < 0) 3127 if (fs_fd < 0)
2064 return; 3128 return;
2065 3129
3130 ev_ref (EV_A);
3131 ev_io_stop (EV_A_ &fs_w);
2066 close (fs_fd); 3132 close (fs_fd);
2067 fs_fd = inotify_init (); 3133 fs_fd = infy_newfd ();
2068 3134
3135 if (fs_fd >= 0)
3136 {
3137 fd_intern (fs_fd);
3138 ev_io_set (&fs_w, fs_fd, EV_READ);
3139 ev_io_start (EV_A_ &fs_w);
3140 ev_unref (EV_A);
3141 }
3142
2069 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3143 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2070 { 3144 {
2071 WL w_ = fs_hash [slot].head; 3145 WL w_ = fs_hash [slot].head;
2072 fs_hash [slot].head = 0; 3146 fs_hash [slot].head = 0;
2073 3147
2074 while (w_) 3148 while (w_)
… …
2079 w->wd = -1; 3153 w->wd = -1;
2080 3154
2081 if (fs_fd >= 0) 3155 if (fs_fd >= 0)
2082 infy_add (EV_A_ w); /* re-add, no matter what */ 3156 infy_add (EV_A_ w); /* re-add, no matter what */
2083 else 3157 else
3158 {
3159 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3160 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2084 ev_timer_start (EV_A_ &w->timer); 3161 ev_timer_again (EV_A_ &w->timer);
3162 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3163 }
2085 } 3164 }
2086
2087 } 3165 }
2088} 3166}
2089 3167
3168#endif
3169
3170#ifdef _WIN32
3171# define EV_LSTAT(p,b) _stati64 (p, b)
3172#else
3173# define EV_LSTAT(p,b) lstat (p, b)
2090#endif 3174#endif
2091 3175
2092void 3176void
2093ev_stat_stat (EV_P_ ev_stat *w) 3177ev_stat_stat (EV_P_ ev_stat *w)
2094{ 3178{
… …
2101static void noinline 3185static void noinline
2102stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3186stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2103{ 3187{
2104 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3188 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2105 3189
2106 /* we copy this here each the time so that */ 3190 ev_statdata prev = w->attr;
2107 /* prev has the old value when the callback gets invoked */
2108 w->prev = w->attr;
2109 ev_stat_stat (EV_A_ w); 3191 ev_stat_stat (EV_A_ w);
2110 3192
2111 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3193 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2112 if ( 3194 if (
2113 w->prev.st_dev != w->attr.st_dev 3195 prev.st_dev != w->attr.st_dev
2114 || w->prev.st_ino != w->attr.st_ino 3196 || prev.st_ino != w->attr.st_ino
2115 || w->prev.st_mode != w->attr.st_mode 3197 || prev.st_mode != w->attr.st_mode
2116 || w->prev.st_nlink != w->attr.st_nlink 3198 || prev.st_nlink != w->attr.st_nlink
2117 || w->prev.st_uid != w->attr.st_uid 3199 || prev.st_uid != w->attr.st_uid
2118 || w->prev.st_gid != w->attr.st_gid 3200 || prev.st_gid != w->attr.st_gid
2119 || w->prev.st_rdev != w->attr.st_rdev 3201 || prev.st_rdev != w->attr.st_rdev
2120 || w->prev.st_size != w->attr.st_size 3202 || prev.st_size != w->attr.st_size
2121 || w->prev.st_atime != w->attr.st_atime 3203 || prev.st_atime != w->attr.st_atime
2122 || w->prev.st_mtime != w->attr.st_mtime 3204 || prev.st_mtime != w->attr.st_mtime
2123 || w->prev.st_ctime != w->attr.st_ctime 3205 || prev.st_ctime != w->attr.st_ctime
2124 ) { 3206 ) {
3207 /* we only update w->prev on actual differences */
3208 /* in case we test more often than invoke the callback, */
3209 /* to ensure that prev is always different to attr */
3210 w->prev = prev;
3211
2125 #if EV_USE_INOTIFY 3212 #if EV_USE_INOTIFY
3213 if (fs_fd >= 0)
3214 {
2126 infy_del (EV_A_ w); 3215 infy_del (EV_A_ w);
2127 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
2128 ev_stat_stat (EV_A_ w); /* avoid race... */ 3217 ev_stat_stat (EV_A_ w); /* avoid race... */
3218 }
2129 #endif 3219 #endif
2130 3220
2131 ev_feed_event (EV_A_ w, EV_STAT); 3221 ev_feed_event (EV_A_ w, EV_STAT);
2132 } 3222 }
2133} 3223}
… …
2136ev_stat_start (EV_P_ ev_stat *w) 3226ev_stat_start (EV_P_ ev_stat *w)
2137{ 3227{
2138 if (expect_false (ev_is_active (w))) 3228 if (expect_false (ev_is_active (w)))
2139 return; 3229 return;
2140 3230
2141 /* since we use memcmp, we need to clear any padding data etc. */
2142 memset (&w->prev, 0, sizeof (ev_statdata));
2143 memset (&w->attr, 0, sizeof (ev_statdata));
2144
2145 ev_stat_stat (EV_A_ w); 3231 ev_stat_stat (EV_A_ w);
2146 3232
3233 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2147 if (w->interval < MIN_STAT_INTERVAL) 3234 w->interval = MIN_STAT_INTERVAL;
2148 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2149 3235
2150 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3236 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2151 ev_set_priority (&w->timer, ev_priority (w)); 3237 ev_set_priority (&w->timer, ev_priority (w));
2152 3238
2153#if EV_USE_INOTIFY 3239#if EV_USE_INOTIFY
2154 infy_init (EV_A); 3240 infy_init (EV_A);
2155 3241
2156 if (fs_fd >= 0) 3242 if (fs_fd >= 0)
2157 infy_add (EV_A_ w); 3243 infy_add (EV_A_ w);
2158 else 3244 else
2159#endif 3245#endif
3246 {
2160 ev_timer_start (EV_A_ &w->timer); 3247 ev_timer_again (EV_A_ &w->timer);
3248 ev_unref (EV_A);
3249 }
2161 3250
2162 ev_start (EV_A_ (W)w, 1); 3251 ev_start (EV_A_ (W)w, 1);
3252
3253 EV_FREQUENT_CHECK;
2163} 3254}
2164 3255
2165void 3256void
2166ev_stat_stop (EV_P_ ev_stat *w) 3257ev_stat_stop (EV_P_ ev_stat *w)
2167{ 3258{
2168 clear_pending (EV_A_ (W)w); 3259 clear_pending (EV_A_ (W)w);
2169 if (expect_false (!ev_is_active (w))) 3260 if (expect_false (!ev_is_active (w)))
2170 return; 3261 return;
2171 3262
3263 EV_FREQUENT_CHECK;
3264
2172#if EV_USE_INOTIFY 3265#if EV_USE_INOTIFY
2173 infy_del (EV_A_ w); 3266 infy_del (EV_A_ w);
2174#endif 3267#endif
3268
3269 if (ev_is_active (&w->timer))
3270 {
3271 ev_ref (EV_A);
2175 ev_timer_stop (EV_A_ &w->timer); 3272 ev_timer_stop (EV_A_ &w->timer);
3273 }
2176 3274
2177 ev_stop (EV_A_ (W)w); 3275 ev_stop (EV_A_ (W)w);
3276
3277 EV_FREQUENT_CHECK;
2178} 3278}
2179#endif 3279#endif
2180 3280
2181#if EV_IDLE_ENABLE 3281#if EV_IDLE_ENABLE
2182void 3282void
… …
2184{ 3284{
2185 if (expect_false (ev_is_active (w))) 3285 if (expect_false (ev_is_active (w)))
2186 return; 3286 return;
2187 3287
2188 pri_adjust (EV_A_ (W)w); 3288 pri_adjust (EV_A_ (W)w);
3289
3290 EV_FREQUENT_CHECK;
2189 3291
2190 { 3292 {
2191 int active = ++idlecnt [ABSPRI (w)]; 3293 int active = ++idlecnt [ABSPRI (w)];
2192 3294
2193 ++idleall; 3295 ++idleall;
2194 ev_start (EV_A_ (W)w, active); 3296 ev_start (EV_A_ (W)w, active);
2195 3297
2196 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 3298 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2197 idles [ABSPRI (w)][active - 1] = w; 3299 idles [ABSPRI (w)][active - 1] = w;
2198 } 3300 }
3301
3302 EV_FREQUENT_CHECK;
2199} 3303}
2200 3304
2201void 3305void
2202ev_idle_stop (EV_P_ ev_idle *w) 3306ev_idle_stop (EV_P_ ev_idle *w)
2203{ 3307{
2204 clear_pending (EV_A_ (W)w); 3308 clear_pending (EV_A_ (W)w);
2205 if (expect_false (!ev_is_active (w))) 3309 if (expect_false (!ev_is_active (w)))
2206 return; 3310 return;
2207 3311
3312 EV_FREQUENT_CHECK;
3313
2208 { 3314 {
2209 int active = ((W)w)->active; 3315 int active = ev_active (w);
2210 3316
2211 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 3317 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2212 ((W)idles [ABSPRI (w)][active - 1])->active = active; 3318 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2213 3319
2214 ev_stop (EV_A_ (W)w); 3320 ev_stop (EV_A_ (W)w);
2215 --idleall; 3321 --idleall;
2216 } 3322 }
2217}
2218#endif
2219 3323
3324 EV_FREQUENT_CHECK;
3325}
3326#endif
3327
3328#if EV_PREPARE_ENABLE
2220void 3329void
2221ev_prepare_start (EV_P_ ev_prepare *w) 3330ev_prepare_start (EV_P_ ev_prepare *w)
2222{ 3331{
2223 if (expect_false (ev_is_active (w))) 3332 if (expect_false (ev_is_active (w)))
2224 return; 3333 return;
3334
3335 EV_FREQUENT_CHECK;
2225 3336
2226 ev_start (EV_A_ (W)w, ++preparecnt); 3337 ev_start (EV_A_ (W)w, ++preparecnt);
2227 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 3338 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2228 prepares [preparecnt - 1] = w; 3339 prepares [preparecnt - 1] = w;
3340
3341 EV_FREQUENT_CHECK;
2229} 3342}
2230 3343
2231void 3344void
2232ev_prepare_stop (EV_P_ ev_prepare *w) 3345ev_prepare_stop (EV_P_ ev_prepare *w)
2233{ 3346{
2234 clear_pending (EV_A_ (W)w); 3347 clear_pending (EV_A_ (W)w);
2235 if (expect_false (!ev_is_active (w))) 3348 if (expect_false (!ev_is_active (w)))
2236 return; 3349 return;
2237 3350
3351 EV_FREQUENT_CHECK;
3352
2238 { 3353 {
2239 int active = ((W)w)->active; 3354 int active = ev_active (w);
3355
2240 prepares [active - 1] = prepares [--preparecnt]; 3356 prepares [active - 1] = prepares [--preparecnt];
2241 ((W)prepares [active - 1])->active = active; 3357 ev_active (prepares [active - 1]) = active;
2242 } 3358 }
2243 3359
2244 ev_stop (EV_A_ (W)w); 3360 ev_stop (EV_A_ (W)w);
2245}
2246 3361
3362 EV_FREQUENT_CHECK;
3363}
3364#endif
3365
3366#if EV_CHECK_ENABLE
2247void 3367void
2248ev_check_start (EV_P_ ev_check *w) 3368ev_check_start (EV_P_ ev_check *w)
2249{ 3369{
2250 if (expect_false (ev_is_active (w))) 3370 if (expect_false (ev_is_active (w)))
2251 return; 3371 return;
3372
3373 EV_FREQUENT_CHECK;
2252 3374
2253 ev_start (EV_A_ (W)w, ++checkcnt); 3375 ev_start (EV_A_ (W)w, ++checkcnt);
2254 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 3376 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2255 checks [checkcnt - 1] = w; 3377 checks [checkcnt - 1] = w;
3378
3379 EV_FREQUENT_CHECK;
2256} 3380}
2257 3381
2258void 3382void
2259ev_check_stop (EV_P_ ev_check *w) 3383ev_check_stop (EV_P_ ev_check *w)
2260{ 3384{
2261 clear_pending (EV_A_ (W)w); 3385 clear_pending (EV_A_ (W)w);
2262 if (expect_false (!ev_is_active (w))) 3386 if (expect_false (!ev_is_active (w)))
2263 return; 3387 return;
2264 3388
3389 EV_FREQUENT_CHECK;
3390
2265 { 3391 {
2266 int active = ((W)w)->active; 3392 int active = ev_active (w);
3393
2267 checks [active - 1] = checks [--checkcnt]; 3394 checks [active - 1] = checks [--checkcnt];
2268 ((W)checks [active - 1])->active = active; 3395 ev_active (checks [active - 1]) = active;
2269 } 3396 }
2270 3397
2271 ev_stop (EV_A_ (W)w); 3398 ev_stop (EV_A_ (W)w);
3399
3400 EV_FREQUENT_CHECK;
2272} 3401}
3402#endif
2273 3403
2274#if EV_EMBED_ENABLE 3404#if EV_EMBED_ENABLE
2275void noinline 3405void noinline
2276ev_embed_sweep (EV_P_ ev_embed *w) 3406ev_embed_sweep (EV_P_ ev_embed *w)
2277{ 3407{
… …
2293embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3423embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2294{ 3424{
2295 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3425 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2296 3426
2297 { 3427 {
2298 struct ev_loop *loop = w->other; 3428 EV_P = w->other;
2299 3429
2300 while (fdchangecnt) 3430 while (fdchangecnt)
2301 { 3431 {
2302 fd_reify (EV_A); 3432 fd_reify (EV_A);
2303 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3433 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2304 } 3434 }
2305 } 3435 }
2306} 3436}
2307 3437
3438static void
3439embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3440{
3441 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3442
3443 ev_embed_stop (EV_A_ w);
3444
3445 {
3446 EV_P = w->other;
3447
3448 ev_loop_fork (EV_A);
3449 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3450 }
3451
3452 ev_embed_start (EV_A_ w);
3453}
3454
2308#if 0 3455#if 0
2309static void 3456static void
2310embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3457embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2311{ 3458{
2312 ev_idle_stop (EV_A_ idle); 3459 ev_idle_stop (EV_A_ idle);
… …
2318{ 3465{
2319 if (expect_false (ev_is_active (w))) 3466 if (expect_false (ev_is_active (w)))
2320 return; 3467 return;
2321 3468
2322 { 3469 {
2323 struct ev_loop *loop = w->other; 3470 EV_P = w->other;
2324 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3471 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2325 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3472 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2326 } 3473 }
3474
3475 EV_FREQUENT_CHECK;
2327 3476
2328 ev_set_priority (&w->io, ev_priority (w)); 3477 ev_set_priority (&w->io, ev_priority (w));
2329 ev_io_start (EV_A_ &w->io); 3478 ev_io_start (EV_A_ &w->io);
2330 3479
2331 ev_prepare_init (&w->prepare, embed_prepare_cb); 3480 ev_prepare_init (&w->prepare, embed_prepare_cb);
2332 ev_set_priority (&w->prepare, EV_MINPRI); 3481 ev_set_priority (&w->prepare, EV_MINPRI);
2333 ev_prepare_start (EV_A_ &w->prepare); 3482 ev_prepare_start (EV_A_ &w->prepare);
2334 3483
3484 ev_fork_init (&w->fork, embed_fork_cb);
3485 ev_fork_start (EV_A_ &w->fork);
3486
2335 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3487 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2336 3488
2337 ev_start (EV_A_ (W)w, 1); 3489 ev_start (EV_A_ (W)w, 1);
3490
3491 EV_FREQUENT_CHECK;
2338} 3492}
2339 3493
2340void 3494void
2341ev_embed_stop (EV_P_ ev_embed *w) 3495ev_embed_stop (EV_P_ ev_embed *w)
2342{ 3496{
2343 clear_pending (EV_A_ (W)w); 3497 clear_pending (EV_A_ (W)w);
2344 if (expect_false (!ev_is_active (w))) 3498 if (expect_false (!ev_is_active (w)))
2345 return; 3499 return;
2346 3500
3501 EV_FREQUENT_CHECK;
3502
2347 ev_io_stop (EV_A_ &w->io); 3503 ev_io_stop (EV_A_ &w->io);
2348 ev_prepare_stop (EV_A_ &w->prepare); 3504 ev_prepare_stop (EV_A_ &w->prepare);
3505 ev_fork_stop (EV_A_ &w->fork);
2349 3506
2350 ev_stop (EV_A_ (W)w); 3507 ev_stop (EV_A_ (W)w);
3508
3509 EV_FREQUENT_CHECK;
2351} 3510}
2352#endif 3511#endif
2353 3512
2354#if EV_FORK_ENABLE 3513#if EV_FORK_ENABLE
2355void 3514void
2356ev_fork_start (EV_P_ ev_fork *w) 3515ev_fork_start (EV_P_ ev_fork *w)
2357{ 3516{
2358 if (expect_false (ev_is_active (w))) 3517 if (expect_false (ev_is_active (w)))
2359 return; 3518 return;
3519
3520 EV_FREQUENT_CHECK;
2360 3521
2361 ev_start (EV_A_ (W)w, ++forkcnt); 3522 ev_start (EV_A_ (W)w, ++forkcnt);
2362 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 3523 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2363 forks [forkcnt - 1] = w; 3524 forks [forkcnt - 1] = w;
3525
3526 EV_FREQUENT_CHECK;
2364} 3527}
2365 3528
2366void 3529void
2367ev_fork_stop (EV_P_ ev_fork *w) 3530ev_fork_stop (EV_P_ ev_fork *w)
2368{ 3531{
2369 clear_pending (EV_A_ (W)w); 3532 clear_pending (EV_A_ (W)w);
2370 if (expect_false (!ev_is_active (w))) 3533 if (expect_false (!ev_is_active (w)))
2371 return; 3534 return;
2372 3535
3536 EV_FREQUENT_CHECK;
3537
2373 { 3538 {
2374 int active = ((W)w)->active; 3539 int active = ev_active (w);
3540
2375 forks [active - 1] = forks [--forkcnt]; 3541 forks [active - 1] = forks [--forkcnt];
2376 ((W)forks [active - 1])->active = active; 3542 ev_active (forks [active - 1]) = active;
2377 } 3543 }
2378 3544
2379 ev_stop (EV_A_ (W)w); 3545 ev_stop (EV_A_ (W)w);
3546
3547 EV_FREQUENT_CHECK;
3548}
3549#endif
3550
3551#if EV_ASYNC_ENABLE
3552void
3553ev_async_start (EV_P_ ev_async *w)
3554{
3555 if (expect_false (ev_is_active (w)))
3556 return;
3557
3558 evpipe_init (EV_A);
3559
3560 EV_FREQUENT_CHECK;
3561
3562 ev_start (EV_A_ (W)w, ++asynccnt);
3563 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
3564 asyncs [asynccnt - 1] = w;
3565
3566 EV_FREQUENT_CHECK;
3567}
3568
3569void
3570ev_async_stop (EV_P_ ev_async *w)
3571{
3572 clear_pending (EV_A_ (W)w);
3573 if (expect_false (!ev_is_active (w)))
3574 return;
3575
3576 EV_FREQUENT_CHECK;
3577
3578 {
3579 int active = ev_active (w);
3580
3581 asyncs [active - 1] = asyncs [--asynccnt];
3582 ev_active (asyncs [active - 1]) = active;
3583 }
3584
3585 ev_stop (EV_A_ (W)w);
3586
3587 EV_FREQUENT_CHECK;
3588}
3589
3590void
3591ev_async_send (EV_P_ ev_async *w)
3592{
3593 w->sent = 1;
3594 evpipe_write (EV_A_ &async_pending);
2380} 3595}
2381#endif 3596#endif
2382 3597
2383/*****************************************************************************/ 3598/*****************************************************************************/
2384 3599
… …
2394once_cb (EV_P_ struct ev_once *once, int revents) 3609once_cb (EV_P_ struct ev_once *once, int revents)
2395{ 3610{
2396 void (*cb)(int revents, void *arg) = once->cb; 3611 void (*cb)(int revents, void *arg) = once->cb;
2397 void *arg = once->arg; 3612 void *arg = once->arg;
2398 3613
2399 ev_io_stop (EV_A_ &once->io); 3614 ev_io_stop (EV_A_ &once->io);
2400 ev_timer_stop (EV_A_ &once->to); 3615 ev_timer_stop (EV_A_ &once->to);
2401 ev_free (once); 3616 ev_free (once);
2402 3617
2403 cb (revents, arg); 3618 cb (revents, arg);
2404} 3619}
2405 3620
2406static void 3621static void
2407once_cb_io (EV_P_ ev_io *w, int revents) 3622once_cb_io (EV_P_ ev_io *w, int revents)
2408{ 3623{
2409 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3624 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3625
3626 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2410} 3627}
2411 3628
2412static void 3629static void
2413once_cb_to (EV_P_ ev_timer *w, int revents) 3630once_cb_to (EV_P_ ev_timer *w, int revents)
2414{ 3631{
2415 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3632 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3633
3634 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2416} 3635}
2417 3636
2418void 3637void
2419ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3638ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2420{ 3639{
2421 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3640 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
2422 3641
2423 if (expect_false (!once)) 3642 if (expect_false (!once))
2424 { 3643 {
2425 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3644 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
2426 return; 3645 return;
2427 } 3646 }
2428 3647
2429 once->cb = cb; 3648 once->cb = cb;
2430 once->arg = arg; 3649 once->arg = arg;
… …
2442 ev_timer_set (&once->to, timeout, 0.); 3661 ev_timer_set (&once->to, timeout, 0.);
2443 ev_timer_start (EV_A_ &once->to); 3662 ev_timer_start (EV_A_ &once->to);
2444 } 3663 }
2445} 3664}
2446 3665
3666/*****************************************************************************/
3667
3668#if EV_WALK_ENABLE
3669void
3670ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3671{
3672 int i, j;
3673 ev_watcher_list *wl, *wn;
3674
3675 if (types & (EV_IO | EV_EMBED))
3676 for (i = 0; i < anfdmax; ++i)
3677 for (wl = anfds [i].head; wl; )
3678 {
3679 wn = wl->next;
3680
3681#if EV_EMBED_ENABLE
3682 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3683 {
3684 if (types & EV_EMBED)
3685 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3686 }
3687 else
3688#endif
3689#if EV_USE_INOTIFY
3690 if (ev_cb ((ev_io *)wl) == infy_cb)
3691 ;
3692 else
3693#endif
3694 if ((ev_io *)wl != &pipe_w)
3695 if (types & EV_IO)
3696 cb (EV_A_ EV_IO, wl);
3697
3698 wl = wn;
3699 }
3700
3701 if (types & (EV_TIMER | EV_STAT))
3702 for (i = timercnt + HEAP0; i-- > HEAP0; )
3703#if EV_STAT_ENABLE
3704 /*TODO: timer is not always active*/
3705 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3706 {
3707 if (types & EV_STAT)
3708 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3709 }
3710 else
3711#endif
3712 if (types & EV_TIMER)
3713 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3714
3715#if EV_PERIODIC_ENABLE
3716 if (types & EV_PERIODIC)
3717 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3718 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3719#endif
3720
3721#if EV_IDLE_ENABLE
3722 if (types & EV_IDLE)
3723 for (j = NUMPRI; i--; )
3724 for (i = idlecnt [j]; i--; )
3725 cb (EV_A_ EV_IDLE, idles [j][i]);
3726#endif
3727
3728#if EV_FORK_ENABLE
3729 if (types & EV_FORK)
3730 for (i = forkcnt; i--; )
3731 if (ev_cb (forks [i]) != embed_fork_cb)
3732 cb (EV_A_ EV_FORK, forks [i]);
3733#endif
3734
3735#if EV_ASYNC_ENABLE
3736 if (types & EV_ASYNC)
3737 for (i = asynccnt; i--; )
3738 cb (EV_A_ EV_ASYNC, asyncs [i]);
3739#endif
3740
3741#if EV_PREPARE_ENABLE
3742 if (types & EV_PREPARE)
3743 for (i = preparecnt; i--; )
3744# if EV_EMBED_ENABLE
3745 if (ev_cb (prepares [i]) != embed_prepare_cb)
3746# endif
3747 cb (EV_A_ EV_PREPARE, prepares [i]);
3748#endif
3749
3750#if EV_CHECK_ENABLE
3751 if (types & EV_CHECK)
3752 for (i = checkcnt; i--; )
3753 cb (EV_A_ EV_CHECK, checks [i]);
3754#endif
3755
3756#if EV_SIGNAL_ENABLE
3757 if (types & EV_SIGNAL)
3758 for (i = 0; i < EV_NSIG - 1; ++i)
3759 for (wl = signals [i].head; wl; )
3760 {
3761 wn = wl->next;
3762 cb (EV_A_ EV_SIGNAL, wl);
3763 wl = wn;
3764 }
3765#endif
3766
3767#if EV_CHILD_ENABLE
3768 if (types & EV_CHILD)
3769 for (i = (EV_PID_HASHSIZE); i--; )
3770 for (wl = childs [i]; wl; )
3771 {
3772 wn = wl->next;
3773 cb (EV_A_ EV_CHILD, wl);
3774 wl = wn;
3775 }
3776#endif
3777/* EV_STAT 0x00001000 /* stat data changed */
3778/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3779}
3780#endif
3781
2447#if EV_MULTIPLICITY 3782#if EV_MULTIPLICITY
2448 #include "ev_wrap.h" 3783 #include "ev_wrap.h"
2449#endif 3784#endif
2450 3785
2451#ifdef __cplusplus 3786#ifdef __cplusplus

Diff Legend

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