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

Comparing libev/ev.c (file contents):
Revision 1.316 by root, Fri Sep 18 21:02:12 2009 UTC vs.
Revision 1.350 by root, Sat Oct 16 00:59:56 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 *
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
88# endif 98# endif
89 99
100# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
103# endif
104# endif 107# endif
105 108
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
109# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
112# endif 116# endif
113 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 119# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
120# endif 125# endif
121 126
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
125# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
128# endif 134# endif
129 135
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
136# endif 143# endif
137 144
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 146# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 147# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
144# endif 152# endif
145 153
154# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 155# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 156# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
157#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
158#include <fcntl.h> 168#include <fcntl.h>
159#include <stddef.h> 169#include <stddef.h>
160 170
161#include <stdio.h> 171#include <stdio.h>
162 172
163#include <assert.h> 173#include <assert.h>
164#include <errno.h> 174#include <errno.h>
165#include <sys/types.h> 175#include <sys/types.h>
166#include <time.h> 176#include <time.h>
177#include <limits.h>
167 178
168#include <signal.h> 179#include <signal.h>
169 180
170#ifdef EV_H 181#ifdef EV_H
171# include EV_H 182# include EV_H
182# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 194# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
186# endif 197# endif
198# undef EV_AVOID_STDIO
187#endif 199#endif
200
201/* OS X, in its infinite idiocy, actually HARDCODES
202 * a limit of 1024 into their select. Where people have brains,
203 * OS X engineers apparently have a vacuum. Or maybe they were
204 * ordered to have a vacuum, or they do anything for money.
205 * This might help. Or not.
206 */
207#define _DARWIN_UNLIMITED_SELECT 1
188 208
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 209/* this block tries to deduce configuration from header-defined symbols and defaults */
190 210
191/* try to deduce the maximum number of signals on this platform */ 211/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG) 212#if defined (EV_NSIG)
204#elif defined (MAXSIG) 224#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 225# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 226#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 227# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 228#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 230#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 232#else
213# error "unable to find value for NSIG, please report" 233# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
215# define EV_NSIG 65 236# define EV_NSIG 65
216#endif 237#endif
217 238
218#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 242# else
222# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
223# endif 244# endif
224#endif 245#endif
225 246
226#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 250# else
230# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
231# endif 252# endif
232#endif 253#endif
233 254
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 257#endif
237 258
238#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 262# else
242# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
243# endif 264# endif
244#endif 265#endif
245 266
246#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 269#endif
249 270
250#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
251# ifdef _WIN32 272# ifdef _WIN32
252# define EV_USE_POLL 0 273# define EV_USE_POLL 0
253# else 274# else
254# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 276# endif
256#endif 277#endif
257 278
258#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 282# else
262# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
263# endif 284# endif
264#endif 285#endif
265 286
271# define EV_USE_PORT 0 292# define EV_USE_PORT 0
272#endif 293#endif
273 294
274#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 298# else
278# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
279# endif 300# endif
280#endif 301#endif
281 302
282#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 305#endif
289 306
290#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 309#endif
297 310
298#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 314# else
302# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
303# endif 316# endif
304#endif 317#endif
305 318
306#ifndef EV_USE_SIGNALFD 319#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 321# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 322# else
310# define EV_USE_SIGNALFD 0 323# define EV_USE_SIGNALFD 0
311# endif 324# endif
312#endif 325#endif
313 326
316# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
318#endif 331#endif
319 332
320#ifndef EV_VERIFY 333#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 335#endif
323 336
324#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 339#endif
327 340
328#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 343#endif
331 344
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 345/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0 355# define EV_USE_CLOCK_SYSCALL 0
343# endif 356# endif
344#endif 357#endif
345 358
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 359/* this block fixes any misconfiguration where we know we run into trouble otherwise */
360
361#ifdef _AIX
362/* AIX has a completely broken poll.h header */
363# undef EV_USE_POLL
364# define EV_USE_POLL 0
365#endif
347 366
348#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
351#endif 370#endif
395# endif 414# endif
396# endif 415# endif
397# ifdef __cplusplus 416# ifdef __cplusplus
398extern "C" { 417extern "C" {
399# endif 418# endif
400int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 420# ifdef __cplusplus
402} 421}
403# endif 422# endif
404#endif 423#endif
405 424
429# ifdef __cplusplus 448# ifdef __cplusplus
430} 449}
431# endif 450# endif
432#endif 451#endif
433 452
434
435/**/ 453/**/
436 454
437#if EV_VERIFY >= 3 455#if EV_VERIFY >= 3
438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 456# define EV_FREQUENT_CHECK ev_verify (EV_A)
439#else 457#else
440# define EV_FREQUENT_CHECK do { } while (0) 458# define EV_FREQUENT_CHECK do { } while (0)
441#endif 459#endif
442 460
443/* 461/*
451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 469#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
452 470
453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 471#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 472#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
455 473
474#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
475#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
476
456#if __GNUC__ >= 4 477#if __GNUC__ >= 4
457# define expect(expr,value) __builtin_expect ((expr),(value)) 478# define expect(expr,value) __builtin_expect ((expr),(value))
458# define noinline __attribute__ ((noinline)) 479# define noinline __attribute__ ((noinline))
459#else 480#else
460# define expect(expr,value) (expr) 481# define expect(expr,value) (expr)
466 487
467#define expect_false(expr) expect ((expr) != 0, 0) 488#define expect_false(expr) expect ((expr) != 0, 0)
468#define expect_true(expr) expect ((expr) != 0, 1) 489#define expect_true(expr) expect ((expr) != 0, 1)
469#define inline_size static inline 490#define inline_size static inline
470 491
471#if EV_MINIMAL 492#if EV_FEATURE_CODE
493# define inline_speed static inline
494#else
472# define inline_speed static noinline 495# define inline_speed static noinline
473#else
474# define inline_speed static inline
475#endif 496#endif
476 497
477#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 498#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
478 499
479#if EV_MINPRI == EV_MAXPRI 500#if EV_MINPRI == EV_MAXPRI
492#define ev_active(w) ((W)(w))->active 513#define ev_active(w) ((W)(w))->active
493#define ev_at(w) ((WT)(w))->at 514#define ev_at(w) ((WT)(w))->at
494 515
495#if EV_USE_REALTIME 516#if EV_USE_REALTIME
496/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 517/* sig_atomic_t is used to avoid per-thread variables or locking but still */
497/* giving it a reasonably high chance of working on typical architetcures */ 518/* giving it a reasonably high chance of working on typical architectures */
498static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 519static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
499#endif 520#endif
500 521
501#if EV_USE_MONOTONIC 522#if EV_USE_MONOTONIC
502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 523static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504 525
505#ifndef EV_FD_TO_WIN32_HANDLE 526#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 527# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif 528#endif
508#ifndef EV_WIN32_HANDLE_TO_FD 529#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 530# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510#endif 531#endif
511#ifndef EV_WIN32_CLOSE_FD 532#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd) 533# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif 534#endif
514 535
515#ifdef _WIN32 536#ifdef _WIN32
516# include "ev_win32.c" 537# include "ev_win32.c"
517#endif 538#endif
518 539
519/*****************************************************************************/ 540/*****************************************************************************/
541
542#if EV_AVOID_STDIO
543static void noinline
544ev_printerr (const char *msg)
545{
546 write (STDERR_FILENO, msg, strlen (msg));
547}
548#endif
520 549
521static void (*syserr_cb)(const char *msg); 550static void (*syserr_cb)(const char *msg);
522 551
523void 552void
524ev_set_syserr_cb (void (*cb)(const char *msg)) 553ev_set_syserr_cb (void (*cb)(const char *msg))
534 563
535 if (syserr_cb) 564 if (syserr_cb)
536 syserr_cb (msg); 565 syserr_cb (msg);
537 else 566 else
538 { 567 {
568#if EV_AVOID_STDIO
569 const char *err = strerror (errno);
570
571 ev_printerr (msg);
572 ev_printerr (": ");
573 ev_printerr (err);
574 ev_printerr ("\n");
575#else
539 perror (msg); 576 perror (msg);
577#endif
540 abort (); 578 abort ();
541 } 579 }
542} 580}
543 581
544static void * 582static void *
545ev_realloc_emul (void *ptr, long size) 583ev_realloc_emul (void *ptr, long size)
546{ 584{
585#if __GLIBC__
586 return realloc (ptr, size);
587#else
547 /* some systems, notably openbsd and darwin, fail to properly 588 /* some systems, notably openbsd and darwin, fail to properly
548 * implement realloc (x, 0) (as required by both ansi c-98 and 589 * implement realloc (x, 0) (as required by both ansi c-89 and
549 * the single unix specification, so work around them here. 590 * the single unix specification, so work around them here.
550 */ 591 */
551 592
552 if (size) 593 if (size)
553 return realloc (ptr, size); 594 return realloc (ptr, size);
554 595
555 free (ptr); 596 free (ptr);
556 return 0; 597 return 0;
598#endif
557} 599}
558 600
559static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 601static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
560 602
561void 603void
569{ 611{
570 ptr = alloc (ptr, size); 612 ptr = alloc (ptr, size);
571 613
572 if (!ptr && size) 614 if (!ptr && size)
573 { 615 {
616#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n");
618#else
574 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
620#endif
575 abort (); 621 abort ();
576 } 622 }
577 623
578 return ptr; 624 return ptr;
579} 625}
661 707
662 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
663 709
664#endif 710#endif
665 711
666#if EV_MINIMAL < 2 712#if EV_FEATURE_API
667# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 713# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
668# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 714# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
669# define EV_INVOKE_PENDING invoke_cb (EV_A) 715# define EV_INVOKE_PENDING invoke_cb (EV_A)
670#else 716#else
671# define EV_RELEASE_CB (void)0 717# define EV_RELEASE_CB (void)0
725 if (delay > 0.) 771 if (delay > 0.)
726 { 772 {
727#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
728 struct timespec ts; 774 struct timespec ts;
729 775
730 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
731 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
732
733 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
734#elif defined(_WIN32) 778#elif defined(_WIN32)
735 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
736#else 780#else
737 struct timeval tv; 781 struct timeval tv;
738 782
739 tv.tv_sec = (time_t)delay;
740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
741
742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
743 /* something not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
744 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
745 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
746#endif 788#endif
747 } 789 }
748} 790}
749 791
750/*****************************************************************************/ 792/*****************************************************************************/
751 793
752#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 794#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
753 795
754/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
755/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
756inline_size int 798inline_size int
757array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
758{ 800{
759 int ncur = cur + 1; 801 int ncur = cur + 1;
760 802
856} 898}
857 899
858/*****************************************************************************/ 900/*****************************************************************************/
859 901
860inline_speed void 902inline_speed void
861fd_event_nc (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
862{ 904{
863 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
864 ev_io *w; 906 ev_io *w;
865 907
866 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 908 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
878fd_event (EV_P_ int fd, int revents) 920fd_event (EV_P_ int fd, int revents)
879{ 921{
880 ANFD *anfd = anfds + fd; 922 ANFD *anfd = anfds + fd;
881 923
882 if (expect_true (!anfd->reify)) 924 if (expect_true (!anfd->reify))
883 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
884} 926}
885 927
886void 928void
887ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
888{ 930{
889 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
890 fd_event_nc (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
891} 933}
892 934
893/* make sure the external fd watch events are in-sync */ 935/* make sure the external fd watch events are in-sync */
894/* with the kernel/libev internal state */ 936/* with the kernel/libev internal state */
895inline_size void 937inline_size void
901 { 943 {
902 int fd = fdchanges [i]; 944 int fd = fdchanges [i];
903 ANFD *anfd = anfds + fd; 945 ANFD *anfd = anfds + fd;
904 ev_io *w; 946 ev_io *w;
905 947
906 unsigned char events = 0; 948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
907 950
908 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 951 anfd->reify = 0;
909 events |= (unsigned char)w->events;
910 952
911#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
912 if (events) 954 if (o_reify & EV__IOFDSET)
913 { 955 {
914 unsigned long arg; 956 unsigned long arg;
915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
917 } 959 }
918#endif 960#endif
919 961
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
920 { 963 {
921 unsigned char o_events = anfd->events;
922 unsigned char o_reify = anfd->reify;
923
924 anfd->reify = 0;
925 anfd->events = events; 964 anfd->events = 0;
926 965
927 if (o_events != events || o_reify & EV__IOFDSET) 966 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
967 anfd->events |= (unsigned char)w->events;
968
969 if (o_events !=anfd-> events)
970 o_reify = EV__IOFDSET; /* actually |= */
971 }
972
973 if (o_reify & EV__IOFDSET)
928 backend_modify (EV_A_ fd, o_events, events); 974 backend_modify (EV_A_ fd, o_events, anfd->events);
929 }
930 } 975 }
931 976
932 fdchangecnt = 0; 977 fdchangecnt = 0;
933} 978}
934 979
958 ev_io_stop (EV_A_ w); 1003 ev_io_stop (EV_A_ w);
959 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1004 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
960 } 1005 }
961} 1006}
962 1007
963/* check whether the given fd is atcually valid, for error recovery */ 1008/* check whether the given fd is actually valid, for error recovery */
964inline_size int 1009inline_size int
965fd_valid (int fd) 1010fd_valid (int fd)
966{ 1011{
967#ifdef _WIN32 1012#ifdef _WIN32
968 return _get_osfhandle (fd) != -1; 1013 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969#else 1014#else
970 return fcntl (fd, F_GETFD) != -1; 1015 return fcntl (fd, F_GETFD) != -1;
971#endif 1016#endif
972} 1017}
973 1018
1010 anfds [fd].emask = 0; 1055 anfds [fd].emask = 0;
1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1056 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1012 } 1057 }
1013} 1058}
1014 1059
1060/* used to prepare libev internal fd's */
1061/* this is not fork-safe */
1062inline_speed void
1063fd_intern (int fd)
1064{
1065#ifdef _WIN32
1066 unsigned long arg = 1;
1067 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1068#else
1069 fcntl (fd, F_SETFD, FD_CLOEXEC);
1070 fcntl (fd, F_SETFL, O_NONBLOCK);
1071#endif
1072}
1073
1015/*****************************************************************************/ 1074/*****************************************************************************/
1016 1075
1017/* 1076/*
1018 * the heap functions want a real array index. array index 0 uis guaranteed to not 1077 * the heap functions want a real array index. array index 0 is guaranteed to not
1019 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1078 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1020 * the branching factor of the d-tree. 1079 * the branching factor of the d-tree.
1021 */ 1080 */
1022 1081
1023/* 1082/*
1171 1230
1172static ANSIG signals [EV_NSIG - 1]; 1231static ANSIG signals [EV_NSIG - 1];
1173 1232
1174/*****************************************************************************/ 1233/*****************************************************************************/
1175 1234
1176/* used to prepare libev internal fd's */ 1235#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1177/* this is not fork-safe */
1178inline_speed void
1179fd_intern (int fd)
1180{
1181#ifdef _WIN32
1182 unsigned long arg = 1;
1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1184#else
1185 fcntl (fd, F_SETFD, FD_CLOEXEC);
1186 fcntl (fd, F_SETFL, O_NONBLOCK);
1187#endif
1188}
1189 1236
1190static void noinline 1237static void noinline
1191evpipe_init (EV_P) 1238evpipe_init (EV_P)
1192{ 1239{
1193 if (!ev_is_active (&pipe_w)) 1240 if (!ev_is_active (&pipe_w))
1194 { 1241 {
1195#if EV_USE_EVENTFD 1242# if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1243 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL) 1244 if (evfd < 0 && errno == EINVAL)
1198 evfd = eventfd (0, 0); 1245 evfd = eventfd (0, 0);
1199 1246
1200 if (evfd >= 0) 1247 if (evfd >= 0)
1202 evpipe [0] = -1; 1249 evpipe [0] = -1;
1203 fd_intern (evfd); /* doing it twice doesn't hurt */ 1250 fd_intern (evfd); /* doing it twice doesn't hurt */
1204 ev_io_set (&pipe_w, evfd, EV_READ); 1251 ev_io_set (&pipe_w, evfd, EV_READ);
1205 } 1252 }
1206 else 1253 else
1207#endif 1254# endif
1208 { 1255 {
1209 while (pipe (evpipe)) 1256 while (pipe (evpipe))
1210 ev_syserr ("(libev) error creating signal/async pipe"); 1257 ev_syserr ("(libev) error creating signal/async pipe");
1211 1258
1212 fd_intern (evpipe [0]); 1259 fd_intern (evpipe [0]);
1223evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1270evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1224{ 1271{
1225 if (!*flag) 1272 if (!*flag)
1226 { 1273 {
1227 int old_errno = errno; /* save errno because write might clobber it */ 1274 int old_errno = errno; /* save errno because write might clobber it */
1275 char dummy;
1228 1276
1229 *flag = 1; 1277 *flag = 1;
1230 1278
1231#if EV_USE_EVENTFD 1279#if EV_USE_EVENTFD
1232 if (evfd >= 0) 1280 if (evfd >= 0)
1234 uint64_t counter = 1; 1282 uint64_t counter = 1;
1235 write (evfd, &counter, sizeof (uint64_t)); 1283 write (evfd, &counter, sizeof (uint64_t));
1236 } 1284 }
1237 else 1285 else
1238#endif 1286#endif
1287 /* win32 people keep sending patches that change this write() to send() */
1288 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1289 /* so when you think this write should be a send instead, please find out */
1290 /* where your send() is from - it's definitely not the microsoft send, and */
1291 /* tell me. thank you. */
1239 write (evpipe [1], &old_errno, 1); 1292 write (evpipe [1], &dummy, 1);
1240 1293
1241 errno = old_errno; 1294 errno = old_errno;
1242 } 1295 }
1243} 1296}
1244 1297
1257 } 1310 }
1258 else 1311 else
1259#endif 1312#endif
1260 { 1313 {
1261 char dummy; 1314 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1262 read (evpipe [0], &dummy, 1); 1316 read (evpipe [0], &dummy, 1);
1263 } 1317 }
1264 1318
1265 if (sig_pending) 1319 if (sig_pending)
1266 { 1320 {
1293{ 1347{
1294#if EV_MULTIPLICITY 1348#if EV_MULTIPLICITY
1295 EV_P = signals [signum - 1].loop; 1349 EV_P = signals [signum - 1].loop;
1296#endif 1350#endif
1297 1351
1298#if _WIN32 1352#ifdef _WIN32
1299 signal (signum, ev_sighandler); 1353 signal (signum, ev_sighandler);
1300#endif 1354#endif
1301 1355
1302 signals [signum - 1].pending = 1; 1356 signals [signum - 1].pending = 1;
1303 evpipe_write (EV_A_ &sig_pending); 1357 evpipe_write (EV_A_ &sig_pending);
1345 break; 1399 break;
1346 } 1400 }
1347} 1401}
1348#endif 1402#endif
1349 1403
1404#endif
1405
1350/*****************************************************************************/ 1406/*****************************************************************************/
1351 1407
1408#if EV_CHILD_ENABLE
1352static WL childs [EV_PID_HASHSIZE]; 1409static WL childs [EV_PID_HASHSIZE];
1353
1354#ifndef _WIN32
1355 1410
1356static ev_signal childev; 1411static ev_signal childev;
1357 1412
1358#ifndef WIFCONTINUED 1413#ifndef WIFCONTINUED
1359# define WIFCONTINUED(status) 0 1414# define WIFCONTINUED(status) 0
1364child_reap (EV_P_ int chain, int pid, int status) 1419child_reap (EV_P_ int chain, int pid, int status)
1365{ 1420{
1366 ev_child *w; 1421 ev_child *w;
1367 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1422 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1368 1423
1369 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1424 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1370 { 1425 {
1371 if ((w->pid == pid || !w->pid) 1426 if ((w->pid == pid || !w->pid)
1372 && (!traced || (w->flags & 1))) 1427 && (!traced || (w->flags & 1)))
1373 { 1428 {
1374 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1429 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1399 /* make sure we are called again until all children have been reaped */ 1454 /* make sure we are called again until all children have been reaped */
1400 /* we need to do it this way so that the callback gets called before we continue */ 1455 /* we need to do it this way so that the callback gets called before we continue */
1401 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1456 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1402 1457
1403 child_reap (EV_A_ pid, pid, status); 1458 child_reap (EV_A_ pid, pid, status);
1404 if (EV_PID_HASHSIZE > 1) 1459 if ((EV_PID_HASHSIZE) > 1)
1405 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1460 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1406} 1461}
1407 1462
1408#endif 1463#endif
1409 1464
1476#ifdef __APPLE__ 1531#ifdef __APPLE__
1477 /* only select works correctly on that "unix-certified" platform */ 1532 /* only select works correctly on that "unix-certified" platform */
1478 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1533 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1479 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1534 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1480#endif 1535#endif
1536#ifdef __FreeBSD__
1537 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1538#endif
1481 1539
1482 return flags; 1540 return flags;
1483} 1541}
1484 1542
1485unsigned int 1543unsigned int
1498ev_backend (EV_P) 1556ev_backend (EV_P)
1499{ 1557{
1500 return backend; 1558 return backend;
1501} 1559}
1502 1560
1503#if EV_MINIMAL < 2 1561#if EV_FEATURE_API
1504unsigned int 1562unsigned int
1505ev_loop_count (EV_P) 1563ev_iteration (EV_P)
1506{ 1564{
1507 return loop_count; 1565 return loop_count;
1508} 1566}
1509 1567
1510unsigned int 1568unsigned int
1511ev_loop_depth (EV_P) 1569ev_depth (EV_P)
1512{ 1570{
1513 return loop_depth; 1571 return loop_depth;
1514} 1572}
1515 1573
1516void 1574void
1588 1646
1589 ev_rt_now = ev_time (); 1647 ev_rt_now = ev_time ();
1590 mn_now = get_clock (); 1648 mn_now = get_clock ();
1591 now_floor = mn_now; 1649 now_floor = mn_now;
1592 rtmn_diff = ev_rt_now - mn_now; 1650 rtmn_diff = ev_rt_now - mn_now;
1593#if EV_MINIMAL < 2 1651#if EV_FEATURE_API
1594 invoke_cb = ev_invoke_pending; 1652 invoke_cb = ev_invoke_pending;
1595#endif 1653#endif
1596 1654
1597 io_blocktime = 0.; 1655 io_blocktime = 0.;
1598 timeout_blocktime = 0.; 1656 timeout_blocktime = 0.;
1604#endif 1662#endif
1605#if EV_USE_INOTIFY 1663#if EV_USE_INOTIFY
1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1664 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607#endif 1665#endif
1608#if EV_USE_SIGNALFD 1666#if EV_USE_SIGNALFD
1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1667 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610#endif 1668#endif
1611 1669
1612 if (!(flags & 0x0000ffffU)) 1670 if (!(flags & 0x0000ffffU))
1613 flags |= ev_recommended_backends (); 1671 flags |= ev_recommended_backends ();
1614 1672
1628 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1686 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1629#endif 1687#endif
1630 1688
1631 ev_prepare_init (&pending_w, pendingcb); 1689 ev_prepare_init (&pending_w, pendingcb);
1632 1690
1691#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1633 ev_init (&pipe_w, pipecb); 1692 ev_init (&pipe_w, pipecb);
1634 ev_set_priority (&pipe_w, EV_MAXPRI); 1693 ev_set_priority (&pipe_w, EV_MAXPRI);
1694#endif
1635 } 1695 }
1636} 1696}
1637 1697
1638/* free up a loop structure */ 1698/* free up a loop structure */
1639static void noinline 1699static void noinline
1658 } 1718 }
1659 } 1719 }
1660 1720
1661#if EV_USE_SIGNALFD 1721#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w)) 1722 if (ev_is_active (&sigfd_w))
1663 {
1664 /*ev_ref (EV_A);*/
1665 /*ev_io_stop (EV_A_ &sigfd_w);*/
1666
1667 close (sigfd); 1723 close (sigfd);
1668 }
1669#endif 1724#endif
1670 1725
1671#if EV_USE_INOTIFY 1726#if EV_USE_INOTIFY
1672 if (fs_fd >= 0) 1727 if (fs_fd >= 0)
1673 close (fs_fd); 1728 close (fs_fd);
1762 { 1817 {
1763 EV_WIN32_CLOSE_FD (evpipe [0]); 1818 EV_WIN32_CLOSE_FD (evpipe [0]);
1764 EV_WIN32_CLOSE_FD (evpipe [1]); 1819 EV_WIN32_CLOSE_FD (evpipe [1]);
1765 } 1820 }
1766 1821
1822#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1767 evpipe_init (EV_A); 1823 evpipe_init (EV_A);
1768 /* now iterate over everything, in case we missed something */ 1824 /* now iterate over everything, in case we missed something */
1769 pipecb (EV_A_ &pipe_w, EV_READ); 1825 pipecb (EV_A_ &pipe_w, EV_READ);
1826#endif
1770 } 1827 }
1771 1828
1772 postfork = 0; 1829 postfork = 0;
1773} 1830}
1774 1831
1836 verify_watcher (EV_A_ ws [cnt]); 1893 verify_watcher (EV_A_ ws [cnt]);
1837 } 1894 }
1838} 1895}
1839#endif 1896#endif
1840 1897
1841#if EV_MINIMAL < 2 1898#if EV_FEATURE_API
1842void 1899void
1843ev_loop_verify (EV_P) 1900ev_verify (EV_P)
1844{ 1901{
1845#if EV_VERIFY 1902#if EV_VERIFY
1846 int i; 1903 int i;
1847 WL w; 1904 WL w;
1848 1905
1887#if EV_ASYNC_ENABLE 1944#if EV_ASYNC_ENABLE
1888 assert (asyncmax >= asynccnt); 1945 assert (asyncmax >= asynccnt);
1889 array_verify (EV_A_ (W *)asyncs, asynccnt); 1946 array_verify (EV_A_ (W *)asyncs, asynccnt);
1890#endif 1947#endif
1891 1948
1949#if EV_PREPARE_ENABLE
1892 assert (preparemax >= preparecnt); 1950 assert (preparemax >= preparecnt);
1893 array_verify (EV_A_ (W *)prepares, preparecnt); 1951 array_verify (EV_A_ (W *)prepares, preparecnt);
1952#endif
1894 1953
1954#if EV_CHECK_ENABLE
1895 assert (checkmax >= checkcnt); 1955 assert (checkmax >= checkcnt);
1896 array_verify (EV_A_ (W *)checks, checkcnt); 1956 array_verify (EV_A_ (W *)checks, checkcnt);
1957#endif
1897 1958
1898# if 0 1959# if 0
1960#if EV_CHILD_ENABLE
1899 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1961 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1962 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1963#endif
1901# endif 1964# endif
1902#endif 1965#endif
1903} 1966}
1904#endif 1967#endif
1905 1968
1921 1984
1922 loop_init (EV_A_ flags); 1985 loop_init (EV_A_ flags);
1923 1986
1924 if (ev_backend (EV_A)) 1987 if (ev_backend (EV_A))
1925 { 1988 {
1926#ifndef _WIN32 1989#if EV_CHILD_ENABLE
1927 ev_signal_init (&childev, childcb, SIGCHLD); 1990 ev_signal_init (&childev, childcb, SIGCHLD);
1928 ev_set_priority (&childev, EV_MAXPRI); 1991 ev_set_priority (&childev, EV_MAXPRI);
1929 ev_signal_start (EV_A_ &childev); 1992 ev_signal_start (EV_A_ &childev);
1930 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1993 ev_unref (EV_A); /* child watcher should not keep loop alive */
1931#endif 1994#endif
1944 EV_P = ev_default_loop_ptr; 2007 EV_P = ev_default_loop_ptr;
1945#endif 2008#endif
1946 2009
1947 ev_default_loop_ptr = 0; 2010 ev_default_loop_ptr = 0;
1948 2011
1949#ifndef _WIN32 2012#if EV_CHILD_ENABLE
1950 ev_ref (EV_A); /* child watcher */ 2013 ev_ref (EV_A); /* child watcher */
1951 ev_signal_stop (EV_A_ &childev); 2014 ev_signal_stop (EV_A_ &childev);
1952#endif 2015#endif
1953 2016
1954 loop_destroy (EV_A); 2017 loop_destroy (EV_A);
2060 EV_FREQUENT_CHECK; 2123 EV_FREQUENT_CHECK;
2061 feed_reverse (EV_A_ (W)w); 2124 feed_reverse (EV_A_ (W)w);
2062 } 2125 }
2063 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2126 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2064 2127
2065 feed_reverse_done (EV_A_ EV_TIMEOUT); 2128 feed_reverse_done (EV_A_ EV_TIMER);
2066 } 2129 }
2067} 2130}
2068 2131
2069#if EV_PERIODIC_ENABLE 2132#if EV_PERIODIC_ENABLE
2070/* make periodics pending */ 2133/* make periodics pending */
2123 feed_reverse_done (EV_A_ EV_PERIODIC); 2186 feed_reverse_done (EV_A_ EV_PERIODIC);
2124 } 2187 }
2125} 2188}
2126 2189
2127/* simply recalculate all periodics */ 2190/* simply recalculate all periodics */
2128/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2191/* TODO: maybe ensure that at least one event happens when jumping forward? */
2129static void noinline 2192static void noinline
2130periodics_reschedule (EV_P) 2193periodics_reschedule (EV_P)
2131{ 2194{
2132 int i; 2195 int i;
2133 2196
2161 ANHE_at_cache (*he); 2224 ANHE_at_cache (*he);
2162 } 2225 }
2163} 2226}
2164 2227
2165/* fetch new monotonic and realtime times from the kernel */ 2228/* fetch new monotonic and realtime times from the kernel */
2166/* also detetc if there was a timejump, and act accordingly */ 2229/* also detect if there was a timejump, and act accordingly */
2167inline_speed void 2230inline_speed void
2168time_update (EV_P_ ev_tstamp max_block) 2231time_update (EV_P_ ev_tstamp max_block)
2169{ 2232{
2170#if EV_USE_MONOTONIC 2233#if EV_USE_MONOTONIC
2171 if (expect_true (have_monotonic)) 2234 if (expect_true (have_monotonic))
2231} 2294}
2232 2295
2233void 2296void
2234ev_loop (EV_P_ int flags) 2297ev_loop (EV_P_ int flags)
2235{ 2298{
2236#if EV_MINIMAL < 2 2299#if EV_FEATURE_API
2237 ++loop_depth; 2300 ++loop_depth;
2238#endif 2301#endif
2239 2302
2240 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2241 2304
2244 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2307 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2245 2308
2246 do 2309 do
2247 { 2310 {
2248#if EV_VERIFY >= 2 2311#if EV_VERIFY >= 2
2249 ev_loop_verify (EV_A); 2312 ev_verify (EV_A);
2250#endif 2313#endif
2251 2314
2252#ifndef _WIN32 2315#ifndef _WIN32
2253 if (expect_false (curpid)) /* penalise the forking check even more */ 2316 if (expect_false (curpid)) /* penalise the forking check even more */
2254 if (expect_false (getpid () != curpid)) 2317 if (expect_false (getpid () != curpid))
2266 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2329 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2267 EV_INVOKE_PENDING; 2330 EV_INVOKE_PENDING;
2268 } 2331 }
2269#endif 2332#endif
2270 2333
2334#if EV_PREPARE_ENABLE
2271 /* queue prepare watchers (and execute them) */ 2335 /* queue prepare watchers (and execute them) */
2272 if (expect_false (preparecnt)) 2336 if (expect_false (preparecnt))
2273 { 2337 {
2274 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2338 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2275 EV_INVOKE_PENDING; 2339 EV_INVOKE_PENDING;
2276 } 2340 }
2341#endif
2277 2342
2278 if (expect_false (loop_done)) 2343 if (expect_false (loop_done))
2279 break; 2344 break;
2280 2345
2281 /* we might have forked, so reify kernel state if necessary */ 2346 /* we might have forked, so reify kernel state if necessary */
2332 waittime -= sleeptime; 2397 waittime -= sleeptime;
2333 } 2398 }
2334 } 2399 }
2335 } 2400 }
2336 2401
2337#if EV_MINIMAL < 2 2402#if EV_FEATURE_API
2338 ++loop_count; 2403 ++loop_count;
2339#endif 2404#endif
2340 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2341 backend_poll (EV_A_ waittime); 2406 backend_poll (EV_A_ waittime);
2342 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2354#if EV_IDLE_ENABLE 2419#if EV_IDLE_ENABLE
2355 /* queue idle watchers unless other events are pending */ 2420 /* queue idle watchers unless other events are pending */
2356 idle_reify (EV_A); 2421 idle_reify (EV_A);
2357#endif 2422#endif
2358 2423
2424#if EV_CHECK_ENABLE
2359 /* queue check watchers, to be executed first */ 2425 /* queue check watchers, to be executed first */
2360 if (expect_false (checkcnt)) 2426 if (expect_false (checkcnt))
2361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2427 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2428#endif
2362 2429
2363 EV_INVOKE_PENDING; 2430 EV_INVOKE_PENDING;
2364 } 2431 }
2365 while (expect_true ( 2432 while (expect_true (
2366 activecnt 2433 activecnt
2369 )); 2436 ));
2370 2437
2371 if (loop_done == EVUNLOOP_ONE) 2438 if (loop_done == EVUNLOOP_ONE)
2372 loop_done = EVUNLOOP_CANCEL; 2439 loop_done = EVUNLOOP_CANCEL;
2373 2440
2374#if EV_MINIMAL < 2 2441#if EV_FEATURE_API
2375 --loop_depth; 2442 --loop_depth;
2376#endif 2443#endif
2377} 2444}
2378 2445
2379void 2446void
2505 2572
2506 if (expect_false (ev_is_active (w))) 2573 if (expect_false (ev_is_active (w)))
2507 return; 2574 return;
2508 2575
2509 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2576 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2510 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2577 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2511 2578
2512 EV_FREQUENT_CHECK; 2579 EV_FREQUENT_CHECK;
2513 2580
2514 ev_start (EV_A_ (W)w, 1); 2581 ev_start (EV_A_ (W)w, 1);
2515 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2582 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2533 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2534 2601
2535 wlist_del (&anfds[w->fd].head, (WL)w); 2602 wlist_del (&anfds[w->fd].head, (WL)w);
2536 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2537 2604
2538 fd_change (EV_A_ w->fd, 1); 2605 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2539 2606
2540 EV_FREQUENT_CHECK; 2607 EV_FREQUENT_CHECK;
2541} 2608}
2542 2609
2543void noinline 2610void noinline
2585 timers [active] = timers [timercnt + HEAP0]; 2652 timers [active] = timers [timercnt + HEAP0];
2586 adjustheap (timers, timercnt, active); 2653 adjustheap (timers, timercnt, active);
2587 } 2654 }
2588 } 2655 }
2589 2656
2590 EV_FREQUENT_CHECK;
2591
2592 ev_at (w) -= mn_now; 2657 ev_at (w) -= mn_now;
2593 2658
2594 ev_stop (EV_A_ (W)w); 2659 ev_stop (EV_A_ (W)w);
2660
2661 EV_FREQUENT_CHECK;
2595} 2662}
2596 2663
2597void noinline 2664void noinline
2598ev_timer_again (EV_P_ ev_timer *w) 2665ev_timer_again (EV_P_ ev_timer *w)
2599{ 2666{
2678 periodics [active] = periodics [periodiccnt + HEAP0]; 2745 periodics [active] = periodics [periodiccnt + HEAP0];
2679 adjustheap (periodics, periodiccnt, active); 2746 adjustheap (periodics, periodiccnt, active);
2680 } 2747 }
2681 } 2748 }
2682 2749
2683 EV_FREQUENT_CHECK;
2684
2685 ev_stop (EV_A_ (W)w); 2750 ev_stop (EV_A_ (W)w);
2751
2752 EV_FREQUENT_CHECK;
2686} 2753}
2687 2754
2688void noinline 2755void noinline
2689ev_periodic_again (EV_P_ ev_periodic *w) 2756ev_periodic_again (EV_P_ ev_periodic *w)
2690{ 2757{
2695#endif 2762#endif
2696 2763
2697#ifndef SA_RESTART 2764#ifndef SA_RESTART
2698# define SA_RESTART 0 2765# define SA_RESTART 0
2699#endif 2766#endif
2767
2768#if EV_SIGNAL_ENABLE
2700 2769
2701void noinline 2770void noinline
2702ev_signal_start (EV_P_ ev_signal *w) 2771ev_signal_start (EV_P_ ev_signal *w)
2703{ 2772{
2704 if (expect_false (ev_is_active (w))) 2773 if (expect_false (ev_is_active (w)))
2751 if (!((WL)w)->next) 2820 if (!((WL)w)->next)
2752# if EV_USE_SIGNALFD 2821# if EV_USE_SIGNALFD
2753 if (sigfd < 0) /*TODO*/ 2822 if (sigfd < 0) /*TODO*/
2754# endif 2823# endif
2755 { 2824 {
2756# if _WIN32 2825# ifdef _WIN32
2826 evpipe_init (EV_A);
2827
2757 signal (w->signum, ev_sighandler); 2828 signal (w->signum, ev_sighandler);
2758# else 2829# else
2759 struct sigaction sa; 2830 struct sigaction sa;
2760 2831
2761 evpipe_init (EV_A); 2832 evpipe_init (EV_A);
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2863 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif 2864#endif
2794#if EV_USE_SIGNALFD 2865#if EV_USE_SIGNALFD
2795 if (sigfd >= 0) 2866 if (sigfd >= 0)
2796 { 2867 {
2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2868 sigset_t ss;
2869
2870 sigemptyset (&ss);
2871 sigaddset (&ss, w->signum);
2798 sigdelset (&sigfd_set, w->signum); 2872 sigdelset (&sigfd_set, w->signum);
2873
2799 signalfd (sigfd, &sigfd_set, 0); 2874 signalfd (sigfd, &sigfd_set, 0);
2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2875 sigprocmask (SIG_UNBLOCK, &ss, 0);
2801 /*TODO: maybe unblock signal? */
2802 } 2876 }
2803 else 2877 else
2804#endif 2878#endif
2805 signal (w->signum, SIG_DFL); 2879 signal (w->signum, SIG_DFL);
2806 } 2880 }
2807 2881
2808 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
2809} 2883}
2810 2884
2885#endif
2886
2887#if EV_CHILD_ENABLE
2888
2811void 2889void
2812ev_child_start (EV_P_ ev_child *w) 2890ev_child_start (EV_P_ ev_child *w)
2813{ 2891{
2814#if EV_MULTIPLICITY 2892#if EV_MULTIPLICITY
2815 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2893 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2818 return; 2896 return;
2819 2897
2820 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2821 2899
2822 ev_start (EV_A_ (W)w, 1); 2900 ev_start (EV_A_ (W)w, 1);
2823 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2824 2902
2825 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2826} 2904}
2827 2905
2828void 2906void
2832 if (expect_false (!ev_is_active (w))) 2910 if (expect_false (!ev_is_active (w)))
2833 return; 2911 return;
2834 2912
2835 EV_FREQUENT_CHECK; 2913 EV_FREQUENT_CHECK;
2836 2914
2837 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2915 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2838 ev_stop (EV_A_ (W)w); 2916 ev_stop (EV_A_ (W)w);
2839 2917
2840 EV_FREQUENT_CHECK; 2918 EV_FREQUENT_CHECK;
2841} 2919}
2920
2921#endif
2842 2922
2843#if EV_STAT_ENABLE 2923#if EV_STAT_ENABLE
2844 2924
2845# ifdef _WIN32 2925# ifdef _WIN32
2846# undef lstat 2926# undef lstat
2852#define MIN_STAT_INTERVAL 0.1074891 2932#define MIN_STAT_INTERVAL 0.1074891
2853 2933
2854static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2934static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2855 2935
2856#if EV_USE_INOTIFY 2936#if EV_USE_INOTIFY
2857# define EV_INOTIFY_BUFSIZE 8192 2937
2938/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2939# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2858 2940
2859static void noinline 2941static void noinline
2860infy_add (EV_P_ ev_stat *w) 2942infy_add (EV_P_ ev_stat *w)
2861{ 2943{
2862 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); 2944 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);
2863 2945
2864 if (w->wd < 0) 2946 if (w->wd >= 0)
2947 {
2948 struct statfs sfs;
2949
2950 /* now local changes will be tracked by inotify, but remote changes won't */
2951 /* unless the filesystem is known to be local, we therefore still poll */
2952 /* also do poll on <2.6.25, but with normal frequency */
2953
2954 if (!fs_2625)
2955 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2956 else if (!statfs (w->path, &sfs)
2957 && (sfs.f_type == 0x1373 /* devfs */
2958 || sfs.f_type == 0xEF53 /* ext2/3 */
2959 || sfs.f_type == 0x3153464a /* jfs */
2960 || sfs.f_type == 0x52654973 /* reiser3 */
2961 || sfs.f_type == 0x01021994 /* tempfs */
2962 || sfs.f_type == 0x58465342 /* xfs */))
2963 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2964 else
2965 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2865 { 2966 }
2967 else
2968 {
2969 /* can't use inotify, continue to stat */
2866 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2970 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2867 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2868 2971
2869 /* monitor some parent directory for speedup hints */ 2972 /* if path is not there, monitor some parent directory for speedup hints */
2870 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2973 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2871 /* but an efficiency issue only */ 2974 /* but an efficiency issue only */
2872 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2975 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2873 { 2976 {
2874 char path [4096]; 2977 char path [4096];
2890 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2993 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2891 } 2994 }
2892 } 2995 }
2893 2996
2894 if (w->wd >= 0) 2997 if (w->wd >= 0)
2895 {
2896 struct statfs sfs;
2897
2898 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2998 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2899 2999
2900 /* now local changes will be tracked by inotify, but remote changes won't */ 3000 /* now re-arm timer, if required */
2901 /* unless the filesystem it known to be local, we therefore still poll */ 3001 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (fs_2625 && !statfs (w->path, &sfs))
2905 if (sfs.f_type == 0x1373 /* devfs */
2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2907 || sfs.f_type == 0x3153464a /* jfs */
2908 || sfs.f_type == 0x52654973 /* reiser3 */
2909 || sfs.f_type == 0x01021994 /* tempfs */
2910 || sfs.f_type == 0x58465342 /* xfs */)
2911 return;
2912
2913 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2914 ev_timer_again (EV_A_ &w->timer); 3002 ev_timer_again (EV_A_ &w->timer);
2915 } 3003 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2916} 3004}
2917 3005
2918static void noinline 3006static void noinline
2919infy_del (EV_P_ ev_stat *w) 3007infy_del (EV_P_ ev_stat *w)
2920{ 3008{
2923 3011
2924 if (wd < 0) 3012 if (wd < 0)
2925 return; 3013 return;
2926 3014
2927 w->wd = -2; 3015 w->wd = -2;
2928 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3016 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2929 wlist_del (&fs_hash [slot].head, (WL)w); 3017 wlist_del (&fs_hash [slot].head, (WL)w);
2930 3018
2931 /* remove this watcher, if others are watching it, they will rearm */ 3019 /* remove this watcher, if others are watching it, they will rearm */
2932 inotify_rm_watch (fs_fd, wd); 3020 inotify_rm_watch (fs_fd, wd);
2933} 3021}
2935static void noinline 3023static void noinline
2936infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3024infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2937{ 3025{
2938 if (slot < 0) 3026 if (slot < 0)
2939 /* overflow, need to check for all hash slots */ 3027 /* overflow, need to check for all hash slots */
2940 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3028 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2941 infy_wd (EV_A_ slot, wd, ev); 3029 infy_wd (EV_A_ slot, wd, ev);
2942 else 3030 else
2943 { 3031 {
2944 WL w_; 3032 WL w_;
2945 3033
2946 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3034 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2947 { 3035 {
2948 ev_stat *w = (ev_stat *)w_; 3036 ev_stat *w = (ev_stat *)w_;
2949 w_ = w_->next; /* lets us remove this watcher and all before it */ 3037 w_ = w_->next; /* lets us remove this watcher and all before it */
2950 3038
2951 if (w->wd == wd || wd == -1) 3039 if (w->wd == wd || wd == -1)
2952 { 3040 {
2953 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3041 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2954 { 3042 {
2955 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3043 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2956 w->wd = -1; 3044 w->wd = -1;
2957 infy_add (EV_A_ w); /* re-add, no matter what */ 3045 infy_add (EV_A_ w); /* re-add, no matter what */
2958 } 3046 }
2959 3047
2960 stat_timer_cb (EV_A_ &w->timer, 0); 3048 stat_timer_cb (EV_A_ &w->timer, 0);
2965 3053
2966static void 3054static void
2967infy_cb (EV_P_ ev_io *w, int revents) 3055infy_cb (EV_P_ ev_io *w, int revents)
2968{ 3056{
2969 char buf [EV_INOTIFY_BUFSIZE]; 3057 char buf [EV_INOTIFY_BUFSIZE];
2970 struct inotify_event *ev = (struct inotify_event *)buf;
2971 int ofs; 3058 int ofs;
2972 int len = read (fs_fd, buf, sizeof (buf)); 3059 int len = read (fs_fd, buf, sizeof (buf));
2973 3060
2974 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3061 for (ofs = 0; ofs < len; )
3062 {
3063 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2975 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3064 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3065 ofs += sizeof (struct inotify_event) + ev->len;
3066 }
3067}
3068
3069inline_size unsigned int
3070ev_linux_version (void)
3071{
3072 struct utsname buf;
3073 unsigned int v;
3074 int i;
3075 char *p = buf.release;
3076
3077 if (uname (&buf))
3078 return 0;
3079
3080 for (i = 3+1; --i; )
3081 {
3082 unsigned int c = 0;
3083
3084 for (;;)
3085 {
3086 if (*p >= '0' && *p <= '9')
3087 c = c * 10 + *p++ - '0';
3088 else
3089 {
3090 p += *p == '.';
3091 break;
3092 }
3093 }
3094
3095 v = (v << 8) | c;
3096 }
3097
3098 return v;
2976} 3099}
2977 3100
2978inline_size void 3101inline_size void
2979check_2625 (EV_P) 3102ev_check_2625 (EV_P)
2980{ 3103{
2981 /* kernels < 2.6.25 are borked 3104 /* kernels < 2.6.25 are borked
2982 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3105 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2983 */ 3106 */
2984 struct utsname buf; 3107 if (ev_linux_version () < 0x020619)
2985 int major, minor, micro;
2986
2987 if (uname (&buf))
2988 return;
2989
2990 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2991 return;
2992
2993 if (major < 2
2994 || (major == 2 && minor < 6)
2995 || (major == 2 && minor == 6 && micro < 25))
2996 return; 3108 return;
2997 3109
2998 fs_2625 = 1; 3110 fs_2625 = 1;
2999} 3111}
3000 3112
3015 if (fs_fd != -2) 3127 if (fs_fd != -2)
3016 return; 3128 return;
3017 3129
3018 fs_fd = -1; 3130 fs_fd = -1;
3019 3131
3020 check_2625 (EV_A); 3132 ev_check_2625 (EV_A);
3021 3133
3022 fs_fd = infy_newfd (); 3134 fs_fd = infy_newfd ();
3023 3135
3024 if (fs_fd >= 0) 3136 if (fs_fd >= 0)
3025 { 3137 {
3026 fd_intern (fs_fd); 3138 fd_intern (fs_fd);
3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3139 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3028 ev_set_priority (&fs_w, EV_MAXPRI); 3140 ev_set_priority (&fs_w, EV_MAXPRI);
3029 ev_io_start (EV_A_ &fs_w); 3141 ev_io_start (EV_A_ &fs_w);
3142 ev_unref (EV_A);
3030 } 3143 }
3031} 3144}
3032 3145
3033inline_size void 3146inline_size void
3034infy_fork (EV_P) 3147infy_fork (EV_P)
3036 int slot; 3149 int slot;
3037 3150
3038 if (fs_fd < 0) 3151 if (fs_fd < 0)
3039 return; 3152 return;
3040 3153
3154 ev_ref (EV_A);
3041 ev_io_stop (EV_A_ &fs_w); 3155 ev_io_stop (EV_A_ &fs_w);
3042 close (fs_fd); 3156 close (fs_fd);
3043 fs_fd = infy_newfd (); 3157 fs_fd = infy_newfd ();
3044 3158
3045 if (fs_fd >= 0) 3159 if (fs_fd >= 0)
3046 { 3160 {
3047 fd_intern (fs_fd); 3161 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ); 3162 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w); 3163 ev_io_start (EV_A_ &fs_w);
3164 ev_unref (EV_A);
3050 } 3165 }
3051 3166
3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3167 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3053 { 3168 {
3054 WL w_ = fs_hash [slot].head; 3169 WL w_ = fs_hash [slot].head;
3055 fs_hash [slot].head = 0; 3170 fs_hash [slot].head = 0;
3056 3171
3057 while (w_) 3172 while (w_)
3062 w->wd = -1; 3177 w->wd = -1;
3063 3178
3064 if (fs_fd >= 0) 3179 if (fs_fd >= 0)
3065 infy_add (EV_A_ w); /* re-add, no matter what */ 3180 infy_add (EV_A_ w); /* re-add, no matter what */
3066 else 3181 else
3182 {
3183 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3184 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3067 ev_timer_again (EV_A_ &w->timer); 3185 ev_timer_again (EV_A_ &w->timer);
3186 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3187 }
3068 } 3188 }
3069 } 3189 }
3070} 3190}
3071 3191
3072#endif 3192#endif
3089static void noinline 3209static void noinline
3090stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3210stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3091{ 3211{
3092 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3212 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3093 3213
3094 /* we copy this here each the time so that */ 3214 ev_statdata prev = w->attr;
3095 /* prev has the old value when the callback gets invoked */
3096 w->prev = w->attr;
3097 ev_stat_stat (EV_A_ w); 3215 ev_stat_stat (EV_A_ w);
3098 3216
3099 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3217 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3100 if ( 3218 if (
3101 w->prev.st_dev != w->attr.st_dev 3219 prev.st_dev != w->attr.st_dev
3102 || w->prev.st_ino != w->attr.st_ino 3220 || prev.st_ino != w->attr.st_ino
3103 || w->prev.st_mode != w->attr.st_mode 3221 || prev.st_mode != w->attr.st_mode
3104 || w->prev.st_nlink != w->attr.st_nlink 3222 || prev.st_nlink != w->attr.st_nlink
3105 || w->prev.st_uid != w->attr.st_uid 3223 || prev.st_uid != w->attr.st_uid
3106 || w->prev.st_gid != w->attr.st_gid 3224 || prev.st_gid != w->attr.st_gid
3107 || w->prev.st_rdev != w->attr.st_rdev 3225 || prev.st_rdev != w->attr.st_rdev
3108 || w->prev.st_size != w->attr.st_size 3226 || prev.st_size != w->attr.st_size
3109 || w->prev.st_atime != w->attr.st_atime 3227 || prev.st_atime != w->attr.st_atime
3110 || w->prev.st_mtime != w->attr.st_mtime 3228 || prev.st_mtime != w->attr.st_mtime
3111 || w->prev.st_ctime != w->attr.st_ctime 3229 || prev.st_ctime != w->attr.st_ctime
3112 ) { 3230 ) {
3231 /* we only update w->prev on actual differences */
3232 /* in case we test more often than invoke the callback, */
3233 /* to ensure that prev is always different to attr */
3234 w->prev = prev;
3235
3113 #if EV_USE_INOTIFY 3236 #if EV_USE_INOTIFY
3114 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
3115 { 3238 {
3116 infy_del (EV_A_ w); 3239 infy_del (EV_A_ w);
3117 infy_add (EV_A_ w); 3240 infy_add (EV_A_ w);
3142 3265
3143 if (fs_fd >= 0) 3266 if (fs_fd >= 0)
3144 infy_add (EV_A_ w); 3267 infy_add (EV_A_ w);
3145 else 3268 else
3146#endif 3269#endif
3270 {
3147 ev_timer_again (EV_A_ &w->timer); 3271 ev_timer_again (EV_A_ &w->timer);
3272 ev_unref (EV_A);
3273 }
3148 3274
3149 ev_start (EV_A_ (W)w, 1); 3275 ev_start (EV_A_ (W)w, 1);
3150 3276
3151 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
3152} 3278}
3161 EV_FREQUENT_CHECK; 3287 EV_FREQUENT_CHECK;
3162 3288
3163#if EV_USE_INOTIFY 3289#if EV_USE_INOTIFY
3164 infy_del (EV_A_ w); 3290 infy_del (EV_A_ w);
3165#endif 3291#endif
3292
3293 if (ev_is_active (&w->timer))
3294 {
3295 ev_ref (EV_A);
3166 ev_timer_stop (EV_A_ &w->timer); 3296 ev_timer_stop (EV_A_ &w->timer);
3297 }
3167 3298
3168 ev_stop (EV_A_ (W)w); 3299 ev_stop (EV_A_ (W)w);
3169 3300
3170 EV_FREQUENT_CHECK; 3301 EV_FREQUENT_CHECK;
3171} 3302}
3216 3347
3217 EV_FREQUENT_CHECK; 3348 EV_FREQUENT_CHECK;
3218} 3349}
3219#endif 3350#endif
3220 3351
3352#if EV_PREPARE_ENABLE
3221void 3353void
3222ev_prepare_start (EV_P_ ev_prepare *w) 3354ev_prepare_start (EV_P_ ev_prepare *w)
3223{ 3355{
3224 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
3225 return; 3357 return;
3251 3383
3252 ev_stop (EV_A_ (W)w); 3384 ev_stop (EV_A_ (W)w);
3253 3385
3254 EV_FREQUENT_CHECK; 3386 EV_FREQUENT_CHECK;
3255} 3387}
3388#endif
3256 3389
3390#if EV_CHECK_ENABLE
3257void 3391void
3258ev_check_start (EV_P_ ev_check *w) 3392ev_check_start (EV_P_ ev_check *w)
3259{ 3393{
3260 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
3261 return; 3395 return;
3287 3421
3288 ev_stop (EV_A_ (W)w); 3422 ev_stop (EV_A_ (W)w);
3289 3423
3290 EV_FREQUENT_CHECK; 3424 EV_FREQUENT_CHECK;
3291} 3425}
3426#endif
3292 3427
3293#if EV_EMBED_ENABLE 3428#if EV_EMBED_ENABLE
3294void noinline 3429void noinline
3295ev_embed_sweep (EV_P_ ev_embed *w) 3430ev_embed_sweep (EV_P_ ev_embed *w)
3296{ 3431{
3391 3526
3392 ev_io_stop (EV_A_ &w->io); 3527 ev_io_stop (EV_A_ &w->io);
3393 ev_prepare_stop (EV_A_ &w->prepare); 3528 ev_prepare_stop (EV_A_ &w->prepare);
3394 ev_fork_stop (EV_A_ &w->fork); 3529 ev_fork_stop (EV_A_ &w->fork);
3395 3530
3531 ev_stop (EV_A_ (W)w);
3532
3396 EV_FREQUENT_CHECK; 3533 EV_FREQUENT_CHECK;
3397} 3534}
3398#endif 3535#endif
3399 3536
3400#if EV_FORK_ENABLE 3537#if EV_FORK_ENABLE
3526{ 3663{
3527 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3664 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3528 3665
3529 if (expect_false (!once)) 3666 if (expect_false (!once))
3530 { 3667 {
3531 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3668 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3532 return; 3669 return;
3533 } 3670 }
3534 3671
3535 once->cb = cb; 3672 once->cb = cb;
3536 once->arg = arg; 3673 once->arg = arg;
3623 if (types & EV_ASYNC) 3760 if (types & EV_ASYNC)
3624 for (i = asynccnt; i--; ) 3761 for (i = asynccnt; i--; )
3625 cb (EV_A_ EV_ASYNC, asyncs [i]); 3762 cb (EV_A_ EV_ASYNC, asyncs [i]);
3626#endif 3763#endif
3627 3764
3765#if EV_PREPARE_ENABLE
3628 if (types & EV_PREPARE) 3766 if (types & EV_PREPARE)
3629 for (i = preparecnt; i--; ) 3767 for (i = preparecnt; i--; )
3630#if EV_EMBED_ENABLE 3768# if EV_EMBED_ENABLE
3631 if (ev_cb (prepares [i]) != embed_prepare_cb) 3769 if (ev_cb (prepares [i]) != embed_prepare_cb)
3632#endif 3770# endif
3633 cb (EV_A_ EV_PREPARE, prepares [i]); 3771 cb (EV_A_ EV_PREPARE, prepares [i]);
3772#endif
3634 3773
3774#if EV_CHECK_ENABLE
3635 if (types & EV_CHECK) 3775 if (types & EV_CHECK)
3636 for (i = checkcnt; i--; ) 3776 for (i = checkcnt; i--; )
3637 cb (EV_A_ EV_CHECK, checks [i]); 3777 cb (EV_A_ EV_CHECK, checks [i]);
3778#endif
3638 3779
3780#if EV_SIGNAL_ENABLE
3639 if (types & EV_SIGNAL) 3781 if (types & EV_SIGNAL)
3640 for (i = 0; i < EV_NSIG - 1; ++i) 3782 for (i = 0; i < EV_NSIG - 1; ++i)
3641 for (wl = signals [i].head; wl; ) 3783 for (wl = signals [i].head; wl; )
3642 { 3784 {
3643 wn = wl->next; 3785 wn = wl->next;
3644 cb (EV_A_ EV_SIGNAL, wl); 3786 cb (EV_A_ EV_SIGNAL, wl);
3645 wl = wn; 3787 wl = wn;
3646 } 3788 }
3789#endif
3647 3790
3791#if EV_CHILD_ENABLE
3648 if (types & EV_CHILD) 3792 if (types & EV_CHILD)
3649 for (i = EV_PID_HASHSIZE; i--; ) 3793 for (i = (EV_PID_HASHSIZE); i--; )
3650 for (wl = childs [i]; wl; ) 3794 for (wl = childs [i]; wl; )
3651 { 3795 {
3652 wn = wl->next; 3796 wn = wl->next;
3653 cb (EV_A_ EV_CHILD, wl); 3797 cb (EV_A_ EV_CHILD, wl);
3654 wl = wn; 3798 wl = wn;
3655 } 3799 }
3800#endif
3656/* EV_STAT 0x00001000 /* stat data changed */ 3801/* EV_STAT 0x00001000 /* stat data changed */
3657/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3802/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3658} 3803}
3659#endif 3804#endif
3660 3805

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines