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

Comparing libev/ev.c (file contents):
Revision 1.282 by root, Sat Mar 28 22:17:17 2009 UTC vs.
Revision 1.395 by root, Wed Aug 24 16:08:17 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 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 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
49# include "config.h" 45# include "config.h"
50# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
51 53
52# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
57# endif 59# endif
58# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 61# define EV_USE_MONOTONIC 1
60# endif 62# endif
61# endif 63# endif
64# elif !defined(EV_USE_CLOCK_SYSCALL)
65# define EV_USE_CLOCK_SYSCALL 0
62# endif 66# endif
63 67
64# if HAVE_CLOCK_GETTIME 68# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 69# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 70# define EV_USE_MONOTONIC 1
… …
75# ifndef EV_USE_REALTIME 79# ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 0 80# define EV_USE_REALTIME 0
77# endif 81# endif
78# endif 82# endif
79 83
84# if HAVE_NANOSLEEP
80# ifndef EV_USE_NANOSLEEP 85# ifndef EV_USE_NANOSLEEP
81# if HAVE_NANOSLEEP
82# define EV_USE_NANOSLEEP 1 86# define EV_USE_NANOSLEEP EV_FEATURE_OS
87# endif
83# else 88# else
89# undef EV_USE_NANOSLEEP
84# define EV_USE_NANOSLEEP 0 90# define EV_USE_NANOSLEEP 0
91# endif
92
93# if HAVE_SELECT && HAVE_SYS_SELECT_H
94# ifndef EV_USE_SELECT
95# define EV_USE_SELECT EV_FEATURE_BACKENDS
85# endif 96# endif
97# else
98# undef EV_USE_SELECT
99# define EV_USE_SELECT 0
86# endif 100# endif
87 101
102# if HAVE_POLL && HAVE_POLL_H
88# ifndef EV_USE_SELECT 103# ifndef EV_USE_POLL
89# if HAVE_SELECT && HAVE_SYS_SELECT_H 104# define EV_USE_POLL EV_FEATURE_BACKENDS
90# define EV_USE_SELECT 1
91# else
92# define EV_USE_SELECT 0
93# endif 105# endif
94# endif
95
96# ifndef EV_USE_POLL
97# if HAVE_POLL && HAVE_POLL_H
98# define EV_USE_POLL 1
99# else 106# else
107# undef EV_USE_POLL
100# define EV_USE_POLL 0 108# define EV_USE_POLL 0
101# endif
102# endif 109# endif
103 110
104# ifndef EV_USE_EPOLL
105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 111# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# define EV_USE_EPOLL 1 112# ifndef EV_USE_EPOLL
107# else 113# define EV_USE_EPOLL EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 0
109# endif 114# endif
115# else
116# undef EV_USE_EPOLL
117# define EV_USE_EPOLL 0
110# endif 118# endif
111 119
120# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
112# ifndef EV_USE_KQUEUE 121# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 122# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
114# define EV_USE_KQUEUE 1
115# else
116# define EV_USE_KQUEUE 0
117# endif 123# endif
124# else
125# undef EV_USE_KQUEUE
126# define EV_USE_KQUEUE 0
118# endif 127# endif
119 128
120# ifndef EV_USE_PORT
121# if HAVE_PORT_H && HAVE_PORT_CREATE 129# if HAVE_PORT_H && HAVE_PORT_CREATE
122# define EV_USE_PORT 1 130# ifndef EV_USE_PORT
123# else 131# define EV_USE_PORT EV_FEATURE_BACKENDS
124# define EV_USE_PORT 0
125# endif 132# endif
133# else
134# undef EV_USE_PORT
135# define EV_USE_PORT 0
126# endif 136# endif
127 137
128# ifndef EV_USE_INOTIFY
129# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 138# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
130# define EV_USE_INOTIFY 1 139# ifndef EV_USE_INOTIFY
131# else
132# define EV_USE_INOTIFY 0 140# define EV_USE_INOTIFY EV_FEATURE_OS
133# endif 141# endif
142# else
143# undef EV_USE_INOTIFY
144# define EV_USE_INOTIFY 0
134# endif 145# endif
135 146
147# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
136# ifndef EV_USE_EVENTFD 148# ifndef EV_USE_SIGNALFD
137# if HAVE_EVENTFD 149# define EV_USE_SIGNALFD EV_FEATURE_OS
138# define EV_USE_EVENTFD 1
139# else
140# define EV_USE_EVENTFD 0
141# endif 150# endif
151# else
152# undef EV_USE_SIGNALFD
153# define EV_USE_SIGNALFD 0
154# endif
155
156# if HAVE_EVENTFD
157# ifndef EV_USE_EVENTFD
158# define EV_USE_EVENTFD EV_FEATURE_OS
159# endif
160# else
161# undef EV_USE_EVENTFD
162# define EV_USE_EVENTFD 0
142# endif 163# endif
143 164
144#endif 165#endif
145 166
146#include <math.h>
147#include <stdlib.h> 167#include <stdlib.h>
168#include <string.h>
148#include <fcntl.h> 169#include <fcntl.h>
149#include <stddef.h> 170#include <stddef.h>
150 171
151#include <stdio.h> 172#include <stdio.h>
152 173
153#include <assert.h> 174#include <assert.h>
154#include <errno.h> 175#include <errno.h>
155#include <sys/types.h> 176#include <sys/types.h>
156#include <time.h> 177#include <time.h>
178#include <limits.h>
157 179
158#include <signal.h> 180#include <signal.h>
159 181
160#ifdef EV_H 182#ifdef EV_H
161# include EV_H 183# include EV_H
162#else 184#else
163# include "ev.h" 185# include "ev.h"
164#endif 186#endif
187
188EV_CPP(extern "C" {)
165 189
166#ifndef _WIN32 190#ifndef _WIN32
167# include <sys/time.h> 191# include <sys/time.h>
168# include <sys/wait.h> 192# include <sys/wait.h>
169# include <unistd.h> 193# include <unistd.h>
… …
172# define WIN32_LEAN_AND_MEAN 196# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 197# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 198# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 199# define EV_SELECT_IS_WINSOCKET 1
176# endif 200# endif
201# undef EV_AVOID_STDIO
177#endif 202#endif
203
204/* OS X, in its infinite idiocy, actually HARDCODES
205 * a limit of 1024 into their select. Where people have brains,
206 * OS X engineers apparently have a vacuum. Or maybe they were
207 * ordered to have a vacuum, or they do anything for money.
208 * This might help. Or not.
209 */
210#define _DARWIN_UNLIMITED_SELECT 1
178 211
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 212/* this block tries to deduce configuration from header-defined symbols and defaults */
213
214/* try to deduce the maximum number of signals on this platform */
215#if defined (EV_NSIG)
216/* use what's provided */
217#elif defined (NSIG)
218# define EV_NSIG (NSIG)
219#elif defined(_NSIG)
220# define EV_NSIG (_NSIG)
221#elif defined (SIGMAX)
222# define EV_NSIG (SIGMAX+1)
223#elif defined (SIG_MAX)
224# define EV_NSIG (SIG_MAX+1)
225#elif defined (_SIG_MAX)
226# define EV_NSIG (_SIG_MAX+1)
227#elif defined (MAXSIG)
228# define EV_NSIG (MAXSIG+1)
229#elif defined (MAX_SIG)
230# define EV_NSIG (MAX_SIG+1)
231#elif defined (SIGARRAYSIZE)
232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
233#elif defined (_sys_nsig)
234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
235#else
236# error "unable to find value for NSIG, please report"
237/* to make it compile regardless, just remove the above line, */
238/* but consider reporting it, too! :) */
239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
180 245
181#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
184# else 249# else
185# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
186# endif 251# endif
187#endif 252#endif
188 253
189#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
192# else 257# else
193# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
194# endif 259# endif
195#endif 260#endif
196 261
… …
198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 264#endif
200 265
201#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
204# else 269# else
205# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
206# endif 271# endif
207#endif 272#endif
208 273
209#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
210# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
211#endif 276#endif
212 277
213#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
214# ifdef _WIN32 279# ifdef _WIN32
215# define EV_USE_POLL 0 280# define EV_USE_POLL 0
216# else 281# else
217# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
218# endif 283# endif
219#endif 284#endif
220 285
221#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
224# else 289# else
225# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
226# endif 291# endif
227#endif 292#endif
228 293
… …
234# define EV_USE_PORT 0 299# define EV_USE_PORT 0
235#endif 300#endif
236 301
237#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
240# else 305# else
241# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
242# endif 307# endif
243#endif 308#endif
244 309
245#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
246# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
247# define EV_PID_HASHSIZE 1
248# else
249# define EV_PID_HASHSIZE 16
250# endif
251#endif 312#endif
252 313
253#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
254# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
255# define EV_INOTIFY_HASHSIZE 1
256# else
257# define EV_INOTIFY_HASHSIZE 16
258# endif
259#endif 316#endif
260 317
261#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
264# else 321# else
265# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
323# endif
324#endif
325
326#ifndef EV_USE_SIGNALFD
327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
328# define EV_USE_SIGNALFD EV_FEATURE_OS
329# else
330# define EV_USE_SIGNALFD 0
266# endif 331# endif
267#endif 332#endif
268 333
269#if 0 /* debugging */ 334#if 0 /* debugging */
270# define EV_VERIFY 3 335# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
273#endif 338#endif
274 339
275#ifndef EV_VERIFY 340#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
277#endif 342#endif
278 343
279#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
281#endif 346#endif
282 347
283#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
350#endif
351
352/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
353/* which makes programs even slower. might work on other unices, too. */
354#if EV_USE_CLOCK_SYSCALL
355# include <syscall.h>
356# ifdef SYS_clock_gettime
357# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
358# undef EV_USE_MONOTONIC
359# define EV_USE_MONOTONIC 1
360# else
361# undef EV_USE_CLOCK_SYSCALL
362# define EV_USE_CLOCK_SYSCALL 0
363# endif
285#endif 364#endif
286 365
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 366/* this block fixes any misconfiguration where we know we run into trouble otherwise */
367
368#ifdef _AIX
369/* AIX has a completely broken poll.h header */
370# undef EV_USE_POLL
371# define EV_USE_POLL 0
372#endif
288 373
289#ifndef CLOCK_MONOTONIC 374#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 375# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 376# define EV_USE_MONOTONIC 0
292#endif 377#endif
… …
300# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
301# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
302#endif 387#endif
303 388
304#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
305# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
306# include <sys/select.h> 392# include <sys/select.h>
307# endif 393# endif
308#endif 394#endif
309 395
310#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h> 397# include <sys/statfs.h>
313# include <sys/inotify.h> 398# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 399/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
320 405
321#if EV_SELECT_IS_WINSOCKET 406#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 407# include <winsock.h>
323#endif 408#endif
324 409
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 410#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 411/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 412# include <stdint.h>
337# ifdef __cplusplus 413# ifndef EFD_NONBLOCK
338extern "C" { 414# define EFD_NONBLOCK O_NONBLOCK
339# endif 415# endif
340int eventfd (unsigned int initval, int flags); 416# ifndef EFD_CLOEXEC
341# ifdef __cplusplus 417# ifdef O_CLOEXEC
342} 418# define EFD_CLOEXEC O_CLOEXEC
419# else
420# define EFD_CLOEXEC 02000000
421# endif
343# endif 422# endif
423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
424#endif
425
426#if EV_USE_SIGNALFD
427/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
428# include <stdint.h>
429# ifndef SFD_NONBLOCK
430# define SFD_NONBLOCK O_NONBLOCK
431# endif
432# ifndef SFD_CLOEXEC
433# ifdef O_CLOEXEC
434# define SFD_CLOEXEC O_CLOEXEC
435# else
436# define SFD_CLOEXEC 02000000
437# endif
438# endif
439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
440
441struct signalfd_siginfo
442{
443 uint32_t ssi_signo;
444 char pad[128 - sizeof (uint32_t)];
445};
344#endif 446#endif
345 447
346/**/ 448/**/
347 449
348#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
350#else 452#else
351# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
352#endif 454#endif
353 455
354/* 456/*
355 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
356 * It is added to ev_rt_now when scheduling periodics
357 * to ensure progress, time-wise, even when rounding
358 * errors are against us.
359 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
360 * Better solutions welcome.
361 */ 459 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
461/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
363 462
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 465
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
468
469/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
470/* ECB.H BEGIN */
471/*
472 * libecb - http://software.schmorp.de/pkg/libecb
473 *
474 * Copyright (©) 2009-2011 Marc Alexander Lehmann <libecb@schmorp.de>
475 * Copyright (©) 2011 Emanuele Giaquinta
476 * All rights reserved.
477 *
478 * Redistribution and use in source and binary forms, with or without modifica-
479 * tion, are permitted provided that the following conditions are met:
480 *
481 * 1. Redistributions of source code must retain the above copyright notice,
482 * this list of conditions and the following disclaimer.
483 *
484 * 2. Redistributions in binary form must reproduce the above copyright
485 * notice, this list of conditions and the following disclaimer in the
486 * documentation and/or other materials provided with the distribution.
487 *
488 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
489 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
490 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
491 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
492 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
493 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
494 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
495 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
496 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
497 * OF THE POSSIBILITY OF SUCH DAMAGE.
498 */
499
500#ifndef ECB_H
501#define ECB_H
502
503#ifdef _WIN32
504 typedef signed char int8_t;
505 typedef unsigned char uint8_t;
506 typedef signed short int16_t;
507 typedef unsigned short uint16_t;
508 typedef signed int int32_t;
509 typedef unsigned int uint32_t;
368#if __GNUC__ >= 4 510 #if __GNUC__
369# define expect(expr,value) __builtin_expect ((expr),(value)) 511 typedef signed long long int64_t;
370# define noinline __attribute__ ((noinline)) 512 typedef unsigned long long uint64_t;
513 #else /* _MSC_VER || __BORLANDC__ */
514 typedef signed __int64 int64_t;
515 typedef unsigned __int64 uint64_t;
516 #endif
371#else 517#else
372# define expect(expr,value) (expr) 518 #include <inttypes.h>
373# define noinline
374# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
375# define inline
376# endif 519#endif
520
521/* many compilers define _GNUC_ to some versions but then only implement
522 * what their idiot authors think are the "more important" extensions,
523 * causing enormous grief in return for some better fake benchmark numbers.
524 * or so.
525 * we try to detect these and simply assume they are not gcc - if they have
526 * an issue with that they should have done it right in the first place.
527 */
528#ifndef ECB_GCC_VERSION
529 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
530 #define ECB_GCC_VERSION(major,minor) 0
531 #else
532 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
377#endif 533 #endif
534#endif
378 535
536/*****************************************************************************/
537
538/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
539/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
540
541#if ECB_NO_THREADS || ECB_NO_SMP
542 #define ECB_MEMORY_FENCE do { } while (0)
543#endif
544
545#ifndef ECB_MEMORY_FENCE
546 #if ECB_GCC_VERSION(2,5)
547 #if __i386__
548 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
549 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
550 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
551 #elif __amd64
552 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
553 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
554 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
555 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
556 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
557 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \
558 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__)
559 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
560 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
561 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
563 #endif
564 #endif
565#endif
566
567#ifndef ECB_MEMORY_FENCE
568 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER)
569 #define ECB_MEMORY_FENCE __sync_synchronize ()
570 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
571 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
572 #elif _MSC_VER >= 1400 /* VC++ 2005 */
573 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
574 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
575 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
576 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
577 #elif defined(_WIN32)
578 #include <WinNT.h>
579 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
580 #endif
581#endif
582
583#ifndef ECB_MEMORY_FENCE
584 #if !ECB_AVOID_PTHREADS
585 /*
586 * if you get undefined symbol references to pthread_mutex_lock,
587 * or failure to find pthread.h, then you should implement
588 * the ECB_MEMORY_FENCE operations for your cpu/compiler
589 * OR provide pthread.h and link against the posix thread library
590 * of your system.
591 */
592 #include <pthread.h>
593 #define ECB_NEEDS_PTHREADS 1
594 #define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1
595
596 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
597 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
598 #endif
599#endif
600
601#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE)
602 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
603#endif
604
605#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE)
606 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
607#endif
608
609/*****************************************************************************/
610
611#define ECB_C99 (__STDC_VERSION__ >= 199901L)
612
613#if __cplusplus
614 #define ecb_inline static inline
615#elif ECB_GCC_VERSION(2,5)
616 #define ecb_inline static __inline__
617#elif ECB_C99
618 #define ecb_inline static inline
619#else
620 #define ecb_inline static
621#endif
622
623#if ECB_GCC_VERSION(3,3)
624 #define ecb_restrict __restrict__
625#elif ECB_C99
626 #define ecb_restrict restrict
627#else
628 #define ecb_restrict
629#endif
630
631typedef int ecb_bool;
632
633#define ECB_CONCAT_(a, b) a ## b
634#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
635#define ECB_STRINGIFY_(a) # a
636#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
637
638#define ecb_function_ ecb_inline
639
640#if ECB_GCC_VERSION(3,1)
641 #define ecb_attribute(attrlist) __attribute__(attrlist)
642 #define ecb_is_constant(expr) __builtin_constant_p (expr)
643 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
644 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
645#else
646 #define ecb_attribute(attrlist)
647 #define ecb_is_constant(expr) 0
648 #define ecb_expect(expr,value) (expr)
649 #define ecb_prefetch(addr,rw,locality)
650#endif
651
652/* no emulation for ecb_decltype */
653#if ECB_GCC_VERSION(4,5)
654 #define ecb_decltype(x) __decltype(x)
655#elif ECB_GCC_VERSION(3,0)
656 #define ecb_decltype(x) __typeof(x)
657#endif
658
659#define ecb_noinline ecb_attribute ((__noinline__))
660#define ecb_noreturn ecb_attribute ((__noreturn__))
661#define ecb_unused ecb_attribute ((__unused__))
662#define ecb_const ecb_attribute ((__const__))
663#define ecb_pure ecb_attribute ((__pure__))
664
665#if ECB_GCC_VERSION(4,3)
666 #define ecb_artificial ecb_attribute ((__artificial__))
667 #define ecb_hot ecb_attribute ((__hot__))
668 #define ecb_cold ecb_attribute ((__cold__))
669#else
670 #define ecb_artificial
671 #define ecb_hot
672 #define ecb_cold
673#endif
674
675/* put around conditional expressions if you are very sure that the */
676/* expression is mostly true or mostly false. note that these return */
677/* booleans, not the expression. */
379#define expect_false(expr) expect ((expr) != 0, 0) 678#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
380#define expect_true(expr) expect ((expr) != 0, 1) 679#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
680/* for compatibility to the rest of the world */
681#define ecb_likely(expr) ecb_expect_true (expr)
682#define ecb_unlikely(expr) ecb_expect_false (expr)
683
684/* count trailing zero bits and count # of one bits */
685#if ECB_GCC_VERSION(3,4)
686 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
687 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
688 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
689 #define ecb_ctz32(x) __builtin_ctz (x)
690 #define ecb_ctz64(x) __builtin_ctzll (x)
691 #define ecb_popcount32(x) __builtin_popcount (x)
692 /* no popcountll */
693#else
694 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
695 ecb_function_ int
696 ecb_ctz32 (uint32_t x)
697 {
698 int r = 0;
699
700 x &= ~x + 1; /* this isolates the lowest bit */
701
702#if ECB_branchless_on_i386
703 r += !!(x & 0xaaaaaaaa) << 0;
704 r += !!(x & 0xcccccccc) << 1;
705 r += !!(x & 0xf0f0f0f0) << 2;
706 r += !!(x & 0xff00ff00) << 3;
707 r += !!(x & 0xffff0000) << 4;
708#else
709 if (x & 0xaaaaaaaa) r += 1;
710 if (x & 0xcccccccc) r += 2;
711 if (x & 0xf0f0f0f0) r += 4;
712 if (x & 0xff00ff00) r += 8;
713 if (x & 0xffff0000) r += 16;
714#endif
715
716 return r;
717 }
718
719 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
720 ecb_function_ int
721 ecb_ctz64 (uint64_t x)
722 {
723 int shift = x & 0xffffffffU ? 0 : 32;
724 return ecb_ctz32 (x >> shift) + shift;
725 }
726
727 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
728 ecb_function_ int
729 ecb_popcount32 (uint32_t x)
730 {
731 x -= (x >> 1) & 0x55555555;
732 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
733 x = ((x >> 4) + x) & 0x0f0f0f0f;
734 x *= 0x01010101;
735
736 return x >> 24;
737 }
738
739 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
740 ecb_function_ int ecb_ld32 (uint32_t x)
741 {
742 int r = 0;
743
744 if (x >> 16) { x >>= 16; r += 16; }
745 if (x >> 8) { x >>= 8; r += 8; }
746 if (x >> 4) { x >>= 4; r += 4; }
747 if (x >> 2) { x >>= 2; r += 2; }
748 if (x >> 1) { r += 1; }
749
750 return r;
751 }
752
753 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
754 ecb_function_ int ecb_ld64 (uint64_t x)
755 {
756 int r = 0;
757
758 if (x >> 32) { x >>= 32; r += 32; }
759
760 return r + ecb_ld32 (x);
761 }
762#endif
763
764/* popcount64 is only available on 64 bit cpus as gcc builtin */
765/* so for this version we are lazy */
766ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
767ecb_function_ int
768ecb_popcount64 (uint64_t x)
769{
770 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
771}
772
773ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
774ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
775ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
776ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
777ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
778ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
779ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
780ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
781
782ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
783ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
784ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
785ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
786ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
787ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
788ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
789ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
790
791#if ECB_GCC_VERSION(4,3)
792 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
793 #define ecb_bswap32(x) __builtin_bswap32 (x)
794 #define ecb_bswap64(x) __builtin_bswap64 (x)
795#else
796 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
797 ecb_function_ uint16_t
798 ecb_bswap16 (uint16_t x)
799 {
800 return ecb_rotl16 (x, 8);
801 }
802
803 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
804 ecb_function_ uint32_t
805 ecb_bswap32 (uint32_t x)
806 {
807 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
808 }
809
810 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
811 ecb_function_ uint64_t
812 ecb_bswap64 (uint64_t x)
813 {
814 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
815 }
816#endif
817
818#if ECB_GCC_VERSION(4,5)
819 #define ecb_unreachable() __builtin_unreachable ()
820#else
821 /* this seems to work fine, but gcc always emits a warning for it :/ */
822 ecb_function_ void ecb_unreachable (void) ecb_noreturn;
823 ecb_function_ void ecb_unreachable (void) { }
824#endif
825
826/* try to tell the compiler that some condition is definitely true */
827#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
828
829ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const;
830ecb_function_ unsigned char
831ecb_byteorder_helper (void)
832{
833 const uint32_t u = 0x11223344;
834 return *(unsigned char *)&u;
835}
836
837ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;
838ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
839ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;
840ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
841
842#if ECB_GCC_VERSION(3,0) || ECB_C99
843 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
844#else
845 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
846#endif
847
848#if ecb_cplusplus_does_not_suck
849 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
850 template<typename T, int N>
851 static inline int ecb_array_length (const T (&arr)[N])
852 {
853 return N;
854 }
855#else
856 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
857#endif
858
859#endif
860
861/* ECB.H END */
862
863#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
864# undef ECB_MEMORY_FENCE
865# undef ECB_MEMORY_FENCE_ACQUIRE
866# undef ECB_MEMORY_FENCE_RELEASE
867#endif
868
869#define expect_false(cond) ecb_expect_false (cond)
870#define expect_true(cond) ecb_expect_true (cond)
871#define noinline ecb_noinline
872
381#define inline_size static inline 873#define inline_size ecb_inline
382 874
383#if EV_MINIMAL 875#if EV_FEATURE_CODE
876# define inline_speed ecb_inline
877#else
384# define inline_speed static noinline 878# define inline_speed static noinline
879#endif
880
881#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
882
883#if EV_MINPRI == EV_MAXPRI
884# define ABSPRI(w) (((W)w), 0)
385#else 885#else
386# define inline_speed static inline
387#endif
388
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 886# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
887#endif
391 888
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 889#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 890#define EMPTY2(a,b) /* used to suppress some warnings */
394 891
395typedef ev_watcher *W; 892typedef ev_watcher *W;
… …
399#define ev_active(w) ((W)(w))->active 896#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 897#define ev_at(w) ((WT)(w))->at
401 898
402#if EV_USE_REALTIME 899#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 900/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */ 901/* giving it a reasonably high chance of working on typical architectures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 902static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif 903#endif
407 904
408#if EV_USE_MONOTONIC 905#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 906static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 907#endif
411 908
909#ifndef EV_FD_TO_WIN32_HANDLE
910# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
911#endif
912#ifndef EV_WIN32_HANDLE_TO_FD
913# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
914#endif
915#ifndef EV_WIN32_CLOSE_FD
916# define EV_WIN32_CLOSE_FD(fd) close (fd)
917#endif
918
412#ifdef _WIN32 919#ifdef _WIN32
413# include "ev_win32.c" 920# include "ev_win32.c"
414#endif 921#endif
415 922
416/*****************************************************************************/ 923/*****************************************************************************/
417 924
925/* define a suitable floor function (only used by periodics atm) */
926
927#if EV_USE_FLOOR
928# include <math.h>
929# define ev_floor(v) floor (v)
930#else
931
932#include <float.h>
933
934/* a floor() replacement function, should be independent of ev_tstamp type */
935static ev_tstamp noinline
936ev_floor (ev_tstamp v)
937{
938 /* the choice of shift factor is not terribly important */
939#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
940 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
941#else
942 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
943#endif
944
945 /* argument too large for an unsigned long? */
946 if (expect_false (v >= shift))
947 {
948 ev_tstamp f;
949
950 if (v == v - 1.)
951 return v; /* very large number */
952
953 f = shift * ev_floor (v * (1. / shift));
954 return f + ev_floor (v - f);
955 }
956
957 /* special treatment for negative args? */
958 if (expect_false (v < 0.))
959 {
960 ev_tstamp f = -ev_floor (-v);
961
962 return f - (f == v ? 0 : 1);
963 }
964
965 /* fits into an unsigned long */
966 return (unsigned long)v;
967}
968
969#endif
970
971/*****************************************************************************/
972
973#ifdef __linux
974# include <sys/utsname.h>
975#endif
976
977static unsigned int noinline ecb_cold
978ev_linux_version (void)
979{
980#ifdef __linux
981 unsigned int v = 0;
982 struct utsname buf;
983 int i;
984 char *p = buf.release;
985
986 if (uname (&buf))
987 return 0;
988
989 for (i = 3+1; --i; )
990 {
991 unsigned int c = 0;
992
993 for (;;)
994 {
995 if (*p >= '0' && *p <= '9')
996 c = c * 10 + *p++ - '0';
997 else
998 {
999 p += *p == '.';
1000 break;
1001 }
1002 }
1003
1004 v = (v << 8) | c;
1005 }
1006
1007 return v;
1008#else
1009 return 0;
1010#endif
1011}
1012
1013/*****************************************************************************/
1014
1015#if EV_AVOID_STDIO
1016static void noinline ecb_cold
1017ev_printerr (const char *msg)
1018{
1019 write (STDERR_FILENO, msg, strlen (msg));
1020}
1021#endif
1022
418static void (*syserr_cb)(const char *msg); 1023static void (*syserr_cb)(const char *msg);
419 1024
420void 1025void ecb_cold
421ev_set_syserr_cb (void (*cb)(const char *msg)) 1026ev_set_syserr_cb (void (*cb)(const char *msg))
422{ 1027{
423 syserr_cb = cb; 1028 syserr_cb = cb;
424} 1029}
425 1030
426static void noinline 1031static void noinline ecb_cold
427ev_syserr (const char *msg) 1032ev_syserr (const char *msg)
428{ 1033{
429 if (!msg) 1034 if (!msg)
430 msg = "(libev) system error"; 1035 msg = "(libev) system error";
431 1036
432 if (syserr_cb) 1037 if (syserr_cb)
433 syserr_cb (msg); 1038 syserr_cb (msg);
434 else 1039 else
435 { 1040 {
1041#if EV_AVOID_STDIO
1042 ev_printerr (msg);
1043 ev_printerr (": ");
1044 ev_printerr (strerror (errno));
1045 ev_printerr ("\n");
1046#else
436 perror (msg); 1047 perror (msg);
1048#endif
437 abort (); 1049 abort ();
438 } 1050 }
439} 1051}
440 1052
441static void * 1053static void *
442ev_realloc_emul (void *ptr, long size) 1054ev_realloc_emul (void *ptr, long size)
443{ 1055{
1056#if __GLIBC__
1057 return realloc (ptr, size);
1058#else
444 /* some systems, notably openbsd and darwin, fail to properly 1059 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 1060 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 1061 * the single unix specification, so work around them here.
447 */ 1062 */
448 1063
449 if (size) 1064 if (size)
450 return realloc (ptr, size); 1065 return realloc (ptr, size);
451 1066
452 free (ptr); 1067 free (ptr);
453 return 0; 1068 return 0;
1069#endif
454} 1070}
455 1071
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1072static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 1073
458void 1074void ecb_cold
459ev_set_allocator (void *(*cb)(void *ptr, long size)) 1075ev_set_allocator (void *(*cb)(void *ptr, long size))
460{ 1076{
461 alloc = cb; 1077 alloc = cb;
462} 1078}
463 1079
… …
466{ 1082{
467 ptr = alloc (ptr, size); 1083 ptr = alloc (ptr, size);
468 1084
469 if (!ptr && size) 1085 if (!ptr && size)
470 { 1086 {
1087#if EV_AVOID_STDIO
1088 ev_printerr ("(libev) memory allocation failed, aborting.\n");
1089#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 1090 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
1091#endif
472 abort (); 1092 abort ();
473 } 1093 }
474 1094
475 return ptr; 1095 return ptr;
476} 1096}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 1098#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 1099#define ev_free(ptr) ev_realloc ((ptr), 0)
480 1100
481/*****************************************************************************/ 1101/*****************************************************************************/
482 1102
1103/* set in reify when reification needed */
1104#define EV_ANFD_REIFY 1
1105
1106/* file descriptor info structure */
483typedef struct 1107typedef struct
484{ 1108{
485 WL head; 1109 WL head;
486 unsigned char events; 1110 unsigned char events; /* the events watched for */
487 unsigned char reify; 1111 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 1112 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 1113 unsigned char unused;
490#if EV_USE_EPOLL 1114#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 1115 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 1116#endif
493#if EV_SELECT_IS_WINSOCKET 1117#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
494 SOCKET handle; 1118 SOCKET handle;
495#endif 1119#endif
1120#if EV_USE_IOCP
1121 OVERLAPPED or, ow;
1122#endif
496} ANFD; 1123} ANFD;
497 1124
1125/* stores the pending event set for a given watcher */
498typedef struct 1126typedef struct
499{ 1127{
500 W w; 1128 W w;
501 int events; 1129 int events; /* the pending event set for the given watcher */
502} ANPENDING; 1130} ANPENDING;
503 1131
504#if EV_USE_INOTIFY 1132#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 1133/* hash table entry per inotify-id */
506typedef struct 1134typedef struct
… …
509} ANFS; 1137} ANFS;
510#endif 1138#endif
511 1139
512/* Heap Entry */ 1140/* Heap Entry */
513#if EV_HEAP_CACHE_AT 1141#if EV_HEAP_CACHE_AT
1142 /* a heap element */
514 typedef struct { 1143 typedef struct {
515 ev_tstamp at; 1144 ev_tstamp at;
516 WT w; 1145 WT w;
517 } ANHE; 1146 } ANHE;
518 1147
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 1148 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 1149 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 1150 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 1151#else
1152 /* a heap element */
523 typedef WT ANHE; 1153 typedef WT ANHE;
524 1154
525 #define ANHE_w(he) (he) 1155 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 1156 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 1157 #define ANHE_at_cache(he)
… …
551 1181
552 static int ev_default_loop_ptr; 1182 static int ev_default_loop_ptr;
553 1183
554#endif 1184#endif
555 1185
1186#if EV_FEATURE_API
1187# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
1188# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
1189# define EV_INVOKE_PENDING invoke_cb (EV_A)
1190#else
1191# define EV_RELEASE_CB (void)0
1192# define EV_ACQUIRE_CB (void)0
1193# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
1194#endif
1195
1196#define EVBREAK_RECURSE 0x80
1197
556/*****************************************************************************/ 1198/*****************************************************************************/
557 1199
1200#ifndef EV_HAVE_EV_TIME
558ev_tstamp 1201ev_tstamp
559ev_time (void) 1202ev_time (void)
560{ 1203{
561#if EV_USE_REALTIME 1204#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 1205 if (expect_true (have_realtime))
… …
569 1212
570 struct timeval tv; 1213 struct timeval tv;
571 gettimeofday (&tv, 0); 1214 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 1215 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 1216}
1217#endif
574 1218
575ev_tstamp inline_size 1219inline_size ev_tstamp
576get_clock (void) 1220get_clock (void)
577{ 1221{
578#if EV_USE_MONOTONIC 1222#if EV_USE_MONOTONIC
579 if (expect_true (have_monotonic)) 1223 if (expect_true (have_monotonic))
580 { 1224 {
… …
601 if (delay > 0.) 1245 if (delay > 0.)
602 { 1246 {
603#if EV_USE_NANOSLEEP 1247#if EV_USE_NANOSLEEP
604 struct timespec ts; 1248 struct timespec ts;
605 1249
606 ts.tv_sec = (time_t)delay; 1250 EV_TS_SET (ts, delay);
607 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
608
609 nanosleep (&ts, 0); 1251 nanosleep (&ts, 0);
610#elif defined(_WIN32) 1252#elif defined(_WIN32)
611 Sleep ((unsigned long)(delay * 1e3)); 1253 Sleep ((unsigned long)(delay * 1e3));
612#else 1254#else
613 struct timeval tv; 1255 struct timeval tv;
614 1256
615 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 1257 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 1258 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 1259 /* by older ones */
1260 EV_TV_SET (tv, delay);
621 select (0, 0, 0, 0, &tv); 1261 select (0, 0, 0, 0, &tv);
622#endif 1262#endif
623 } 1263 }
624} 1264}
625 1265
626/*****************************************************************************/ 1266/*****************************************************************************/
627 1267
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 1268#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 1269
630int inline_size 1270/* find a suitable new size for the given array, */
1271/* hopefully by rounding to a nice-to-malloc size */
1272inline_size int
631array_nextsize (int elem, int cur, int cnt) 1273array_nextsize (int elem, int cur, int cnt)
632{ 1274{
633 int ncur = cur + 1; 1275 int ncur = cur + 1;
634 1276
635 do 1277 do
… …
646 } 1288 }
647 1289
648 return ncur; 1290 return ncur;
649} 1291}
650 1292
651static noinline void * 1293static void * noinline ecb_cold
652array_realloc (int elem, void *base, int *cur, int cnt) 1294array_realloc (int elem, void *base, int *cur, int cnt)
653{ 1295{
654 *cur = array_nextsize (elem, *cur, cnt); 1296 *cur = array_nextsize (elem, *cur, cnt);
655 return ev_realloc (base, elem * *cur); 1297 return ev_realloc (base, elem * *cur);
656} 1298}
… …
659 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1301 memset ((void *)(base), 0, sizeof (*(base)) * (count))
660 1302
661#define array_needsize(type,base,cur,cnt,init) \ 1303#define array_needsize(type,base,cur,cnt,init) \
662 if (expect_false ((cnt) > (cur))) \ 1304 if (expect_false ((cnt) > (cur))) \
663 { \ 1305 { \
664 int ocur_ = (cur); \ 1306 int ecb_unused ocur_ = (cur); \
665 (base) = (type *)array_realloc \ 1307 (base) = (type *)array_realloc \
666 (sizeof (type), (base), &(cur), (cnt)); \ 1308 (sizeof (type), (base), &(cur), (cnt)); \
667 init ((base) + (ocur_), (cur) - ocur_); \ 1309 init ((base) + (ocur_), (cur) - ocur_); \
668 } 1310 }
669 1311
… …
680#define array_free(stem, idx) \ 1322#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 1323 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 1324
683/*****************************************************************************/ 1325/*****************************************************************************/
684 1326
1327/* dummy callback for pending events */
1328static void noinline
1329pendingcb (EV_P_ ev_prepare *w, int revents)
1330{
1331}
1332
685void noinline 1333void noinline
686ev_feed_event (EV_P_ void *w, int revents) 1334ev_feed_event (EV_P_ void *w, int revents)
687{ 1335{
688 W w_ = (W)w; 1336 W w_ = (W)w;
689 int pri = ABSPRI (w_); 1337 int pri = ABSPRI (w_);
… …
697 pendings [pri][w_->pending - 1].w = w_; 1345 pendings [pri][w_->pending - 1].w = w_;
698 pendings [pri][w_->pending - 1].events = revents; 1346 pendings [pri][w_->pending - 1].events = revents;
699 } 1347 }
700} 1348}
701 1349
702void inline_speed 1350inline_speed void
1351feed_reverse (EV_P_ W w)
1352{
1353 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
1354 rfeeds [rfeedcnt++] = w;
1355}
1356
1357inline_size void
1358feed_reverse_done (EV_P_ int revents)
1359{
1360 do
1361 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
1362 while (rfeedcnt);
1363}
1364
1365inline_speed void
703queue_events (EV_P_ W *events, int eventcnt, int type) 1366queue_events (EV_P_ W *events, int eventcnt, int type)
704{ 1367{
705 int i; 1368 int i;
706 1369
707 for (i = 0; i < eventcnt; ++i) 1370 for (i = 0; i < eventcnt; ++i)
708 ev_feed_event (EV_A_ events [i], type); 1371 ev_feed_event (EV_A_ events [i], type);
709} 1372}
710 1373
711/*****************************************************************************/ 1374/*****************************************************************************/
712 1375
713void inline_speed 1376inline_speed void
714fd_event (EV_P_ int fd, int revents) 1377fd_event_nocheck (EV_P_ int fd, int revents)
715{ 1378{
716 ANFD *anfd = anfds + fd; 1379 ANFD *anfd = anfds + fd;
717 ev_io *w; 1380 ev_io *w;
718 1381
719 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1382 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
723 if (ev) 1386 if (ev)
724 ev_feed_event (EV_A_ (W)w, ev); 1387 ev_feed_event (EV_A_ (W)w, ev);
725 } 1388 }
726} 1389}
727 1390
1391/* do not submit kernel events for fds that have reify set */
1392/* because that means they changed while we were polling for new events */
1393inline_speed void
1394fd_event (EV_P_ int fd, int revents)
1395{
1396 ANFD *anfd = anfds + fd;
1397
1398 if (expect_true (!anfd->reify))
1399 fd_event_nocheck (EV_A_ fd, revents);
1400}
1401
728void 1402void
729ev_feed_fd_event (EV_P_ int fd, int revents) 1403ev_feed_fd_event (EV_P_ int fd, int revents)
730{ 1404{
731 if (fd >= 0 && fd < anfdmax) 1405 if (fd >= 0 && fd < anfdmax)
732 fd_event (EV_A_ fd, revents); 1406 fd_event_nocheck (EV_A_ fd, revents);
733} 1407}
734 1408
735void inline_size 1409/* make sure the external fd watch events are in-sync */
1410/* with the kernel/libev internal state */
1411inline_size void
736fd_reify (EV_P) 1412fd_reify (EV_P)
737{ 1413{
738 int i; 1414 int i;
1415
1416#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1417 for (i = 0; i < fdchangecnt; ++i)
1418 {
1419 int fd = fdchanges [i];
1420 ANFD *anfd = anfds + fd;
1421
1422 if (anfd->reify & EV__IOFDSET && anfd->head)
1423 {
1424 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1425
1426 if (handle != anfd->handle)
1427 {
1428 unsigned long arg;
1429
1430 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1431
1432 /* handle changed, but fd didn't - we need to do it in two steps */
1433 backend_modify (EV_A_ fd, anfd->events, 0);
1434 anfd->events = 0;
1435 anfd->handle = handle;
1436 }
1437 }
1438 }
1439#endif
739 1440
740 for (i = 0; i < fdchangecnt; ++i) 1441 for (i = 0; i < fdchangecnt; ++i)
741 { 1442 {
742 int fd = fdchanges [i]; 1443 int fd = fdchanges [i];
743 ANFD *anfd = anfds + fd; 1444 ANFD *anfd = anfds + fd;
744 ev_io *w; 1445 ev_io *w;
745 1446
746 unsigned char events = 0; 1447 unsigned char o_events = anfd->events;
1448 unsigned char o_reify = anfd->reify;
747 1449
748 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1450 anfd->reify = 0;
749 events |= (unsigned char)w->events;
750 1451
751#if EV_SELECT_IS_WINSOCKET 1452 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
752 if (events)
753 { 1453 {
754 unsigned long arg; 1454 anfd->events = 0;
755 #ifdef EV_FD_TO_WIN32_HANDLE 1455
756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1456 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
757 #else 1457 anfd->events |= (unsigned char)w->events;
758 anfd->handle = _get_osfhandle (fd); 1458
759 #endif 1459 if (o_events != anfd->events)
760 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1460 o_reify = EV__IOFDSET; /* actually |= */
761 } 1461 }
762#endif
763 1462
764 { 1463 if (o_reify & EV__IOFDSET)
765 unsigned char o_events = anfd->events;
766 unsigned char o_reify = anfd->reify;
767
768 anfd->reify = 0;
769 anfd->events = events;
770
771 if (o_events != events || o_reify & EV__IOFDSET)
772 backend_modify (EV_A_ fd, o_events, events); 1464 backend_modify (EV_A_ fd, o_events, anfd->events);
773 }
774 } 1465 }
775 1466
776 fdchangecnt = 0; 1467 fdchangecnt = 0;
777} 1468}
778 1469
779void inline_size 1470/* something about the given fd changed */
1471inline_size void
780fd_change (EV_P_ int fd, int flags) 1472fd_change (EV_P_ int fd, int flags)
781{ 1473{
782 unsigned char reify = anfds [fd].reify; 1474 unsigned char reify = anfds [fd].reify;
783 anfds [fd].reify |= flags; 1475 anfds [fd].reify |= flags;
784 1476
… …
788 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 1480 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
789 fdchanges [fdchangecnt - 1] = fd; 1481 fdchanges [fdchangecnt - 1] = fd;
790 } 1482 }
791} 1483}
792 1484
793void inline_speed 1485/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1486inline_speed void ecb_cold
794fd_kill (EV_P_ int fd) 1487fd_kill (EV_P_ int fd)
795{ 1488{
796 ev_io *w; 1489 ev_io *w;
797 1490
798 while ((w = (ev_io *)anfds [fd].head)) 1491 while ((w = (ev_io *)anfds [fd].head))
… …
800 ev_io_stop (EV_A_ w); 1493 ev_io_stop (EV_A_ w);
801 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1494 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
802 } 1495 }
803} 1496}
804 1497
805int inline_size 1498/* check whether the given fd is actually valid, for error recovery */
1499inline_size int ecb_cold
806fd_valid (int fd) 1500fd_valid (int fd)
807{ 1501{
808#ifdef _WIN32 1502#ifdef _WIN32
809 return _get_osfhandle (fd) != -1; 1503 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
810#else 1504#else
811 return fcntl (fd, F_GETFD) != -1; 1505 return fcntl (fd, F_GETFD) != -1;
812#endif 1506#endif
813} 1507}
814 1508
815/* called on EBADF to verify fds */ 1509/* called on EBADF to verify fds */
816static void noinline 1510static void noinline ecb_cold
817fd_ebadf (EV_P) 1511fd_ebadf (EV_P)
818{ 1512{
819 int fd; 1513 int fd;
820 1514
821 for (fd = 0; fd < anfdmax; ++fd) 1515 for (fd = 0; fd < anfdmax; ++fd)
… …
823 if (!fd_valid (fd) && errno == EBADF) 1517 if (!fd_valid (fd) && errno == EBADF)
824 fd_kill (EV_A_ fd); 1518 fd_kill (EV_A_ fd);
825} 1519}
826 1520
827/* called on ENOMEM in select/poll to kill some fds and retry */ 1521/* called on ENOMEM in select/poll to kill some fds and retry */
828static void noinline 1522static void noinline ecb_cold
829fd_enomem (EV_P) 1523fd_enomem (EV_P)
830{ 1524{
831 int fd; 1525 int fd;
832 1526
833 for (fd = anfdmax; fd--; ) 1527 for (fd = anfdmax; fd--; )
834 if (anfds [fd].events) 1528 if (anfds [fd].events)
835 { 1529 {
836 fd_kill (EV_A_ fd); 1530 fd_kill (EV_A_ fd);
837 return; 1531 break;
838 } 1532 }
839} 1533}
840 1534
841/* usually called after fork if backend needs to re-arm all fds from scratch */ 1535/* usually called after fork if backend needs to re-arm all fds from scratch */
842static void noinline 1536static void noinline
… …
847 for (fd = 0; fd < anfdmax; ++fd) 1541 for (fd = 0; fd < anfdmax; ++fd)
848 if (anfds [fd].events) 1542 if (anfds [fd].events)
849 { 1543 {
850 anfds [fd].events = 0; 1544 anfds [fd].events = 0;
851 anfds [fd].emask = 0; 1545 anfds [fd].emask = 0;
852 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1546 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
853 } 1547 }
854} 1548}
855 1549
1550/* used to prepare libev internal fd's */
1551/* this is not fork-safe */
1552inline_speed void
1553fd_intern (int fd)
1554{
1555#ifdef _WIN32
1556 unsigned long arg = 1;
1557 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1558#else
1559 fcntl (fd, F_SETFD, FD_CLOEXEC);
1560 fcntl (fd, F_SETFL, O_NONBLOCK);
1561#endif
1562}
1563
856/*****************************************************************************/ 1564/*****************************************************************************/
857 1565
858/* 1566/*
859 * the heap functions want a real array index. array index 0 uis guaranteed to not 1567 * the heap functions want a real array index. array index 0 is guaranteed to not
860 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1568 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
861 * the branching factor of the d-tree. 1569 * the branching factor of the d-tree.
862 */ 1570 */
863 1571
864/* 1572/*
… …
873#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1581#define HEAP0 (DHEAP - 1) /* index of first element in heap */
874#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1582#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
875#define UPHEAP_DONE(p,k) ((p) == (k)) 1583#define UPHEAP_DONE(p,k) ((p) == (k))
876 1584
877/* away from the root */ 1585/* away from the root */
878void inline_speed 1586inline_speed void
879downheap (ANHE *heap, int N, int k) 1587downheap (ANHE *heap, int N, int k)
880{ 1588{
881 ANHE he = heap [k]; 1589 ANHE he = heap [k];
882 ANHE *E = heap + N + HEAP0; 1590 ANHE *E = heap + N + HEAP0;
883 1591
… …
923#define HEAP0 1 1631#define HEAP0 1
924#define HPARENT(k) ((k) >> 1) 1632#define HPARENT(k) ((k) >> 1)
925#define UPHEAP_DONE(p,k) (!(p)) 1633#define UPHEAP_DONE(p,k) (!(p))
926 1634
927/* away from the root */ 1635/* away from the root */
928void inline_speed 1636inline_speed void
929downheap (ANHE *heap, int N, int k) 1637downheap (ANHE *heap, int N, int k)
930{ 1638{
931 ANHE he = heap [k]; 1639 ANHE he = heap [k];
932 1640
933 for (;;) 1641 for (;;)
934 { 1642 {
935 int c = k << 1; 1643 int c = k << 1;
936 1644
937 if (c > N + HEAP0 - 1) 1645 if (c >= N + HEAP0)
938 break; 1646 break;
939 1647
940 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1648 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
941 ? 1 : 0; 1649 ? 1 : 0;
942 1650
… …
953 ev_active (ANHE_w (he)) = k; 1661 ev_active (ANHE_w (he)) = k;
954} 1662}
955#endif 1663#endif
956 1664
957/* towards the root */ 1665/* towards the root */
958void inline_speed 1666inline_speed void
959upheap (ANHE *heap, int k) 1667upheap (ANHE *heap, int k)
960{ 1668{
961 ANHE he = heap [k]; 1669 ANHE he = heap [k];
962 1670
963 for (;;) 1671 for (;;)
… …
974 1682
975 heap [k] = he; 1683 heap [k] = he;
976 ev_active (ANHE_w (he)) = k; 1684 ev_active (ANHE_w (he)) = k;
977} 1685}
978 1686
979void inline_size 1687/* move an element suitably so it is in a correct place */
1688inline_size void
980adjustheap (ANHE *heap, int N, int k) 1689adjustheap (ANHE *heap, int N, int k)
981{ 1690{
982 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1691 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
983 upheap (heap, k); 1692 upheap (heap, k);
984 else 1693 else
985 downheap (heap, N, k); 1694 downheap (heap, N, k);
986} 1695}
987 1696
988/* rebuild the heap: this function is used only once and executed rarely */ 1697/* rebuild the heap: this function is used only once and executed rarely */
989void inline_size 1698inline_size void
990reheap (ANHE *heap, int N) 1699reheap (ANHE *heap, int N)
991{ 1700{
992 int i; 1701 int i;
993 1702
994 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1703 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
997 upheap (heap, i + HEAP0); 1706 upheap (heap, i + HEAP0);
998} 1707}
999 1708
1000/*****************************************************************************/ 1709/*****************************************************************************/
1001 1710
1711/* associate signal watchers to a signal signal */
1002typedef struct 1712typedef struct
1003{ 1713{
1714 EV_ATOMIC_T pending;
1715#if EV_MULTIPLICITY
1716 EV_P;
1717#endif
1004 WL head; 1718 WL head;
1005 EV_ATOMIC_T gotsig;
1006} ANSIG; 1719} ANSIG;
1007 1720
1008static ANSIG *signals; 1721static ANSIG signals [EV_NSIG - 1];
1009static int signalmax;
1010
1011static EV_ATOMIC_T gotsig;
1012 1722
1013/*****************************************************************************/ 1723/*****************************************************************************/
1014 1724
1015void inline_speed 1725#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1016fd_intern (int fd)
1017{
1018#ifdef _WIN32
1019 unsigned long arg = 1;
1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1021#else
1022 fcntl (fd, F_SETFD, FD_CLOEXEC);
1023 fcntl (fd, F_SETFL, O_NONBLOCK);
1024#endif
1025}
1026 1726
1027static void noinline 1727static void noinline ecb_cold
1028evpipe_init (EV_P) 1728evpipe_init (EV_P)
1029{ 1729{
1030 if (!ev_is_active (&pipeev)) 1730 if (!ev_is_active (&pipe_w))
1031 { 1731 {
1032#if EV_USE_EVENTFD 1732# if EV_USE_EVENTFD
1733 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1734 if (evfd < 0 && errno == EINVAL)
1033 if ((evfd = eventfd (0, 0)) >= 0) 1735 evfd = eventfd (0, 0);
1736
1737 if (evfd >= 0)
1034 { 1738 {
1035 evpipe [0] = -1; 1739 evpipe [0] = -1;
1036 fd_intern (evfd); 1740 fd_intern (evfd); /* doing it twice doesn't hurt */
1037 ev_io_set (&pipeev, evfd, EV_READ); 1741 ev_io_set (&pipe_w, evfd, EV_READ);
1038 } 1742 }
1039 else 1743 else
1040#endif 1744# endif
1041 { 1745 {
1042 while (pipe (evpipe)) 1746 while (pipe (evpipe))
1043 ev_syserr ("(libev) error creating signal/async pipe"); 1747 ev_syserr ("(libev) error creating signal/async pipe");
1044 1748
1045 fd_intern (evpipe [0]); 1749 fd_intern (evpipe [0]);
1046 fd_intern (evpipe [1]); 1750 fd_intern (evpipe [1]);
1047 ev_io_set (&pipeev, evpipe [0], EV_READ); 1751 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1048 } 1752 }
1049 1753
1050 ev_io_start (EV_A_ &pipeev); 1754 ev_io_start (EV_A_ &pipe_w);
1051 ev_unref (EV_A); /* watcher should not keep loop alive */ 1755 ev_unref (EV_A); /* watcher should not keep loop alive */
1052 } 1756 }
1053} 1757}
1054 1758
1055void inline_size 1759inline_speed void
1056evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1760evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1057{ 1761{
1058 if (!*flag) 1762 if (expect_true (*flag))
1763 return;
1764
1765 *flag = 1;
1766
1767 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1768
1769 pipe_write_skipped = 1;
1770
1771 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1772
1773 if (pipe_write_wanted)
1059 { 1774 {
1775 int old_errno;
1776
1777 pipe_write_skipped = 0; /* just an optimisation, no fence needed */
1778
1060 int old_errno = errno; /* save errno because write might clobber it */ 1779 old_errno = errno; /* save errno because write will clobber it */
1061
1062 *flag = 1;
1063 1780
1064#if EV_USE_EVENTFD 1781#if EV_USE_EVENTFD
1065 if (evfd >= 0) 1782 if (evfd >= 0)
1066 { 1783 {
1067 uint64_t counter = 1; 1784 uint64_t counter = 1;
1068 write (evfd, &counter, sizeof (uint64_t)); 1785 write (evfd, &counter, sizeof (uint64_t));
1069 } 1786 }
1070 else 1787 else
1071#endif 1788#endif
1789 {
1790 /* win32 people keep sending patches that change this write() to send() */
1791 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1792 /* so when you think this write should be a send instead, please find out */
1793 /* where your send() is from - it's definitely not the microsoft send, and */
1794 /* tell me. thank you. */
1072 write (evpipe [1], &old_errno, 1); 1795 write (evpipe [1], &(evpipe [1]), 1);
1796 }
1073 1797
1074 errno = old_errno; 1798 errno = old_errno;
1075 } 1799 }
1076} 1800}
1077 1801
1802/* called whenever the libev signal pipe */
1803/* got some events (signal, async) */
1078static void 1804static void
1079pipecb (EV_P_ ev_io *iow, int revents) 1805pipecb (EV_P_ ev_io *iow, int revents)
1080{ 1806{
1807 int i;
1808
1809 if (revents & EV_READ)
1810 {
1081#if EV_USE_EVENTFD 1811#if EV_USE_EVENTFD
1082 if (evfd >= 0) 1812 if (evfd >= 0)
1083 { 1813 {
1084 uint64_t counter; 1814 uint64_t counter;
1085 read (evfd, &counter, sizeof (uint64_t)); 1815 read (evfd, &counter, sizeof (uint64_t));
1086 } 1816 }
1087 else 1817 else
1088#endif 1818#endif
1089 { 1819 {
1090 char dummy; 1820 char dummy;
1821 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1091 read (evpipe [0], &dummy, 1); 1822 read (evpipe [0], &dummy, 1);
1823 }
1824 }
1825
1826 pipe_write_skipped = 0;
1827
1828#if EV_SIGNAL_ENABLE
1829 if (sig_pending)
1092 } 1830 {
1831 sig_pending = 0;
1093 1832
1094 if (gotsig && ev_is_default_loop (EV_A)) 1833 for (i = EV_NSIG - 1; i--; )
1095 { 1834 if (expect_false (signals [i].pending))
1096 int signum;
1097 gotsig = 0;
1098
1099 for (signum = signalmax; signum--; )
1100 if (signals [signum].gotsig)
1101 ev_feed_signal_event (EV_A_ signum + 1); 1835 ev_feed_signal_event (EV_A_ i + 1);
1102 } 1836 }
1837#endif
1103 1838
1104#if EV_ASYNC_ENABLE 1839#if EV_ASYNC_ENABLE
1105 if (gotasync) 1840 if (async_pending)
1106 { 1841 {
1107 int i; 1842 async_pending = 0;
1108 gotasync = 0;
1109 1843
1110 for (i = asynccnt; i--; ) 1844 for (i = asynccnt; i--; )
1111 if (asyncs [i]->sent) 1845 if (asyncs [i]->sent)
1112 { 1846 {
1113 asyncs [i]->sent = 0; 1847 asyncs [i]->sent = 0;
… …
1117#endif 1851#endif
1118} 1852}
1119 1853
1120/*****************************************************************************/ 1854/*****************************************************************************/
1121 1855
1856void
1857ev_feed_signal (int signum)
1858{
1859#if EV_MULTIPLICITY
1860 EV_P = signals [signum - 1].loop;
1861
1862 if (!EV_A)
1863 return;
1864#endif
1865
1866 if (!ev_active (&pipe_w))
1867 return;
1868
1869 signals [signum - 1].pending = 1;
1870 evpipe_write (EV_A_ &sig_pending);
1871}
1872
1122static void 1873static void
1123ev_sighandler (int signum) 1874ev_sighandler (int signum)
1124{ 1875{
1125#if EV_MULTIPLICITY
1126 struct ev_loop *loop = &default_loop_struct;
1127#endif
1128
1129#if _WIN32 1876#ifdef _WIN32
1130 signal (signum, ev_sighandler); 1877 signal (signum, ev_sighandler);
1131#endif 1878#endif
1132 1879
1133 signals [signum - 1].gotsig = 1; 1880 ev_feed_signal (signum);
1134 evpipe_write (EV_A_ &gotsig);
1135} 1881}
1136 1882
1137void noinline 1883void noinline
1138ev_feed_signal_event (EV_P_ int signum) 1884ev_feed_signal_event (EV_P_ int signum)
1139{ 1885{
1140 WL w; 1886 WL w;
1141 1887
1888 if (expect_false (signum <= 0 || signum > EV_NSIG))
1889 return;
1890
1891 --signum;
1892
1142#if EV_MULTIPLICITY 1893#if EV_MULTIPLICITY
1143 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1894 /* it is permissible to try to feed a signal to the wrong loop */
1144#endif 1895 /* or, likely more useful, feeding a signal nobody is waiting for */
1145 1896
1146 --signum; 1897 if (expect_false (signals [signum].loop != EV_A))
1147
1148 if (signum < 0 || signum >= signalmax)
1149 return; 1898 return;
1899#endif
1150 1900
1151 signals [signum].gotsig = 0; 1901 signals [signum].pending = 0;
1152 1902
1153 for (w = signals [signum].head; w; w = w->next) 1903 for (w = signals [signum].head; w; w = w->next)
1154 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1904 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1155} 1905}
1156 1906
1907#if EV_USE_SIGNALFD
1908static void
1909sigfdcb (EV_P_ ev_io *iow, int revents)
1910{
1911 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1912
1913 for (;;)
1914 {
1915 ssize_t res = read (sigfd, si, sizeof (si));
1916
1917 /* not ISO-C, as res might be -1, but works with SuS */
1918 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1919 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1920
1921 if (res < (ssize_t)sizeof (si))
1922 break;
1923 }
1924}
1925#endif
1926
1927#endif
1928
1157/*****************************************************************************/ 1929/*****************************************************************************/
1158 1930
1931#if EV_CHILD_ENABLE
1159static WL childs [EV_PID_HASHSIZE]; 1932static WL childs [EV_PID_HASHSIZE];
1160
1161#ifndef _WIN32
1162 1933
1163static ev_signal childev; 1934static ev_signal childev;
1164 1935
1165#ifndef WIFCONTINUED 1936#ifndef WIFCONTINUED
1166# define WIFCONTINUED(status) 0 1937# define WIFCONTINUED(status) 0
1167#endif 1938#endif
1168 1939
1169void inline_speed 1940/* handle a single child status event */
1941inline_speed void
1170child_reap (EV_P_ int chain, int pid, int status) 1942child_reap (EV_P_ int chain, int pid, int status)
1171{ 1943{
1172 ev_child *w; 1944 ev_child *w;
1173 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1945 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1174 1946
1175 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1947 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1176 { 1948 {
1177 if ((w->pid == pid || !w->pid) 1949 if ((w->pid == pid || !w->pid)
1178 && (!traced || (w->flags & 1))) 1950 && (!traced || (w->flags & 1)))
1179 { 1951 {
1180 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1952 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1187 1959
1188#ifndef WCONTINUED 1960#ifndef WCONTINUED
1189# define WCONTINUED 0 1961# define WCONTINUED 0
1190#endif 1962#endif
1191 1963
1964/* called on sigchld etc., calls waitpid */
1192static void 1965static void
1193childcb (EV_P_ ev_signal *sw, int revents) 1966childcb (EV_P_ ev_signal *sw, int revents)
1194{ 1967{
1195 int pid, status; 1968 int pid, status;
1196 1969
… …
1204 /* make sure we are called again until all children have been reaped */ 1977 /* make sure we are called again until all children have been reaped */
1205 /* we need to do it this way so that the callback gets called before we continue */ 1978 /* we need to do it this way so that the callback gets called before we continue */
1206 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1979 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1207 1980
1208 child_reap (EV_A_ pid, pid, status); 1981 child_reap (EV_A_ pid, pid, status);
1209 if (EV_PID_HASHSIZE > 1) 1982 if ((EV_PID_HASHSIZE) > 1)
1210 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1983 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1211} 1984}
1212 1985
1213#endif 1986#endif
1214 1987
1215/*****************************************************************************/ 1988/*****************************************************************************/
1216 1989
1990#if EV_USE_IOCP
1991# include "ev_iocp.c"
1992#endif
1217#if EV_USE_PORT 1993#if EV_USE_PORT
1218# include "ev_port.c" 1994# include "ev_port.c"
1219#endif 1995#endif
1220#if EV_USE_KQUEUE 1996#if EV_USE_KQUEUE
1221# include "ev_kqueue.c" 1997# include "ev_kqueue.c"
… …
1228#endif 2004#endif
1229#if EV_USE_SELECT 2005#if EV_USE_SELECT
1230# include "ev_select.c" 2006# include "ev_select.c"
1231#endif 2007#endif
1232 2008
1233int 2009int ecb_cold
1234ev_version_major (void) 2010ev_version_major (void)
1235{ 2011{
1236 return EV_VERSION_MAJOR; 2012 return EV_VERSION_MAJOR;
1237} 2013}
1238 2014
1239int 2015int ecb_cold
1240ev_version_minor (void) 2016ev_version_minor (void)
1241{ 2017{
1242 return EV_VERSION_MINOR; 2018 return EV_VERSION_MINOR;
1243} 2019}
1244 2020
1245/* return true if we are running with elevated privileges and should ignore env variables */ 2021/* return true if we are running with elevated privileges and should ignore env variables */
1246int inline_size 2022int inline_size ecb_cold
1247enable_secure (void) 2023enable_secure (void)
1248{ 2024{
1249#ifdef _WIN32 2025#ifdef _WIN32
1250 return 0; 2026 return 0;
1251#else 2027#else
1252 return getuid () != geteuid () 2028 return getuid () != geteuid ()
1253 || getgid () != getegid (); 2029 || getgid () != getegid ();
1254#endif 2030#endif
1255} 2031}
1256 2032
1257unsigned int 2033unsigned int ecb_cold
1258ev_supported_backends (void) 2034ev_supported_backends (void)
1259{ 2035{
1260 unsigned int flags = 0; 2036 unsigned int flags = 0;
1261 2037
1262 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2038 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1266 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 2042 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1267 2043
1268 return flags; 2044 return flags;
1269} 2045}
1270 2046
1271unsigned int 2047unsigned int ecb_cold
1272ev_recommended_backends (void) 2048ev_recommended_backends (void)
1273{ 2049{
1274 unsigned int flags = ev_supported_backends (); 2050 unsigned int flags = ev_supported_backends ();
1275 2051
1276#ifndef __NetBSD__ 2052#ifndef __NetBSD__
… …
1281#ifdef __APPLE__ 2057#ifdef __APPLE__
1282 /* only select works correctly on that "unix-certified" platform */ 2058 /* only select works correctly on that "unix-certified" platform */
1283 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 2059 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1284 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 2060 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1285#endif 2061#endif
2062#ifdef __FreeBSD__
2063 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
2064#endif
1286 2065
1287 return flags; 2066 return flags;
1288} 2067}
1289 2068
1290unsigned int 2069unsigned int ecb_cold
1291ev_embeddable_backends (void) 2070ev_embeddable_backends (void)
1292{ 2071{
1293 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2072 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1294 2073
1295 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2074 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1296 /* please fix it and tell me how to detect the fix */ 2075 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1297 flags &= ~EVBACKEND_EPOLL; 2076 flags &= ~EVBACKEND_EPOLL;
1298 2077
1299 return flags; 2078 return flags;
1300} 2079}
1301 2080
1302unsigned int 2081unsigned int
1303ev_backend (EV_P) 2082ev_backend (EV_P)
1304{ 2083{
1305 return backend; 2084 return backend;
1306} 2085}
1307 2086
2087#if EV_FEATURE_API
1308unsigned int 2088unsigned int
1309ev_loop_count (EV_P) 2089ev_iteration (EV_P)
1310{ 2090{
1311 return loop_count; 2091 return loop_count;
2092}
2093
2094unsigned int
2095ev_depth (EV_P)
2096{
2097 return loop_depth;
1312} 2098}
1313 2099
1314void 2100void
1315ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 2101ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1316{ 2102{
… …
1321ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 2107ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1322{ 2108{
1323 timeout_blocktime = interval; 2109 timeout_blocktime = interval;
1324} 2110}
1325 2111
2112void
2113ev_set_userdata (EV_P_ void *data)
2114{
2115 userdata = data;
2116}
2117
2118void *
2119ev_userdata (EV_P)
2120{
2121 return userdata;
2122}
2123
2124void
2125ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
2126{
2127 invoke_cb = invoke_pending_cb;
2128}
2129
2130void
2131ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
2132{
2133 release_cb = release;
2134 acquire_cb = acquire;
2135}
2136#endif
2137
2138/* initialise a loop structure, must be zero-initialised */
1326static void noinline 2139static void noinline ecb_cold
1327loop_init (EV_P_ unsigned int flags) 2140loop_init (EV_P_ unsigned int flags)
1328{ 2141{
1329 if (!backend) 2142 if (!backend)
1330 { 2143 {
2144 origflags = flags;
2145
1331#if EV_USE_REALTIME 2146#if EV_USE_REALTIME
1332 if (!have_realtime) 2147 if (!have_realtime)
1333 { 2148 {
1334 struct timespec ts; 2149 struct timespec ts;
1335 2150
… …
1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 2161 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1347 have_monotonic = 1; 2162 have_monotonic = 1;
1348 } 2163 }
1349#endif 2164#endif
1350 2165
1351 ev_rt_now = ev_time ();
1352 mn_now = get_clock ();
1353 now_floor = mn_now;
1354 rtmn_diff = ev_rt_now - mn_now;
1355
1356 io_blocktime = 0.;
1357 timeout_blocktime = 0.;
1358 backend = 0;
1359 backend_fd = -1;
1360 gotasync = 0;
1361#if EV_USE_INOTIFY
1362 fs_fd = -2;
1363#endif
1364
1365 /* pid check not overridable via env */ 2166 /* pid check not overridable via env */
1366#ifndef _WIN32 2167#ifndef _WIN32
1367 if (flags & EVFLAG_FORKCHECK) 2168 if (flags & EVFLAG_FORKCHECK)
1368 curpid = getpid (); 2169 curpid = getpid ();
1369#endif 2170#endif
… …
1371 if (!(flags & EVFLAG_NOENV) 2172 if (!(flags & EVFLAG_NOENV)
1372 && !enable_secure () 2173 && !enable_secure ()
1373 && getenv ("LIBEV_FLAGS")) 2174 && getenv ("LIBEV_FLAGS"))
1374 flags = atoi (getenv ("LIBEV_FLAGS")); 2175 flags = atoi (getenv ("LIBEV_FLAGS"));
1375 2176
1376 if (!(flags & 0x0000ffffU)) 2177 ev_rt_now = ev_time ();
2178 mn_now = get_clock ();
2179 now_floor = mn_now;
2180 rtmn_diff = ev_rt_now - mn_now;
2181#if EV_FEATURE_API
2182 invoke_cb = ev_invoke_pending;
2183#endif
2184
2185 io_blocktime = 0.;
2186 timeout_blocktime = 0.;
2187 backend = 0;
2188 backend_fd = -1;
2189 sig_pending = 0;
2190#if EV_ASYNC_ENABLE
2191 async_pending = 0;
2192#endif
2193 pipe_write_skipped = 0;
2194 pipe_write_wanted = 0;
2195#if EV_USE_INOTIFY
2196 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2197#endif
2198#if EV_USE_SIGNALFD
2199 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
2200#endif
2201
2202 if (!(flags & EVBACKEND_MASK))
1377 flags |= ev_recommended_backends (); 2203 flags |= ev_recommended_backends ();
1378 2204
2205#if EV_USE_IOCP
2206 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
2207#endif
1379#if EV_USE_PORT 2208#if EV_USE_PORT
1380 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 2209 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1381#endif 2210#endif
1382#if EV_USE_KQUEUE 2211#if EV_USE_KQUEUE
1383 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 2212 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1390#endif 2219#endif
1391#if EV_USE_SELECT 2220#if EV_USE_SELECT
1392 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 2221 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1393#endif 2222#endif
1394 2223
2224 ev_prepare_init (&pending_w, pendingcb);
2225
2226#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1395 ev_init (&pipeev, pipecb); 2227 ev_init (&pipe_w, pipecb);
1396 ev_set_priority (&pipeev, EV_MAXPRI); 2228 ev_set_priority (&pipe_w, EV_MAXPRI);
2229#endif
1397 } 2230 }
1398} 2231}
1399 2232
1400static void noinline 2233/* free up a loop structure */
2234void ecb_cold
1401loop_destroy (EV_P) 2235ev_loop_destroy (EV_P)
1402{ 2236{
1403 int i; 2237 int i;
1404 2238
2239#if EV_MULTIPLICITY
2240 /* mimic free (0) */
2241 if (!EV_A)
2242 return;
2243#endif
2244
2245#if EV_CLEANUP_ENABLE
2246 /* queue cleanup watchers (and execute them) */
2247 if (expect_false (cleanupcnt))
2248 {
2249 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
2250 EV_INVOKE_PENDING;
2251 }
2252#endif
2253
2254#if EV_CHILD_ENABLE
2255 if (ev_is_active (&childev))
2256 {
2257 ev_ref (EV_A); /* child watcher */
2258 ev_signal_stop (EV_A_ &childev);
2259 }
2260#endif
2261
1405 if (ev_is_active (&pipeev)) 2262 if (ev_is_active (&pipe_w))
1406 { 2263 {
1407 ev_ref (EV_A); /* signal watcher */ 2264 /*ev_ref (EV_A);*/
1408 ev_io_stop (EV_A_ &pipeev); 2265 /*ev_io_stop (EV_A_ &pipe_w);*/
1409 2266
1410#if EV_USE_EVENTFD 2267#if EV_USE_EVENTFD
1411 if (evfd >= 0) 2268 if (evfd >= 0)
1412 close (evfd); 2269 close (evfd);
1413#endif 2270#endif
1414 2271
1415 if (evpipe [0] >= 0) 2272 if (evpipe [0] >= 0)
1416 { 2273 {
1417 close (evpipe [0]); 2274 EV_WIN32_CLOSE_FD (evpipe [0]);
1418 close (evpipe [1]); 2275 EV_WIN32_CLOSE_FD (evpipe [1]);
1419 } 2276 }
1420 } 2277 }
2278
2279#if EV_USE_SIGNALFD
2280 if (ev_is_active (&sigfd_w))
2281 close (sigfd);
2282#endif
1421 2283
1422#if EV_USE_INOTIFY 2284#if EV_USE_INOTIFY
1423 if (fs_fd >= 0) 2285 if (fs_fd >= 0)
1424 close (fs_fd); 2286 close (fs_fd);
1425#endif 2287#endif
1426 2288
1427 if (backend_fd >= 0) 2289 if (backend_fd >= 0)
1428 close (backend_fd); 2290 close (backend_fd);
1429 2291
2292#if EV_USE_IOCP
2293 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
2294#endif
1430#if EV_USE_PORT 2295#if EV_USE_PORT
1431 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 2296 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1432#endif 2297#endif
1433#if EV_USE_KQUEUE 2298#if EV_USE_KQUEUE
1434 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 2299 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1449#if EV_IDLE_ENABLE 2314#if EV_IDLE_ENABLE
1450 array_free (idle, [i]); 2315 array_free (idle, [i]);
1451#endif 2316#endif
1452 } 2317 }
1453 2318
1454 ev_free (anfds); anfdmax = 0; 2319 ev_free (anfds); anfds = 0; anfdmax = 0;
1455 2320
1456 /* have to use the microsoft-never-gets-it-right macro */ 2321 /* have to use the microsoft-never-gets-it-right macro */
2322 array_free (rfeed, EMPTY);
1457 array_free (fdchange, EMPTY); 2323 array_free (fdchange, EMPTY);
1458 array_free (timer, EMPTY); 2324 array_free (timer, EMPTY);
1459#if EV_PERIODIC_ENABLE 2325#if EV_PERIODIC_ENABLE
1460 array_free (periodic, EMPTY); 2326 array_free (periodic, EMPTY);
1461#endif 2327#endif
1462#if EV_FORK_ENABLE 2328#if EV_FORK_ENABLE
1463 array_free (fork, EMPTY); 2329 array_free (fork, EMPTY);
1464#endif 2330#endif
2331#if EV_CLEANUP_ENABLE
2332 array_free (cleanup, EMPTY);
2333#endif
1465 array_free (prepare, EMPTY); 2334 array_free (prepare, EMPTY);
1466 array_free (check, EMPTY); 2335 array_free (check, EMPTY);
1467#if EV_ASYNC_ENABLE 2336#if EV_ASYNC_ENABLE
1468 array_free (async, EMPTY); 2337 array_free (async, EMPTY);
1469#endif 2338#endif
1470 2339
1471 backend = 0; 2340 backend = 0;
2341
2342#if EV_MULTIPLICITY
2343 if (ev_is_default_loop (EV_A))
2344#endif
2345 ev_default_loop_ptr = 0;
2346#if EV_MULTIPLICITY
2347 else
2348 ev_free (EV_A);
2349#endif
1472} 2350}
1473 2351
1474#if EV_USE_INOTIFY 2352#if EV_USE_INOTIFY
1475void inline_size infy_fork (EV_P); 2353inline_size void infy_fork (EV_P);
1476#endif 2354#endif
1477 2355
1478void inline_size 2356inline_size void
1479loop_fork (EV_P) 2357loop_fork (EV_P)
1480{ 2358{
1481#if EV_USE_PORT 2359#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 2360 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1483#endif 2361#endif
… …
1489#endif 2367#endif
1490#if EV_USE_INOTIFY 2368#if EV_USE_INOTIFY
1491 infy_fork (EV_A); 2369 infy_fork (EV_A);
1492#endif 2370#endif
1493 2371
1494 if (ev_is_active (&pipeev)) 2372 if (ev_is_active (&pipe_w))
1495 { 2373 {
1496 /* this "locks" the handlers against writing to the pipe */ 2374 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1497 /* while we modify the fd vars */
1498 gotsig = 1;
1499#if EV_ASYNC_ENABLE
1500 gotasync = 1;
1501#endif
1502 2375
1503 ev_ref (EV_A); 2376 ev_ref (EV_A);
1504 ev_io_stop (EV_A_ &pipeev); 2377 ev_io_stop (EV_A_ &pipe_w);
1505 2378
1506#if EV_USE_EVENTFD 2379#if EV_USE_EVENTFD
1507 if (evfd >= 0) 2380 if (evfd >= 0)
1508 close (evfd); 2381 close (evfd);
1509#endif 2382#endif
1510 2383
1511 if (evpipe [0] >= 0) 2384 if (evpipe [0] >= 0)
1512 { 2385 {
1513 close (evpipe [0]); 2386 EV_WIN32_CLOSE_FD (evpipe [0]);
1514 close (evpipe [1]); 2387 EV_WIN32_CLOSE_FD (evpipe [1]);
1515 } 2388 }
1516 2389
2390#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1517 evpipe_init (EV_A); 2391 evpipe_init (EV_A);
1518 /* now iterate over everything, in case we missed something */ 2392 /* now iterate over everything, in case we missed something */
1519 pipecb (EV_A_ &pipeev, EV_READ); 2393 pipecb (EV_A_ &pipe_w, EV_READ);
2394#endif
1520 } 2395 }
1521 2396
1522 postfork = 0; 2397 postfork = 0;
1523} 2398}
1524 2399
1525#if EV_MULTIPLICITY 2400#if EV_MULTIPLICITY
1526 2401
1527struct ev_loop * 2402struct ev_loop * ecb_cold
1528ev_loop_new (unsigned int flags) 2403ev_loop_new (unsigned int flags)
1529{ 2404{
1530 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2405 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1531 2406
1532 memset (loop, 0, sizeof (struct ev_loop)); 2407 memset (EV_A, 0, sizeof (struct ev_loop));
1533
1534 loop_init (EV_A_ flags); 2408 loop_init (EV_A_ flags);
1535 2409
1536 if (ev_backend (EV_A)) 2410 if (ev_backend (EV_A))
1537 return loop; 2411 return EV_A;
1538 2412
2413 ev_free (EV_A);
1539 return 0; 2414 return 0;
1540} 2415}
1541 2416
1542void 2417#endif /* multiplicity */
1543ev_loop_destroy (EV_P)
1544{
1545 loop_destroy (EV_A);
1546 ev_free (loop);
1547}
1548
1549void
1550ev_loop_fork (EV_P)
1551{
1552 postfork = 1; /* must be in line with ev_default_fork */
1553}
1554 2418
1555#if EV_VERIFY 2419#if EV_VERIFY
1556static void noinline 2420static void noinline ecb_cold
1557verify_watcher (EV_P_ W w) 2421verify_watcher (EV_P_ W w)
1558{ 2422{
1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2423 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1560 2424
1561 if (w->pending) 2425 if (w->pending)
1562 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2426 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1563} 2427}
1564 2428
1565static void noinline 2429static void noinline ecb_cold
1566verify_heap (EV_P_ ANHE *heap, int N) 2430verify_heap (EV_P_ ANHE *heap, int N)
1567{ 2431{
1568 int i; 2432 int i;
1569 2433
1570 for (i = HEAP0; i < N + HEAP0; ++i) 2434 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1575 2439
1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2440 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1577 } 2441 }
1578} 2442}
1579 2443
1580static void noinline 2444static void noinline ecb_cold
1581array_verify (EV_P_ W *ws, int cnt) 2445array_verify (EV_P_ W *ws, int cnt)
1582{ 2446{
1583 while (cnt--) 2447 while (cnt--)
1584 { 2448 {
1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2449 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1586 verify_watcher (EV_A_ ws [cnt]); 2450 verify_watcher (EV_A_ ws [cnt]);
1587 } 2451 }
1588} 2452}
1589#endif 2453#endif
1590 2454
1591void 2455#if EV_FEATURE_API
2456void ecb_cold
1592ev_loop_verify (EV_P) 2457ev_verify (EV_P)
1593{ 2458{
1594#if EV_VERIFY 2459#if EV_VERIFY
1595 int i; 2460 int i;
1596 WL w; 2461 WL w;
1597 2462
… …
1631#if EV_FORK_ENABLE 2496#if EV_FORK_ENABLE
1632 assert (forkmax >= forkcnt); 2497 assert (forkmax >= forkcnt);
1633 array_verify (EV_A_ (W *)forks, forkcnt); 2498 array_verify (EV_A_ (W *)forks, forkcnt);
1634#endif 2499#endif
1635 2500
2501#if EV_CLEANUP_ENABLE
2502 assert (cleanupmax >= cleanupcnt);
2503 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2504#endif
2505
1636#if EV_ASYNC_ENABLE 2506#if EV_ASYNC_ENABLE
1637 assert (asyncmax >= asynccnt); 2507 assert (asyncmax >= asynccnt);
1638 array_verify (EV_A_ (W *)asyncs, asynccnt); 2508 array_verify (EV_A_ (W *)asyncs, asynccnt);
1639#endif 2509#endif
1640 2510
2511#if EV_PREPARE_ENABLE
1641 assert (preparemax >= preparecnt); 2512 assert (preparemax >= preparecnt);
1642 array_verify (EV_A_ (W *)prepares, preparecnt); 2513 array_verify (EV_A_ (W *)prepares, preparecnt);
2514#endif
1643 2515
2516#if EV_CHECK_ENABLE
1644 assert (checkmax >= checkcnt); 2517 assert (checkmax >= checkcnt);
1645 array_verify (EV_A_ (W *)checks, checkcnt); 2518 array_verify (EV_A_ (W *)checks, checkcnt);
2519#endif
1646 2520
1647# if 0 2521# if 0
2522#if EV_CHILD_ENABLE
1648 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2523 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1649 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2524 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2525#endif
1650# endif 2526# endif
1651#endif 2527#endif
1652} 2528}
1653 2529#endif
1654#endif /* multiplicity */
1655 2530
1656#if EV_MULTIPLICITY 2531#if EV_MULTIPLICITY
1657struct ev_loop * 2532struct ev_loop * ecb_cold
1658ev_default_loop_init (unsigned int flags)
1659#else 2533#else
1660int 2534int
2535#endif
1661ev_default_loop (unsigned int flags) 2536ev_default_loop (unsigned int flags)
1662#endif
1663{ 2537{
1664 if (!ev_default_loop_ptr) 2538 if (!ev_default_loop_ptr)
1665 { 2539 {
1666#if EV_MULTIPLICITY 2540#if EV_MULTIPLICITY
1667 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2541 EV_P = ev_default_loop_ptr = &default_loop_struct;
1668#else 2542#else
1669 ev_default_loop_ptr = 1; 2543 ev_default_loop_ptr = 1;
1670#endif 2544#endif
1671 2545
1672 loop_init (EV_A_ flags); 2546 loop_init (EV_A_ flags);
1673 2547
1674 if (ev_backend (EV_A)) 2548 if (ev_backend (EV_A))
1675 { 2549 {
1676#ifndef _WIN32 2550#if EV_CHILD_ENABLE
1677 ev_signal_init (&childev, childcb, SIGCHLD); 2551 ev_signal_init (&childev, childcb, SIGCHLD);
1678 ev_set_priority (&childev, EV_MAXPRI); 2552 ev_set_priority (&childev, EV_MAXPRI);
1679 ev_signal_start (EV_A_ &childev); 2553 ev_signal_start (EV_A_ &childev);
1680 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2554 ev_unref (EV_A); /* child watcher should not keep loop alive */
1681#endif 2555#endif
… …
1686 2560
1687 return ev_default_loop_ptr; 2561 return ev_default_loop_ptr;
1688} 2562}
1689 2563
1690void 2564void
1691ev_default_destroy (void) 2565ev_loop_fork (EV_P)
1692{ 2566{
1693#if EV_MULTIPLICITY
1694 struct ev_loop *loop = ev_default_loop_ptr;
1695#endif
1696
1697 ev_default_loop_ptr = 0;
1698
1699#ifndef _WIN32
1700 ev_ref (EV_A); /* child watcher */
1701 ev_signal_stop (EV_A_ &childev);
1702#endif
1703
1704 loop_destroy (EV_A);
1705}
1706
1707void
1708ev_default_fork (void)
1709{
1710#if EV_MULTIPLICITY
1711 struct ev_loop *loop = ev_default_loop_ptr;
1712#endif
1713
1714 postfork = 1; /* must be in line with ev_loop_fork */ 2567 postfork = 1; /* must be in line with ev_default_fork */
1715} 2568}
1716 2569
1717/*****************************************************************************/ 2570/*****************************************************************************/
1718 2571
1719void 2572void
1720ev_invoke (EV_P_ void *w, int revents) 2573ev_invoke (EV_P_ void *w, int revents)
1721{ 2574{
1722 EV_CB_INVOKE ((W)w, revents); 2575 EV_CB_INVOKE ((W)w, revents);
1723} 2576}
1724 2577
1725void inline_speed 2578unsigned int
1726call_pending (EV_P) 2579ev_pending_count (EV_P)
2580{
2581 int pri;
2582 unsigned int count = 0;
2583
2584 for (pri = NUMPRI; pri--; )
2585 count += pendingcnt [pri];
2586
2587 return count;
2588}
2589
2590void noinline
2591ev_invoke_pending (EV_P)
1727{ 2592{
1728 int pri; 2593 int pri;
1729 2594
1730 for (pri = NUMPRI; pri--; ) 2595 for (pri = NUMPRI; pri--; )
1731 while (pendingcnt [pri]) 2596 while (pendingcnt [pri])
1732 { 2597 {
1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2598 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1734 2599
1735 if (expect_true (p->w))
1736 {
1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1738
1739 p->w->pending = 0; 2600 p->w->pending = 0;
1740 EV_CB_INVOKE (p->w, p->events); 2601 EV_CB_INVOKE (p->w, p->events);
1741 EV_FREQUENT_CHECK; 2602 EV_FREQUENT_CHECK;
1742 }
1743 } 2603 }
1744} 2604}
1745 2605
1746#if EV_IDLE_ENABLE 2606#if EV_IDLE_ENABLE
1747void inline_size 2607/* make idle watchers pending. this handles the "call-idle */
2608/* only when higher priorities are idle" logic */
2609inline_size void
1748idle_reify (EV_P) 2610idle_reify (EV_P)
1749{ 2611{
1750 if (expect_false (idleall)) 2612 if (expect_false (idleall))
1751 { 2613 {
1752 int pri; 2614 int pri;
… …
1764 } 2626 }
1765 } 2627 }
1766} 2628}
1767#endif 2629#endif
1768 2630
1769void inline_size 2631/* make timers pending */
2632inline_size void
1770timers_reify (EV_P) 2633timers_reify (EV_P)
1771{ 2634{
1772 EV_FREQUENT_CHECK; 2635 EV_FREQUENT_CHECK;
1773 2636
1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2637 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1775 { 2638 {
1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2639 do
1777
1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1779
1780 /* first reschedule or stop timer */
1781 if (w->repeat)
1782 { 2640 {
2641 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2642
2643 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2644
2645 /* first reschedule or stop timer */
2646 if (w->repeat)
2647 {
1783 ev_at (w) += w->repeat; 2648 ev_at (w) += w->repeat;
1784 if (ev_at (w) < mn_now) 2649 if (ev_at (w) < mn_now)
1785 ev_at (w) = mn_now; 2650 ev_at (w) = mn_now;
1786 2651
1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2652 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1788 2653
1789 ANHE_at_cache (timers [HEAP0]); 2654 ANHE_at_cache (timers [HEAP0]);
1790 downheap (timers, timercnt, HEAP0); 2655 downheap (timers, timercnt, HEAP0);
2656 }
2657 else
2658 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2659
2660 EV_FREQUENT_CHECK;
2661 feed_reverse (EV_A_ (W)w);
1791 } 2662 }
1792 else 2663 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1793 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1794 2664
1795 EV_FREQUENT_CHECK; 2665 feed_reverse_done (EV_A_ EV_TIMER);
1796 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1797 } 2666 }
1798} 2667}
1799 2668
1800#if EV_PERIODIC_ENABLE 2669#if EV_PERIODIC_ENABLE
1801void inline_size 2670
2671static void noinline
2672periodic_recalc (EV_P_ ev_periodic *w)
2673{
2674 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2675 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2676
2677 /* the above almost always errs on the low side */
2678 while (at <= ev_rt_now)
2679 {
2680 ev_tstamp nat = at + w->interval;
2681
2682 /* when resolution fails us, we use ev_rt_now */
2683 if (expect_false (nat == at))
2684 {
2685 at = ev_rt_now;
2686 break;
2687 }
2688
2689 at = nat;
2690 }
2691
2692 ev_at (w) = at;
2693}
2694
2695/* make periodics pending */
2696inline_size void
1802periodics_reify (EV_P) 2697periodics_reify (EV_P)
1803{ 2698{
1804 EV_FREQUENT_CHECK; 2699 EV_FREQUENT_CHECK;
1805 2700
1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2701 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1807 { 2702 {
1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2703 int feed_count = 0;
1809 2704
1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2705 do
1811
1812 /* first reschedule or stop timer */
1813 if (w->reschedule_cb)
1814 { 2706 {
2707 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2708
2709 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2710
2711 /* first reschedule or stop timer */
2712 if (w->reschedule_cb)
2713 {
1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2714 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1816 2715
1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2716 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1818 2717
1819 ANHE_at_cache (periodics [HEAP0]); 2718 ANHE_at_cache (periodics [HEAP0]);
1820 downheap (periodics, periodiccnt, HEAP0); 2719 downheap (periodics, periodiccnt, HEAP0);
2720 }
2721 else if (w->interval)
2722 {
2723 periodic_recalc (EV_A_ w);
2724 ANHE_at_cache (periodics [HEAP0]);
2725 downheap (periodics, periodiccnt, HEAP0);
2726 }
2727 else
2728 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2729
2730 EV_FREQUENT_CHECK;
2731 feed_reverse (EV_A_ (W)w);
1821 } 2732 }
1822 else if (w->interval) 2733 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1823 {
1824 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1825 /* if next trigger time is not sufficiently in the future, put it there */
1826 /* this might happen because of floating point inexactness */
1827 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1828 {
1829 ev_at (w) += w->interval;
1830 2734
1831 /* if interval is unreasonably low we might still have a time in the past */
1832 /* so correct this. this will make the periodic very inexact, but the user */
1833 /* has effectively asked to get triggered more often than possible */
1834 if (ev_at (w) < ev_rt_now)
1835 ev_at (w) = ev_rt_now;
1836 }
1837
1838 ANHE_at_cache (periodics [HEAP0]);
1839 downheap (periodics, periodiccnt, HEAP0);
1840 }
1841 else
1842 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1843
1844 EV_FREQUENT_CHECK;
1845 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2735 feed_reverse_done (EV_A_ EV_PERIODIC);
1846 } 2736 }
1847} 2737}
1848 2738
2739/* simply recalculate all periodics */
2740/* TODO: maybe ensure that at least one event happens when jumping forward? */
1849static void noinline 2741static void noinline ecb_cold
1850periodics_reschedule (EV_P) 2742periodics_reschedule (EV_P)
1851{ 2743{
1852 int i; 2744 int i;
1853 2745
1854 /* adjust periodics after time jump */ 2746 /* adjust periodics after time jump */
… …
1857 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2749 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1858 2750
1859 if (w->reschedule_cb) 2751 if (w->reschedule_cb)
1860 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2752 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1861 else if (w->interval) 2753 else if (w->interval)
1862 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2754 periodic_recalc (EV_A_ w);
1863 2755
1864 ANHE_at_cache (periodics [i]); 2756 ANHE_at_cache (periodics [i]);
1865 } 2757 }
1866 2758
1867 reheap (periodics, periodiccnt); 2759 reheap (periodics, periodiccnt);
1868} 2760}
1869#endif 2761#endif
1870 2762
1871void inline_speed 2763/* adjust all timers by a given offset */
2764static void noinline ecb_cold
2765timers_reschedule (EV_P_ ev_tstamp adjust)
2766{
2767 int i;
2768
2769 for (i = 0; i < timercnt; ++i)
2770 {
2771 ANHE *he = timers + i + HEAP0;
2772 ANHE_w (*he)->at += adjust;
2773 ANHE_at_cache (*he);
2774 }
2775}
2776
2777/* fetch new monotonic and realtime times from the kernel */
2778/* also detect if there was a timejump, and act accordingly */
2779inline_speed void
1872time_update (EV_P_ ev_tstamp max_block) 2780time_update (EV_P_ ev_tstamp max_block)
1873{ 2781{
1874 int i;
1875
1876#if EV_USE_MONOTONIC 2782#if EV_USE_MONOTONIC
1877 if (expect_true (have_monotonic)) 2783 if (expect_true (have_monotonic))
1878 { 2784 {
2785 int i;
1879 ev_tstamp odiff = rtmn_diff; 2786 ev_tstamp odiff = rtmn_diff;
1880 2787
1881 mn_now = get_clock (); 2788 mn_now = get_clock ();
1882 2789
1883 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2790 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1899 * doesn't hurt either as we only do this on time-jumps or 2806 * doesn't hurt either as we only do this on time-jumps or
1900 * in the unlikely event of having been preempted here. 2807 * in the unlikely event of having been preempted here.
1901 */ 2808 */
1902 for (i = 4; --i; ) 2809 for (i = 4; --i; )
1903 { 2810 {
2811 ev_tstamp diff;
1904 rtmn_diff = ev_rt_now - mn_now; 2812 rtmn_diff = ev_rt_now - mn_now;
1905 2813
2814 diff = odiff - rtmn_diff;
2815
1906 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2816 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
1907 return; /* all is well */ 2817 return; /* all is well */
1908 2818
1909 ev_rt_now = ev_time (); 2819 ev_rt_now = ev_time ();
1910 mn_now = get_clock (); 2820 mn_now = get_clock ();
1911 now_floor = mn_now; 2821 now_floor = mn_now;
1912 } 2822 }
1913 2823
2824 /* no timer adjustment, as the monotonic clock doesn't jump */
2825 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1914# if EV_PERIODIC_ENABLE 2826# if EV_PERIODIC_ENABLE
1915 periodics_reschedule (EV_A); 2827 periodics_reschedule (EV_A);
1916# endif 2828# endif
1917 /* no timer adjustment, as the monotonic clock doesn't jump */
1918 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1919 } 2829 }
1920 else 2830 else
1921#endif 2831#endif
1922 { 2832 {
1923 ev_rt_now = ev_time (); 2833 ev_rt_now = ev_time ();
1924 2834
1925 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2835 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1926 { 2836 {
2837 /* adjust timers. this is easy, as the offset is the same for all of them */
2838 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1927#if EV_PERIODIC_ENABLE 2839#if EV_PERIODIC_ENABLE
1928 periodics_reschedule (EV_A); 2840 periodics_reschedule (EV_A);
1929#endif 2841#endif
1930 /* adjust timers. this is easy, as the offset is the same for all of them */
1931 for (i = 0; i < timercnt; ++i)
1932 {
1933 ANHE *he = timers + i + HEAP0;
1934 ANHE_w (*he)->at += ev_rt_now - mn_now;
1935 ANHE_at_cache (*he);
1936 }
1937 } 2842 }
1938 2843
1939 mn_now = ev_rt_now; 2844 mn_now = ev_rt_now;
1940 } 2845 }
1941} 2846}
1942 2847
1943void 2848void
1944ev_ref (EV_P)
1945{
1946 ++activecnt;
1947}
1948
1949void
1950ev_unref (EV_P)
1951{
1952 --activecnt;
1953}
1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1961static int loop_done;
1962
1963void
1964ev_loop (EV_P_ int flags) 2849ev_run (EV_P_ int flags)
1965{ 2850{
2851#if EV_FEATURE_API
2852 ++loop_depth;
2853#endif
2854
2855 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2856
1966 loop_done = EVUNLOOP_CANCEL; 2857 loop_done = EVBREAK_CANCEL;
1967 2858
1968 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2859 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1969 2860
1970 do 2861 do
1971 { 2862 {
1972#if EV_VERIFY >= 2 2863#if EV_VERIFY >= 2
1973 ev_loop_verify (EV_A); 2864 ev_verify (EV_A);
1974#endif 2865#endif
1975 2866
1976#ifndef _WIN32 2867#ifndef _WIN32
1977 if (expect_false (curpid)) /* penalise the forking check even more */ 2868 if (expect_false (curpid)) /* penalise the forking check even more */
1978 if (expect_false (getpid () != curpid)) 2869 if (expect_false (getpid () != curpid))
… …
1986 /* we might have forked, so queue fork handlers */ 2877 /* we might have forked, so queue fork handlers */
1987 if (expect_false (postfork)) 2878 if (expect_false (postfork))
1988 if (forkcnt) 2879 if (forkcnt)
1989 { 2880 {
1990 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2881 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1991 call_pending (EV_A); 2882 EV_INVOKE_PENDING;
1992 } 2883 }
1993#endif 2884#endif
1994 2885
2886#if EV_PREPARE_ENABLE
1995 /* queue prepare watchers (and execute them) */ 2887 /* queue prepare watchers (and execute them) */
1996 if (expect_false (preparecnt)) 2888 if (expect_false (preparecnt))
1997 { 2889 {
1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2890 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1999 call_pending (EV_A); 2891 EV_INVOKE_PENDING;
2000 } 2892 }
2893#endif
2001 2894
2002 if (expect_false (!activecnt)) 2895 if (expect_false (loop_done))
2003 break; 2896 break;
2004 2897
2005 /* we might have forked, so reify kernel state if necessary */ 2898 /* we might have forked, so reify kernel state if necessary */
2006 if (expect_false (postfork)) 2899 if (expect_false (postfork))
2007 loop_fork (EV_A); 2900 loop_fork (EV_A);
… …
2012 /* calculate blocking time */ 2905 /* calculate blocking time */
2013 { 2906 {
2014 ev_tstamp waittime = 0.; 2907 ev_tstamp waittime = 0.;
2015 ev_tstamp sleeptime = 0.; 2908 ev_tstamp sleeptime = 0.;
2016 2909
2910 /* remember old timestamp for io_blocktime calculation */
2911 ev_tstamp prev_mn_now = mn_now;
2912
2913 /* update time to cancel out callback processing overhead */
2914 time_update (EV_A_ 1e100);
2915
2916 /* from now on, we want a pipe-wake-up */
2917 pipe_write_wanted = 1;
2918
2919 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
2920
2017 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2921 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2018 { 2922 {
2019 /* update time to cancel out callback processing overhead */
2020 time_update (EV_A_ 1e100);
2021
2022 waittime = MAX_BLOCKTIME; 2923 waittime = MAX_BLOCKTIME;
2023 2924
2024 if (timercnt) 2925 if (timercnt)
2025 { 2926 {
2026 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2927 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2027 if (waittime > to) waittime = to; 2928 if (waittime > to) waittime = to;
2028 } 2929 }
2029 2930
2030#if EV_PERIODIC_ENABLE 2931#if EV_PERIODIC_ENABLE
2031 if (periodiccnt) 2932 if (periodiccnt)
2032 { 2933 {
2033 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2934 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2034 if (waittime > to) waittime = to; 2935 if (waittime > to) waittime = to;
2035 } 2936 }
2036#endif 2937#endif
2037 2938
2939 /* don't let timeouts decrease the waittime below timeout_blocktime */
2038 if (expect_false (waittime < timeout_blocktime)) 2940 if (expect_false (waittime < timeout_blocktime))
2039 waittime = timeout_blocktime; 2941 waittime = timeout_blocktime;
2040 2942
2041 sleeptime = waittime - backend_fudge; 2943 /* at this point, we NEED to wait, so we have to ensure */
2944 /* to pass a minimum nonzero value to the backend */
2945 if (expect_false (waittime < backend_mintime))
2946 waittime = backend_mintime;
2042 2947
2948 /* extra check because io_blocktime is commonly 0 */
2043 if (expect_true (sleeptime > io_blocktime)) 2949 if (expect_false (io_blocktime))
2044 sleeptime = io_blocktime;
2045
2046 if (sleeptime)
2047 { 2950 {
2951 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2952
2953 if (sleeptime > waittime - backend_mintime)
2954 sleeptime = waittime - backend_mintime;
2955
2956 if (expect_true (sleeptime > 0.))
2957 {
2048 ev_sleep (sleeptime); 2958 ev_sleep (sleeptime);
2049 waittime -= sleeptime; 2959 waittime -= sleeptime;
2960 }
2050 } 2961 }
2051 } 2962 }
2052 2963
2964#if EV_FEATURE_API
2053 ++loop_count; 2965 ++loop_count;
2966#endif
2967 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2054 backend_poll (EV_A_ waittime); 2968 backend_poll (EV_A_ waittime);
2969 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2970
2971 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2972
2973 if (pipe_write_skipped)
2974 {
2975 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2976 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2977 }
2978
2055 2979
2056 /* update ev_rt_now, do magic */ 2980 /* update ev_rt_now, do magic */
2057 time_update (EV_A_ waittime + sleeptime); 2981 time_update (EV_A_ waittime + sleeptime);
2058 } 2982 }
2059 2983
… …
2066#if EV_IDLE_ENABLE 2990#if EV_IDLE_ENABLE
2067 /* queue idle watchers unless other events are pending */ 2991 /* queue idle watchers unless other events are pending */
2068 idle_reify (EV_A); 2992 idle_reify (EV_A);
2069#endif 2993#endif
2070 2994
2995#if EV_CHECK_ENABLE
2071 /* queue check watchers, to be executed first */ 2996 /* queue check watchers, to be executed first */
2072 if (expect_false (checkcnt)) 2997 if (expect_false (checkcnt))
2073 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2998 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2999#endif
2074 3000
2075 call_pending (EV_A); 3001 EV_INVOKE_PENDING;
2076 } 3002 }
2077 while (expect_true ( 3003 while (expect_true (
2078 activecnt 3004 activecnt
2079 && !loop_done 3005 && !loop_done
2080 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 3006 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2081 )); 3007 ));
2082 3008
2083 if (loop_done == EVUNLOOP_ONE) 3009 if (loop_done == EVBREAK_ONE)
2084 loop_done = EVUNLOOP_CANCEL; 3010 loop_done = EVBREAK_CANCEL;
3011
3012#if EV_FEATURE_API
3013 --loop_depth;
3014#endif
2085} 3015}
2086 3016
2087void 3017void
2088ev_unloop (EV_P_ int how) 3018ev_break (EV_P_ int how)
2089{ 3019{
2090 loop_done = how; 3020 loop_done = how;
2091} 3021}
2092 3022
3023void
3024ev_ref (EV_P)
3025{
3026 ++activecnt;
3027}
3028
3029void
3030ev_unref (EV_P)
3031{
3032 --activecnt;
3033}
3034
3035void
3036ev_now_update (EV_P)
3037{
3038 time_update (EV_A_ 1e100);
3039}
3040
3041void
3042ev_suspend (EV_P)
3043{
3044 ev_now_update (EV_A);
3045}
3046
3047void
3048ev_resume (EV_P)
3049{
3050 ev_tstamp mn_prev = mn_now;
3051
3052 ev_now_update (EV_A);
3053 timers_reschedule (EV_A_ mn_now - mn_prev);
3054#if EV_PERIODIC_ENABLE
3055 /* TODO: really do this? */
3056 periodics_reschedule (EV_A);
3057#endif
3058}
3059
2093/*****************************************************************************/ 3060/*****************************************************************************/
3061/* singly-linked list management, used when the expected list length is short */
2094 3062
2095void inline_size 3063inline_size void
2096wlist_add (WL *head, WL elem) 3064wlist_add (WL *head, WL elem)
2097{ 3065{
2098 elem->next = *head; 3066 elem->next = *head;
2099 *head = elem; 3067 *head = elem;
2100} 3068}
2101 3069
2102void inline_size 3070inline_size void
2103wlist_del (WL *head, WL elem) 3071wlist_del (WL *head, WL elem)
2104{ 3072{
2105 while (*head) 3073 while (*head)
2106 { 3074 {
2107 if (*head == elem) 3075 if (expect_true (*head == elem))
2108 { 3076 {
2109 *head = elem->next; 3077 *head = elem->next;
2110 return; 3078 break;
2111 } 3079 }
2112 3080
2113 head = &(*head)->next; 3081 head = &(*head)->next;
2114 } 3082 }
2115} 3083}
2116 3084
2117void inline_speed 3085/* internal, faster, version of ev_clear_pending */
3086inline_speed void
2118clear_pending (EV_P_ W w) 3087clear_pending (EV_P_ W w)
2119{ 3088{
2120 if (w->pending) 3089 if (w->pending)
2121 { 3090 {
2122 pendings [ABSPRI (w)][w->pending - 1].w = 0; 3091 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2123 w->pending = 0; 3092 w->pending = 0;
2124 } 3093 }
2125} 3094}
2126 3095
2127int 3096int
… …
2131 int pending = w_->pending; 3100 int pending = w_->pending;
2132 3101
2133 if (expect_true (pending)) 3102 if (expect_true (pending))
2134 { 3103 {
2135 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 3104 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
3105 p->w = (W)&pending_w;
2136 w_->pending = 0; 3106 w_->pending = 0;
2137 p->w = 0;
2138 return p->events; 3107 return p->events;
2139 } 3108 }
2140 else 3109 else
2141 return 0; 3110 return 0;
2142} 3111}
2143 3112
2144void inline_size 3113inline_size void
2145pri_adjust (EV_P_ W w) 3114pri_adjust (EV_P_ W w)
2146{ 3115{
2147 int pri = w->priority; 3116 int pri = ev_priority (w);
2148 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 3117 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2149 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 3118 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2150 w->priority = pri; 3119 ev_set_priority (w, pri);
2151} 3120}
2152 3121
2153void inline_speed 3122inline_speed void
2154ev_start (EV_P_ W w, int active) 3123ev_start (EV_P_ W w, int active)
2155{ 3124{
2156 pri_adjust (EV_A_ w); 3125 pri_adjust (EV_A_ w);
2157 w->active = active; 3126 w->active = active;
2158 ev_ref (EV_A); 3127 ev_ref (EV_A);
2159} 3128}
2160 3129
2161void inline_size 3130inline_size void
2162ev_stop (EV_P_ W w) 3131ev_stop (EV_P_ W w)
2163{ 3132{
2164 ev_unref (EV_A); 3133 ev_unref (EV_A);
2165 w->active = 0; 3134 w->active = 0;
2166} 3135}
… …
2174 3143
2175 if (expect_false (ev_is_active (w))) 3144 if (expect_false (ev_is_active (w)))
2176 return; 3145 return;
2177 3146
2178 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 3147 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2179 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 3148 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2180 3149
2181 EV_FREQUENT_CHECK; 3150 EV_FREQUENT_CHECK;
2182 3151
2183 ev_start (EV_A_ (W)w, 1); 3152 ev_start (EV_A_ (W)w, 1);
2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3153 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2185 wlist_add (&anfds[fd].head, (WL)w); 3154 wlist_add (&anfds[fd].head, (WL)w);
2186 3155
2187 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 3156 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2188 w->events &= ~EV__IOFDSET; 3157 w->events &= ~EV__IOFDSET;
2189 3158
2190 EV_FREQUENT_CHECK; 3159 EV_FREQUENT_CHECK;
2191} 3160}
2192 3161
… …
2202 EV_FREQUENT_CHECK; 3171 EV_FREQUENT_CHECK;
2203 3172
2204 wlist_del (&anfds[w->fd].head, (WL)w); 3173 wlist_del (&anfds[w->fd].head, (WL)w);
2205 ev_stop (EV_A_ (W)w); 3174 ev_stop (EV_A_ (W)w);
2206 3175
2207 fd_change (EV_A_ w->fd, 1); 3176 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2208 3177
2209 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
2210} 3179}
2211 3180
2212void noinline 3181void noinline
… …
2254 timers [active] = timers [timercnt + HEAP0]; 3223 timers [active] = timers [timercnt + HEAP0];
2255 adjustheap (timers, timercnt, active); 3224 adjustheap (timers, timercnt, active);
2256 } 3225 }
2257 } 3226 }
2258 3227
2259 EV_FREQUENT_CHECK;
2260
2261 ev_at (w) -= mn_now; 3228 ev_at (w) -= mn_now;
2262 3229
2263 ev_stop (EV_A_ (W)w); 3230 ev_stop (EV_A_ (W)w);
3231
3232 EV_FREQUENT_CHECK;
2264} 3233}
2265 3234
2266void noinline 3235void noinline
2267ev_timer_again (EV_P_ ev_timer *w) 3236ev_timer_again (EV_P_ ev_timer *w)
2268{ 3237{
… …
2286 } 3255 }
2287 3256
2288 EV_FREQUENT_CHECK; 3257 EV_FREQUENT_CHECK;
2289} 3258}
2290 3259
3260ev_tstamp
3261ev_timer_remaining (EV_P_ ev_timer *w)
3262{
3263 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
3264}
3265
2291#if EV_PERIODIC_ENABLE 3266#if EV_PERIODIC_ENABLE
2292void noinline 3267void noinline
2293ev_periodic_start (EV_P_ ev_periodic *w) 3268ev_periodic_start (EV_P_ ev_periodic *w)
2294{ 3269{
2295 if (expect_false (ev_is_active (w))) 3270 if (expect_false (ev_is_active (w)))
… …
2298 if (w->reschedule_cb) 3273 if (w->reschedule_cb)
2299 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 3274 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2300 else if (w->interval) 3275 else if (w->interval)
2301 { 3276 {
2302 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 3277 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2303 /* this formula differs from the one in periodic_reify because we do not always round up */ 3278 periodic_recalc (EV_A_ w);
2304 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2305 } 3279 }
2306 else 3280 else
2307 ev_at (w) = w->offset; 3281 ev_at (w) = w->offset;
2308 3282
2309 EV_FREQUENT_CHECK; 3283 EV_FREQUENT_CHECK;
… …
2341 periodics [active] = periodics [periodiccnt + HEAP0]; 3315 periodics [active] = periodics [periodiccnt + HEAP0];
2342 adjustheap (periodics, periodiccnt, active); 3316 adjustheap (periodics, periodiccnt, active);
2343 } 3317 }
2344 } 3318 }
2345 3319
2346 EV_FREQUENT_CHECK;
2347
2348 ev_stop (EV_A_ (W)w); 3320 ev_stop (EV_A_ (W)w);
3321
3322 EV_FREQUENT_CHECK;
2349} 3323}
2350 3324
2351void noinline 3325void noinline
2352ev_periodic_again (EV_P_ ev_periodic *w) 3326ev_periodic_again (EV_P_ ev_periodic *w)
2353{ 3327{
… …
2359 3333
2360#ifndef SA_RESTART 3334#ifndef SA_RESTART
2361# define SA_RESTART 0 3335# define SA_RESTART 0
2362#endif 3336#endif
2363 3337
3338#if EV_SIGNAL_ENABLE
3339
2364void noinline 3340void noinline
2365ev_signal_start (EV_P_ ev_signal *w) 3341ev_signal_start (EV_P_ ev_signal *w)
2366{ 3342{
2367#if EV_MULTIPLICITY
2368 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2369#endif
2370 if (expect_false (ev_is_active (w))) 3343 if (expect_false (ev_is_active (w)))
2371 return; 3344 return;
2372 3345
2373 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 3346 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2374 3347
2375 evpipe_init (EV_A); 3348#if EV_MULTIPLICITY
3349 assert (("libev: a signal must not be attached to two different loops",
3350 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2376 3351
2377 EV_FREQUENT_CHECK; 3352 signals [w->signum - 1].loop = EV_A;
3353#endif
2378 3354
3355 EV_FREQUENT_CHECK;
3356
3357#if EV_USE_SIGNALFD
3358 if (sigfd == -2)
2379 { 3359 {
2380#ifndef _WIN32 3360 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2381 sigset_t full, prev; 3361 if (sigfd < 0 && errno == EINVAL)
2382 sigfillset (&full); 3362 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2383 sigprocmask (SIG_SETMASK, &full, &prev);
2384#endif
2385 3363
2386 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 3364 if (sigfd >= 0)
3365 {
3366 fd_intern (sigfd); /* doing it twice will not hurt */
2387 3367
2388#ifndef _WIN32 3368 sigemptyset (&sigfd_set);
2389 sigprocmask (SIG_SETMASK, &prev, 0); 3369
2390#endif 3370 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
3371 ev_set_priority (&sigfd_w, EV_MAXPRI);
3372 ev_io_start (EV_A_ &sigfd_w);
3373 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
3374 }
2391 } 3375 }
3376
3377 if (sigfd >= 0)
3378 {
3379 /* TODO: check .head */
3380 sigaddset (&sigfd_set, w->signum);
3381 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
3382
3383 signalfd (sigfd, &sigfd_set, 0);
3384 }
3385#endif
2392 3386
2393 ev_start (EV_A_ (W)w, 1); 3387 ev_start (EV_A_ (W)w, 1);
2394 wlist_add (&signals [w->signum - 1].head, (WL)w); 3388 wlist_add (&signals [w->signum - 1].head, (WL)w);
2395 3389
2396 if (!((WL)w)->next) 3390 if (!((WL)w)->next)
3391# if EV_USE_SIGNALFD
3392 if (sigfd < 0) /*TODO*/
3393# endif
2397 { 3394 {
2398#if _WIN32 3395# ifdef _WIN32
3396 evpipe_init (EV_A);
3397
2399 signal (w->signum, ev_sighandler); 3398 signal (w->signum, ev_sighandler);
2400#else 3399# else
2401 struct sigaction sa; 3400 struct sigaction sa;
3401
3402 evpipe_init (EV_A);
3403
2402 sa.sa_handler = ev_sighandler; 3404 sa.sa_handler = ev_sighandler;
2403 sigfillset (&sa.sa_mask); 3405 sigfillset (&sa.sa_mask);
2404 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 3406 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2405 sigaction (w->signum, &sa, 0); 3407 sigaction (w->signum, &sa, 0);
3408
3409 if (origflags & EVFLAG_NOSIGMASK)
3410 {
3411 sigemptyset (&sa.sa_mask);
3412 sigaddset (&sa.sa_mask, w->signum);
3413 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
3414 }
2406#endif 3415#endif
2407 } 3416 }
2408 3417
2409 EV_FREQUENT_CHECK; 3418 EV_FREQUENT_CHECK;
2410} 3419}
2411 3420
2412void noinline 3421void noinline
… …
2420 3429
2421 wlist_del (&signals [w->signum - 1].head, (WL)w); 3430 wlist_del (&signals [w->signum - 1].head, (WL)w);
2422 ev_stop (EV_A_ (W)w); 3431 ev_stop (EV_A_ (W)w);
2423 3432
2424 if (!signals [w->signum - 1].head) 3433 if (!signals [w->signum - 1].head)
3434 {
3435#if EV_MULTIPLICITY
3436 signals [w->signum - 1].loop = 0; /* unattach from signal */
3437#endif
3438#if EV_USE_SIGNALFD
3439 if (sigfd >= 0)
3440 {
3441 sigset_t ss;
3442
3443 sigemptyset (&ss);
3444 sigaddset (&ss, w->signum);
3445 sigdelset (&sigfd_set, w->signum);
3446
3447 signalfd (sigfd, &sigfd_set, 0);
3448 sigprocmask (SIG_UNBLOCK, &ss, 0);
3449 }
3450 else
3451#endif
2425 signal (w->signum, SIG_DFL); 3452 signal (w->signum, SIG_DFL);
3453 }
2426 3454
2427 EV_FREQUENT_CHECK; 3455 EV_FREQUENT_CHECK;
2428} 3456}
3457
3458#endif
3459
3460#if EV_CHILD_ENABLE
2429 3461
2430void 3462void
2431ev_child_start (EV_P_ ev_child *w) 3463ev_child_start (EV_P_ ev_child *w)
2432{ 3464{
2433#if EV_MULTIPLICITY 3465#if EV_MULTIPLICITY
… …
2437 return; 3469 return;
2438 3470
2439 EV_FREQUENT_CHECK; 3471 EV_FREQUENT_CHECK;
2440 3472
2441 ev_start (EV_A_ (W)w, 1); 3473 ev_start (EV_A_ (W)w, 1);
2442 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3474 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2443 3475
2444 EV_FREQUENT_CHECK; 3476 EV_FREQUENT_CHECK;
2445} 3477}
2446 3478
2447void 3479void
… …
2451 if (expect_false (!ev_is_active (w))) 3483 if (expect_false (!ev_is_active (w)))
2452 return; 3484 return;
2453 3485
2454 EV_FREQUENT_CHECK; 3486 EV_FREQUENT_CHECK;
2455 3487
2456 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3488 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2457 ev_stop (EV_A_ (W)w); 3489 ev_stop (EV_A_ (W)w);
2458 3490
2459 EV_FREQUENT_CHECK; 3491 EV_FREQUENT_CHECK;
2460} 3492}
3493
3494#endif
2461 3495
2462#if EV_STAT_ENABLE 3496#if EV_STAT_ENABLE
2463 3497
2464# ifdef _WIN32 3498# ifdef _WIN32
2465# undef lstat 3499# undef lstat
… …
2471#define MIN_STAT_INTERVAL 0.1074891 3505#define MIN_STAT_INTERVAL 0.1074891
2472 3506
2473static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3507static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2474 3508
2475#if EV_USE_INOTIFY 3509#if EV_USE_INOTIFY
2476# define EV_INOTIFY_BUFSIZE 8192 3510
3511/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3512# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2477 3513
2478static void noinline 3514static void noinline
2479infy_add (EV_P_ ev_stat *w) 3515infy_add (EV_P_ ev_stat *w)
2480{ 3516{
2481 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); 3517 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);
2482 3518
2483 if (w->wd < 0) 3519 if (w->wd >= 0)
3520 {
3521 struct statfs sfs;
3522
3523 /* now local changes will be tracked by inotify, but remote changes won't */
3524 /* unless the filesystem is known to be local, we therefore still poll */
3525 /* also do poll on <2.6.25, but with normal frequency */
3526
3527 if (!fs_2625)
3528 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3529 else if (!statfs (w->path, &sfs)
3530 && (sfs.f_type == 0x1373 /* devfs */
3531 || sfs.f_type == 0xEF53 /* ext2/3 */
3532 || sfs.f_type == 0x3153464a /* jfs */
3533 || sfs.f_type == 0x52654973 /* reiser3 */
3534 || sfs.f_type == 0x01021994 /* tempfs */
3535 || sfs.f_type == 0x58465342 /* xfs */))
3536 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3537 else
3538 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2484 { 3539 }
3540 else
3541 {
3542 /* can't use inotify, continue to stat */
2485 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3543 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2486 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2487 3544
2488 /* monitor some parent directory for speedup hints */ 3545 /* if path is not there, monitor some parent directory for speedup hints */
2489 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3546 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2490 /* but an efficiency issue only */ 3547 /* but an efficiency issue only */
2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3548 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2492 { 3549 {
2493 char path [4096]; 3550 char path [4096];
… …
2503 if (!pend || pend == path) 3560 if (!pend || pend == path)
2504 break; 3561 break;
2505 3562
2506 *pend = 0; 3563 *pend = 0;
2507 w->wd = inotify_add_watch (fs_fd, path, mask); 3564 w->wd = inotify_add_watch (fs_fd, path, mask);
2508 } 3565 }
2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3566 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2510 } 3567 }
2511 } 3568 }
2512 3569
2513 if (w->wd >= 0) 3570 if (w->wd >= 0)
2514 {
2515 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3571 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2516 3572
2517 /* now local changes will be tracked by inotify, but remote changes won't */ 3573 /* now re-arm timer, if required */
2518 /* unless the filesystem it known to be local, we therefore still poll */ 3574 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2519 /* also do poll on <2.6.25, but with normal frequency */
2520 struct statfs sfs;
2521
2522 if (fs_2625 && !statfs (w->path, &sfs))
2523 if (sfs.f_type == 0x1373 /* devfs */
2524 || sfs.f_type == 0xEF53 /* ext2/3 */
2525 || sfs.f_type == 0x3153464a /* jfs */
2526 || sfs.f_type == 0x52654973 /* reiser3 */
2527 || sfs.f_type == 0x01021994 /* tempfs */
2528 || sfs.f_type == 0x58465342 /* xfs */)
2529 return;
2530
2531 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2532 ev_timer_again (EV_A_ &w->timer); 3575 ev_timer_again (EV_A_ &w->timer);
2533 } 3576 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2534} 3577}
2535 3578
2536static void noinline 3579static void noinline
2537infy_del (EV_P_ ev_stat *w) 3580infy_del (EV_P_ ev_stat *w)
2538{ 3581{
… …
2541 3584
2542 if (wd < 0) 3585 if (wd < 0)
2543 return; 3586 return;
2544 3587
2545 w->wd = -2; 3588 w->wd = -2;
2546 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3589 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2547 wlist_del (&fs_hash [slot].head, (WL)w); 3590 wlist_del (&fs_hash [slot].head, (WL)w);
2548 3591
2549 /* remove this watcher, if others are watching it, they will rearm */ 3592 /* remove this watcher, if others are watching it, they will rearm */
2550 inotify_rm_watch (fs_fd, wd); 3593 inotify_rm_watch (fs_fd, wd);
2551} 3594}
… …
2553static void noinline 3596static void noinline
2554infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3597infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2555{ 3598{
2556 if (slot < 0) 3599 if (slot < 0)
2557 /* overflow, need to check for all hash slots */ 3600 /* overflow, need to check for all hash slots */
2558 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3601 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2559 infy_wd (EV_A_ slot, wd, ev); 3602 infy_wd (EV_A_ slot, wd, ev);
2560 else 3603 else
2561 { 3604 {
2562 WL w_; 3605 WL w_;
2563 3606
2564 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3607 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2565 { 3608 {
2566 ev_stat *w = (ev_stat *)w_; 3609 ev_stat *w = (ev_stat *)w_;
2567 w_ = w_->next; /* lets us remove this watcher and all before it */ 3610 w_ = w_->next; /* lets us remove this watcher and all before it */
2568 3611
2569 if (w->wd == wd || wd == -1) 3612 if (w->wd == wd || wd == -1)
2570 { 3613 {
2571 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3614 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2572 { 3615 {
2573 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3616 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2574 w->wd = -1; 3617 w->wd = -1;
2575 infy_add (EV_A_ w); /* re-add, no matter what */ 3618 infy_add (EV_A_ w); /* re-add, no matter what */
2576 } 3619 }
2577 3620
2578 stat_timer_cb (EV_A_ &w->timer, 0); 3621 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2583 3626
2584static void 3627static void
2585infy_cb (EV_P_ ev_io *w, int revents) 3628infy_cb (EV_P_ ev_io *w, int revents)
2586{ 3629{
2587 char buf [EV_INOTIFY_BUFSIZE]; 3630 char buf [EV_INOTIFY_BUFSIZE];
2588 struct inotify_event *ev = (struct inotify_event *)buf;
2589 int ofs; 3631 int ofs;
2590 int len = read (fs_fd, buf, sizeof (buf)); 3632 int len = read (fs_fd, buf, sizeof (buf));
2591 3633
2592 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3634 for (ofs = 0; ofs < len; )
3635 {
3636 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2593 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3637 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3638 ofs += sizeof (struct inotify_event) + ev->len;
3639 }
2594} 3640}
2595 3641
2596void inline_size 3642inline_size void ecb_cold
2597check_2625 (EV_P) 3643ev_check_2625 (EV_P)
2598{ 3644{
2599 /* kernels < 2.6.25 are borked 3645 /* kernels < 2.6.25 are borked
2600 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3646 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2601 */ 3647 */
2602 struct utsname buf; 3648 if (ev_linux_version () < 0x020619)
2603 int major, minor, micro;
2604
2605 if (uname (&buf))
2606 return; 3649 return;
2607 3650
2608 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2609 return;
2610
2611 if (major < 2
2612 || (major == 2 && minor < 6)
2613 || (major == 2 && minor == 6 && micro < 25))
2614 return;
2615
2616 fs_2625 = 1; 3651 fs_2625 = 1;
2617} 3652}
2618 3653
2619void inline_size 3654inline_size int
3655infy_newfd (void)
3656{
3657#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3658 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3659 if (fd >= 0)
3660 return fd;
3661#endif
3662 return inotify_init ();
3663}
3664
3665inline_size void
2620infy_init (EV_P) 3666infy_init (EV_P)
2621{ 3667{
2622 if (fs_fd != -2) 3668 if (fs_fd != -2)
2623 return; 3669 return;
2624 3670
2625 fs_fd = -1; 3671 fs_fd = -1;
2626 3672
2627 check_2625 (EV_A); 3673 ev_check_2625 (EV_A);
2628 3674
2629 fs_fd = inotify_init (); 3675 fs_fd = infy_newfd ();
2630 3676
2631 if (fs_fd >= 0) 3677 if (fs_fd >= 0)
2632 { 3678 {
3679 fd_intern (fs_fd);
2633 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3680 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2634 ev_set_priority (&fs_w, EV_MAXPRI); 3681 ev_set_priority (&fs_w, EV_MAXPRI);
2635 ev_io_start (EV_A_ &fs_w); 3682 ev_io_start (EV_A_ &fs_w);
3683 ev_unref (EV_A);
2636 } 3684 }
2637} 3685}
2638 3686
2639void inline_size 3687inline_size void
2640infy_fork (EV_P) 3688infy_fork (EV_P)
2641{ 3689{
2642 int slot; 3690 int slot;
2643 3691
2644 if (fs_fd < 0) 3692 if (fs_fd < 0)
2645 return; 3693 return;
2646 3694
3695 ev_ref (EV_A);
3696 ev_io_stop (EV_A_ &fs_w);
2647 close (fs_fd); 3697 close (fs_fd);
2648 fs_fd = inotify_init (); 3698 fs_fd = infy_newfd ();
2649 3699
3700 if (fs_fd >= 0)
3701 {
3702 fd_intern (fs_fd);
3703 ev_io_set (&fs_w, fs_fd, EV_READ);
3704 ev_io_start (EV_A_ &fs_w);
3705 ev_unref (EV_A);
3706 }
3707
2650 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3708 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2651 { 3709 {
2652 WL w_ = fs_hash [slot].head; 3710 WL w_ = fs_hash [slot].head;
2653 fs_hash [slot].head = 0; 3711 fs_hash [slot].head = 0;
2654 3712
2655 while (w_) 3713 while (w_)
… …
2660 w->wd = -1; 3718 w->wd = -1;
2661 3719
2662 if (fs_fd >= 0) 3720 if (fs_fd >= 0)
2663 infy_add (EV_A_ w); /* re-add, no matter what */ 3721 infy_add (EV_A_ w); /* re-add, no matter what */
2664 else 3722 else
3723 {
3724 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3725 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2665 ev_timer_again (EV_A_ &w->timer); 3726 ev_timer_again (EV_A_ &w->timer);
3727 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3728 }
2666 } 3729 }
2667 } 3730 }
2668} 3731}
2669 3732
2670#endif 3733#endif
… …
2687static void noinline 3750static void noinline
2688stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3751stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2689{ 3752{
2690 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3753 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2691 3754
2692 /* we copy this here each the time so that */ 3755 ev_statdata prev = w->attr;
2693 /* prev has the old value when the callback gets invoked */
2694 w->prev = w->attr;
2695 ev_stat_stat (EV_A_ w); 3756 ev_stat_stat (EV_A_ w);
2696 3757
2697 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3758 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2698 if ( 3759 if (
2699 w->prev.st_dev != w->attr.st_dev 3760 prev.st_dev != w->attr.st_dev
2700 || w->prev.st_ino != w->attr.st_ino 3761 || prev.st_ino != w->attr.st_ino
2701 || w->prev.st_mode != w->attr.st_mode 3762 || prev.st_mode != w->attr.st_mode
2702 || w->prev.st_nlink != w->attr.st_nlink 3763 || prev.st_nlink != w->attr.st_nlink
2703 || w->prev.st_uid != w->attr.st_uid 3764 || prev.st_uid != w->attr.st_uid
2704 || w->prev.st_gid != w->attr.st_gid 3765 || prev.st_gid != w->attr.st_gid
2705 || w->prev.st_rdev != w->attr.st_rdev 3766 || prev.st_rdev != w->attr.st_rdev
2706 || w->prev.st_size != w->attr.st_size 3767 || prev.st_size != w->attr.st_size
2707 || w->prev.st_atime != w->attr.st_atime 3768 || prev.st_atime != w->attr.st_atime
2708 || w->prev.st_mtime != w->attr.st_mtime 3769 || prev.st_mtime != w->attr.st_mtime
2709 || w->prev.st_ctime != w->attr.st_ctime 3770 || prev.st_ctime != w->attr.st_ctime
2710 ) { 3771 ) {
3772 /* we only update w->prev on actual differences */
3773 /* in case we test more often than invoke the callback, */
3774 /* to ensure that prev is always different to attr */
3775 w->prev = prev;
3776
2711 #if EV_USE_INOTIFY 3777 #if EV_USE_INOTIFY
2712 if (fs_fd >= 0) 3778 if (fs_fd >= 0)
2713 { 3779 {
2714 infy_del (EV_A_ w); 3780 infy_del (EV_A_ w);
2715 infy_add (EV_A_ w); 3781 infy_add (EV_A_ w);
… …
2740 3806
2741 if (fs_fd >= 0) 3807 if (fs_fd >= 0)
2742 infy_add (EV_A_ w); 3808 infy_add (EV_A_ w);
2743 else 3809 else
2744#endif 3810#endif
3811 {
2745 ev_timer_again (EV_A_ &w->timer); 3812 ev_timer_again (EV_A_ &w->timer);
3813 ev_unref (EV_A);
3814 }
2746 3815
2747 ev_start (EV_A_ (W)w, 1); 3816 ev_start (EV_A_ (W)w, 1);
2748 3817
2749 EV_FREQUENT_CHECK; 3818 EV_FREQUENT_CHECK;
2750} 3819}
… …
2759 EV_FREQUENT_CHECK; 3828 EV_FREQUENT_CHECK;
2760 3829
2761#if EV_USE_INOTIFY 3830#if EV_USE_INOTIFY
2762 infy_del (EV_A_ w); 3831 infy_del (EV_A_ w);
2763#endif 3832#endif
3833
3834 if (ev_is_active (&w->timer))
3835 {
3836 ev_ref (EV_A);
2764 ev_timer_stop (EV_A_ &w->timer); 3837 ev_timer_stop (EV_A_ &w->timer);
3838 }
2765 3839
2766 ev_stop (EV_A_ (W)w); 3840 ev_stop (EV_A_ (W)w);
2767 3841
2768 EV_FREQUENT_CHECK; 3842 EV_FREQUENT_CHECK;
2769} 3843}
… …
2814 3888
2815 EV_FREQUENT_CHECK; 3889 EV_FREQUENT_CHECK;
2816} 3890}
2817#endif 3891#endif
2818 3892
3893#if EV_PREPARE_ENABLE
2819void 3894void
2820ev_prepare_start (EV_P_ ev_prepare *w) 3895ev_prepare_start (EV_P_ ev_prepare *w)
2821{ 3896{
2822 if (expect_false (ev_is_active (w))) 3897 if (expect_false (ev_is_active (w)))
2823 return; 3898 return;
… …
2849 3924
2850 ev_stop (EV_A_ (W)w); 3925 ev_stop (EV_A_ (W)w);
2851 3926
2852 EV_FREQUENT_CHECK; 3927 EV_FREQUENT_CHECK;
2853} 3928}
3929#endif
2854 3930
3931#if EV_CHECK_ENABLE
2855void 3932void
2856ev_check_start (EV_P_ ev_check *w) 3933ev_check_start (EV_P_ ev_check *w)
2857{ 3934{
2858 if (expect_false (ev_is_active (w))) 3935 if (expect_false (ev_is_active (w)))
2859 return; 3936 return;
… …
2885 3962
2886 ev_stop (EV_A_ (W)w); 3963 ev_stop (EV_A_ (W)w);
2887 3964
2888 EV_FREQUENT_CHECK; 3965 EV_FREQUENT_CHECK;
2889} 3966}
3967#endif
2890 3968
2891#if EV_EMBED_ENABLE 3969#if EV_EMBED_ENABLE
2892void noinline 3970void noinline
2893ev_embed_sweep (EV_P_ ev_embed *w) 3971ev_embed_sweep (EV_P_ ev_embed *w)
2894{ 3972{
2895 ev_loop (w->other, EVLOOP_NONBLOCK); 3973 ev_run (w->other, EVRUN_NOWAIT);
2896} 3974}
2897 3975
2898static void 3976static void
2899embed_io_cb (EV_P_ ev_io *io, int revents) 3977embed_io_cb (EV_P_ ev_io *io, int revents)
2900{ 3978{
2901 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3979 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2902 3980
2903 if (ev_cb (w)) 3981 if (ev_cb (w))
2904 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3982 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2905 else 3983 else
2906 ev_loop (w->other, EVLOOP_NONBLOCK); 3984 ev_run (w->other, EVRUN_NOWAIT);
2907} 3985}
2908 3986
2909static void 3987static void
2910embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3988embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2911{ 3989{
2912 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3990 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2913 3991
2914 { 3992 {
2915 struct ev_loop *loop = w->other; 3993 EV_P = w->other;
2916 3994
2917 while (fdchangecnt) 3995 while (fdchangecnt)
2918 { 3996 {
2919 fd_reify (EV_A); 3997 fd_reify (EV_A);
2920 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3998 ev_run (EV_A_ EVRUN_NOWAIT);
2921 } 3999 }
2922 } 4000 }
2923} 4001}
2924 4002
2925static void 4003static void
… …
2928 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 4006 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2929 4007
2930 ev_embed_stop (EV_A_ w); 4008 ev_embed_stop (EV_A_ w);
2931 4009
2932 { 4010 {
2933 struct ev_loop *loop = w->other; 4011 EV_P = w->other;
2934 4012
2935 ev_loop_fork (EV_A); 4013 ev_loop_fork (EV_A);
2936 ev_loop (EV_A_ EVLOOP_NONBLOCK); 4014 ev_run (EV_A_ EVRUN_NOWAIT);
2937 } 4015 }
2938 4016
2939 ev_embed_start (EV_A_ w); 4017 ev_embed_start (EV_A_ w);
2940} 4018}
2941 4019
… …
2952{ 4030{
2953 if (expect_false (ev_is_active (w))) 4031 if (expect_false (ev_is_active (w)))
2954 return; 4032 return;
2955 4033
2956 { 4034 {
2957 struct ev_loop *loop = w->other; 4035 EV_P = w->other;
2958 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 4036 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2959 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 4037 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2960 } 4038 }
2961 4039
2962 EV_FREQUENT_CHECK; 4040 EV_FREQUENT_CHECK;
… …
2989 4067
2990 ev_io_stop (EV_A_ &w->io); 4068 ev_io_stop (EV_A_ &w->io);
2991 ev_prepare_stop (EV_A_ &w->prepare); 4069 ev_prepare_stop (EV_A_ &w->prepare);
2992 ev_fork_stop (EV_A_ &w->fork); 4070 ev_fork_stop (EV_A_ &w->fork);
2993 4071
4072 ev_stop (EV_A_ (W)w);
4073
2994 EV_FREQUENT_CHECK; 4074 EV_FREQUENT_CHECK;
2995} 4075}
2996#endif 4076#endif
2997 4077
2998#if EV_FORK_ENABLE 4078#if EV_FORK_ENABLE
… …
3031 4111
3032 EV_FREQUENT_CHECK; 4112 EV_FREQUENT_CHECK;
3033} 4113}
3034#endif 4114#endif
3035 4115
4116#if EV_CLEANUP_ENABLE
4117void
4118ev_cleanup_start (EV_P_ ev_cleanup *w)
4119{
4120 if (expect_false (ev_is_active (w)))
4121 return;
4122
4123 EV_FREQUENT_CHECK;
4124
4125 ev_start (EV_A_ (W)w, ++cleanupcnt);
4126 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
4127 cleanups [cleanupcnt - 1] = w;
4128
4129 /* cleanup watchers should never keep a refcount on the loop */
4130 ev_unref (EV_A);
4131 EV_FREQUENT_CHECK;
4132}
4133
4134void
4135ev_cleanup_stop (EV_P_ ev_cleanup *w)
4136{
4137 clear_pending (EV_A_ (W)w);
4138 if (expect_false (!ev_is_active (w)))
4139 return;
4140
4141 EV_FREQUENT_CHECK;
4142 ev_ref (EV_A);
4143
4144 {
4145 int active = ev_active (w);
4146
4147 cleanups [active - 1] = cleanups [--cleanupcnt];
4148 ev_active (cleanups [active - 1]) = active;
4149 }
4150
4151 ev_stop (EV_A_ (W)w);
4152
4153 EV_FREQUENT_CHECK;
4154}
4155#endif
4156
3036#if EV_ASYNC_ENABLE 4157#if EV_ASYNC_ENABLE
3037void 4158void
3038ev_async_start (EV_P_ ev_async *w) 4159ev_async_start (EV_P_ ev_async *w)
3039{ 4160{
3040 if (expect_false (ev_is_active (w))) 4161 if (expect_false (ev_is_active (w)))
3041 return; 4162 return;
3042 4163
4164 w->sent = 0;
4165
3043 evpipe_init (EV_A); 4166 evpipe_init (EV_A);
3044 4167
3045 EV_FREQUENT_CHECK; 4168 EV_FREQUENT_CHECK;
3046 4169
3047 ev_start (EV_A_ (W)w, ++asynccnt); 4170 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3074 4197
3075void 4198void
3076ev_async_send (EV_P_ ev_async *w) 4199ev_async_send (EV_P_ ev_async *w)
3077{ 4200{
3078 w->sent = 1; 4201 w->sent = 1;
3079 evpipe_write (EV_A_ &gotasync); 4202 evpipe_write (EV_A_ &async_pending);
3080} 4203}
3081#endif 4204#endif
3082 4205
3083/*****************************************************************************/ 4206/*****************************************************************************/
3084 4207
… …
3124{ 4247{
3125 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 4248 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3126 4249
3127 if (expect_false (!once)) 4250 if (expect_false (!once))
3128 { 4251 {
3129 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 4252 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3130 return; 4253 return;
3131 } 4254 }
3132 4255
3133 once->cb = cb; 4256 once->cb = cb;
3134 once->arg = arg; 4257 once->arg = arg;
… …
3148 } 4271 }
3149} 4272}
3150 4273
3151/*****************************************************************************/ 4274/*****************************************************************************/
3152 4275
3153#if 0 4276#if EV_WALK_ENABLE
3154void 4277void ecb_cold
3155ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4278ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3156{ 4279{
3157 int i, j; 4280 int i, j;
3158 ev_watcher_list *wl, *wn; 4281 ev_watcher_list *wl, *wn;
3159 4282
… …
3174#if EV_USE_INOTIFY 4297#if EV_USE_INOTIFY
3175 if (ev_cb ((ev_io *)wl) == infy_cb) 4298 if (ev_cb ((ev_io *)wl) == infy_cb)
3176 ; 4299 ;
3177 else 4300 else
3178#endif 4301#endif
3179 if ((ev_io *)wl != &pipeev) 4302 if ((ev_io *)wl != &pipe_w)
3180 if (types & EV_IO) 4303 if (types & EV_IO)
3181 cb (EV_A_ EV_IO, wl); 4304 cb (EV_A_ EV_IO, wl);
3182 4305
3183 wl = wn; 4306 wl = wn;
3184 } 4307 }
… …
3203 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i])); 4326 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3204#endif 4327#endif
3205 4328
3206#if EV_IDLE_ENABLE 4329#if EV_IDLE_ENABLE
3207 if (types & EV_IDLE) 4330 if (types & EV_IDLE)
3208 for (j = NUMPRI; i--; ) 4331 for (j = NUMPRI; j--; )
3209 for (i = idlecnt [j]; i--; ) 4332 for (i = idlecnt [j]; i--; )
3210 cb (EV_A_ EV_IDLE, idles [j][i]); 4333 cb (EV_A_ EV_IDLE, idles [j][i]);
3211#endif 4334#endif
3212 4335
3213#if EV_FORK_ENABLE 4336#if EV_FORK_ENABLE
… …
3221 if (types & EV_ASYNC) 4344 if (types & EV_ASYNC)
3222 for (i = asynccnt; i--; ) 4345 for (i = asynccnt; i--; )
3223 cb (EV_A_ EV_ASYNC, asyncs [i]); 4346 cb (EV_A_ EV_ASYNC, asyncs [i]);
3224#endif 4347#endif
3225 4348
4349#if EV_PREPARE_ENABLE
3226 if (types & EV_PREPARE) 4350 if (types & EV_PREPARE)
3227 for (i = preparecnt; i--; ) 4351 for (i = preparecnt; i--; )
3228#if EV_EMBED_ENABLE 4352# if EV_EMBED_ENABLE
3229 if (ev_cb (prepares [i]) != embed_prepare_cb) 4353 if (ev_cb (prepares [i]) != embed_prepare_cb)
3230#endif 4354# endif
3231 cb (EV_A_ EV_PREPARE, prepares [i]); 4355 cb (EV_A_ EV_PREPARE, prepares [i]);
4356#endif
3232 4357
4358#if EV_CHECK_ENABLE
3233 if (types & EV_CHECK) 4359 if (types & EV_CHECK)
3234 for (i = checkcnt; i--; ) 4360 for (i = checkcnt; i--; )
3235 cb (EV_A_ EV_CHECK, checks [i]); 4361 cb (EV_A_ EV_CHECK, checks [i]);
4362#endif
3236 4363
4364#if EV_SIGNAL_ENABLE
3237 if (types & EV_SIGNAL) 4365 if (types & EV_SIGNAL)
3238 for (i = 0; i < signalmax; ++i) 4366 for (i = 0; i < EV_NSIG - 1; ++i)
3239 for (wl = signals [i].head; wl; ) 4367 for (wl = signals [i].head; wl; )
3240 { 4368 {
3241 wn = wl->next; 4369 wn = wl->next;
3242 cb (EV_A_ EV_SIGNAL, wl); 4370 cb (EV_A_ EV_SIGNAL, wl);
3243 wl = wn; 4371 wl = wn;
3244 } 4372 }
4373#endif
3245 4374
4375#if EV_CHILD_ENABLE
3246 if (types & EV_CHILD) 4376 if (types & EV_CHILD)
3247 for (i = EV_PID_HASHSIZE; i--; ) 4377 for (i = (EV_PID_HASHSIZE); i--; )
3248 for (wl = childs [i]; wl; ) 4378 for (wl = childs [i]; wl; )
3249 { 4379 {
3250 wn = wl->next; 4380 wn = wl->next;
3251 cb (EV_A_ EV_CHILD, wl); 4381 cb (EV_A_ EV_CHILD, wl);
3252 wl = wn; 4382 wl = wn;
3253 } 4383 }
4384#endif
3254/* EV_STAT 0x00001000 /* stat data changed */ 4385/* EV_STAT 0x00001000 /* stat data changed */
3255/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 4386/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3256} 4387}
3257#endif 4388#endif
3258 4389
3259#if EV_MULTIPLICITY 4390#if EV_MULTIPLICITY
3260 #include "ev_wrap.h" 4391 #include "ev_wrap.h"
3261#endif 4392#endif
3262 4393
3263#ifdef __cplusplus 4394EV_CPP(})
3264}
3265#endif
3266 4395

Diff Legend

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