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

Comparing libev/ev.c (file contents):
Revision 1.303 by root, Sun Jul 19 01:36:34 2009 UTC vs.
Revision 1.349 by sf-exg, Fri Oct 15 22:59:59 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 */
210
211/* try to deduce the maximum number of signals on this platform */
212#if defined (EV_NSIG)
213/* use what's provided */
214#elif defined (NSIG)
215# define EV_NSIG (NSIG)
216#elif defined(_NSIG)
217# define EV_NSIG (_NSIG)
218#elif defined (SIGMAX)
219# define EV_NSIG (SIGMAX+1)
220#elif defined (SIG_MAX)
221# define EV_NSIG (SIG_MAX+1)
222#elif defined (_SIG_MAX)
223# define EV_NSIG (_SIG_MAX+1)
224#elif defined (MAXSIG)
225# define EV_NSIG (MAXSIG+1)
226#elif defined (MAX_SIG)
227# define EV_NSIG (MAX_SIG+1)
228#elif defined (SIGARRAYSIZE)
229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
230#elif defined (_sys_nsig)
231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
232#else
233# error "unable to find value for NSIG, please report"
234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
236# define EV_NSIG 65
237#endif
190 238
191#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
194# else 242# else
195# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
196# endif 244# endif
197#endif 245#endif
198 246
199#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
201# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
202# else 250# else
203# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
204# endif 252# endif
205#endif 253#endif
206 254
… …
208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
209#endif 257#endif
210 258
211#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
212# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
213# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
214# else 262# else
215# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
216# endif 264# endif
217#endif 265#endif
218 266
219#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
220# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
221#endif 269#endif
222 270
223#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
224# ifdef _WIN32 272# ifdef _WIN32
225# define EV_USE_POLL 0 273# define EV_USE_POLL 0
226# else 274# else
227# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
228# endif 276# endif
229#endif 277#endif
230 278
231#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
232# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
233# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
234# else 282# else
235# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
236# endif 284# endif
237#endif 285#endif
238 286
… …
244# define EV_USE_PORT 0 292# define EV_USE_PORT 0
245#endif 293#endif
246 294
247#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
248# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
249# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
250# else 298# else
251# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
252# endif 300# endif
253#endif 301#endif
254 302
255#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
256# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_PID_HASHSIZE 1
258# else
259# define EV_PID_HASHSIZE 16
260# endif
261#endif 305#endif
262 306
263#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
264# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
265# define EV_INOTIFY_HASHSIZE 1
266# else
267# define EV_INOTIFY_HASHSIZE 16
268# endif
269#endif 309#endif
270 310
271#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
273# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
274# else 314# else
275# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
276# endif 316# endif
277#endif 317#endif
278 318
279#ifndef EV_USE_SIGNALFD 319#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 321# define EV_USE_SIGNALFD EV_FEATURE_OS
282# else 322# else
283# define EV_USE_SIGNALFD 0 323# define EV_USE_SIGNALFD 0
284# endif 324# endif
285#endif 325#endif
286 326
… …
289# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
290# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
291#endif 331#endif
292 332
293#ifndef EV_VERIFY 333#ifndef EV_VERIFY
294# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
295#endif 335#endif
296 336
297#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
298# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
299#endif 339#endif
300 340
301#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
302# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
303#endif 343#endif
304 344
305/* 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, */
306/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
307#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
… …
316# endif 356# endif
317#endif 357#endif
318 358
319/* 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 */
320 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
366
321#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
322# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
323# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
324#endif 370#endif
325 371
… …
359# include <stdint.h> 405# include <stdint.h>
360# ifndef EFD_NONBLOCK 406# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 407# define EFD_NONBLOCK O_NONBLOCK
362# endif 408# endif
363# ifndef EFD_CLOEXEC 409# ifndef EFD_CLOEXEC
410# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 411# define EFD_CLOEXEC O_CLOEXEC
412# else
413# define EFD_CLOEXEC 02000000
414# endif
365# endif 415# endif
366# ifdef __cplusplus 416# ifdef __cplusplus
367extern "C" { 417extern "C" {
368# endif 418# endif
369int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
370# ifdef __cplusplus 420# ifdef __cplusplus
371} 421}
372# endif 422# endif
373#endif 423#endif
374 424
375#if EV_USE_SIGNALFD 425#if EV_USE_SIGNALFD
376# include <sys/signalfd.h> 426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h>
428# ifndef SFD_NONBLOCK
429# define SFD_NONBLOCK O_NONBLOCK
430# endif
431# ifndef SFD_CLOEXEC
432# ifdef O_CLOEXEC
433# define SFD_CLOEXEC O_CLOEXEC
434# else
435# define SFD_CLOEXEC 02000000
436# endif
437# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags);
442
443struct signalfd_siginfo
444{
445 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)];
447};
448# ifdef __cplusplus
449}
450# endif
377#endif 451#endif
378 452
379/**/ 453/**/
380 454
381#if EV_VERIFY >= 3 455#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 456# define EV_FREQUENT_CHECK ev_verify (EV_A)
383#else 457#else
384# define EV_FREQUENT_CHECK do { } while (0) 458# define EV_FREQUENT_CHECK do { } while (0)
385#endif 459#endif
386 460
387/* 461/*
… …
394 */ 468 */
395#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 469#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
396 470
397#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) */
398#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) */
399/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 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)
400 476
401#if __GNUC__ >= 4 477#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 478# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 479# define noinline __attribute__ ((noinline))
404#else 480#else
… …
411 487
412#define expect_false(expr) expect ((expr) != 0, 0) 488#define expect_false(expr) expect ((expr) != 0, 0)
413#define expect_true(expr) expect ((expr) != 0, 1) 489#define expect_true(expr) expect ((expr) != 0, 1)
414#define inline_size static inline 490#define inline_size static inline
415 491
416#if EV_MINIMAL 492#if EV_FEATURE_CODE
493# define inline_speed static inline
494#else
417# define inline_speed static noinline 495# define inline_speed static noinline
418#else
419# define inline_speed static inline
420#endif 496#endif
421 497
422#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 498#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
423 499
424#if EV_MINPRI == EV_MAXPRI 500#if EV_MINPRI == EV_MAXPRI
… …
437#define ev_active(w) ((W)(w))->active 513#define ev_active(w) ((W)(w))->active
438#define ev_at(w) ((WT)(w))->at 514#define ev_at(w) ((WT)(w))->at
439 515
440#if EV_USE_REALTIME 516#if EV_USE_REALTIME
441/* 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 */
442/* giving it a reasonably high chance of working on typical architetcures */ 518/* giving it a reasonably high chance of working on typical architectures */
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 519static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif 520#endif
445 521
446#if EV_USE_MONOTONIC 522#if EV_USE_MONOTONIC
447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 523static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
448#endif 524#endif
449 525
526#ifndef EV_FD_TO_WIN32_HANDLE
527# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
528#endif
529#ifndef EV_WIN32_HANDLE_TO_FD
530# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
531#endif
532#ifndef EV_WIN32_CLOSE_FD
533# define EV_WIN32_CLOSE_FD(fd) close (fd)
534#endif
535
450#ifdef _WIN32 536#ifdef _WIN32
451# include "ev_win32.c" 537# include "ev_win32.c"
452#endif 538#endif
453 539
454/*****************************************************************************/ 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
455 549
456static void (*syserr_cb)(const char *msg); 550static void (*syserr_cb)(const char *msg);
457 551
458void 552void
459ev_set_syserr_cb (void (*cb)(const char *msg)) 553ev_set_syserr_cb (void (*cb)(const char *msg))
… …
469 563
470 if (syserr_cb) 564 if (syserr_cb)
471 syserr_cb (msg); 565 syserr_cb (msg);
472 else 566 else
473 { 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
474 perror (msg); 576 perror (msg);
577#endif
475 abort (); 578 abort ();
476 } 579 }
477} 580}
478 581
479static void * 582static void *
480ev_realloc_emul (void *ptr, long size) 583ev_realloc_emul (void *ptr, long size)
481{ 584{
585#if __GLIBC__
586 return realloc (ptr, size);
587#else
482 /* some systems, notably openbsd and darwin, fail to properly 588 /* some systems, notably openbsd and darwin, fail to properly
483 * 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
484 * the single unix specification, so work around them here. 590 * the single unix specification, so work around them here.
485 */ 591 */
486 592
487 if (size) 593 if (size)
488 return realloc (ptr, size); 594 return realloc (ptr, size);
489 595
490 free (ptr); 596 free (ptr);
491 return 0; 597 return 0;
598#endif
492} 599}
493 600
494static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 601static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
495 602
496void 603void
… …
504{ 611{
505 ptr = alloc (ptr, size); 612 ptr = alloc (ptr, size);
506 613
507 if (!ptr && size) 614 if (!ptr && size)
508 { 615 {
616#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n");
618#else
509 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
620#endif
510 abort (); 621 abort ();
511 } 622 }
512 623
513 return ptr; 624 return ptr;
514} 625}
… …
596 707
597 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
598 709
599#endif 710#endif
600 711
601#if EV_MINIMAL < 2 712#if EV_FEATURE_API
602# 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)
603# 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)
604# define EV_INVOKE_PENDING invoke_cb (EV_A) 715# define EV_INVOKE_PENDING invoke_cb (EV_A)
605#else 716#else
606# define EV_RELEASE_CB (void)0 717# define EV_RELEASE_CB (void)0
… …
660 if (delay > 0.) 771 if (delay > 0.)
661 { 772 {
662#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
663 struct timespec ts; 774 struct timespec ts;
664 775
665 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
666 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
667
668 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
669#elif defined(_WIN32) 778#elif defined(_WIN32)
670 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
671#else 780#else
672 struct timeval tv; 781 struct timeval tv;
673 782
674 tv.tv_sec = (time_t)delay;
675 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
676
677 /* 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 */
678 /* something not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
679 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
680 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
681#endif 788#endif
682 } 789 }
683} 790}
684 791
685/*****************************************************************************/ 792/*****************************************************************************/
686 793
687#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 */
688 795
689/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
690/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
691inline_size int 798inline_size int
692array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
693{ 800{
694 int ncur = cur + 1; 801 int ncur = cur + 1;
695 802
… …
791} 898}
792 899
793/*****************************************************************************/ 900/*****************************************************************************/
794 901
795inline_speed void 902inline_speed void
796fd_event_nc (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
797{ 904{
798 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
799 ev_io *w; 906 ev_io *w;
800 907
801 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)
… …
813fd_event (EV_P_ int fd, int revents) 920fd_event (EV_P_ int fd, int revents)
814{ 921{
815 ANFD *anfd = anfds + fd; 922 ANFD *anfd = anfds + fd;
816 923
817 if (expect_true (!anfd->reify)) 924 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
819} 926}
820 927
821void 928void
822ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
823{ 930{
824 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
825 fd_event_nc (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
826} 933}
827 934
828/* make sure the external fd watch events are in-sync */ 935/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */ 936/* with the kernel/libev internal state */
830inline_size void 937inline_size void
… …
845 952
846#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
847 if (events) 954 if (events)
848 { 955 {
849 unsigned long arg; 956 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
852 #else
853 anfd->handle = _get_osfhandle (fd);
854 #endif
855 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));
856 } 959 }
857#endif 960#endif
858 961
859 { 962 {
… …
897 ev_io_stop (EV_A_ w); 1000 ev_io_stop (EV_A_ w);
898 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1001 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
899 } 1002 }
900} 1003}
901 1004
902/* check whether the given fd is atcually valid, for error recovery */ 1005/* check whether the given fd is actually valid, for error recovery */
903inline_size int 1006inline_size int
904fd_valid (int fd) 1007fd_valid (int fd)
905{ 1008{
906#ifdef _WIN32 1009#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 1010 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 1011#else
909 return fcntl (fd, F_GETFD) != -1; 1012 return fcntl (fd, F_GETFD) != -1;
910#endif 1013#endif
911} 1014}
912 1015
… …
930 1033
931 for (fd = anfdmax; fd--; ) 1034 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1035 if (anfds [fd].events)
933 { 1036 {
934 fd_kill (EV_A_ fd); 1037 fd_kill (EV_A_ fd);
935 return; 1038 break;
936 } 1039 }
937} 1040}
938 1041
939/* usually called after fork if backend needs to re-arm all fds from scratch */ 1042/* usually called after fork if backend needs to re-arm all fds from scratch */
940static void noinline 1043static void noinline
… …
949 anfds [fd].emask = 0; 1052 anfds [fd].emask = 0;
950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1053 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
951 } 1054 }
952} 1055}
953 1056
1057/* used to prepare libev internal fd's */
1058/* this is not fork-safe */
1059inline_speed void
1060fd_intern (int fd)
1061{
1062#ifdef _WIN32
1063 unsigned long arg = 1;
1064 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1065#else
1066 fcntl (fd, F_SETFD, FD_CLOEXEC);
1067 fcntl (fd, F_SETFL, O_NONBLOCK);
1068#endif
1069}
1070
954/*****************************************************************************/ 1071/*****************************************************************************/
955 1072
956/* 1073/*
957 * the heap functions want a real array index. array index 0 uis guaranteed to not 1074 * the heap functions want a real array index. array index 0 is guaranteed to not
958 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1075 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
959 * the branching factor of the d-tree. 1076 * the branching factor of the d-tree.
960 */ 1077 */
961 1078
962/* 1079/*
… …
1030 1147
1031 for (;;) 1148 for (;;)
1032 { 1149 {
1033 int c = k << 1; 1150 int c = k << 1;
1034 1151
1035 if (c > N + HEAP0 - 1) 1152 if (c >= N + HEAP0)
1036 break; 1153 break;
1037 1154
1038 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1155 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1039 ? 1 : 0; 1156 ? 1 : 0;
1040 1157
… …
1076 1193
1077/* move an element suitably so it is in a correct place */ 1194/* move an element suitably so it is in a correct place */
1078inline_size void 1195inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1196adjustheap (ANHE *heap, int N, int k)
1080{ 1197{
1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1198 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1082 upheap (heap, k); 1199 upheap (heap, k);
1083 else 1200 else
1084 downheap (heap, N, k); 1201 downheap (heap, N, k);
1085} 1202}
1086 1203
… …
1099/*****************************************************************************/ 1216/*****************************************************************************/
1100 1217
1101/* associate signal watchers to a signal signal */ 1218/* associate signal watchers to a signal signal */
1102typedef struct 1219typedef struct
1103{ 1220{
1221 EV_ATOMIC_T pending;
1222#if EV_MULTIPLICITY
1223 EV_P;
1224#endif
1104 WL head; 1225 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1226} ANSIG;
1107 1227
1108static ANSIG *signals; 1228static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1229
1113/*****************************************************************************/ 1230/*****************************************************************************/
1114 1231
1115/* used to prepare libev internal fd's */ 1232#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1116/* this is not fork-safe */
1117inline_speed void
1118fd_intern (int fd)
1119{
1120#ifdef _WIN32
1121 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1123#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif
1127}
1128 1233
1129static void noinline 1234static void noinline
1130evpipe_init (EV_P) 1235evpipe_init (EV_P)
1131{ 1236{
1132 if (!ev_is_active (&pipe_w)) 1237 if (!ev_is_active (&pipe_w))
1133 { 1238 {
1134#if EV_USE_EVENTFD 1239# if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1240 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL) 1241 if (evfd < 0 && errno == EINVAL)
1137 evfd = eventfd (0, 0); 1242 evfd = eventfd (0, 0);
1138 1243
1139 if (evfd >= 0) 1244 if (evfd >= 0)
… …
1141 evpipe [0] = -1; 1246 evpipe [0] = -1;
1142 fd_intern (evfd); /* doing it twice doesn't hurt */ 1247 fd_intern (evfd); /* doing it twice doesn't hurt */
1143 ev_io_set (&pipe_w, evfd, EV_READ); 1248 ev_io_set (&pipe_w, evfd, EV_READ);
1144 } 1249 }
1145 else 1250 else
1146#endif 1251# endif
1147 { 1252 {
1148 while (pipe (evpipe)) 1253 while (pipe (evpipe))
1149 ev_syserr ("(libev) error creating signal/async pipe"); 1254 ev_syserr ("(libev) error creating signal/async pipe");
1150 1255
1151 fd_intern (evpipe [0]); 1256 fd_intern (evpipe [0]);
… …
1162evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1267evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1163{ 1268{
1164 if (!*flag) 1269 if (!*flag)
1165 { 1270 {
1166 int old_errno = errno; /* save errno because write might clobber it */ 1271 int old_errno = errno; /* save errno because write might clobber it */
1272 char dummy;
1167 1273
1168 *flag = 1; 1274 *flag = 1;
1169 1275
1170#if EV_USE_EVENTFD 1276#if EV_USE_EVENTFD
1171 if (evfd >= 0) 1277 if (evfd >= 0)
… …
1173 uint64_t counter = 1; 1279 uint64_t counter = 1;
1174 write (evfd, &counter, sizeof (uint64_t)); 1280 write (evfd, &counter, sizeof (uint64_t));
1175 } 1281 }
1176 else 1282 else
1177#endif 1283#endif
1284 /* win32 people keep sending patches that change this write() to send() */
1285 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1286 /* so when you think this write should be a send instead, please find out */
1287 /* where your send() is from - it's definitely not the microsoft send, and */
1288 /* tell me. thank you. */
1178 write (evpipe [1], &old_errno, 1); 1289 write (evpipe [1], &dummy, 1);
1179 1290
1180 errno = old_errno; 1291 errno = old_errno;
1181 } 1292 }
1182} 1293}
1183 1294
1184/* called whenever the libev signal pipe */ 1295/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1296/* got some events (signal, async) */
1186static void 1297static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1298pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1299{
1300 int i;
1301
1189#if EV_USE_EVENTFD 1302#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1303 if (evfd >= 0)
1191 { 1304 {
1192 uint64_t counter; 1305 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1306 read (evfd, &counter, sizeof (uint64_t));
1194 } 1307 }
1195 else 1308 else
1196#endif 1309#endif
1197 { 1310 {
1198 char dummy; 1311 char dummy;
1312 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1199 read (evpipe [0], &dummy, 1); 1313 read (evpipe [0], &dummy, 1);
1200 } 1314 }
1201 1315
1202 if (gotsig && ev_is_default_loop (EV_A)) 1316 if (sig_pending)
1203 { 1317 {
1204 int signum; 1318 sig_pending = 0;
1205 gotsig = 0;
1206 1319
1207 for (signum = signalmax; signum--; ) 1320 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1321 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1322 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1323 }
1211 1324
1212#if EV_ASYNC_ENABLE 1325#if EV_ASYNC_ENABLE
1213 if (gotasync) 1326 if (async_pending)
1214 { 1327 {
1215 int i; 1328 async_pending = 0;
1216 gotasync = 0;
1217 1329
1218 for (i = asynccnt; i--; ) 1330 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1331 if (asyncs [i]->sent)
1220 { 1332 {
1221 asyncs [i]->sent = 0; 1333 asyncs [i]->sent = 0;
… …
1229 1341
1230static void 1342static void
1231ev_sighandler (int signum) 1343ev_sighandler (int signum)
1232{ 1344{
1233#if EV_MULTIPLICITY 1345#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1346 EV_P = signals [signum - 1].loop;
1235#endif 1347#endif
1236 1348
1237#if _WIN32 1349#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1350 signal (signum, ev_sighandler);
1239#endif 1351#endif
1240 1352
1241 signals [signum - 1].gotsig = 1; 1353 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1354 evpipe_write (EV_A_ &sig_pending);
1243} 1355}
1244 1356
1245void noinline 1357void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1358ev_feed_signal_event (EV_P_ int signum)
1247{ 1359{
1248 WL w; 1360 WL w;
1249 1361
1362 if (expect_false (signum <= 0 || signum > EV_NSIG))
1363 return;
1364
1365 --signum;
1366
1250#if EV_MULTIPLICITY 1367#if EV_MULTIPLICITY
1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1368 /* it is permissible to try to feed a signal to the wrong loop */
1252#endif 1369 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1370
1254 --signum; 1371 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1372 return;
1373#endif
1258 1374
1259 signals [signum].gotsig = 0; 1375 signals [signum].pending = 0;
1260 1376
1261 for (w = signals [signum].head; w; w = w->next) 1377 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1378 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1379}
1264 1380
1265#if EV_USE_SIGNALFD 1381#if EV_USE_SIGNALFD
1266static void 1382static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1383sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1384{
1269 struct signalfd_siginfo si[4], *sip; 1385 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1386
1271 for (;;) 1387 for (;;)
1272 { 1388 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1389 ssize_t res = read (sigfd, si, sizeof (si));
1274 1390
… …
1280 break; 1396 break;
1281 } 1397 }
1282} 1398}
1283#endif 1399#endif
1284 1400
1401#endif
1402
1285/*****************************************************************************/ 1403/*****************************************************************************/
1286 1404
1405#if EV_CHILD_ENABLE
1287static WL childs [EV_PID_HASHSIZE]; 1406static WL childs [EV_PID_HASHSIZE];
1288
1289#ifndef _WIN32
1290 1407
1291static ev_signal childev; 1408static ev_signal childev;
1292 1409
1293#ifndef WIFCONTINUED 1410#ifndef WIFCONTINUED
1294# define WIFCONTINUED(status) 0 1411# define WIFCONTINUED(status) 0
… …
1299child_reap (EV_P_ int chain, int pid, int status) 1416child_reap (EV_P_ int chain, int pid, int status)
1300{ 1417{
1301 ev_child *w; 1418 ev_child *w;
1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1419 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1303 1420
1304 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1421 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1305 { 1422 {
1306 if ((w->pid == pid || !w->pid) 1423 if ((w->pid == pid || !w->pid)
1307 && (!traced || (w->flags & 1))) 1424 && (!traced || (w->flags & 1)))
1308 { 1425 {
1309 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1426 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1334 /* make sure we are called again until all children have been reaped */ 1451 /* make sure we are called again until all children have been reaped */
1335 /* we need to do it this way so that the callback gets called before we continue */ 1452 /* we need to do it this way so that the callback gets called before we continue */
1336 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1453 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1337 1454
1338 child_reap (EV_A_ pid, pid, status); 1455 child_reap (EV_A_ pid, pid, status);
1339 if (EV_PID_HASHSIZE > 1) 1456 if ((EV_PID_HASHSIZE) > 1)
1340 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1457 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1341} 1458}
1342 1459
1343#endif 1460#endif
1344 1461
… …
1411#ifdef __APPLE__ 1528#ifdef __APPLE__
1412 /* only select works correctly on that "unix-certified" platform */ 1529 /* only select works correctly on that "unix-certified" platform */
1413 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1530 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1414 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1531 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1415#endif 1532#endif
1533#ifdef __FreeBSD__
1534 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1535#endif
1416 1536
1417 return flags; 1537 return flags;
1418} 1538}
1419 1539
1420unsigned int 1540unsigned int
… …
1433ev_backend (EV_P) 1553ev_backend (EV_P)
1434{ 1554{
1435 return backend; 1555 return backend;
1436} 1556}
1437 1557
1438#if EV_MINIMAL < 2 1558#if EV_FEATURE_API
1439unsigned int 1559unsigned int
1440ev_loop_count (EV_P) 1560ev_iteration (EV_P)
1441{ 1561{
1442 return loop_count; 1562 return loop_count;
1443} 1563}
1444 1564
1445unsigned int 1565unsigned int
1446ev_loop_depth (EV_P) 1566ev_depth (EV_P)
1447{ 1567{
1448 return loop_depth; 1568 return loop_depth;
1449} 1569}
1450 1570
1451void 1571void
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1628 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1629 have_monotonic = 1;
1510 } 1630 }
1511#endif 1631#endif
1512 1632
1633 /* pid check not overridable via env */
1634#ifndef _WIN32
1635 if (flags & EVFLAG_FORKCHECK)
1636 curpid = getpid ();
1637#endif
1638
1639 if (!(flags & EVFLAG_NOENV)
1640 && !enable_secure ()
1641 && getenv ("LIBEV_FLAGS"))
1642 flags = atoi (getenv ("LIBEV_FLAGS"));
1643
1513 ev_rt_now = ev_time (); 1644 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1645 mn_now = get_clock ();
1515 now_floor = mn_now; 1646 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1647 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1648#if EV_FEATURE_API
1518 invoke_cb = ev_invoke_pending; 1649 invoke_cb = ev_invoke_pending;
1519#endif 1650#endif
1520 1651
1521 io_blocktime = 0.; 1652 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1653 timeout_blocktime = 0.;
1523 backend = 0; 1654 backend = 0;
1524 backend_fd = -1; 1655 backend_fd = -1;
1525 gotasync = 0; 1656 sig_pending = 0;
1657#if EV_ASYNC_ENABLE
1658 async_pending = 0;
1659#endif
1526#if EV_USE_INOTIFY 1660#if EV_USE_INOTIFY
1527 fs_fd = -2; 1661 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1662#endif
1529#if EV_USE_SIGNALFD 1663#if EV_USE_SIGNALFD
1530 sigfd = -2; 1664 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1665#endif
1532
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV)
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543 1666
1544 if (!(flags & 0x0000ffffU)) 1667 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1668 flags |= ev_recommended_backends ();
1546 1669
1547#if EV_USE_PORT 1670#if EV_USE_PORT
… …
1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1683 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1561#endif 1684#endif
1562 1685
1563 ev_prepare_init (&pending_w, pendingcb); 1686 ev_prepare_init (&pending_w, pendingcb);
1564 1687
1688#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1565 ev_init (&pipe_w, pipecb); 1689 ev_init (&pipe_w, pipecb);
1566 ev_set_priority (&pipe_w, EV_MAXPRI); 1690 ev_set_priority (&pipe_w, EV_MAXPRI);
1691#endif
1567 } 1692 }
1568} 1693}
1569 1694
1570/* free up a loop structure */ 1695/* free up a loop structure */
1571static void noinline 1696static void noinline
… …
1583 close (evfd); 1708 close (evfd);
1584#endif 1709#endif
1585 1710
1586 if (evpipe [0] >= 0) 1711 if (evpipe [0] >= 0)
1587 { 1712 {
1588 close (evpipe [0]); 1713 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1714 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1715 }
1591 } 1716 }
1592 1717
1593#if EV_USE_SIGNALFD 1718#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1719 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1720 close (sigfd);
1600 }
1601#endif 1721#endif
1602 1722
1603#if EV_USE_INOTIFY 1723#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1724 if (fs_fd >= 0)
1605 close (fs_fd); 1725 close (fs_fd);
… …
1630#if EV_IDLE_ENABLE 1750#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1751 array_free (idle, [i]);
1632#endif 1752#endif
1633 } 1753 }
1634 1754
1635 ev_free (anfds); anfdmax = 0; 1755 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1756
1637 /* have to use the microsoft-never-gets-it-right macro */ 1757 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1758 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1759 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1760 array_free (timer, EMPTY);
… …
1675 1795
1676 if (ev_is_active (&pipe_w)) 1796 if (ev_is_active (&pipe_w))
1677 { 1797 {
1678 /* this "locks" the handlers against writing to the pipe */ 1798 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1799 /* while we modify the fd vars */
1680 gotsig = 1; 1800 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1801#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1802 async_pending = 1;
1683#endif 1803#endif
1684 1804
1685 ev_ref (EV_A); 1805 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1806 ev_io_stop (EV_A_ &pipe_w);
1687 1807
… …
1690 close (evfd); 1810 close (evfd);
1691#endif 1811#endif
1692 1812
1693 if (evpipe [0] >= 0) 1813 if (evpipe [0] >= 0)
1694 { 1814 {
1695 close (evpipe [0]); 1815 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1816 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1817 }
1698 1818
1819#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1699 evpipe_init (EV_A); 1820 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1821 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1822 pipecb (EV_A_ &pipe_w, EV_READ);
1823#endif
1702 } 1824 }
1703 1825
1704 postfork = 0; 1826 postfork = 0;
1705} 1827}
1706 1828
1707#if EV_MULTIPLICITY 1829#if EV_MULTIPLICITY
1708 1830
1709struct ev_loop * 1831struct ev_loop *
1710ev_loop_new (unsigned int flags) 1832ev_loop_new (unsigned int flags)
1711{ 1833{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1834 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 1835
1714 memset (loop, 0, sizeof (struct ev_loop)); 1836 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1837 loop_init (EV_A_ flags);
1716 1838
1717 if (ev_backend (EV_A)) 1839 if (ev_backend (EV_A))
1718 return loop; 1840 return EV_A;
1719 1841
1720 return 0; 1842 return 0;
1721} 1843}
1722 1844
1723void 1845void
… …
1768 verify_watcher (EV_A_ ws [cnt]); 1890 verify_watcher (EV_A_ ws [cnt]);
1769 } 1891 }
1770} 1892}
1771#endif 1893#endif
1772 1894
1773#if EV_MINIMAL < 2 1895#if EV_FEATURE_API
1774void 1896void
1775ev_loop_verify (EV_P) 1897ev_verify (EV_P)
1776{ 1898{
1777#if EV_VERIFY 1899#if EV_VERIFY
1778 int i; 1900 int i;
1779 WL w; 1901 WL w;
1780 1902
… …
1819#if EV_ASYNC_ENABLE 1941#if EV_ASYNC_ENABLE
1820 assert (asyncmax >= asynccnt); 1942 assert (asyncmax >= asynccnt);
1821 array_verify (EV_A_ (W *)asyncs, asynccnt); 1943 array_verify (EV_A_ (W *)asyncs, asynccnt);
1822#endif 1944#endif
1823 1945
1946#if EV_PREPARE_ENABLE
1824 assert (preparemax >= preparecnt); 1947 assert (preparemax >= preparecnt);
1825 array_verify (EV_A_ (W *)prepares, preparecnt); 1948 array_verify (EV_A_ (W *)prepares, preparecnt);
1949#endif
1826 1950
1951#if EV_CHECK_ENABLE
1827 assert (checkmax >= checkcnt); 1952 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1953 array_verify (EV_A_ (W *)checks, checkcnt);
1954#endif
1829 1955
1830# if 0 1956# if 0
1957#if EV_CHILD_ENABLE
1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1958 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1959 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1960#endif
1833# endif 1961# endif
1834#endif 1962#endif
1835} 1963}
1836#endif 1964#endif
1837 1965
… …
1844#endif 1972#endif
1845{ 1973{
1846 if (!ev_default_loop_ptr) 1974 if (!ev_default_loop_ptr)
1847 { 1975 {
1848#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1977 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1978#else
1851 ev_default_loop_ptr = 1; 1979 ev_default_loop_ptr = 1;
1852#endif 1980#endif
1853 1981
1854 loop_init (EV_A_ flags); 1982 loop_init (EV_A_ flags);
1855 1983
1856 if (ev_backend (EV_A)) 1984 if (ev_backend (EV_A))
1857 { 1985 {
1858#ifndef _WIN32 1986#if EV_CHILD_ENABLE
1859 ev_signal_init (&childev, childcb, SIGCHLD); 1987 ev_signal_init (&childev, childcb, SIGCHLD);
1860 ev_set_priority (&childev, EV_MAXPRI); 1988 ev_set_priority (&childev, EV_MAXPRI);
1861 ev_signal_start (EV_A_ &childev); 1989 ev_signal_start (EV_A_ &childev);
1862 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1990 ev_unref (EV_A); /* child watcher should not keep loop alive */
1863#endif 1991#endif
… …
1871 1999
1872void 2000void
1873ev_default_destroy (void) 2001ev_default_destroy (void)
1874{ 2002{
1875#if EV_MULTIPLICITY 2003#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 2004 EV_P = ev_default_loop_ptr;
1877#endif 2005#endif
1878 2006
1879 ev_default_loop_ptr = 0; 2007 ev_default_loop_ptr = 0;
1880 2008
1881#ifndef _WIN32 2009#if EV_CHILD_ENABLE
1882 ev_ref (EV_A); /* child watcher */ 2010 ev_ref (EV_A); /* child watcher */
1883 ev_signal_stop (EV_A_ &childev); 2011 ev_signal_stop (EV_A_ &childev);
1884#endif 2012#endif
1885 2013
1886 loop_destroy (EV_A); 2014 loop_destroy (EV_A);
… …
1888 2016
1889void 2017void
1890ev_default_fork (void) 2018ev_default_fork (void)
1891{ 2019{
1892#if EV_MULTIPLICITY 2020#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 2021 EV_P = ev_default_loop_ptr;
1894#endif 2022#endif
1895 2023
1896 postfork = 1; /* must be in line with ev_loop_fork */ 2024 postfork = 1; /* must be in line with ev_loop_fork */
1897} 2025}
1898 2026
… …
1992 EV_FREQUENT_CHECK; 2120 EV_FREQUENT_CHECK;
1993 feed_reverse (EV_A_ (W)w); 2121 feed_reverse (EV_A_ (W)w);
1994 } 2122 }
1995 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2123 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1996 2124
1997 feed_reverse_done (EV_A_ EV_TIMEOUT); 2125 feed_reverse_done (EV_A_ EV_TIMER);
1998 } 2126 }
1999} 2127}
2000 2128
2001#if EV_PERIODIC_ENABLE 2129#if EV_PERIODIC_ENABLE
2002/* make periodics pending */ 2130/* make periodics pending */
… …
2055 feed_reverse_done (EV_A_ EV_PERIODIC); 2183 feed_reverse_done (EV_A_ EV_PERIODIC);
2056 } 2184 }
2057} 2185}
2058 2186
2059/* simply recalculate all periodics */ 2187/* simply recalculate all periodics */
2060/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2188/* TODO: maybe ensure that at least one event happens when jumping forward? */
2061static void noinline 2189static void noinline
2062periodics_reschedule (EV_P) 2190periodics_reschedule (EV_P)
2063{ 2191{
2064 int i; 2192 int i;
2065 2193
… …
2093 ANHE_at_cache (*he); 2221 ANHE_at_cache (*he);
2094 } 2222 }
2095} 2223}
2096 2224
2097/* fetch new monotonic and realtime times from the kernel */ 2225/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2226/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2227inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2228time_update (EV_P_ ev_tstamp max_block)
2101{ 2229{
2102#if EV_USE_MONOTONIC 2230#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2231 if (expect_true (have_monotonic))
… …
2163} 2291}
2164 2292
2165void 2293void
2166ev_loop (EV_P_ int flags) 2294ev_loop (EV_P_ int flags)
2167{ 2295{
2168#if EV_MINIMAL < 2 2296#if EV_FEATURE_API
2169 ++loop_depth; 2297 ++loop_depth;
2170#endif 2298#endif
2171 2299
2172 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2300 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2173 2301
… …
2176 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2304 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2177 2305
2178 do 2306 do
2179 { 2307 {
2180#if EV_VERIFY >= 2 2308#if EV_VERIFY >= 2
2181 ev_loop_verify (EV_A); 2309 ev_verify (EV_A);
2182#endif 2310#endif
2183 2311
2184#ifndef _WIN32 2312#ifndef _WIN32
2185 if (expect_false (curpid)) /* penalise the forking check even more */ 2313 if (expect_false (curpid)) /* penalise the forking check even more */
2186 if (expect_false (getpid () != curpid)) 2314 if (expect_false (getpid () != curpid))
… …
2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2326 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2199 EV_INVOKE_PENDING; 2327 EV_INVOKE_PENDING;
2200 } 2328 }
2201#endif 2329#endif
2202 2330
2331#if EV_PREPARE_ENABLE
2203 /* queue prepare watchers (and execute them) */ 2332 /* queue prepare watchers (and execute them) */
2204 if (expect_false (preparecnt)) 2333 if (expect_false (preparecnt))
2205 { 2334 {
2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2335 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2207 EV_INVOKE_PENDING; 2336 EV_INVOKE_PENDING;
2208 } 2337 }
2338#endif
2209 2339
2210 if (expect_false (loop_done)) 2340 if (expect_false (loop_done))
2211 break; 2341 break;
2212 2342
2213 /* we might have forked, so reify kernel state if necessary */ 2343 /* we might have forked, so reify kernel state if necessary */
… …
2264 waittime -= sleeptime; 2394 waittime -= sleeptime;
2265 } 2395 }
2266 } 2396 }
2267 } 2397 }
2268 2398
2269#if EV_MINIMAL < 2 2399#if EV_FEATURE_API
2270 ++loop_count; 2400 ++loop_count;
2271#endif 2401#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2402 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2273 backend_poll (EV_A_ waittime); 2403 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2404 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2286#if EV_IDLE_ENABLE 2416#if EV_IDLE_ENABLE
2287 /* queue idle watchers unless other events are pending */ 2417 /* queue idle watchers unless other events are pending */
2288 idle_reify (EV_A); 2418 idle_reify (EV_A);
2289#endif 2419#endif
2290 2420
2421#if EV_CHECK_ENABLE
2291 /* queue check watchers, to be executed first */ 2422 /* queue check watchers, to be executed first */
2292 if (expect_false (checkcnt)) 2423 if (expect_false (checkcnt))
2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2424 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2425#endif
2294 2426
2295 EV_INVOKE_PENDING; 2427 EV_INVOKE_PENDING;
2296 } 2428 }
2297 while (expect_true ( 2429 while (expect_true (
2298 activecnt 2430 activecnt
… …
2301 )); 2433 ));
2302 2434
2303 if (loop_done == EVUNLOOP_ONE) 2435 if (loop_done == EVUNLOOP_ONE)
2304 loop_done = EVUNLOOP_CANCEL; 2436 loop_done = EVUNLOOP_CANCEL;
2305 2437
2306#if EV_MINIMAL < 2 2438#if EV_FEATURE_API
2307 --loop_depth; 2439 --loop_depth;
2308#endif 2440#endif
2309} 2441}
2310 2442
2311void 2443void
… …
2364inline_size void 2496inline_size void
2365wlist_del (WL *head, WL elem) 2497wlist_del (WL *head, WL elem)
2366{ 2498{
2367 while (*head) 2499 while (*head)
2368 { 2500 {
2369 if (*head == elem) 2501 if (expect_true (*head == elem))
2370 { 2502 {
2371 *head = elem->next; 2503 *head = elem->next;
2372 return; 2504 break;
2373 } 2505 }
2374 2506
2375 head = &(*head)->next; 2507 head = &(*head)->next;
2376 } 2508 }
2377} 2509}
… …
2437 2569
2438 if (expect_false (ev_is_active (w))) 2570 if (expect_false (ev_is_active (w)))
2439 return; 2571 return;
2440 2572
2441 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2573 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2574 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2443 2575
2444 EV_FREQUENT_CHECK; 2576 EV_FREQUENT_CHECK;
2445 2577
2446 ev_start (EV_A_ (W)w, 1); 2578 ev_start (EV_A_ (W)w, 1);
2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2579 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2517 timers [active] = timers [timercnt + HEAP0]; 2649 timers [active] = timers [timercnt + HEAP0];
2518 adjustheap (timers, timercnt, active); 2650 adjustheap (timers, timercnt, active);
2519 } 2651 }
2520 } 2652 }
2521 2653
2522 EV_FREQUENT_CHECK;
2523
2524 ev_at (w) -= mn_now; 2654 ev_at (w) -= mn_now;
2525 2655
2526 ev_stop (EV_A_ (W)w); 2656 ev_stop (EV_A_ (W)w);
2657
2658 EV_FREQUENT_CHECK;
2527} 2659}
2528 2660
2529void noinline 2661void noinline
2530ev_timer_again (EV_P_ ev_timer *w) 2662ev_timer_again (EV_P_ ev_timer *w)
2531{ 2663{
… …
2610 periodics [active] = periodics [periodiccnt + HEAP0]; 2742 periodics [active] = periodics [periodiccnt + HEAP0];
2611 adjustheap (periodics, periodiccnt, active); 2743 adjustheap (periodics, periodiccnt, active);
2612 } 2744 }
2613 } 2745 }
2614 2746
2615 EV_FREQUENT_CHECK;
2616
2617 ev_stop (EV_A_ (W)w); 2747 ev_stop (EV_A_ (W)w);
2748
2749 EV_FREQUENT_CHECK;
2618} 2750}
2619 2751
2620void noinline 2752void noinline
2621ev_periodic_again (EV_P_ ev_periodic *w) 2753ev_periodic_again (EV_P_ ev_periodic *w)
2622{ 2754{
… …
2628 2760
2629#ifndef SA_RESTART 2761#ifndef SA_RESTART
2630# define SA_RESTART 0 2762# define SA_RESTART 0
2631#endif 2763#endif
2632 2764
2765#if EV_SIGNAL_ENABLE
2766
2633void noinline 2767void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2768ev_signal_start (EV_P_ ev_signal *w)
2635{ 2769{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2770 if (expect_false (ev_is_active (w)))
2640 return; 2771 return;
2641 2772
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2773 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2774
2775#if EV_MULTIPLICITY
2776 assert (("libev: a signal must not be attached to two different loops",
2777 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2778
2779 signals [w->signum - 1].loop = EV_A;
2780#endif
2643 2781
2644 EV_FREQUENT_CHECK; 2782 EV_FREQUENT_CHECK;
2645 2783
2646#if EV_USE_SIGNALFD 2784#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2785 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2807 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2808 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2809
2672 signalfd (sigfd, &sigfd_set, 0); 2810 signalfd (sigfd, &sigfd_set, 0);
2673 } 2811 }
2674 else
2675#endif 2812#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688 if (sigfd < 0)/*TODO*/
2689 sigdelset (&prev, w->signum);
2690 sigprocmask (SIG_SETMASK, &prev, 0);
2691#endif
2692 }
2693 2813
2694 ev_start (EV_A_ (W)w, 1); 2814 ev_start (EV_A_ (W)w, 1);
2695 wlist_add (&signals [w->signum - 1].head, (WL)w); 2815 wlist_add (&signals [w->signum - 1].head, (WL)w);
2696 2816
2697 if (!((WL)w)->next) 2817 if (!((WL)w)->next)
2818# if EV_USE_SIGNALFD
2819 if (sigfd < 0) /*TODO*/
2820# endif
2698 { 2821 {
2699#if _WIN32 2822# ifdef _WIN32
2823 evpipe_init (EV_A);
2824
2700 signal (w->signum, ev_sighandler); 2825 signal (w->signum, ev_sighandler);
2701#else 2826# else
2702 if (sigfd < 0) /*TODO*/
2703 {
2704 struct sigaction sa = { }; 2827 struct sigaction sa;
2828
2829 evpipe_init (EV_A);
2830
2705 sa.sa_handler = ev_sighandler; 2831 sa.sa_handler = ev_sighandler;
2706 sigfillset (&sa.sa_mask); 2832 sigfillset (&sa.sa_mask);
2707 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2833 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2708 sigaction (w->signum, &sa, 0); 2834 sigaction (w->signum, &sa, 0);
2835
2836 sigemptyset (&sa.sa_mask);
2837 sigaddset (&sa.sa_mask, w->signum);
2838 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2839#endif
2709 } 2840 }
2710#endif
2711 }
2712 2841
2713 EV_FREQUENT_CHECK; 2842 EV_FREQUENT_CHECK;
2714} 2843}
2715 2844
2716void noinline 2845void noinline
… …
2724 2853
2725 wlist_del (&signals [w->signum - 1].head, (WL)w); 2854 wlist_del (&signals [w->signum - 1].head, (WL)w);
2726 ev_stop (EV_A_ (W)w); 2855 ev_stop (EV_A_ (W)w);
2727 2856
2728 if (!signals [w->signum - 1].head) 2857 if (!signals [w->signum - 1].head)
2858 {
2859#if EV_MULTIPLICITY
2860 signals [w->signum - 1].loop = 0; /* unattach from signal */
2861#endif
2729#if EV_USE_SIGNALFD 2862#if EV_USE_SIGNALFD
2730 if (sigfd >= 0) 2863 if (sigfd >= 0)
2731 { 2864 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2865 sigset_t ss;
2866
2867 sigemptyset (&ss);
2868 sigaddset (&ss, w->signum);
2733 sigdelset (&sigfd_set, w->signum); 2869 sigdelset (&sigfd_set, w->signum);
2870
2734 signalfd (sigfd, &sigfd_set, 0); 2871 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2872 sigprocmask (SIG_UNBLOCK, &ss, 0);
2736 /*TODO: maybe unblock signal? */
2737 } 2873 }
2738 else 2874 else
2739#endif 2875#endif
2740 signal (w->signum, SIG_DFL); 2876 signal (w->signum, SIG_DFL);
2877 }
2741 2878
2742 EV_FREQUENT_CHECK; 2879 EV_FREQUENT_CHECK;
2743} 2880}
2881
2882#endif
2883
2884#if EV_CHILD_ENABLE
2744 2885
2745void 2886void
2746ev_child_start (EV_P_ ev_child *w) 2887ev_child_start (EV_P_ ev_child *w)
2747{ 2888{
2748#if EV_MULTIPLICITY 2889#if EV_MULTIPLICITY
… …
2752 return; 2893 return;
2753 2894
2754 EV_FREQUENT_CHECK; 2895 EV_FREQUENT_CHECK;
2755 2896
2756 ev_start (EV_A_ (W)w, 1); 2897 ev_start (EV_A_ (W)w, 1);
2757 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2898 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2758 2899
2759 EV_FREQUENT_CHECK; 2900 EV_FREQUENT_CHECK;
2760} 2901}
2761 2902
2762void 2903void
… …
2766 if (expect_false (!ev_is_active (w))) 2907 if (expect_false (!ev_is_active (w)))
2767 return; 2908 return;
2768 2909
2769 EV_FREQUENT_CHECK; 2910 EV_FREQUENT_CHECK;
2770 2911
2771 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2912 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2772 ev_stop (EV_A_ (W)w); 2913 ev_stop (EV_A_ (W)w);
2773 2914
2774 EV_FREQUENT_CHECK; 2915 EV_FREQUENT_CHECK;
2775} 2916}
2917
2918#endif
2776 2919
2777#if EV_STAT_ENABLE 2920#if EV_STAT_ENABLE
2778 2921
2779# ifdef _WIN32 2922# ifdef _WIN32
2780# undef lstat 2923# undef lstat
… …
2786#define MIN_STAT_INTERVAL 0.1074891 2929#define MIN_STAT_INTERVAL 0.1074891
2787 2930
2788static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2931static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2789 2932
2790#if EV_USE_INOTIFY 2933#if EV_USE_INOTIFY
2791# define EV_INOTIFY_BUFSIZE 8192 2934
2935/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2936# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2792 2937
2793static void noinline 2938static void noinline
2794infy_add (EV_P_ ev_stat *w) 2939infy_add (EV_P_ ev_stat *w)
2795{ 2940{
2796 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); 2941 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);
2797 2942
2798 if (w->wd < 0) 2943 if (w->wd >= 0)
2944 {
2945 struct statfs sfs;
2946
2947 /* now local changes will be tracked by inotify, but remote changes won't */
2948 /* unless the filesystem is known to be local, we therefore still poll */
2949 /* also do poll on <2.6.25, but with normal frequency */
2950
2951 if (!fs_2625)
2952 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2953 else if (!statfs (w->path, &sfs)
2954 && (sfs.f_type == 0x1373 /* devfs */
2955 || sfs.f_type == 0xEF53 /* ext2/3 */
2956 || sfs.f_type == 0x3153464a /* jfs */
2957 || sfs.f_type == 0x52654973 /* reiser3 */
2958 || sfs.f_type == 0x01021994 /* tempfs */
2959 || sfs.f_type == 0x58465342 /* xfs */))
2960 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2961 else
2962 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2799 { 2963 }
2964 else
2965 {
2966 /* can't use inotify, continue to stat */
2800 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2967 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2801 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2802 2968
2803 /* monitor some parent directory for speedup hints */ 2969 /* if path is not there, monitor some parent directory for speedup hints */
2804 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2970 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2805 /* but an efficiency issue only */ 2971 /* but an efficiency issue only */
2806 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2972 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2807 { 2973 {
2808 char path [4096]; 2974 char path [4096];
… …
2824 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2990 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2825 } 2991 }
2826 } 2992 }
2827 2993
2828 if (w->wd >= 0) 2994 if (w->wd >= 0)
2829 {
2830 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2995 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2831 2996
2832 /* now local changes will be tracked by inotify, but remote changes won't */ 2997 /* now re-arm timer, if required */
2833 /* unless the filesystem it known to be local, we therefore still poll */ 2998 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2834 /* also do poll on <2.6.25, but with normal frequency */
2835 struct statfs sfs;
2836
2837 if (fs_2625 && !statfs (w->path, &sfs))
2838 if (sfs.f_type == 0x1373 /* devfs */
2839 || sfs.f_type == 0xEF53 /* ext2/3 */
2840 || sfs.f_type == 0x3153464a /* jfs */
2841 || sfs.f_type == 0x52654973 /* reiser3 */
2842 || sfs.f_type == 0x01021994 /* tempfs */
2843 || sfs.f_type == 0x58465342 /* xfs */)
2844 return;
2845
2846 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2847 ev_timer_again (EV_A_ &w->timer); 2999 ev_timer_again (EV_A_ &w->timer);
2848 } 3000 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2849} 3001}
2850 3002
2851static void noinline 3003static void noinline
2852infy_del (EV_P_ ev_stat *w) 3004infy_del (EV_P_ ev_stat *w)
2853{ 3005{
… …
2856 3008
2857 if (wd < 0) 3009 if (wd < 0)
2858 return; 3010 return;
2859 3011
2860 w->wd = -2; 3012 w->wd = -2;
2861 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3013 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2862 wlist_del (&fs_hash [slot].head, (WL)w); 3014 wlist_del (&fs_hash [slot].head, (WL)w);
2863 3015
2864 /* remove this watcher, if others are watching it, they will rearm */ 3016 /* remove this watcher, if others are watching it, they will rearm */
2865 inotify_rm_watch (fs_fd, wd); 3017 inotify_rm_watch (fs_fd, wd);
2866} 3018}
… …
2868static void noinline 3020static void noinline
2869infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3021infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2870{ 3022{
2871 if (slot < 0) 3023 if (slot < 0)
2872 /* overflow, need to check for all hash slots */ 3024 /* overflow, need to check for all hash slots */
2873 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3025 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2874 infy_wd (EV_A_ slot, wd, ev); 3026 infy_wd (EV_A_ slot, wd, ev);
2875 else 3027 else
2876 { 3028 {
2877 WL w_; 3029 WL w_;
2878 3030
2879 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3031 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2880 { 3032 {
2881 ev_stat *w = (ev_stat *)w_; 3033 ev_stat *w = (ev_stat *)w_;
2882 w_ = w_->next; /* lets us remove this watcher and all before it */ 3034 w_ = w_->next; /* lets us remove this watcher and all before it */
2883 3035
2884 if (w->wd == wd || wd == -1) 3036 if (w->wd == wd || wd == -1)
2885 { 3037 {
2886 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3038 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2887 { 3039 {
2888 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3040 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2889 w->wd = -1; 3041 w->wd = -1;
2890 infy_add (EV_A_ w); /* re-add, no matter what */ 3042 infy_add (EV_A_ w); /* re-add, no matter what */
2891 } 3043 }
2892 3044
2893 stat_timer_cb (EV_A_ &w->timer, 0); 3045 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2898 3050
2899static void 3051static void
2900infy_cb (EV_P_ ev_io *w, int revents) 3052infy_cb (EV_P_ ev_io *w, int revents)
2901{ 3053{
2902 char buf [EV_INOTIFY_BUFSIZE]; 3054 char buf [EV_INOTIFY_BUFSIZE];
2903 struct inotify_event *ev = (struct inotify_event *)buf;
2904 int ofs; 3055 int ofs;
2905 int len = read (fs_fd, buf, sizeof (buf)); 3056 int len = read (fs_fd, buf, sizeof (buf));
2906 3057
2907 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3058 for (ofs = 0; ofs < len; )
3059 {
3060 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2908 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3061 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3062 ofs += sizeof (struct inotify_event) + ev->len;
3063 }
3064}
3065
3066inline_size unsigned int
3067ev_linux_version (void)
3068{
3069 struct utsname buf;
3070 unsigned int v;
3071 int i;
3072 char *p = buf.release;
3073
3074 if (uname (&buf))
3075 return 0;
3076
3077 for (i = 3+1; --i; )
3078 {
3079 unsigned int c = 0;
3080
3081 for (;;)
3082 {
3083 if (*p >= '0' && *p <= '9')
3084 c = c * 10 + *p++ - '0';
3085 else
3086 {
3087 p += *p == '.';
3088 break;
3089 }
3090 }
3091
3092 v = (v << 8) | c;
3093 }
3094
3095 return v;
2909} 3096}
2910 3097
2911inline_size void 3098inline_size void
2912check_2625 (EV_P) 3099ev_check_2625 (EV_P)
2913{ 3100{
2914 /* kernels < 2.6.25 are borked 3101 /* kernels < 2.6.25 are borked
2915 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3102 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2916 */ 3103 */
2917 struct utsname buf; 3104 if (ev_linux_version () < 0x020619)
2918 int major, minor, micro;
2919
2920 if (uname (&buf))
2921 return; 3105 return;
2922 3106
2923 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2924 return;
2925
2926 if (major < 2
2927 || (major == 2 && minor < 6)
2928 || (major == 2 && minor == 6 && micro < 25))
2929 return;
2930
2931 fs_2625 = 1; 3107 fs_2625 = 1;
3108}
3109
3110inline_size int
3111infy_newfd (void)
3112{
3113#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3114 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3115 if (fd >= 0)
3116 return fd;
3117#endif
3118 return inotify_init ();
2932} 3119}
2933 3120
2934inline_size void 3121inline_size void
2935infy_init (EV_P) 3122infy_init (EV_P)
2936{ 3123{
2937 if (fs_fd != -2) 3124 if (fs_fd != -2)
2938 return; 3125 return;
2939 3126
2940 fs_fd = -1; 3127 fs_fd = -1;
2941 3128
2942 check_2625 (EV_A); 3129 ev_check_2625 (EV_A);
2943 3130
2944 fs_fd = inotify_init (); 3131 fs_fd = infy_newfd ();
2945 3132
2946 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
2947 { 3134 {
3135 fd_intern (fs_fd);
2948 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3136 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2949 ev_set_priority (&fs_w, EV_MAXPRI); 3137 ev_set_priority (&fs_w, EV_MAXPRI);
2950 ev_io_start (EV_A_ &fs_w); 3138 ev_io_start (EV_A_ &fs_w);
3139 ev_unref (EV_A);
2951 } 3140 }
2952} 3141}
2953 3142
2954inline_size void 3143inline_size void
2955infy_fork (EV_P) 3144infy_fork (EV_P)
… …
2957 int slot; 3146 int slot;
2958 3147
2959 if (fs_fd < 0) 3148 if (fs_fd < 0)
2960 return; 3149 return;
2961 3150
3151 ev_ref (EV_A);
3152 ev_io_stop (EV_A_ &fs_w);
2962 close (fs_fd); 3153 close (fs_fd);
2963 fs_fd = inotify_init (); 3154 fs_fd = infy_newfd ();
2964 3155
3156 if (fs_fd >= 0)
3157 {
3158 fd_intern (fs_fd);
3159 ev_io_set (&fs_w, fs_fd, EV_READ);
3160 ev_io_start (EV_A_ &fs_w);
3161 ev_unref (EV_A);
3162 }
3163
2965 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3164 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2966 { 3165 {
2967 WL w_ = fs_hash [slot].head; 3166 WL w_ = fs_hash [slot].head;
2968 fs_hash [slot].head = 0; 3167 fs_hash [slot].head = 0;
2969 3168
2970 while (w_) 3169 while (w_)
… …
2975 w->wd = -1; 3174 w->wd = -1;
2976 3175
2977 if (fs_fd >= 0) 3176 if (fs_fd >= 0)
2978 infy_add (EV_A_ w); /* re-add, no matter what */ 3177 infy_add (EV_A_ w); /* re-add, no matter what */
2979 else 3178 else
3179 {
3180 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3181 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2980 ev_timer_again (EV_A_ &w->timer); 3182 ev_timer_again (EV_A_ &w->timer);
3183 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3184 }
2981 } 3185 }
2982 } 3186 }
2983} 3187}
2984 3188
2985#endif 3189#endif
… …
3002static void noinline 3206static void noinline
3003stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3207stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3004{ 3208{
3005 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3209 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3006 3210
3007 /* we copy this here each the time so that */ 3211 ev_statdata prev = w->attr;
3008 /* prev has the old value when the callback gets invoked */
3009 w->prev = w->attr;
3010 ev_stat_stat (EV_A_ w); 3212 ev_stat_stat (EV_A_ w);
3011 3213
3012 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3214 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3013 if ( 3215 if (
3014 w->prev.st_dev != w->attr.st_dev 3216 prev.st_dev != w->attr.st_dev
3015 || w->prev.st_ino != w->attr.st_ino 3217 || prev.st_ino != w->attr.st_ino
3016 || w->prev.st_mode != w->attr.st_mode 3218 || prev.st_mode != w->attr.st_mode
3017 || w->prev.st_nlink != w->attr.st_nlink 3219 || prev.st_nlink != w->attr.st_nlink
3018 || w->prev.st_uid != w->attr.st_uid 3220 || prev.st_uid != w->attr.st_uid
3019 || w->prev.st_gid != w->attr.st_gid 3221 || prev.st_gid != w->attr.st_gid
3020 || w->prev.st_rdev != w->attr.st_rdev 3222 || prev.st_rdev != w->attr.st_rdev
3021 || w->prev.st_size != w->attr.st_size 3223 || prev.st_size != w->attr.st_size
3022 || w->prev.st_atime != w->attr.st_atime 3224 || prev.st_atime != w->attr.st_atime
3023 || w->prev.st_mtime != w->attr.st_mtime 3225 || prev.st_mtime != w->attr.st_mtime
3024 || w->prev.st_ctime != w->attr.st_ctime 3226 || prev.st_ctime != w->attr.st_ctime
3025 ) { 3227 ) {
3228 /* we only update w->prev on actual differences */
3229 /* in case we test more often than invoke the callback, */
3230 /* to ensure that prev is always different to attr */
3231 w->prev = prev;
3232
3026 #if EV_USE_INOTIFY 3233 #if EV_USE_INOTIFY
3027 if (fs_fd >= 0) 3234 if (fs_fd >= 0)
3028 { 3235 {
3029 infy_del (EV_A_ w); 3236 infy_del (EV_A_ w);
3030 infy_add (EV_A_ w); 3237 infy_add (EV_A_ w);
… …
3055 3262
3056 if (fs_fd >= 0) 3263 if (fs_fd >= 0)
3057 infy_add (EV_A_ w); 3264 infy_add (EV_A_ w);
3058 else 3265 else
3059#endif 3266#endif
3267 {
3060 ev_timer_again (EV_A_ &w->timer); 3268 ev_timer_again (EV_A_ &w->timer);
3269 ev_unref (EV_A);
3270 }
3061 3271
3062 ev_start (EV_A_ (W)w, 1); 3272 ev_start (EV_A_ (W)w, 1);
3063 3273
3064 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;
3065} 3275}
… …
3074 EV_FREQUENT_CHECK; 3284 EV_FREQUENT_CHECK;
3075 3285
3076#if EV_USE_INOTIFY 3286#if EV_USE_INOTIFY
3077 infy_del (EV_A_ w); 3287 infy_del (EV_A_ w);
3078#endif 3288#endif
3289
3290 if (ev_is_active (&w->timer))
3291 {
3292 ev_ref (EV_A);
3079 ev_timer_stop (EV_A_ &w->timer); 3293 ev_timer_stop (EV_A_ &w->timer);
3294 }
3080 3295
3081 ev_stop (EV_A_ (W)w); 3296 ev_stop (EV_A_ (W)w);
3082 3297
3083 EV_FREQUENT_CHECK; 3298 EV_FREQUENT_CHECK;
3084} 3299}
… …
3129 3344
3130 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3131} 3346}
3132#endif 3347#endif
3133 3348
3349#if EV_PREPARE_ENABLE
3134void 3350void
3135ev_prepare_start (EV_P_ ev_prepare *w) 3351ev_prepare_start (EV_P_ ev_prepare *w)
3136{ 3352{
3137 if (expect_false (ev_is_active (w))) 3353 if (expect_false (ev_is_active (w)))
3138 return; 3354 return;
… …
3164 3380
3165 ev_stop (EV_A_ (W)w); 3381 ev_stop (EV_A_ (W)w);
3166 3382
3167 EV_FREQUENT_CHECK; 3383 EV_FREQUENT_CHECK;
3168} 3384}
3385#endif
3169 3386
3387#if EV_CHECK_ENABLE
3170void 3388void
3171ev_check_start (EV_P_ ev_check *w) 3389ev_check_start (EV_P_ ev_check *w)
3172{ 3390{
3173 if (expect_false (ev_is_active (w))) 3391 if (expect_false (ev_is_active (w)))
3174 return; 3392 return;
… …
3200 3418
3201 ev_stop (EV_A_ (W)w); 3419 ev_stop (EV_A_ (W)w);
3202 3420
3203 EV_FREQUENT_CHECK; 3421 EV_FREQUENT_CHECK;
3204} 3422}
3423#endif
3205 3424
3206#if EV_EMBED_ENABLE 3425#if EV_EMBED_ENABLE
3207void noinline 3426void noinline
3208ev_embed_sweep (EV_P_ ev_embed *w) 3427ev_embed_sweep (EV_P_ ev_embed *w)
3209{ 3428{
… …
3225embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3444embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3226{ 3445{
3227 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3446 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3228 3447
3229 { 3448 {
3230 struct ev_loop *loop = w->other; 3449 EV_P = w->other;
3231 3450
3232 while (fdchangecnt) 3451 while (fdchangecnt)
3233 { 3452 {
3234 fd_reify (EV_A); 3453 fd_reify (EV_A);
3235 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3454 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3243 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3462 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3244 3463
3245 ev_embed_stop (EV_A_ w); 3464 ev_embed_stop (EV_A_ w);
3246 3465
3247 { 3466 {
3248 struct ev_loop *loop = w->other; 3467 EV_P = w->other;
3249 3468
3250 ev_loop_fork (EV_A); 3469 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3470 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 } 3471 }
3253 3472
… …
3267{ 3486{
3268 if (expect_false (ev_is_active (w))) 3487 if (expect_false (ev_is_active (w)))
3269 return; 3488 return;
3270 3489
3271 { 3490 {
3272 struct ev_loop *loop = w->other; 3491 EV_P = w->other;
3273 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3492 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3274 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3493 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3275 } 3494 }
3276 3495
3277 EV_FREQUENT_CHECK; 3496 EV_FREQUENT_CHECK;
… …
3304 3523
3305 ev_io_stop (EV_A_ &w->io); 3524 ev_io_stop (EV_A_ &w->io);
3306 ev_prepare_stop (EV_A_ &w->prepare); 3525 ev_prepare_stop (EV_A_ &w->prepare);
3307 ev_fork_stop (EV_A_ &w->fork); 3526 ev_fork_stop (EV_A_ &w->fork);
3308 3527
3528 ev_stop (EV_A_ (W)w);
3529
3309 EV_FREQUENT_CHECK; 3530 EV_FREQUENT_CHECK;
3310} 3531}
3311#endif 3532#endif
3312 3533
3313#if EV_FORK_ENABLE 3534#if EV_FORK_ENABLE
… …
3389 3610
3390void 3611void
3391ev_async_send (EV_P_ ev_async *w) 3612ev_async_send (EV_P_ ev_async *w)
3392{ 3613{
3393 w->sent = 1; 3614 w->sent = 1;
3394 evpipe_write (EV_A_ &gotasync); 3615 evpipe_write (EV_A_ &async_pending);
3395} 3616}
3396#endif 3617#endif
3397 3618
3398/*****************************************************************************/ 3619/*****************************************************************************/
3399 3620
… …
3439{ 3660{
3440 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3661 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3441 3662
3442 if (expect_false (!once)) 3663 if (expect_false (!once))
3443 { 3664 {
3444 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3665 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3445 return; 3666 return;
3446 } 3667 }
3447 3668
3448 once->cb = cb; 3669 once->cb = cb;
3449 once->arg = arg; 3670 once->arg = arg;
… …
3536 if (types & EV_ASYNC) 3757 if (types & EV_ASYNC)
3537 for (i = asynccnt; i--; ) 3758 for (i = asynccnt; i--; )
3538 cb (EV_A_ EV_ASYNC, asyncs [i]); 3759 cb (EV_A_ EV_ASYNC, asyncs [i]);
3539#endif 3760#endif
3540 3761
3762#if EV_PREPARE_ENABLE
3541 if (types & EV_PREPARE) 3763 if (types & EV_PREPARE)
3542 for (i = preparecnt; i--; ) 3764 for (i = preparecnt; i--; )
3543#if EV_EMBED_ENABLE 3765# if EV_EMBED_ENABLE
3544 if (ev_cb (prepares [i]) != embed_prepare_cb) 3766 if (ev_cb (prepares [i]) != embed_prepare_cb)
3545#endif 3767# endif
3546 cb (EV_A_ EV_PREPARE, prepares [i]); 3768 cb (EV_A_ EV_PREPARE, prepares [i]);
3769#endif
3547 3770
3771#if EV_CHECK_ENABLE
3548 if (types & EV_CHECK) 3772 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; ) 3773 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]); 3774 cb (EV_A_ EV_CHECK, checks [i]);
3775#endif
3551 3776
3777#if EV_SIGNAL_ENABLE
3552 if (types & EV_SIGNAL) 3778 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i) 3779 for (i = 0; i < EV_NSIG - 1; ++i)
3554 for (wl = signals [i].head; wl; ) 3780 for (wl = signals [i].head; wl; )
3555 { 3781 {
3556 wn = wl->next; 3782 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl); 3783 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn; 3784 wl = wn;
3559 } 3785 }
3786#endif
3560 3787
3788#if EV_CHILD_ENABLE
3561 if (types & EV_CHILD) 3789 if (types & EV_CHILD)
3562 for (i = EV_PID_HASHSIZE; i--; ) 3790 for (i = (EV_PID_HASHSIZE); i--; )
3563 for (wl = childs [i]; wl; ) 3791 for (wl = childs [i]; wl; )
3564 { 3792 {
3565 wn = wl->next; 3793 wn = wl->next;
3566 cb (EV_A_ EV_CHILD, wl); 3794 cb (EV_A_ EV_CHILD, wl);
3567 wl = wn; 3795 wl = wn;
3568 } 3796 }
3797#endif
3569/* EV_STAT 0x00001000 /* stat data changed */ 3798/* EV_STAT 0x00001000 /* stat data changed */
3570/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3799/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3571} 3800}
3572#endif 3801#endif
3573 3802

Diff Legend

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