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

Comparing libev/ev.c (file contents):
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC vs.
Revision 1.357 by root, Sat Oct 23 22:25:44 2010 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 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 *
… …
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
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
157#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
158#include <fcntl.h> 164#include <fcntl.h>
159#include <stddef.h> 165#include <stddef.h>
160 166
161#include <stdio.h> 167#include <stdio.h>
162 168
163#include <assert.h> 169#include <assert.h>
164#include <errno.h> 170#include <errno.h>
165#include <sys/types.h> 171#include <sys/types.h>
166#include <time.h> 172#include <time.h>
173#include <limits.h>
167 174
168#include <signal.h> 175#include <signal.h>
169 176
170#ifdef EV_H 177#ifdef EV_H
171# include EV_H 178# include EV_H
172#else 179#else
173# include "ev.h" 180# include "ev.h"
174#endif 181#endif
182
183EV_CPP(extern "C" {)
175 184
176#ifndef _WIN32 185#ifndef _WIN32
177# include <sys/time.h> 186# include <sys/time.h>
178# include <sys/wait.h> 187# include <sys/wait.h>
179# include <unistd.h> 188# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 192# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
186# endif 195# endif
196# undef EV_AVOID_STDIO
187#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
188 206
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
190 208
191/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
204#elif defined (MAXSIG) 222#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 230#else
213# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
215# define EV_NSIG 64 234# define EV_NSIG 65
216#endif 235#endif
217 236
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
228# else 240# else
229# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
230# endif 242# endif
231#endif 243#endif
232 244
233#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
234# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
235# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
236# else 248# else
237# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
238# endif 250# endif
239#endif 251#endif
240 252
… …
242# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
243#endif 255#endif
244 256
245#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
246# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
247# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
248# else 260# else
249# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
250# endif 262# endif
251#endif 263#endif
252 264
253#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
254# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
255#endif 267#endif
256 268
257#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
258# ifdef _WIN32 270# ifdef _WIN32
259# define EV_USE_POLL 0 271# define EV_USE_POLL 0
260# else 272# else
261# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
262# endif 274# endif
263#endif 275#endif
264 276
265#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
266# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
267# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
268# else 280# else
269# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
270# endif 282# endif
271#endif 283#endif
272 284
… …
278# define EV_USE_PORT 0 290# define EV_USE_PORT 0
279#endif 291#endif
280 292
281#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
282# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
283# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
284# else 296# else
285# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
286# endif 298# endif
287#endif 299#endif
288 300
289#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
290# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
291# define EV_PID_HASHSIZE 1
292# else
293# define EV_PID_HASHSIZE 16
294# endif
295#endif 303#endif
296 304
297#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
298# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
299# define EV_INOTIFY_HASHSIZE 1
300# else
301# define EV_INOTIFY_HASHSIZE 16
302# endif
303#endif 307#endif
304 308
305#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
306# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
307# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
308# else 312# else
309# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
310# endif 314# endif
311#endif 315#endif
312 316
313#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
316# else 320# else
317# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
318# endif 322# endif
319#endif 323#endif
320 324
… …
323# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
324# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
325#endif 329#endif
326 330
327#ifndef EV_VERIFY 331#ifndef EV_VERIFY
328# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
329#endif 333#endif
330 334
331#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
332# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
333#endif 337#endif
334 338
335#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
336# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
337#endif 341#endif
338 342
339/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
340/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
341#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
350# endif 354# endif
351#endif 355#endif
352 356
353/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 357/* this block fixes any misconfiguration where we know we run into trouble otherwise */
354 358
359#ifdef _AIX
360/* AIX has a completely broken poll.h header */
361# undef EV_USE_POLL
362# define EV_USE_POLL 0
363#endif
364
355#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
358#endif 368#endif
359 369
… …
372# include <sys/select.h> 382# include <sys/select.h>
373# endif 383# endif
374#endif 384#endif
375 385
376#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
377# include <sys/utsname.h>
378# include <sys/statfs.h> 387# include <sys/statfs.h>
379# include <sys/inotify.h> 388# include <sys/inotify.h>
380/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
381# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
382# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
393# include <stdint.h> 402# include <stdint.h>
394# ifndef EFD_NONBLOCK 403# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 404# define EFD_NONBLOCK O_NONBLOCK
396# endif 405# endif
397# ifndef EFD_CLOEXEC 406# ifndef EFD_CLOEXEC
407# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
399# endif 412# endif
400# ifdef __cplusplus 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
401extern "C" { 414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
402# endif 421# endif
403int eventfd (unsigned int initval, int flags); 422# ifndef SFD_CLOEXEC
404# ifdef __cplusplus 423# ifdef O_CLOEXEC
405} 424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
406# endif 428# endif
407#endif 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
408 430
409#if EV_USE_SIGNALFD 431struct signalfd_siginfo
410# include <sys/signalfd.h> 432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
411#endif 436#endif
412 437
413/**/ 438/**/
414 439
415#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
417#else 442#else
418# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
419#endif 444#endif
420 445
421/* 446/*
… …
428 */ 453 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 455
431#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
432#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
433/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
434 461
435#if __GNUC__ >= 4 462#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
438#else 465#else
… …
445 472
446#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
447#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
448#define inline_size static inline 475#define inline_size static inline
449 476
450#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
451# define inline_speed static noinline 480# define inline_speed static noinline
452#else
453# define inline_speed static inline
454#endif 481#endif
455 482
456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457 484
458#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
471#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
472#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
473 500
474#if EV_USE_REALTIME 501#if EV_USE_REALTIME
475/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
476/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
477static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
478#endif 505#endif
479 506
480#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
482#endif 509#endif
483 510
511#ifndef EV_FD_TO_WIN32_HANDLE
512# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
513#endif
514#ifndef EV_WIN32_HANDLE_TO_FD
515# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
516#endif
517#ifndef EV_WIN32_CLOSE_FD
518# define EV_WIN32_CLOSE_FD(fd) close (fd)
519#endif
520
484#ifdef _WIN32 521#ifdef _WIN32
485# include "ev_win32.c" 522# include "ev_win32.c"
486#endif 523#endif
487 524
488/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
489 576
490static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
491 578
492void 579void
493ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
503 590
504 if (syserr_cb) 591 if (syserr_cb)
505 syserr_cb (msg); 592 syserr_cb (msg);
506 else 593 else
507 { 594 {
595#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg);
599 ev_printerr (": ");
600 ev_printerr (err);
601 ev_printerr ("\n");
602#else
508 perror (msg); 603 perror (msg);
604#endif
509 abort (); 605 abort ();
510 } 606 }
511} 607}
512 608
513static void * 609static void *
514ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
515{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
516 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
517 * implement realloc (x, 0) (as required by both ansi c-98 and 616 * implement realloc (x, 0) (as required by both ansi c-89 and
518 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
519 */ 618 */
520 619
521 if (size) 620 if (size)
522 return realloc (ptr, size); 621 return realloc (ptr, size);
523 622
524 free (ptr); 623 free (ptr);
525 return 0; 624 return 0;
625#endif
526} 626}
527 627
528static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
529 629
530void 630void
… …
538{ 638{
539 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
540 640
541 if (!ptr && size) 641 if (!ptr && size)
542 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
543 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
544 abort (); 648 abort ();
545 } 649 }
546 650
547 return ptr; 651 return ptr;
548} 652}
… …
564 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
565 unsigned char unused; 669 unsigned char unused;
566#if EV_USE_EPOLL 670#if EV_USE_EPOLL
567 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
568#endif 672#endif
569#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
570 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
571#endif 678#endif
572} ANFD; 679} ANFD;
573 680
574/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
575typedef struct 682typedef struct
… …
630 737
631 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
632 739
633#endif 740#endif
634 741
635#if EV_MINIMAL < 2 742#if EV_FEATURE_API
636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 743# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
637# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
638# define EV_INVOKE_PENDING invoke_cb (EV_A) 745# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else 746#else
640# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
641# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
642# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
643#endif 750#endif
644 751
645#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
646 753
647/*****************************************************************************/ 754/*****************************************************************************/
648 755
649#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
650ev_tstamp 757ev_tstamp
… …
694 if (delay > 0.) 801 if (delay > 0.)
695 { 802 {
696#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
697 struct timespec ts; 804 struct timespec ts;
698 805
699 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
700 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
701
702 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
703#elif defined(_WIN32) 808#elif defined(_WIN32)
704 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
705#else 810#else
706 struct timeval tv; 811 struct timeval tv;
707 812
708 tv.tv_sec = (time_t)delay;
709 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
710
711 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
712 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
713 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
714 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
715#endif 818#endif
716 } 819 }
717} 820}
718 821
719/*****************************************************************************/ 822/*****************************************************************************/
720 823
721#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
722 825
723/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
724/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
725inline_size int 828inline_size int
726array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
727{ 830{
728 int ncur = cur + 1; 831 int ncur = cur + 1;
729 832
… …
825} 928}
826 929
827/*****************************************************************************/ 930/*****************************************************************************/
828 931
829inline_speed void 932inline_speed void
830fd_event_nc (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
831{ 934{
832 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
833 ev_io *w; 936 ev_io *w;
834 937
835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
847fd_event (EV_P_ int fd, int revents) 950fd_event (EV_P_ int fd, int revents)
848{ 951{
849 ANFD *anfd = anfds + fd; 952 ANFD *anfd = anfds + fd;
850 953
851 if (expect_true (!anfd->reify)) 954 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents); 955 fd_event_nocheck (EV_A_ fd, revents);
853} 956}
854 957
855void 958void
856ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
857{ 960{
858 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
859 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
860} 963}
861 964
862/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
863/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
864inline_size void 967inline_size void
… …
870 { 973 {
871 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
872 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
873 ev_io *w; 976 ev_io *w;
874 977
875 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
876 980
877 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
878 events |= (unsigned char)w->events;
879 982
880#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
881 if (events) 984 if (o_reify & EV__IOFDSET)
882 { 985 {
883 unsigned long arg; 986 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
886 #else
887 anfd->handle = _get_osfhandle (fd);
888 #endif
889 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
890 } 990 }
891#endif 991#endif
892 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
893 { 994 {
894 unsigned char o_events = anfd->events;
895 unsigned char o_reify = anfd->reify;
896
897 anfd->reify = 0;
898 anfd->events = events; 995 anfd->events = 0;
899 996
900 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
901 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
902 }
903 } 1006 }
904 1007
905 fdchangecnt = 0; 1008 fdchangecnt = 0;
906} 1009}
907 1010
… …
931 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
932 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1035 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
933 } 1036 }
934} 1037}
935 1038
936/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
937inline_size int 1040inline_size int
938fd_valid (int fd) 1041fd_valid (int fd)
939{ 1042{
940#ifdef _WIN32 1043#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 1045#else
943 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
944#endif 1047#endif
945} 1048}
946 1049
… …
964 1067
965 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1069 if (anfds [fd].events)
967 { 1070 {
968 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
969 return; 1072 break;
970 } 1073 }
971} 1074}
972 1075
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1076/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1077static void noinline
… …
983 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
985 } 1088 }
986} 1089}
987 1090
1091/* used to prepare libev internal fd's */
1092/* this is not fork-safe */
1093inline_speed void
1094fd_intern (int fd)
1095{
1096#ifdef _WIN32
1097 unsigned long arg = 1;
1098 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1099#else
1100 fcntl (fd, F_SETFD, FD_CLOEXEC);
1101 fcntl (fd, F_SETFL, O_NONBLOCK);
1102#endif
1103}
1104
988/*****************************************************************************/ 1105/*****************************************************************************/
989 1106
990/* 1107/*
991 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * the heap functions want a real array index. array index 0 is guaranteed to not
992 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
993 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
994 */ 1111 */
995 1112
996/* 1113/*
… …
1064 1181
1065 for (;;) 1182 for (;;)
1066 { 1183 {
1067 int c = k << 1; 1184 int c = k << 1;
1068 1185
1069 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
1070 break; 1187 break;
1071 1188
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1189 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1190 ? 1 : 0;
1074 1191
… …
1110 1227
1111/* move an element suitably so it is in a correct place */ 1228/* move an element suitably so it is in a correct place */
1112inline_size void 1229inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
1114{ 1231{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1232 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1233 upheap (heap, k);
1117 else 1234 else
1118 downheap (heap, N, k); 1235 downheap (heap, N, k);
1119} 1236}
1120 1237
… …
1133/*****************************************************************************/ 1250/*****************************************************************************/
1134 1251
1135/* associate signal watchers to a signal signal */ 1252/* associate signal watchers to a signal signal */
1136typedef struct 1253typedef struct
1137{ 1254{
1255 EV_ATOMIC_T pending;
1256#if EV_MULTIPLICITY
1257 EV_P;
1258#endif
1138 WL head; 1259 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1260} ANSIG;
1141 1261
1142static ANSIG *signals; 1262static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1263
1147/*****************************************************************************/ 1264/*****************************************************************************/
1148 1265
1149/* used to prepare libev internal fd's */ 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1150/* this is not fork-safe */
1151inline_speed void
1152fd_intern (int fd)
1153{
1154#ifdef _WIN32
1155 unsigned long arg = 1;
1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1157#else
1158 fcntl (fd, F_SETFD, FD_CLOEXEC);
1159 fcntl (fd, F_SETFL, O_NONBLOCK);
1160#endif
1161}
1162 1267
1163static void noinline 1268static void noinline
1164evpipe_init (EV_P) 1269evpipe_init (EV_P)
1165{ 1270{
1166 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1167 { 1272 {
1168#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL) 1275 if (evfd < 0 && errno == EINVAL)
1171 evfd = eventfd (0, 0); 1276 evfd = eventfd (0, 0);
1172 1277
1173 if (evfd >= 0) 1278 if (evfd >= 0)
… …
1175 evpipe [0] = -1; 1280 evpipe [0] = -1;
1176 fd_intern (evfd); /* doing it twice doesn't hurt */ 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1177 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1178 } 1283 }
1179 else 1284 else
1180#endif 1285# endif
1181 { 1286 {
1182 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1183 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1184 1289
1185 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1196evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1197{ 1302{
1198 if (!*flag) 1303 if (!*flag)
1199 { 1304 {
1200 int old_errno = errno; /* save errno because write might clobber it */ 1305 int old_errno = errno; /* save errno because write might clobber it */
1306 char dummy;
1201 1307
1202 *flag = 1; 1308 *flag = 1;
1203 1309
1204#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1205 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1207 uint64_t counter = 1; 1313 uint64_t counter = 1;
1208 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1209 } 1315 }
1210 else 1316 else
1211#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1212 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1213 1324
1214 errno = old_errno; 1325 errno = old_errno;
1215 } 1326 }
1216} 1327}
1217 1328
1218/* called whenever the libev signal pipe */ 1329/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1330/* got some events (signal, async) */
1220static void 1331static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1333{
1334 int i;
1335
1223#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1337 if (evfd >= 0)
1225 { 1338 {
1226 uint64_t counter; 1339 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1228 } 1341 }
1229 else 1342 else
1230#endif 1343#endif
1231 { 1344 {
1232 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1233 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1234 } 1348 }
1235 1349
1236 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1237 { 1351 {
1238 int signum; 1352 sig_pending = 0;
1239 gotsig = 0;
1240 1353
1241 for (signum = signalmax; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1357 }
1245 1358
1246#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1247 if (gotasync) 1360 if (async_pending)
1248 { 1361 {
1249 int i; 1362 async_pending = 0;
1250 gotasync = 0;
1251 1363
1252 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1254 { 1366 {
1255 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1263 1375
1264static void 1376static void
1265ev_sighandler (int signum) 1377ev_sighandler (int signum)
1266{ 1378{
1267#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1380 EV_P = signals [signum - 1].loop;
1269#endif 1381#endif
1270 1382
1271#if _WIN32 1383#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1273#endif 1385#endif
1274 1386
1275 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1277} 1389}
1278 1390
1279void noinline 1391void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1281{ 1393{
1282 WL w; 1394 WL w;
1283 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1284#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1402 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1404
1288 --signum; 1405 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1406 return;
1407#endif
1292 1408
1293 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1294 1410
1295 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1413}
1298 1414
1299#if EV_USE_SIGNALFD 1415#if EV_USE_SIGNALFD
1300static void 1416static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1417sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1418{
1303 struct signalfd_siginfo si[4], *sip; 1419 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1420
1305 for (;;) 1421 for (;;)
1306 { 1422 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1423 ssize_t res = read (sigfd, si, sizeof (si));
1308 1424
… …
1314 break; 1430 break;
1315 } 1431 }
1316} 1432}
1317#endif 1433#endif
1318 1434
1435#endif
1436
1319/*****************************************************************************/ 1437/*****************************************************************************/
1320 1438
1439#if EV_CHILD_ENABLE
1321static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1322
1323#ifndef _WIN32
1324 1441
1325static ev_signal childev; 1442static ev_signal childev;
1326 1443
1327#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1328# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1333child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1334{ 1451{
1335 ev_child *w; 1452 ev_child *w;
1336 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1337 1454
1338 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1455 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1339 { 1456 {
1340 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1341 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1342 { 1459 {
1343 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1460 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1368 /* make sure we are called again until all children have been reaped */ 1485 /* make sure we are called again until all children have been reaped */
1369 /* we need to do it this way so that the callback gets called before we continue */ 1486 /* we need to do it this way so that the callback gets called before we continue */
1370 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1371 1488
1372 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1373 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1374 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1491 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1375} 1492}
1376 1493
1377#endif 1494#endif
1378 1495
1379/*****************************************************************************/ 1496/*****************************************************************************/
1380 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1381#if EV_USE_PORT 1501#if EV_USE_PORT
1382# include "ev_port.c" 1502# include "ev_port.c"
1383#endif 1503#endif
1384#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1385# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1445#ifdef __APPLE__ 1565#ifdef __APPLE__
1446 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1447 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1448 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1568 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1449#endif 1569#endif
1570#ifdef __FreeBSD__
1571 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1572#endif
1450 1573
1451 return flags; 1574 return flags;
1452} 1575}
1453 1576
1454unsigned int 1577unsigned int
1455ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1456{ 1579{
1457 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1458 1581
1459 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1460 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1461 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1462 1585
1463 return flags; 1586 return flags;
1464} 1587}
1465 1588
1466unsigned int 1589unsigned int
1467ev_backend (EV_P) 1590ev_backend (EV_P)
1468{ 1591{
1469 return backend; 1592 return backend;
1470} 1593}
1471 1594
1472#if EV_MINIMAL < 2 1595#if EV_FEATURE_API
1473unsigned int 1596unsigned int
1474ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1475{ 1598{
1476 return loop_count; 1599 return loop_count;
1477} 1600}
1478 1601
1479unsigned int 1602unsigned int
1480ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1481{ 1604{
1482 return loop_depth; 1605 return loop_depth;
1483} 1606}
1484 1607
1485void 1608void
… …
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1665 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1666 have_monotonic = 1;
1544 } 1667 }
1545#endif 1668#endif
1546 1669
1670 /* pid check not overridable via env */
1671#ifndef _WIN32
1672 if (flags & EVFLAG_FORKCHECK)
1673 curpid = getpid ();
1674#endif
1675
1676 if (!(flags & EVFLAG_NOENV)
1677 && !enable_secure ()
1678 && getenv ("LIBEV_FLAGS"))
1679 flags = atoi (getenv ("LIBEV_FLAGS"));
1680
1547 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1682 mn_now = get_clock ();
1549 now_floor = mn_now; 1683 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1685#if EV_FEATURE_API
1552 invoke_cb = ev_invoke_pending; 1686 invoke_cb = ev_invoke_pending;
1553#endif 1687#endif
1554 1688
1555 io_blocktime = 0.; 1689 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1557 backend = 0; 1691 backend = 0;
1558 backend_fd = -1; 1692 backend_fd = -1;
1559 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1560#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1561 fs_fd = -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1699#endif
1563#if EV_USE_SIGNALFD 1700#if EV_USE_SIGNALFD
1564 sigfd = -2; 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1702#endif
1566
1567 /* pid check not overridable via env */
1568#ifndef _WIN32
1569 if (flags & EVFLAG_FORKCHECK)
1570 curpid = getpid ();
1571#endif
1572
1573 if (!(flags & EVFLAG_NOENV)
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577 1703
1578 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1580 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1581#if EV_USE_PORT 1710#if EV_USE_PORT
1582 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1583#endif 1712#endif
1584#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1585 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1724#endif
1596 1725
1597 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1598 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1601 } 1732 }
1602} 1733}
1603 1734
1604/* free up a loop structure */ 1735/* free up a loop structure */
1605static void noinline 1736static void noinline
… …
1617 close (evfd); 1748 close (evfd);
1618#endif 1749#endif
1619 1750
1620 if (evpipe [0] >= 0) 1751 if (evpipe [0] >= 0)
1621 { 1752 {
1622 close (evpipe [0]); 1753 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1754 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1755 }
1625 } 1756 }
1626 1757
1627#if EV_USE_SIGNALFD 1758#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1759 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1760 close (sigfd);
1634 }
1635#endif 1761#endif
1636 1762
1637#if EV_USE_INOTIFY 1763#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1764 if (fs_fd >= 0)
1639 close (fs_fd); 1765 close (fs_fd);
1640#endif 1766#endif
1641 1767
1642 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1643 close (backend_fd); 1769 close (backend_fd);
1644 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1645#if EV_USE_PORT 1774#if EV_USE_PORT
1646 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1647#endif 1776#endif
1648#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1649 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1709 1838
1710 if (ev_is_active (&pipe_w)) 1839 if (ev_is_active (&pipe_w))
1711 { 1840 {
1712 /* this "locks" the handlers against writing to the pipe */ 1841 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1842 /* while we modify the fd vars */
1714 gotsig = 1; 1843 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1844#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1845 async_pending = 1;
1717#endif 1846#endif
1718 1847
1719 ev_ref (EV_A); 1848 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1849 ev_io_stop (EV_A_ &pipe_w);
1721 1850
… …
1724 close (evfd); 1853 close (evfd);
1725#endif 1854#endif
1726 1855
1727 if (evpipe [0] >= 0) 1856 if (evpipe [0] >= 0)
1728 { 1857 {
1729 close (evpipe [0]); 1858 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1859 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1860 }
1732 1861
1862#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1863 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1864 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1865 pipecb (EV_A_ &pipe_w, EV_READ);
1866#endif
1736 } 1867 }
1737 1868
1738 postfork = 0; 1869 postfork = 0;
1739} 1870}
1740 1871
1741#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1742 1873
1743struct ev_loop * 1874struct ev_loop *
1744ev_loop_new (unsigned int flags) 1875ev_loop_new (unsigned int flags)
1745{ 1876{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1877 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1878
1748 memset (loop, 0, sizeof (struct ev_loop)); 1879 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1880 loop_init (EV_A_ flags);
1750 1881
1751 if (ev_backend (EV_A)) 1882 if (ev_backend (EV_A))
1752 return loop; 1883 return EV_A;
1753 1884
1754 return 0; 1885 return 0;
1755} 1886}
1756 1887
1757void 1888void
… …
1802 verify_watcher (EV_A_ ws [cnt]); 1933 verify_watcher (EV_A_ ws [cnt]);
1803 } 1934 }
1804} 1935}
1805#endif 1936#endif
1806 1937
1807#if EV_MINIMAL < 2 1938#if EV_FEATURE_API
1808void 1939void
1809ev_loop_verify (EV_P) 1940ev_verify (EV_P)
1810{ 1941{
1811#if EV_VERIFY 1942#if EV_VERIFY
1812 int i; 1943 int i;
1813 WL w; 1944 WL w;
1814 1945
… …
1853#if EV_ASYNC_ENABLE 1984#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 1985 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 1986 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 1987#endif
1857 1988
1989#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 1990 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 1991 array_verify (EV_A_ (W *)prepares, preparecnt);
1992#endif
1860 1993
1994#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 1995 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1996 array_verify (EV_A_ (W *)checks, checkcnt);
1997#endif
1863 1998
1864# if 0 1999# if 0
2000#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2001 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2002 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2003#endif
1867# endif 2004# endif
1868#endif 2005#endif
1869} 2006}
1870#endif 2007#endif
1871 2008
… …
1878#endif 2015#endif
1879{ 2016{
1880 if (!ev_default_loop_ptr) 2017 if (!ev_default_loop_ptr)
1881 { 2018 {
1882#if EV_MULTIPLICITY 2019#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2020 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 2021#else
1885 ev_default_loop_ptr = 1; 2022 ev_default_loop_ptr = 1;
1886#endif 2023#endif
1887 2024
1888 loop_init (EV_A_ flags); 2025 loop_init (EV_A_ flags);
1889 2026
1890 if (ev_backend (EV_A)) 2027 if (ev_backend (EV_A))
1891 { 2028 {
1892#ifndef _WIN32 2029#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 2030 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 2031 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 2032 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2033 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 2034#endif
… …
1905 2042
1906void 2043void
1907ev_default_destroy (void) 2044ev_default_destroy (void)
1908{ 2045{
1909#if EV_MULTIPLICITY 2046#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 2047 EV_P = ev_default_loop_ptr;
1911#endif 2048#endif
1912 2049
1913 ev_default_loop_ptr = 0; 2050 ev_default_loop_ptr = 0;
1914 2051
1915#ifndef _WIN32 2052#if EV_CHILD_ENABLE
1916 ev_ref (EV_A); /* child watcher */ 2053 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev); 2054 ev_signal_stop (EV_A_ &childev);
1918#endif 2055#endif
1919 2056
1920 loop_destroy (EV_A); 2057 loop_destroy (EV_A);
… …
1922 2059
1923void 2060void
1924ev_default_fork (void) 2061ev_default_fork (void)
1925{ 2062{
1926#if EV_MULTIPLICITY 2063#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 2064 EV_P = ev_default_loop_ptr;
1928#endif 2065#endif
1929 2066
1930 postfork = 1; /* must be in line with ev_loop_fork */ 2067 postfork = 1; /* must be in line with ev_loop_fork */
1931} 2068}
1932 2069
… …
2026 EV_FREQUENT_CHECK; 2163 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2164 feed_reverse (EV_A_ (W)w);
2028 } 2165 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2166 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2167
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2168 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2169 }
2033} 2170}
2034 2171
2035#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
2036/* make periodics pending */ 2173/* make periodics pending */
… …
2089 feed_reverse_done (EV_A_ EV_PERIODIC); 2226 feed_reverse_done (EV_A_ EV_PERIODIC);
2090 } 2227 }
2091} 2228}
2092 2229
2093/* simply recalculate all periodics */ 2230/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2231/* TODO: maybe ensure that at least one event happens when jumping forward? */
2095static void noinline 2232static void noinline
2096periodics_reschedule (EV_P) 2233periodics_reschedule (EV_P)
2097{ 2234{
2098 int i; 2235 int i;
2099 2236
… …
2127 ANHE_at_cache (*he); 2264 ANHE_at_cache (*he);
2128 } 2265 }
2129} 2266}
2130 2267
2131/* fetch new monotonic and realtime times from the kernel */ 2268/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2269/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2270inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2271time_update (EV_P_ ev_tstamp max_block)
2135{ 2272{
2136#if EV_USE_MONOTONIC 2273#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2274 if (expect_true (have_monotonic))
… …
2195 mn_now = ev_rt_now; 2332 mn_now = ev_rt_now;
2196 } 2333 }
2197} 2334}
2198 2335
2199void 2336void
2200ev_loop (EV_P_ int flags) 2337ev_run (EV_P_ int flags)
2201{ 2338{
2202#if EV_MINIMAL < 2 2339#if EV_FEATURE_API
2203 ++loop_depth; 2340 ++loop_depth;
2204#endif 2341#endif
2205 2342
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2343 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2207 2344
2208 loop_done = EVUNLOOP_CANCEL; 2345 loop_done = EVBREAK_CANCEL;
2209 2346
2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2347 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2211 2348
2212 do 2349 do
2213 { 2350 {
2214#if EV_VERIFY >= 2 2351#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2352 ev_verify (EV_A);
2216#endif 2353#endif
2217 2354
2218#ifndef _WIN32 2355#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2356 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2357 if (expect_false (getpid () != curpid))
… …
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2370 EV_INVOKE_PENDING;
2234 } 2371 }
2235#endif 2372#endif
2236 2373
2374#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2375 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2376 if (expect_false (preparecnt))
2239 { 2377 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2378 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2379 EV_INVOKE_PENDING;
2242 } 2380 }
2381#endif
2243 2382
2244 if (expect_false (loop_done)) 2383 if (expect_false (loop_done))
2245 break; 2384 break;
2246 2385
2247 /* we might have forked, so reify kernel state if necessary */ 2386 /* we might have forked, so reify kernel state if necessary */
… …
2254 /* calculate blocking time */ 2393 /* calculate blocking time */
2255 { 2394 {
2256 ev_tstamp waittime = 0.; 2395 ev_tstamp waittime = 0.;
2257 ev_tstamp sleeptime = 0.; 2396 ev_tstamp sleeptime = 0.;
2258 2397
2398 /* remember old timestamp for io_blocktime calculation */
2399 ev_tstamp prev_mn_now = mn_now;
2400
2401 /* update time to cancel out callback processing overhead */
2402 time_update (EV_A_ 1e100);
2403
2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2404 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2260 { 2405 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2264 /* update time to cancel out callback processing overhead */
2265 time_update (EV_A_ 1e100);
2266
2267 waittime = MAX_BLOCKTIME; 2406 waittime = MAX_BLOCKTIME;
2268 2407
2269 if (timercnt) 2408 if (timercnt)
2270 { 2409 {
2271 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2410 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2298 waittime -= sleeptime; 2437 waittime -= sleeptime;
2299 } 2438 }
2300 } 2439 }
2301 } 2440 }
2302 2441
2303#if EV_MINIMAL < 2 2442#if EV_FEATURE_API
2304 ++loop_count; 2443 ++loop_count;
2305#endif 2444#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2445 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2446 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2447 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2309 2448
2310 /* update ev_rt_now, do magic */ 2449 /* update ev_rt_now, do magic */
2311 time_update (EV_A_ waittime + sleeptime); 2450 time_update (EV_A_ waittime + sleeptime);
2312 } 2451 }
2313 2452
… …
2320#if EV_IDLE_ENABLE 2459#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2460 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2461 idle_reify (EV_A);
2323#endif 2462#endif
2324 2463
2464#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2465 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2466 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2467 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2468#endif
2328 2469
2329 EV_INVOKE_PENDING; 2470 EV_INVOKE_PENDING;
2330 } 2471 }
2331 while (expect_true ( 2472 while (expect_true (
2332 activecnt 2473 activecnt
2333 && !loop_done 2474 && !loop_done
2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2475 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2335 )); 2476 ));
2336 2477
2337 if (loop_done == EVUNLOOP_ONE) 2478 if (loop_done == EVBREAK_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2479 loop_done = EVBREAK_CANCEL;
2339 2480
2340#if EV_MINIMAL < 2 2481#if EV_FEATURE_API
2341 --loop_depth; 2482 --loop_depth;
2342#endif 2483#endif
2343} 2484}
2344 2485
2345void 2486void
2346ev_unloop (EV_P_ int how) 2487ev_break (EV_P_ int how)
2347{ 2488{
2348 loop_done = how; 2489 loop_done = how;
2349} 2490}
2350 2491
2351void 2492void
… …
2398inline_size void 2539inline_size void
2399wlist_del (WL *head, WL elem) 2540wlist_del (WL *head, WL elem)
2400{ 2541{
2401 while (*head) 2542 while (*head)
2402 { 2543 {
2403 if (*head == elem) 2544 if (expect_true (*head == elem))
2404 { 2545 {
2405 *head = elem->next; 2546 *head = elem->next;
2406 return; 2547 break;
2407 } 2548 }
2408 2549
2409 head = &(*head)->next; 2550 head = &(*head)->next;
2410 } 2551 }
2411} 2552}
… …
2471 2612
2472 if (expect_false (ev_is_active (w))) 2613 if (expect_false (ev_is_active (w)))
2473 return; 2614 return;
2474 2615
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2616 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2617 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2618
2478 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2479 2620
2480 ev_start (EV_A_ (W)w, 1); 2621 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2622 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2499 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2500 2641
2501 wlist_del (&anfds[w->fd].head, (WL)w); 2642 wlist_del (&anfds[w->fd].head, (WL)w);
2502 ev_stop (EV_A_ (W)w); 2643 ev_stop (EV_A_ (W)w);
2503 2644
2504 fd_change (EV_A_ w->fd, 1); 2645 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2505 2646
2506 EV_FREQUENT_CHECK; 2647 EV_FREQUENT_CHECK;
2507} 2648}
2508 2649
2509void noinline 2650void noinline
… …
2551 timers [active] = timers [timercnt + HEAP0]; 2692 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2693 adjustheap (timers, timercnt, active);
2553 } 2694 }
2554 } 2695 }
2555 2696
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2697 ev_at (w) -= mn_now;
2559 2698
2560 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2561} 2702}
2562 2703
2563void noinline 2704void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2705ev_timer_again (EV_P_ ev_timer *w)
2565{ 2706{
… …
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2785 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2786 adjustheap (periodics, periodiccnt, active);
2646 } 2787 }
2647 } 2788 }
2648 2789
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2790 ev_stop (EV_A_ (W)w);
2791
2792 EV_FREQUENT_CHECK;
2652} 2793}
2653 2794
2654void noinline 2795void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2796ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2797{
… …
2662 2803
2663#ifndef SA_RESTART 2804#ifndef SA_RESTART
2664# define SA_RESTART 0 2805# define SA_RESTART 0
2665#endif 2806#endif
2666 2807
2808#if EV_SIGNAL_ENABLE
2809
2667void noinline 2810void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2811ev_signal_start (EV_P_ ev_signal *w)
2669{ 2812{
2670#if EV_MULTIPLICITY
2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2672#endif
2673 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2674 return; 2814 return;
2675 2815
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2816 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2817
2818#if EV_MULTIPLICITY
2819 assert (("libev: a signal must not be attached to two different loops",
2820 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2821
2822 signals [w->signum - 1].loop = EV_A;
2823#endif
2677 2824
2678 EV_FREQUENT_CHECK; 2825 EV_FREQUENT_CHECK;
2679 2826
2680#if EV_USE_SIGNALFD 2827#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2828 if (sigfd == -2)
… …
2703 sigaddset (&sigfd_set, w->signum); 2850 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2851 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2852
2706 signalfd (sigfd, &sigfd_set, 0); 2853 signalfd (sigfd, &sigfd_set, 0);
2707 } 2854 }
2708 else
2709#endif
2710 evpipe_init (EV_A);
2711
2712 {
2713#ifndef _WIN32
2714 sigset_t full, prev;
2715 sigfillset (&full);
2716 sigprocmask (SIG_SETMASK, &full, &prev);
2717#endif
2718
2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2720
2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif 2855#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2856
2730 ev_start (EV_A_ (W)w, 1); 2857 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2858 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2859
2733 if (!((WL)w)->next) 2860 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2861# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2862 if (sigfd < 0) /*TODO*/
2740# endif 2863# endif
2741 { 2864 {
2865# ifdef _WIN32
2866 evpipe_init (EV_A);
2867
2868 signal (w->signum, ev_sighandler);
2869# else
2742 struct sigaction sa = { }; 2870 struct sigaction sa;
2871
2872 evpipe_init (EV_A);
2873
2743 sa.sa_handler = ev_sighandler; 2874 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2875 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2876 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2877 sigaction (w->signum, &sa, 0);
2878
2879 sigemptyset (&sa.sa_mask);
2880 sigaddset (&sa.sa_mask, w->signum);
2881 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2882#endif
2747 } 2883 }
2748#endif
2749 }
2750 2884
2751 EV_FREQUENT_CHECK; 2885 EV_FREQUENT_CHECK;
2752} 2886}
2753 2887
2754void noinline 2888void noinline
… …
2762 2896
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2897 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2898 ev_stop (EV_A_ (W)w);
2765 2899
2766 if (!signals [w->signum - 1].head) 2900 if (!signals [w->signum - 1].head)
2901 {
2902#if EV_MULTIPLICITY
2903 signals [w->signum - 1].loop = 0; /* unattach from signal */
2904#endif
2767#if EV_USE_SIGNALFD 2905#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2906 if (sigfd >= 0)
2769 { 2907 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2908 sigset_t ss;
2909
2910 sigemptyset (&ss);
2911 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2912 sigdelset (&sigfd_set, w->signum);
2913
2772 signalfd (sigfd, &sigfd_set, 0); 2914 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2915 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2916 }
2776 else 2917 else
2777#endif 2918#endif
2778 signal (w->signum, SIG_DFL); 2919 signal (w->signum, SIG_DFL);
2920 }
2779 2921
2780 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2781} 2923}
2924
2925#endif
2926
2927#if EV_CHILD_ENABLE
2782 2928
2783void 2929void
2784ev_child_start (EV_P_ ev_child *w) 2930ev_child_start (EV_P_ ev_child *w)
2785{ 2931{
2786#if EV_MULTIPLICITY 2932#if EV_MULTIPLICITY
… …
2790 return; 2936 return;
2791 2937
2792 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2793 2939
2794 ev_start (EV_A_ (W)w, 1); 2940 ev_start (EV_A_ (W)w, 1);
2795 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2941 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2796 2942
2797 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2798} 2944}
2799 2945
2800void 2946void
… …
2804 if (expect_false (!ev_is_active (w))) 2950 if (expect_false (!ev_is_active (w)))
2805 return; 2951 return;
2806 2952
2807 EV_FREQUENT_CHECK; 2953 EV_FREQUENT_CHECK;
2808 2954
2809 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2955 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2810 ev_stop (EV_A_ (W)w); 2956 ev_stop (EV_A_ (W)w);
2811 2957
2812 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2813} 2959}
2960
2961#endif
2814 2962
2815#if EV_STAT_ENABLE 2963#if EV_STAT_ENABLE
2816 2964
2817# ifdef _WIN32 2965# ifdef _WIN32
2818# undef lstat 2966# undef lstat
… …
2824#define MIN_STAT_INTERVAL 0.1074891 2972#define MIN_STAT_INTERVAL 0.1074891
2825 2973
2826static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2974static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2827 2975
2828#if EV_USE_INOTIFY 2976#if EV_USE_INOTIFY
2829# define EV_INOTIFY_BUFSIZE 8192 2977
2978/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2979# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2830 2980
2831static void noinline 2981static void noinline
2832infy_add (EV_P_ ev_stat *w) 2982infy_add (EV_P_ ev_stat *w)
2833{ 2983{
2834 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); 2984 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);
2835 2985
2836 if (w->wd < 0) 2986 if (w->wd >= 0)
2987 {
2988 struct statfs sfs;
2989
2990 /* now local changes will be tracked by inotify, but remote changes won't */
2991 /* unless the filesystem is known to be local, we therefore still poll */
2992 /* also do poll on <2.6.25, but with normal frequency */
2993
2994 if (!fs_2625)
2995 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2996 else if (!statfs (w->path, &sfs)
2997 && (sfs.f_type == 0x1373 /* devfs */
2998 || sfs.f_type == 0xEF53 /* ext2/3 */
2999 || sfs.f_type == 0x3153464a /* jfs */
3000 || sfs.f_type == 0x52654973 /* reiser3 */
3001 || sfs.f_type == 0x01021994 /* tempfs */
3002 || sfs.f_type == 0x58465342 /* xfs */))
3003 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3004 else
3005 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 3006 }
3007 else
3008 {
3009 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3010 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2839 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2840 3011
2841 /* monitor some parent directory for speedup hints */ 3012 /* if path is not there, monitor some parent directory for speedup hints */
2842 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3013 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 3014 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3015 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 3016 {
2846 char path [4096]; 3017 char path [4096];
… …
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3033 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 3034 }
2864 } 3035 }
2865 3036
2866 if (w->wd >= 0) 3037 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3038 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2869 3039
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 3040 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 3041 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 /* also do poll on <2.6.25, but with normal frequency */
2873 struct statfs sfs;
2874
2875 if (fs_2625 && !statfs (w->path, &sfs))
2876 if (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */)
2882 return;
2883
2884 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2885 ev_timer_again (EV_A_ &w->timer); 3042 ev_timer_again (EV_A_ &w->timer);
2886 } 3043 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 3044}
2888 3045
2889static void noinline 3046static void noinline
2890infy_del (EV_P_ ev_stat *w) 3047infy_del (EV_P_ ev_stat *w)
2891{ 3048{
… …
2894 3051
2895 if (wd < 0) 3052 if (wd < 0)
2896 return; 3053 return;
2897 3054
2898 w->wd = -2; 3055 w->wd = -2;
2899 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3056 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2900 wlist_del (&fs_hash [slot].head, (WL)w); 3057 wlist_del (&fs_hash [slot].head, (WL)w);
2901 3058
2902 /* remove this watcher, if others are watching it, they will rearm */ 3059 /* remove this watcher, if others are watching it, they will rearm */
2903 inotify_rm_watch (fs_fd, wd); 3060 inotify_rm_watch (fs_fd, wd);
2904} 3061}
… …
2906static void noinline 3063static void noinline
2907infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3064infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2908{ 3065{
2909 if (slot < 0) 3066 if (slot < 0)
2910 /* overflow, need to check for all hash slots */ 3067 /* overflow, need to check for all hash slots */
2911 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2912 infy_wd (EV_A_ slot, wd, ev); 3069 infy_wd (EV_A_ slot, wd, ev);
2913 else 3070 else
2914 { 3071 {
2915 WL w_; 3072 WL w_;
2916 3073
2917 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3074 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2918 { 3075 {
2919 ev_stat *w = (ev_stat *)w_; 3076 ev_stat *w = (ev_stat *)w_;
2920 w_ = w_->next; /* lets us remove this watcher and all before it */ 3077 w_ = w_->next; /* lets us remove this watcher and all before it */
2921 3078
2922 if (w->wd == wd || wd == -1) 3079 if (w->wd == wd || wd == -1)
2923 { 3080 {
2924 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3081 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2925 { 3082 {
2926 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3083 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2927 w->wd = -1; 3084 w->wd = -1;
2928 infy_add (EV_A_ w); /* re-add, no matter what */ 3085 infy_add (EV_A_ w); /* re-add, no matter what */
2929 } 3086 }
2930 3087
2931 stat_timer_cb (EV_A_ &w->timer, 0); 3088 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2936 3093
2937static void 3094static void
2938infy_cb (EV_P_ ev_io *w, int revents) 3095infy_cb (EV_P_ ev_io *w, int revents)
2939{ 3096{
2940 char buf [EV_INOTIFY_BUFSIZE]; 3097 char buf [EV_INOTIFY_BUFSIZE];
2941 struct inotify_event *ev = (struct inotify_event *)buf;
2942 int ofs; 3098 int ofs;
2943 int len = read (fs_fd, buf, sizeof (buf)); 3099 int len = read (fs_fd, buf, sizeof (buf));
2944 3100
2945 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3101 for (ofs = 0; ofs < len; )
3102 {
3103 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2946 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3104 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3105 ofs += sizeof (struct inotify_event) + ev->len;
3106 }
2947} 3107}
2948 3108
2949inline_size void 3109inline_size void
2950check_2625 (EV_P) 3110ev_check_2625 (EV_P)
2951{ 3111{
2952 /* kernels < 2.6.25 are borked 3112 /* kernels < 2.6.25 are borked
2953 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3113 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2954 */ 3114 */
2955 struct utsname buf; 3115 if (ev_linux_version () < 0x020619)
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return; 3116 return;
2960 3117
2961 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2962 return;
2963
2964 if (major < 2
2965 || (major == 2 && minor < 6)
2966 || (major == 2 && minor == 6 && micro < 25))
2967 return;
2968
2969 fs_2625 = 1; 3118 fs_2625 = 1;
3119}
3120
3121inline_size int
3122infy_newfd (void)
3123{
3124#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3125 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3126 if (fd >= 0)
3127 return fd;
3128#endif
3129 return inotify_init ();
2970} 3130}
2971 3131
2972inline_size void 3132inline_size void
2973infy_init (EV_P) 3133infy_init (EV_P)
2974{ 3134{
2975 if (fs_fd != -2) 3135 if (fs_fd != -2)
2976 return; 3136 return;
2977 3137
2978 fs_fd = -1; 3138 fs_fd = -1;
2979 3139
2980 check_2625 (EV_A); 3140 ev_check_2625 (EV_A);
2981 3141
2982 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2983 3143
2984 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
2985 { 3145 {
3146 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3147 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3148 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3149 ev_io_start (EV_A_ &fs_w);
3150 ev_unref (EV_A);
2989 } 3151 }
2990} 3152}
2991 3153
2992inline_size void 3154inline_size void
2993infy_fork (EV_P) 3155infy_fork (EV_P)
… …
2995 int slot; 3157 int slot;
2996 3158
2997 if (fs_fd < 0) 3159 if (fs_fd < 0)
2998 return; 3160 return;
2999 3161
3162 ev_ref (EV_A);
3163 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3164 close (fs_fd);
3001 fs_fd = inotify_init (); 3165 fs_fd = infy_newfd ();
3002 3166
3167 if (fs_fd >= 0)
3168 {
3169 fd_intern (fs_fd);
3170 ev_io_set (&fs_w, fs_fd, EV_READ);
3171 ev_io_start (EV_A_ &fs_w);
3172 ev_unref (EV_A);
3173 }
3174
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3175 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3004 { 3176 {
3005 WL w_ = fs_hash [slot].head; 3177 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3178 fs_hash [slot].head = 0;
3007 3179
3008 while (w_) 3180 while (w_)
… …
3013 w->wd = -1; 3185 w->wd = -1;
3014 3186
3015 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3188 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3189 else
3190 {
3191 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3192 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3193 ev_timer_again (EV_A_ &w->timer);
3194 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3195 }
3019 } 3196 }
3020 } 3197 }
3021} 3198}
3022 3199
3023#endif 3200#endif
… …
3040static void noinline 3217static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3218stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3219{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3220 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3221
3045 /* we copy this here each the time so that */ 3222 ev_statdata prev = w->attr;
3046 /* prev has the old value when the callback gets invoked */
3047 w->prev = w->attr;
3048 ev_stat_stat (EV_A_ w); 3223 ev_stat_stat (EV_A_ w);
3049 3224
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3225 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3226 if (
3052 w->prev.st_dev != w->attr.st_dev 3227 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3228 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3229 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3230 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3231 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3232 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3233 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3234 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3235 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3236 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3237 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3238 ) {
3239 /* we only update w->prev on actual differences */
3240 /* in case we test more often than invoke the callback, */
3241 /* to ensure that prev is always different to attr */
3242 w->prev = prev;
3243
3064 #if EV_USE_INOTIFY 3244 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3245 if (fs_fd >= 0)
3066 { 3246 {
3067 infy_del (EV_A_ w); 3247 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
… …
3093 3273
3094 if (fs_fd >= 0) 3274 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3275 infy_add (EV_A_ w);
3096 else 3276 else
3097#endif 3277#endif
3278 {
3098 ev_timer_again (EV_A_ &w->timer); 3279 ev_timer_again (EV_A_ &w->timer);
3280 ev_unref (EV_A);
3281 }
3099 3282
3100 ev_start (EV_A_ (W)w, 1); 3283 ev_start (EV_A_ (W)w, 1);
3101 3284
3102 EV_FREQUENT_CHECK; 3285 EV_FREQUENT_CHECK;
3103} 3286}
… …
3112 EV_FREQUENT_CHECK; 3295 EV_FREQUENT_CHECK;
3113 3296
3114#if EV_USE_INOTIFY 3297#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3298 infy_del (EV_A_ w);
3116#endif 3299#endif
3300
3301 if (ev_is_active (&w->timer))
3302 {
3303 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3304 ev_timer_stop (EV_A_ &w->timer);
3305 }
3118 3306
3119 ev_stop (EV_A_ (W)w); 3307 ev_stop (EV_A_ (W)w);
3120 3308
3121 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
3122} 3310}
… …
3167 3355
3168 EV_FREQUENT_CHECK; 3356 EV_FREQUENT_CHECK;
3169} 3357}
3170#endif 3358#endif
3171 3359
3360#if EV_PREPARE_ENABLE
3172void 3361void
3173ev_prepare_start (EV_P_ ev_prepare *w) 3362ev_prepare_start (EV_P_ ev_prepare *w)
3174{ 3363{
3175 if (expect_false (ev_is_active (w))) 3364 if (expect_false (ev_is_active (w)))
3176 return; 3365 return;
… …
3202 3391
3203 ev_stop (EV_A_ (W)w); 3392 ev_stop (EV_A_ (W)w);
3204 3393
3205 EV_FREQUENT_CHECK; 3394 EV_FREQUENT_CHECK;
3206} 3395}
3396#endif
3207 3397
3398#if EV_CHECK_ENABLE
3208void 3399void
3209ev_check_start (EV_P_ ev_check *w) 3400ev_check_start (EV_P_ ev_check *w)
3210{ 3401{
3211 if (expect_false (ev_is_active (w))) 3402 if (expect_false (ev_is_active (w)))
3212 return; 3403 return;
… …
3238 3429
3239 ev_stop (EV_A_ (W)w); 3430 ev_stop (EV_A_ (W)w);
3240 3431
3241 EV_FREQUENT_CHECK; 3432 EV_FREQUENT_CHECK;
3242} 3433}
3434#endif
3243 3435
3244#if EV_EMBED_ENABLE 3436#if EV_EMBED_ENABLE
3245void noinline 3437void noinline
3246ev_embed_sweep (EV_P_ ev_embed *w) 3438ev_embed_sweep (EV_P_ ev_embed *w)
3247{ 3439{
3248 ev_loop (w->other, EVLOOP_NONBLOCK); 3440 ev_run (w->other, EVRUN_NOWAIT);
3249} 3441}
3250 3442
3251static void 3443static void
3252embed_io_cb (EV_P_ ev_io *io, int revents) 3444embed_io_cb (EV_P_ ev_io *io, int revents)
3253{ 3445{
3254 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3446 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3255 3447
3256 if (ev_cb (w)) 3448 if (ev_cb (w))
3257 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3449 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3258 else 3450 else
3259 ev_loop (w->other, EVLOOP_NONBLOCK); 3451 ev_run (w->other, EVRUN_NOWAIT);
3260} 3452}
3261 3453
3262static void 3454static void
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3455embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3456{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3457 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3458
3267 { 3459 {
3268 struct ev_loop *loop = w->other; 3460 EV_P = w->other;
3269 3461
3270 while (fdchangecnt) 3462 while (fdchangecnt)
3271 { 3463 {
3272 fd_reify (EV_A); 3464 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3274 } 3466 }
3275 } 3467 }
3276} 3468}
3277 3469
3278static void 3470static void
… …
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3473 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3474
3283 ev_embed_stop (EV_A_ w); 3475 ev_embed_stop (EV_A_ w);
3284 3476
3285 { 3477 {
3286 struct ev_loop *loop = w->other; 3478 EV_P = w->other;
3287 3479
3288 ev_loop_fork (EV_A); 3480 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3481 ev_run (EV_A_ EVRUN_NOWAIT);
3290 } 3482 }
3291 3483
3292 ev_embed_start (EV_A_ w); 3484 ev_embed_start (EV_A_ w);
3293} 3485}
3294 3486
… …
3305{ 3497{
3306 if (expect_false (ev_is_active (w))) 3498 if (expect_false (ev_is_active (w)))
3307 return; 3499 return;
3308 3500
3309 { 3501 {
3310 struct ev_loop *loop = w->other; 3502 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3503 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3312 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3504 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3505 }
3314 3506
3315 EV_FREQUENT_CHECK; 3507 EV_FREQUENT_CHECK;
… …
3342 3534
3343 ev_io_stop (EV_A_ &w->io); 3535 ev_io_stop (EV_A_ &w->io);
3344 ev_prepare_stop (EV_A_ &w->prepare); 3536 ev_prepare_stop (EV_A_ &w->prepare);
3345 ev_fork_stop (EV_A_ &w->fork); 3537 ev_fork_stop (EV_A_ &w->fork);
3346 3538
3539 ev_stop (EV_A_ (W)w);
3540
3347 EV_FREQUENT_CHECK; 3541 EV_FREQUENT_CHECK;
3348} 3542}
3349#endif 3543#endif
3350 3544
3351#if EV_FORK_ENABLE 3545#if EV_FORK_ENABLE
… …
3391ev_async_start (EV_P_ ev_async *w) 3585ev_async_start (EV_P_ ev_async *w)
3392{ 3586{
3393 if (expect_false (ev_is_active (w))) 3587 if (expect_false (ev_is_active (w)))
3394 return; 3588 return;
3395 3589
3590 w->sent = 0;
3591
3396 evpipe_init (EV_A); 3592 evpipe_init (EV_A);
3397 3593
3398 EV_FREQUENT_CHECK; 3594 EV_FREQUENT_CHECK;
3399 3595
3400 ev_start (EV_A_ (W)w, ++asynccnt); 3596 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3427 3623
3428void 3624void
3429ev_async_send (EV_P_ ev_async *w) 3625ev_async_send (EV_P_ ev_async *w)
3430{ 3626{
3431 w->sent = 1; 3627 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3628 evpipe_write (EV_A_ &async_pending);
3433} 3629}
3434#endif 3630#endif
3435 3631
3436/*****************************************************************************/ 3632/*****************************************************************************/
3437 3633
… …
3477{ 3673{
3478 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3674 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3479 3675
3480 if (expect_false (!once)) 3676 if (expect_false (!once))
3481 { 3677 {
3482 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3678 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3483 return; 3679 return;
3484 } 3680 }
3485 3681
3486 once->cb = cb; 3682 once->cb = cb;
3487 once->arg = arg; 3683 once->arg = arg;
… …
3574 if (types & EV_ASYNC) 3770 if (types & EV_ASYNC)
3575 for (i = asynccnt; i--; ) 3771 for (i = asynccnt; i--; )
3576 cb (EV_A_ EV_ASYNC, asyncs [i]); 3772 cb (EV_A_ EV_ASYNC, asyncs [i]);
3577#endif 3773#endif
3578 3774
3775#if EV_PREPARE_ENABLE
3579 if (types & EV_PREPARE) 3776 if (types & EV_PREPARE)
3580 for (i = preparecnt; i--; ) 3777 for (i = preparecnt; i--; )
3581#if EV_EMBED_ENABLE 3778# if EV_EMBED_ENABLE
3582 if (ev_cb (prepares [i]) != embed_prepare_cb) 3779 if (ev_cb (prepares [i]) != embed_prepare_cb)
3583#endif 3780# endif
3584 cb (EV_A_ EV_PREPARE, prepares [i]); 3781 cb (EV_A_ EV_PREPARE, prepares [i]);
3782#endif
3585 3783
3784#if EV_CHECK_ENABLE
3586 if (types & EV_CHECK) 3785 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3786 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3787 cb (EV_A_ EV_CHECK, checks [i]);
3788#endif
3589 3789
3790#if EV_SIGNAL_ENABLE
3590 if (types & EV_SIGNAL) 3791 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3792 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3793 for (wl = signals [i].head; wl; )
3593 { 3794 {
3594 wn = wl->next; 3795 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3796 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3797 wl = wn;
3597 } 3798 }
3799#endif
3598 3800
3801#if EV_CHILD_ENABLE
3599 if (types & EV_CHILD) 3802 if (types & EV_CHILD)
3600 for (i = EV_PID_HASHSIZE; i--; ) 3803 for (i = (EV_PID_HASHSIZE); i--; )
3601 for (wl = childs [i]; wl; ) 3804 for (wl = childs [i]; wl; )
3602 { 3805 {
3603 wn = wl->next; 3806 wn = wl->next;
3604 cb (EV_A_ EV_CHILD, wl); 3807 cb (EV_A_ EV_CHILD, wl);
3605 wl = wn; 3808 wl = wn;
3606 } 3809 }
3810#endif
3607/* EV_STAT 0x00001000 /* stat data changed */ 3811/* EV_STAT 0x00001000 /* stat data changed */
3608/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3812/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3609} 3813}
3610#endif 3814#endif
3611 3815
3612#if EV_MULTIPLICITY 3816#if EV_MULTIPLICITY
3613 #include "ev_wrap.h" 3817 #include "ev_wrap.h"
3614#endif 3818#endif
3615 3819
3616#ifdef __cplusplus 3820EV_CPP(})
3617}
3618#endif
3619 3821

Diff Legend

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