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

Comparing libev/ev.c (file contents):
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC vs.
Revision 1.347 by root, Fri Oct 15 22:44:41 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 64 236# define EV_NSIG 65
216#endif 237#endif
217 238
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
228# else 242# else
229# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
230# endif 244# endif
231#endif 245#endif
232 246
233#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
234# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
235# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
236# else 250# else
237# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
238# endif 252# endif
239#endif 253#endif
240 254
… …
242# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
243#endif 257#endif
244 258
245#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
246# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
247# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
248# else 262# else
249# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
250# endif 264# endif
251#endif 265#endif
252 266
253#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
254# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
255#endif 269#endif
256 270
257#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
258# ifdef _WIN32 272# ifdef _WIN32
259# define EV_USE_POLL 0 273# define EV_USE_POLL 0
260# else 274# else
261# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
262# endif 276# endif
263#endif 277#endif
264 278
265#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
266# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
267# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
268# else 282# else
269# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
270# endif 284# endif
271#endif 285#endif
272 286
… …
278# define EV_USE_PORT 0 292# define EV_USE_PORT 0
279#endif 293#endif
280 294
281#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
282# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
283# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
284# else 298# else
285# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
286# endif 300# endif
287#endif 301#endif
288 302
289#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
290# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
291# define EV_PID_HASHSIZE 1
292# else
293# define EV_PID_HASHSIZE 16
294# endif
295#endif 305#endif
296 306
297#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
298# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
299# define EV_INOTIFY_HASHSIZE 1
300# else
301# define EV_INOTIFY_HASHSIZE 16
302# endif
303#endif 309#endif
304 310
305#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
306# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
307# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
308# else 314# else
309# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
310# endif 316# endif
311#endif 317#endif
312 318
313#ifndef EV_USE_SIGNALFD 319#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 321# define EV_USE_SIGNALFD EV_FEATURE_OS
316# else 322# else
317# define EV_USE_SIGNALFD 0 323# define EV_USE_SIGNALFD 0
318# endif 324# endif
319#endif 325#endif
320 326
… …
323# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
324# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
325#endif 331#endif
326 332
327#ifndef EV_VERIFY 333#ifndef EV_VERIFY
328# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
329#endif 335#endif
330 336
331#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
332# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
333#endif 339#endif
334 340
335#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
336# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
337#endif 343#endif
338 344
339/* 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, */
340/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
341#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
… …
350# endif 356# endif
351#endif 357#endif
352 358
353/* 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 */
354 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
355#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
358#endif 370#endif
359 371
… …
393# include <stdint.h> 405# include <stdint.h>
394# ifndef EFD_NONBLOCK 406# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 407# define EFD_NONBLOCK O_NONBLOCK
396# endif 408# endif
397# ifndef EFD_CLOEXEC 409# ifndef EFD_CLOEXEC
410# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 411# define EFD_CLOEXEC O_CLOEXEC
412# else
413# define EFD_CLOEXEC 02000000
414# endif
399# endif 415# endif
400# ifdef __cplusplus 416# ifdef __cplusplus
401extern "C" { 417extern "C" {
402# endif 418# endif
403int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
404# ifdef __cplusplus 420# ifdef __cplusplus
405} 421}
406# endif 422# endif
407#endif 423#endif
408 424
409#if EV_USE_SIGNALFD 425#if EV_USE_SIGNALFD
410# 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
411#endif 451#endif
412 452
413/**/ 453/**/
414 454
415#if EV_VERIFY >= 3 455#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 456# define EV_FREQUENT_CHECK ev_verify (EV_A)
417#else 457#else
418# define EV_FREQUENT_CHECK do { } while (0) 458# define EV_FREQUENT_CHECK do { } while (0)
419#endif 459#endif
420 460
421/* 461/*
… …
428 */ 468 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 469#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 470
431#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) */
432#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) */
433/*#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; tv.tv_nsec = (long)((t - tv.tv_sec) * 1e9); } while (0)
434 476
435#if __GNUC__ >= 4 477#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 478# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 479# define noinline __attribute__ ((noinline))
438#else 480#else
… …
445 487
446#define expect_false(expr) expect ((expr) != 0, 0) 488#define expect_false(expr) expect ((expr) != 0, 0)
447#define expect_true(expr) expect ((expr) != 0, 1) 489#define expect_true(expr) expect ((expr) != 0, 1)
448#define inline_size static inline 490#define inline_size static inline
449 491
450#if EV_MINIMAL 492#if EV_FEATURE_CODE
493# define inline_speed static inline
494#else
451# define inline_speed static noinline 495# define inline_speed static noinline
452#else
453# define inline_speed static inline
454#endif 496#endif
455 497
456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 498#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457 499
458#if EV_MINPRI == EV_MAXPRI 500#if EV_MINPRI == EV_MAXPRI
… …
471#define ev_active(w) ((W)(w))->active 513#define ev_active(w) ((W)(w))->active
472#define ev_at(w) ((WT)(w))->at 514#define ev_at(w) ((WT)(w))->at
473 515
474#if EV_USE_REALTIME 516#if EV_USE_REALTIME
475/* 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 */
476/* giving it a reasonably high chance of working on typical architetcures */ 518/* giving it a reasonably high chance of working on typical architectures */
477static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 519static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
478#endif 520#endif
479 521
480#if EV_USE_MONOTONIC 522#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 523static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
482#endif 524#endif
483 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
484#ifdef _WIN32 536#ifdef _WIN32
485# include "ev_win32.c" 537# include "ev_win32.c"
486#endif 538#endif
487 539
488/*****************************************************************************/ 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
489 549
490static void (*syserr_cb)(const char *msg); 550static void (*syserr_cb)(const char *msg);
491 551
492void 552void
493ev_set_syserr_cb (void (*cb)(const char *msg)) 553ev_set_syserr_cb (void (*cb)(const char *msg))
… …
503 563
504 if (syserr_cb) 564 if (syserr_cb)
505 syserr_cb (msg); 565 syserr_cb (msg);
506 else 566 else
507 { 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
508 perror (msg); 576 perror (msg);
577#endif
509 abort (); 578 abort ();
510 } 579 }
511} 580}
512 581
513static void * 582static void *
514ev_realloc_emul (void *ptr, long size) 583ev_realloc_emul (void *ptr, long size)
515{ 584{
585#if __GLIBC__
586 return realloc (ptr, size);
587#else
516 /* some systems, notably openbsd and darwin, fail to properly 588 /* some systems, notably openbsd and darwin, fail to properly
517 * 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
518 * the single unix specification, so work around them here. 590 * the single unix specification, so work around them here.
519 */ 591 */
520 592
521 if (size) 593 if (size)
522 return realloc (ptr, size); 594 return realloc (ptr, size);
523 595
524 free (ptr); 596 free (ptr);
525 return 0; 597 return 0;
598#endif
526} 599}
527 600
528static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 601static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
529 602
530void 603void
… …
538{ 611{
539 ptr = alloc (ptr, size); 612 ptr = alloc (ptr, size);
540 613
541 if (!ptr && size) 614 if (!ptr && size)
542 { 615 {
616#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n");
618#else
543 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
620#endif
544 abort (); 621 abort ();
545 } 622 }
546 623
547 return ptr; 624 return ptr;
548} 625}
… …
630 707
631 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
632 709
633#endif 710#endif
634 711
635#if EV_MINIMAL < 2 712#if EV_FEATURE_API
636# 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)
637# 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)
638# define EV_INVOKE_PENDING invoke_cb (EV_A) 715# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else 716#else
640# define EV_RELEASE_CB (void)0 717# define EV_RELEASE_CB (void)0
… …
694 if (delay > 0.) 771 if (delay > 0.)
695 { 772 {
696#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
697 struct timespec ts; 774 struct timespec ts;
698 775
699 ts.tv_sec = (time_t)delay; 776 EV_SET_TS (ts, delay);
700 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
701
702 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
703#elif defined(_WIN32) 778#elif defined(_WIN32)
704 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
705#else 780#else
706 struct timeval tv; 781 struct timeval tv;
707 782
708 tv.tv_sec = (time_t)delay;
709 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
710
711 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
712 /* something not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
713 /* by older ones */ 785 /* by older ones */
786 EV_SET_TV (tv, delay);
714 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
715#endif 788#endif
716 } 789 }
717} 790}
718 791
719/*****************************************************************************/ 792/*****************************************************************************/
720 793
721#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 */
722 795
723/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
724/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
725inline_size int 798inline_size int
726array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
727{ 800{
728 int ncur = cur + 1; 801 int ncur = cur + 1;
729 802
… …
825} 898}
826 899
827/*****************************************************************************/ 900/*****************************************************************************/
828 901
829inline_speed void 902inline_speed void
830fd_event_nc (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
831{ 904{
832 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
833 ev_io *w; 906 ev_io *w;
834 907
835 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)
… …
847fd_event (EV_P_ int fd, int revents) 920fd_event (EV_P_ int fd, int revents)
848{ 921{
849 ANFD *anfd = anfds + fd; 922 ANFD *anfd = anfds + fd;
850 923
851 if (expect_true (!anfd->reify)) 924 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
853} 926}
854 927
855void 928void
856ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
857{ 930{
858 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
859 fd_event_nc (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
860} 933}
861 934
862/* make sure the external fd watch events are in-sync */ 935/* make sure the external fd watch events are in-sync */
863/* with the kernel/libev internal state */ 936/* with the kernel/libev internal state */
864inline_size void 937inline_size void
… …
879 952
880#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
881 if (events) 954 if (events)
882 { 955 {
883 unsigned long arg; 956 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
886 #else
887 anfd->handle = _get_osfhandle (fd);
888 #endif
889 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
890 } 959 }
891#endif 960#endif
892 961
893 { 962 {
… …
931 ev_io_stop (EV_A_ w); 1000 ev_io_stop (EV_A_ w);
932 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);
933 } 1002 }
934} 1003}
935 1004
936/* check whether the given fd is atcually valid, for error recovery */ 1005/* check whether the given fd is actually valid, for error recovery */
937inline_size int 1006inline_size int
938fd_valid (int fd) 1007fd_valid (int fd)
939{ 1008{
940#ifdef _WIN32 1009#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 1010 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 1011#else
943 return fcntl (fd, F_GETFD) != -1; 1012 return fcntl (fd, F_GETFD) != -1;
944#endif 1013#endif
945} 1014}
946 1015
… …
964 1033
965 for (fd = anfdmax; fd--; ) 1034 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1035 if (anfds [fd].events)
967 { 1036 {
968 fd_kill (EV_A_ fd); 1037 fd_kill (EV_A_ fd);
969 return; 1038 break;
970 } 1039 }
971} 1040}
972 1041
973/* 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 */
974static void noinline 1043static void noinline
… …
983 anfds [fd].emask = 0; 1052 anfds [fd].emask = 0;
984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1053 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
985 } 1054 }
986} 1055}
987 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
988/*****************************************************************************/ 1071/*****************************************************************************/
989 1072
990/* 1073/*
991 * 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
992 * 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
993 * the branching factor of the d-tree. 1076 * the branching factor of the d-tree.
994 */ 1077 */
995 1078
996/* 1079/*
… …
1064 1147
1065 for (;;) 1148 for (;;)
1066 { 1149 {
1067 int c = k << 1; 1150 int c = k << 1;
1068 1151
1069 if (c > N + HEAP0 - 1) 1152 if (c >= N + HEAP0)
1070 break; 1153 break;
1071 1154
1072 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])
1073 ? 1 : 0; 1156 ? 1 : 0;
1074 1157
… …
1110 1193
1111/* move an element suitably so it is in a correct place */ 1194/* move an element suitably so it is in a correct place */
1112inline_size void 1195inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1196adjustheap (ANHE *heap, int N, int k)
1114{ 1197{
1115 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)]))
1116 upheap (heap, k); 1199 upheap (heap, k);
1117 else 1200 else
1118 downheap (heap, N, k); 1201 downheap (heap, N, k);
1119} 1202}
1120 1203
… …
1133/*****************************************************************************/ 1216/*****************************************************************************/
1134 1217
1135/* associate signal watchers to a signal signal */ 1218/* associate signal watchers to a signal signal */
1136typedef struct 1219typedef struct
1137{ 1220{
1221 EV_ATOMIC_T pending;
1222#if EV_MULTIPLICITY
1223 EV_P;
1224#endif
1138 WL head; 1225 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1226} ANSIG;
1141 1227
1142static ANSIG *signals; 1228static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1229
1147/*****************************************************************************/ 1230/*****************************************************************************/
1148 1231
1149/* used to prepare libev internal fd's */ 1232#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1150/* this is not fork-safe */
1151inline_speed void
1152fd_intern (int fd)
1153{
1154#ifdef _WIN32
1155 unsigned long arg = 1;
1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1157#else
1158 fcntl (fd, F_SETFD, FD_CLOEXEC);
1159 fcntl (fd, F_SETFL, O_NONBLOCK);
1160#endif
1161}
1162 1233
1163static void noinline 1234static void noinline
1164evpipe_init (EV_P) 1235evpipe_init (EV_P)
1165{ 1236{
1166 if (!ev_is_active (&pipe_w)) 1237 if (!ev_is_active (&pipe_w))
1167 { 1238 {
1168#if EV_USE_EVENTFD 1239# if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1240 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL) 1241 if (evfd < 0 && errno == EINVAL)
1171 evfd = eventfd (0, 0); 1242 evfd = eventfd (0, 0);
1172 1243
1173 if (evfd >= 0) 1244 if (evfd >= 0)
… …
1175 evpipe [0] = -1; 1246 evpipe [0] = -1;
1176 fd_intern (evfd); /* doing it twice doesn't hurt */ 1247 fd_intern (evfd); /* doing it twice doesn't hurt */
1177 ev_io_set (&pipe_w, evfd, EV_READ); 1248 ev_io_set (&pipe_w, evfd, EV_READ);
1178 } 1249 }
1179 else 1250 else
1180#endif 1251# endif
1181 { 1252 {
1182 while (pipe (evpipe)) 1253 while (pipe (evpipe))
1183 ev_syserr ("(libev) error creating signal/async pipe"); 1254 ev_syserr ("(libev) error creating signal/async pipe");
1184 1255
1185 fd_intern (evpipe [0]); 1256 fd_intern (evpipe [0]);
… …
1196evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1267evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1197{ 1268{
1198 if (!*flag) 1269 if (!*flag)
1199 { 1270 {
1200 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;
1201 1273
1202 *flag = 1; 1274 *flag = 1;
1203 1275
1204#if EV_USE_EVENTFD 1276#if EV_USE_EVENTFD
1205 if (evfd >= 0) 1277 if (evfd >= 0)
… …
1207 uint64_t counter = 1; 1279 uint64_t counter = 1;
1208 write (evfd, &counter, sizeof (uint64_t)); 1280 write (evfd, &counter, sizeof (uint64_t));
1209 } 1281 }
1210 else 1282 else
1211#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. */
1212 write (evpipe [1], &old_errno, 1); 1289 write (evpipe [1], &dummy, 1);
1213 1290
1214 errno = old_errno; 1291 errno = old_errno;
1215 } 1292 }
1216} 1293}
1217 1294
1218/* called whenever the libev signal pipe */ 1295/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1296/* got some events (signal, async) */
1220static void 1297static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1298pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1299{
1300 int i;
1301
1223#if EV_USE_EVENTFD 1302#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1303 if (evfd >= 0)
1225 { 1304 {
1226 uint64_t counter; 1305 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1306 read (evfd, &counter, sizeof (uint64_t));
1228 } 1307 }
1229 else 1308 else
1230#endif 1309#endif
1231 { 1310 {
1232 char dummy; 1311 char dummy;
1312 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1233 read (evpipe [0], &dummy, 1); 1313 read (evpipe [0], &dummy, 1);
1234 } 1314 }
1235 1315
1236 if (gotsig && ev_is_default_loop (EV_A)) 1316 if (sig_pending)
1237 { 1317 {
1238 int signum; 1318 sig_pending = 0;
1239 gotsig = 0;
1240 1319
1241 for (signum = signalmax; signum--; ) 1320 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1321 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1322 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1323 }
1245 1324
1246#if EV_ASYNC_ENABLE 1325#if EV_ASYNC_ENABLE
1247 if (gotasync) 1326 if (async_pending)
1248 { 1327 {
1249 int i; 1328 async_pending = 0;
1250 gotasync = 0;
1251 1329
1252 for (i = asynccnt; i--; ) 1330 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1331 if (asyncs [i]->sent)
1254 { 1332 {
1255 asyncs [i]->sent = 0; 1333 asyncs [i]->sent = 0;
… …
1263 1341
1264static void 1342static void
1265ev_sighandler (int signum) 1343ev_sighandler (int signum)
1266{ 1344{
1267#if EV_MULTIPLICITY 1345#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1346 EV_P = signals [signum - 1].loop;
1269#endif 1347#endif
1270 1348
1271#if _WIN32 1349#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1350 signal (signum, ev_sighandler);
1273#endif 1351#endif
1274 1352
1275 signals [signum - 1].gotsig = 1; 1353 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1354 evpipe_write (EV_A_ &sig_pending);
1277} 1355}
1278 1356
1279void noinline 1357void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1358ev_feed_signal_event (EV_P_ int signum)
1281{ 1359{
1282 WL w; 1360 WL w;
1283 1361
1362 if (expect_false (signum <= 0 || signum > EV_NSIG))
1363 return;
1364
1365 --signum;
1366
1284#if EV_MULTIPLICITY 1367#if EV_MULTIPLICITY
1285 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 */
1286#endif 1369 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1370
1288 --signum; 1371 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1372 return;
1373#endif
1292 1374
1293 signals [signum].gotsig = 0; 1375 signals [signum].pending = 0;
1294 1376
1295 for (w = signals [signum].head; w; w = w->next) 1377 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1378 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1379}
1298 1380
1299#if EV_USE_SIGNALFD 1381#if EV_USE_SIGNALFD
1300static void 1382static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1383sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1384{
1303 struct signalfd_siginfo si[4], *sip; 1385 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1386
1305 for (;;) 1387 for (;;)
1306 { 1388 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1389 ssize_t res = read (sigfd, si, sizeof (si));
1308 1390
… …
1314 break; 1396 break;
1315 } 1397 }
1316} 1398}
1317#endif 1399#endif
1318 1400
1401#endif
1402
1319/*****************************************************************************/ 1403/*****************************************************************************/
1320 1404
1405#if EV_CHILD_ENABLE
1321static WL childs [EV_PID_HASHSIZE]; 1406static WL childs [EV_PID_HASHSIZE];
1322
1323#ifndef _WIN32
1324 1407
1325static ev_signal childev; 1408static ev_signal childev;
1326 1409
1327#ifndef WIFCONTINUED 1410#ifndef WIFCONTINUED
1328# define WIFCONTINUED(status) 0 1411# define WIFCONTINUED(status) 0
… …
1333child_reap (EV_P_ int chain, int pid, int status) 1416child_reap (EV_P_ int chain, int pid, int status)
1334{ 1417{
1335 ev_child *w; 1418 ev_child *w;
1336 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1419 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1337 1420
1338 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)
1339 { 1422 {
1340 if ((w->pid == pid || !w->pid) 1423 if ((w->pid == pid || !w->pid)
1341 && (!traced || (w->flags & 1))) 1424 && (!traced || (w->flags & 1)))
1342 { 1425 {
1343 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 */
… …
1368 /* 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 */
1369 /* 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 */
1370 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1453 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1371 1454
1372 child_reap (EV_A_ pid, pid, status); 1455 child_reap (EV_A_ pid, pid, status);
1373 if (EV_PID_HASHSIZE > 1) 1456 if ((EV_PID_HASHSIZE) > 1)
1374 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 */
1375} 1458}
1376 1459
1377#endif 1460#endif
1378 1461
… …
1445#ifdef __APPLE__ 1528#ifdef __APPLE__
1446 /* only select works correctly on that "unix-certified" platform */ 1529 /* only select works correctly on that "unix-certified" platform */
1447 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1530 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1448 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 */
1449#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
1450 1536
1451 return flags; 1537 return flags;
1452} 1538}
1453 1539
1454unsigned int 1540unsigned int
… …
1467ev_backend (EV_P) 1553ev_backend (EV_P)
1468{ 1554{
1469 return backend; 1555 return backend;
1470} 1556}
1471 1557
1472#if EV_MINIMAL < 2 1558#if EV_FEATURE_API
1473unsigned int 1559unsigned int
1474ev_loop_count (EV_P) 1560ev_iteration (EV_P)
1475{ 1561{
1476 return loop_count; 1562 return loop_count;
1477} 1563}
1478 1564
1479unsigned int 1565unsigned int
1480ev_loop_depth (EV_P) 1566ev_depth (EV_P)
1481{ 1567{
1482 return loop_depth; 1568 return loop_depth;
1483} 1569}
1484 1570
1485void 1571void
… …
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1628 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1629 have_monotonic = 1;
1544 } 1630 }
1545#endif 1631#endif
1546 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
1547 ev_rt_now = ev_time (); 1644 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1645 mn_now = get_clock ();
1549 now_floor = mn_now; 1646 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1647 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1648#if EV_FEATURE_API
1552 invoke_cb = ev_invoke_pending; 1649 invoke_cb = ev_invoke_pending;
1553#endif 1650#endif
1554 1651
1555 io_blocktime = 0.; 1652 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1653 timeout_blocktime = 0.;
1557 backend = 0; 1654 backend = 0;
1558 backend_fd = -1; 1655 backend_fd = -1;
1559 gotasync = 0; 1656 sig_pending = 0;
1657#if EV_ASYNC_ENABLE
1658 async_pending = 0;
1659#endif
1560#if EV_USE_INOTIFY 1660#if EV_USE_INOTIFY
1561 fs_fd = -2; 1661 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1662#endif
1563#if EV_USE_SIGNALFD 1663#if EV_USE_SIGNALFD
1564 sigfd = -2; 1664 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1665#endif
1566
1567 /* pid check not overridable via env */
1568#ifndef _WIN32
1569 if (flags & EVFLAG_FORKCHECK)
1570 curpid = getpid ();
1571#endif
1572
1573 if (!(flags & EVFLAG_NOENV)
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577 1666
1578 if (!(flags & 0x0000ffffU)) 1667 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1668 flags |= ev_recommended_backends ();
1580 1669
1581#if EV_USE_PORT 1670#if EV_USE_PORT
… …
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1683 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1684#endif
1596 1685
1597 ev_prepare_init (&pending_w, pendingcb); 1686 ev_prepare_init (&pending_w, pendingcb);
1598 1687
1688#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1689 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1690 ev_set_priority (&pipe_w, EV_MAXPRI);
1691#endif
1601 } 1692 }
1602} 1693}
1603 1694
1604/* free up a loop structure */ 1695/* free up a loop structure */
1605static void noinline 1696static void noinline
… …
1617 close (evfd); 1708 close (evfd);
1618#endif 1709#endif
1619 1710
1620 if (evpipe [0] >= 0) 1711 if (evpipe [0] >= 0)
1621 { 1712 {
1622 close (evpipe [0]); 1713 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1714 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1715 }
1625 } 1716 }
1626 1717
1627#if EV_USE_SIGNALFD 1718#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1719 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1720 close (sigfd);
1634 }
1635#endif 1721#endif
1636 1722
1637#if EV_USE_INOTIFY 1723#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1724 if (fs_fd >= 0)
1639 close (fs_fd); 1725 close (fs_fd);
… …
1709 1795
1710 if (ev_is_active (&pipe_w)) 1796 if (ev_is_active (&pipe_w))
1711 { 1797 {
1712 /* this "locks" the handlers against writing to the pipe */ 1798 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1799 /* while we modify the fd vars */
1714 gotsig = 1; 1800 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1801#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1802 async_pending = 1;
1717#endif 1803#endif
1718 1804
1719 ev_ref (EV_A); 1805 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1806 ev_io_stop (EV_A_ &pipe_w);
1721 1807
… …
1724 close (evfd); 1810 close (evfd);
1725#endif 1811#endif
1726 1812
1727 if (evpipe [0] >= 0) 1813 if (evpipe [0] >= 0)
1728 { 1814 {
1729 close (evpipe [0]); 1815 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1816 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1817 }
1732 1818
1819#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1820 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1821 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1822 pipecb (EV_A_ &pipe_w, EV_READ);
1823#endif
1736 } 1824 }
1737 1825
1738 postfork = 0; 1826 postfork = 0;
1739} 1827}
1740 1828
1741#if EV_MULTIPLICITY 1829#if EV_MULTIPLICITY
1742 1830
1743struct ev_loop * 1831struct ev_loop *
1744ev_loop_new (unsigned int flags) 1832ev_loop_new (unsigned int flags)
1745{ 1833{
1746 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));
1747 1835
1748 memset (loop, 0, sizeof (struct ev_loop)); 1836 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1837 loop_init (EV_A_ flags);
1750 1838
1751 if (ev_backend (EV_A)) 1839 if (ev_backend (EV_A))
1752 return loop; 1840 return EV_A;
1753 1841
1754 return 0; 1842 return 0;
1755} 1843}
1756 1844
1757void 1845void
… …
1802 verify_watcher (EV_A_ ws [cnt]); 1890 verify_watcher (EV_A_ ws [cnt]);
1803 } 1891 }
1804} 1892}
1805#endif 1893#endif
1806 1894
1807#if EV_MINIMAL < 2 1895#if EV_FEATURE_API
1808void 1896void
1809ev_loop_verify (EV_P) 1897ev_verify (EV_P)
1810{ 1898{
1811#if EV_VERIFY 1899#if EV_VERIFY
1812 int i; 1900 int i;
1813 WL w; 1901 WL w;
1814 1902
… …
1853#if EV_ASYNC_ENABLE 1941#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 1942 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 1943 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 1944#endif
1857 1945
1946#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 1947 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 1948 array_verify (EV_A_ (W *)prepares, preparecnt);
1949#endif
1860 1950
1951#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 1952 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1953 array_verify (EV_A_ (W *)checks, checkcnt);
1954#endif
1863 1955
1864# if 0 1956# if 0
1957#if EV_CHILD_ENABLE
1865 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)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1959 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1960#endif
1867# endif 1961# endif
1868#endif 1962#endif
1869} 1963}
1870#endif 1964#endif
1871 1965
… …
1878#endif 1972#endif
1879{ 1973{
1880 if (!ev_default_loop_ptr) 1974 if (!ev_default_loop_ptr)
1881 { 1975 {
1882#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1977 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1978#else
1885 ev_default_loop_ptr = 1; 1979 ev_default_loop_ptr = 1;
1886#endif 1980#endif
1887 1981
1888 loop_init (EV_A_ flags); 1982 loop_init (EV_A_ flags);
1889 1983
1890 if (ev_backend (EV_A)) 1984 if (ev_backend (EV_A))
1891 { 1985 {
1892#ifndef _WIN32 1986#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 1987 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 1988 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 1989 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1990 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 1991#endif
… …
1905 1999
1906void 2000void
1907ev_default_destroy (void) 2001ev_default_destroy (void)
1908{ 2002{
1909#if EV_MULTIPLICITY 2003#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 2004 EV_P = ev_default_loop_ptr;
1911#endif 2005#endif
1912 2006
1913 ev_default_loop_ptr = 0; 2007 ev_default_loop_ptr = 0;
1914 2008
1915#ifndef _WIN32 2009#if EV_CHILD_ENABLE
1916 ev_ref (EV_A); /* child watcher */ 2010 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev); 2011 ev_signal_stop (EV_A_ &childev);
1918#endif 2012#endif
1919 2013
1920 loop_destroy (EV_A); 2014 loop_destroy (EV_A);
… …
1922 2016
1923void 2017void
1924ev_default_fork (void) 2018ev_default_fork (void)
1925{ 2019{
1926#if EV_MULTIPLICITY 2020#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 2021 EV_P = ev_default_loop_ptr;
1928#endif 2022#endif
1929 2023
1930 postfork = 1; /* must be in line with ev_loop_fork */ 2024 postfork = 1; /* must be in line with ev_loop_fork */
1931} 2025}
1932 2026
… …
2026 EV_FREQUENT_CHECK; 2120 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2121 feed_reverse (EV_A_ (W)w);
2028 } 2122 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2123 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2124
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2125 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2126 }
2033} 2127}
2034 2128
2035#if EV_PERIODIC_ENABLE 2129#if EV_PERIODIC_ENABLE
2036/* make periodics pending */ 2130/* make periodics pending */
… …
2089 feed_reverse_done (EV_A_ EV_PERIODIC); 2183 feed_reverse_done (EV_A_ EV_PERIODIC);
2090 } 2184 }
2091} 2185}
2092 2186
2093/* simply recalculate all periodics */ 2187/* simply recalculate all periodics */
2094/* 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? */
2095static void noinline 2189static void noinline
2096periodics_reschedule (EV_P) 2190periodics_reschedule (EV_P)
2097{ 2191{
2098 int i; 2192 int i;
2099 2193
… …
2127 ANHE_at_cache (*he); 2221 ANHE_at_cache (*he);
2128 } 2222 }
2129} 2223}
2130 2224
2131/* fetch new monotonic and realtime times from the kernel */ 2225/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2226/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2227inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2228time_update (EV_P_ ev_tstamp max_block)
2135{ 2229{
2136#if EV_USE_MONOTONIC 2230#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2231 if (expect_true (have_monotonic))
… …
2197} 2291}
2198 2292
2199void 2293void
2200ev_loop (EV_P_ int flags) 2294ev_loop (EV_P_ int flags)
2201{ 2295{
2202#if EV_MINIMAL < 2 2296#if EV_FEATURE_API
2203 ++loop_depth; 2297 ++loop_depth;
2204#endif 2298#endif
2205 2299
2206 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));
2207 2301
… …
2210 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 */
2211 2305
2212 do 2306 do
2213 { 2307 {
2214#if EV_VERIFY >= 2 2308#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2309 ev_verify (EV_A);
2216#endif 2310#endif
2217 2311
2218#ifndef _WIN32 2312#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2313 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2314 if (expect_false (getpid () != curpid))
… …
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2326 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2327 EV_INVOKE_PENDING;
2234 } 2328 }
2235#endif 2329#endif
2236 2330
2331#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2332 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2333 if (expect_false (preparecnt))
2239 { 2334 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2335 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2336 EV_INVOKE_PENDING;
2242 } 2337 }
2338#endif
2243 2339
2244 if (expect_false (loop_done)) 2340 if (expect_false (loop_done))
2245 break; 2341 break;
2246 2342
2247 /* we might have forked, so reify kernel state if necessary */ 2343 /* we might have forked, so reify kernel state if necessary */
… …
2298 waittime -= sleeptime; 2394 waittime -= sleeptime;
2299 } 2395 }
2300 } 2396 }
2301 } 2397 }
2302 2398
2303#if EV_MINIMAL < 2 2399#if EV_FEATURE_API
2304 ++loop_count; 2400 ++loop_count;
2305#endif 2401#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2402 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2403 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2404 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2320#if EV_IDLE_ENABLE 2416#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2417 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2418 idle_reify (EV_A);
2323#endif 2419#endif
2324 2420
2421#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2422 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2423 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2424 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2425#endif
2328 2426
2329 EV_INVOKE_PENDING; 2427 EV_INVOKE_PENDING;
2330 } 2428 }
2331 while (expect_true ( 2429 while (expect_true (
2332 activecnt 2430 activecnt
… …
2335 )); 2433 ));
2336 2434
2337 if (loop_done == EVUNLOOP_ONE) 2435 if (loop_done == EVUNLOOP_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2436 loop_done = EVUNLOOP_CANCEL;
2339 2437
2340#if EV_MINIMAL < 2 2438#if EV_FEATURE_API
2341 --loop_depth; 2439 --loop_depth;
2342#endif 2440#endif
2343} 2441}
2344 2442
2345void 2443void
… …
2398inline_size void 2496inline_size void
2399wlist_del (WL *head, WL elem) 2497wlist_del (WL *head, WL elem)
2400{ 2498{
2401 while (*head) 2499 while (*head)
2402 { 2500 {
2403 if (*head == elem) 2501 if (expect_true (*head == elem))
2404 { 2502 {
2405 *head = elem->next; 2503 *head = elem->next;
2406 return; 2504 break;
2407 } 2505 }
2408 2506
2409 head = &(*head)->next; 2507 head = &(*head)->next;
2410 } 2508 }
2411} 2509}
… …
2471 2569
2472 if (expect_false (ev_is_active (w))) 2570 if (expect_false (ev_is_active (w)))
2473 return; 2571 return;
2474 2572
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2573 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2574 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2575
2478 EV_FREQUENT_CHECK; 2576 EV_FREQUENT_CHECK;
2479 2577
2480 ev_start (EV_A_ (W)w, 1); 2578 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2579 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2551 timers [active] = timers [timercnt + HEAP0]; 2649 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2650 adjustheap (timers, timercnt, active);
2553 } 2651 }
2554 } 2652 }
2555 2653
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2654 ev_at (w) -= mn_now;
2559 2655
2560 ev_stop (EV_A_ (W)w); 2656 ev_stop (EV_A_ (W)w);
2657
2658 EV_FREQUENT_CHECK;
2561} 2659}
2562 2660
2563void noinline 2661void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2662ev_timer_again (EV_P_ ev_timer *w)
2565{ 2663{
… …
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2742 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2743 adjustheap (periodics, periodiccnt, active);
2646 } 2744 }
2647 } 2745 }
2648 2746
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2747 ev_stop (EV_A_ (W)w);
2748
2749 EV_FREQUENT_CHECK;
2652} 2750}
2653 2751
2654void noinline 2752void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2753ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2754{
… …
2662 2760
2663#ifndef SA_RESTART 2761#ifndef SA_RESTART
2664# define SA_RESTART 0 2762# define SA_RESTART 0
2665#endif 2763#endif
2666 2764
2765#if EV_SIGNAL_ENABLE
2766
2667void noinline 2767void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2768ev_signal_start (EV_P_ ev_signal *w)
2669{ 2769{
2670#if EV_MULTIPLICITY
2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2672#endif
2673 if (expect_false (ev_is_active (w))) 2770 if (expect_false (ev_is_active (w)))
2674 return; 2771 return;
2675 2772
2676 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
2677 2781
2678 EV_FREQUENT_CHECK; 2782 EV_FREQUENT_CHECK;
2679 2783
2680#if EV_USE_SIGNALFD 2784#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2785 if (sigfd == -2)
… …
2703 sigaddset (&sigfd_set, w->signum); 2807 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2808 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2809
2706 signalfd (sigfd, &sigfd_set, 0); 2810 signalfd (sigfd, &sigfd_set, 0);
2707 } 2811 }
2708 else
2709#endif
2710 evpipe_init (EV_A);
2711
2712 {
2713#ifndef _WIN32
2714 sigset_t full, prev;
2715 sigfillset (&full);
2716 sigprocmask (SIG_SETMASK, &full, &prev);
2717#endif
2718
2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2720
2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif 2812#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2813
2730 ev_start (EV_A_ (W)w, 1); 2814 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2815 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2816
2733 if (!((WL)w)->next) 2817 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2818# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2819 if (sigfd < 0) /*TODO*/
2740# endif 2820# endif
2741 { 2821 {
2822# ifdef _WIN32
2823 evpipe_init (EV_A);
2824
2825 signal (w->signum, ev_sighandler);
2826# else
2742 struct sigaction sa = { }; 2827 struct sigaction sa;
2828
2829 evpipe_init (EV_A);
2830
2743 sa.sa_handler = ev_sighandler; 2831 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2832 sigfillset (&sa.sa_mask);
2745 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 */
2746 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
2747 } 2840 }
2748#endif
2749 }
2750 2841
2751 EV_FREQUENT_CHECK; 2842 EV_FREQUENT_CHECK;
2752} 2843}
2753 2844
2754void noinline 2845void noinline
… …
2762 2853
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2854 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2855 ev_stop (EV_A_ (W)w);
2765 2856
2766 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
2767#if EV_USE_SIGNALFD 2862#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2863 if (sigfd >= 0)
2769 { 2864 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2865 sigset_t ss;
2866
2867 sigemptyset (&ss);
2868 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2869 sigdelset (&sigfd_set, w->signum);
2870
2772 signalfd (sigfd, &sigfd_set, 0); 2871 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2872 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2873 }
2776 else 2874 else
2777#endif 2875#endif
2778 signal (w->signum, SIG_DFL); 2876 signal (w->signum, SIG_DFL);
2877 }
2779 2878
2780 EV_FREQUENT_CHECK; 2879 EV_FREQUENT_CHECK;
2781} 2880}
2881
2882#endif
2883
2884#if EV_CHILD_ENABLE
2782 2885
2783void 2886void
2784ev_child_start (EV_P_ ev_child *w) 2887ev_child_start (EV_P_ ev_child *w)
2785{ 2888{
2786#if EV_MULTIPLICITY 2889#if EV_MULTIPLICITY
… …
2790 return; 2893 return;
2791 2894
2792 EV_FREQUENT_CHECK; 2895 EV_FREQUENT_CHECK;
2793 2896
2794 ev_start (EV_A_ (W)w, 1); 2897 ev_start (EV_A_ (W)w, 1);
2795 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2898 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2796 2899
2797 EV_FREQUENT_CHECK; 2900 EV_FREQUENT_CHECK;
2798} 2901}
2799 2902
2800void 2903void
… …
2804 if (expect_false (!ev_is_active (w))) 2907 if (expect_false (!ev_is_active (w)))
2805 return; 2908 return;
2806 2909
2807 EV_FREQUENT_CHECK; 2910 EV_FREQUENT_CHECK;
2808 2911
2809 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2912 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2810 ev_stop (EV_A_ (W)w); 2913 ev_stop (EV_A_ (W)w);
2811 2914
2812 EV_FREQUENT_CHECK; 2915 EV_FREQUENT_CHECK;
2813} 2916}
2917
2918#endif
2814 2919
2815#if EV_STAT_ENABLE 2920#if EV_STAT_ENABLE
2816 2921
2817# ifdef _WIN32 2922# ifdef _WIN32
2818# undef lstat 2923# undef lstat
… …
2824#define MIN_STAT_INTERVAL 0.1074891 2929#define MIN_STAT_INTERVAL 0.1074891
2825 2930
2826static 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);
2827 2932
2828#if EV_USE_INOTIFY 2933#if EV_USE_INOTIFY
2829# 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)
2830 2937
2831static void noinline 2938static void noinline
2832infy_add (EV_P_ ev_stat *w) 2939infy_add (EV_P_ ev_stat *w)
2833{ 2940{
2834 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 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);
2835 2942
2836 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 */
2837 { 2963 }
2964 else
2965 {
2966 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2967 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2839 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2840 2968
2841 /* monitor some parent directory for speedup hints */ 2969 /* if path is not there, monitor some parent directory for speedup hints */
2842 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2970 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 2971 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2972 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 2973 {
2846 char path [4096]; 2974 char path [4096];
… …
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2990 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 2991 }
2864 } 2992 }
2865 2993
2866 if (w->wd >= 0) 2994 if (w->wd >= 0)
2867 {
2868 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);
2869 2996
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2997 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2998 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 /* also do poll on <2.6.25, but with normal frequency */
2873 struct statfs sfs;
2874
2875 if (fs_2625 && !statfs (w->path, &sfs))
2876 if (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */)
2882 return;
2883
2884 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2885 ev_timer_again (EV_A_ &w->timer); 2999 ev_timer_again (EV_A_ &w->timer);
2886 } 3000 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 3001}
2888 3002
2889static void noinline 3003static void noinline
2890infy_del (EV_P_ ev_stat *w) 3004infy_del (EV_P_ ev_stat *w)
2891{ 3005{
… …
2894 3008
2895 if (wd < 0) 3009 if (wd < 0)
2896 return; 3010 return;
2897 3011
2898 w->wd = -2; 3012 w->wd = -2;
2899 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3013 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2900 wlist_del (&fs_hash [slot].head, (WL)w); 3014 wlist_del (&fs_hash [slot].head, (WL)w);
2901 3015
2902 /* remove this watcher, if others are watching it, they will rearm */ 3016 /* remove this watcher, if others are watching it, they will rearm */
2903 inotify_rm_watch (fs_fd, wd); 3017 inotify_rm_watch (fs_fd, wd);
2904} 3018}
… …
2906static void noinline 3020static void noinline
2907infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3021infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2908{ 3022{
2909 if (slot < 0) 3023 if (slot < 0)
2910 /* overflow, need to check for all hash slots */ 3024 /* overflow, need to check for all hash slots */
2911 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3025 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2912 infy_wd (EV_A_ slot, wd, ev); 3026 infy_wd (EV_A_ slot, wd, ev);
2913 else 3027 else
2914 { 3028 {
2915 WL w_; 3029 WL w_;
2916 3030
2917 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3031 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2918 { 3032 {
2919 ev_stat *w = (ev_stat *)w_; 3033 ev_stat *w = (ev_stat *)w_;
2920 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 */
2921 3035
2922 if (w->wd == wd || wd == -1) 3036 if (w->wd == wd || wd == -1)
2923 { 3037 {
2924 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3038 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2925 { 3039 {
2926 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);
2927 w->wd = -1; 3041 w->wd = -1;
2928 infy_add (EV_A_ w); /* re-add, no matter what */ 3042 infy_add (EV_A_ w); /* re-add, no matter what */
2929 } 3043 }
2930 3044
2931 stat_timer_cb (EV_A_ &w->timer, 0); 3045 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2936 3050
2937static void 3051static void
2938infy_cb (EV_P_ ev_io *w, int revents) 3052infy_cb (EV_P_ ev_io *w, int revents)
2939{ 3053{
2940 char buf [EV_INOTIFY_BUFSIZE]; 3054 char buf [EV_INOTIFY_BUFSIZE];
2941 struct inotify_event *ev = (struct inotify_event *)buf;
2942 int ofs; 3055 int ofs;
2943 int len = read (fs_fd, buf, sizeof (buf)); 3056 int len = read (fs_fd, buf, sizeof (buf));
2944 3057
2945 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);
2946 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;
2947} 3096}
2948 3097
2949inline_size void 3098inline_size void
2950check_2625 (EV_P) 3099ev_check_2625 (EV_P)
2951{ 3100{
2952 /* kernels < 2.6.25 are borked 3101 /* kernels < 2.6.25 are borked
2953 * 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
2954 */ 3103 */
2955 struct utsname buf; 3104 if (ev_linux_version () < 0x020619)
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return; 3105 return;
2960 3106
2961 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2962 return;
2963
2964 if (major < 2
2965 || (major == 2 && minor < 6)
2966 || (major == 2 && minor == 6 && micro < 25))
2967 return;
2968
2969 fs_2625 = 1; 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 ();
2970} 3119}
2971 3120
2972inline_size void 3121inline_size void
2973infy_init (EV_P) 3122infy_init (EV_P)
2974{ 3123{
2975 if (fs_fd != -2) 3124 if (fs_fd != -2)
2976 return; 3125 return;
2977 3126
2978 fs_fd = -1; 3127 fs_fd = -1;
2979 3128
2980 check_2625 (EV_A); 3129 ev_check_2625 (EV_A);
2981 3130
2982 fs_fd = inotify_init (); 3131 fs_fd = infy_newfd ();
2983 3132
2984 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
2985 { 3134 {
3135 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3136 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3137 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3138 ev_io_start (EV_A_ &fs_w);
3139 ev_unref (EV_A);
2989 } 3140 }
2990} 3141}
2991 3142
2992inline_size void 3143inline_size void
2993infy_fork (EV_P) 3144infy_fork (EV_P)
… …
2995 int slot; 3146 int slot;
2996 3147
2997 if (fs_fd < 0) 3148 if (fs_fd < 0)
2998 return; 3149 return;
2999 3150
3151 ev_ref (EV_A);
3152 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3153 close (fs_fd);
3001 fs_fd = inotify_init (); 3154 fs_fd = infy_newfd ();
3002 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
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3164 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3004 { 3165 {
3005 WL w_ = fs_hash [slot].head; 3166 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3167 fs_hash [slot].head = 0;
3007 3168
3008 while (w_) 3169 while (w_)
… …
3013 w->wd = -1; 3174 w->wd = -1;
3014 3175
3015 if (fs_fd >= 0) 3176 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3177 infy_add (EV_A_ w); /* re-add, no matter what */
3017 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);
3018 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 }
3019 } 3185 }
3020 } 3186 }
3021} 3187}
3022 3188
3023#endif 3189#endif
… …
3040static void noinline 3206static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3207stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3208{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3209 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3210
3045 /* we copy this here each the time so that */ 3211 ev_statdata prev = w->attr;
3046 /* prev has the old value when the callback gets invoked */
3047 w->prev = w->attr;
3048 ev_stat_stat (EV_A_ w); 3212 ev_stat_stat (EV_A_ w);
3049 3213
3050 /* 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 */
3051 if ( 3215 if (
3052 w->prev.st_dev != w->attr.st_dev 3216 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3217 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3218 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3219 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3220 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3221 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3222 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3223 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3224 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3225 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3226 || prev.st_ctime != w->attr.st_ctime
3063 ) { 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
3064 #if EV_USE_INOTIFY 3233 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3234 if (fs_fd >= 0)
3066 { 3235 {
3067 infy_del (EV_A_ w); 3236 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3237 infy_add (EV_A_ w);
… …
3093 3262
3094 if (fs_fd >= 0) 3263 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3264 infy_add (EV_A_ w);
3096 else 3265 else
3097#endif 3266#endif
3267 {
3098 ev_timer_again (EV_A_ &w->timer); 3268 ev_timer_again (EV_A_ &w->timer);
3269 ev_unref (EV_A);
3270 }
3099 3271
3100 ev_start (EV_A_ (W)w, 1); 3272 ev_start (EV_A_ (W)w, 1);
3101 3273
3102 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;
3103} 3275}
… …
3112 EV_FREQUENT_CHECK; 3284 EV_FREQUENT_CHECK;
3113 3285
3114#if EV_USE_INOTIFY 3286#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3287 infy_del (EV_A_ w);
3116#endif 3288#endif
3289
3290 if (ev_is_active (&w->timer))
3291 {
3292 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3293 ev_timer_stop (EV_A_ &w->timer);
3294 }
3118 3295
3119 ev_stop (EV_A_ (W)w); 3296 ev_stop (EV_A_ (W)w);
3120 3297
3121 EV_FREQUENT_CHECK; 3298 EV_FREQUENT_CHECK;
3122} 3299}
… …
3167 3344
3168 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3169} 3346}
3170#endif 3347#endif
3171 3348
3349#if EV_PREPARE_ENABLE
3172void 3350void
3173ev_prepare_start (EV_P_ ev_prepare *w) 3351ev_prepare_start (EV_P_ ev_prepare *w)
3174{ 3352{
3175 if (expect_false (ev_is_active (w))) 3353 if (expect_false (ev_is_active (w)))
3176 return; 3354 return;
… …
3202 3380
3203 ev_stop (EV_A_ (W)w); 3381 ev_stop (EV_A_ (W)w);
3204 3382
3205 EV_FREQUENT_CHECK; 3383 EV_FREQUENT_CHECK;
3206} 3384}
3385#endif
3207 3386
3387#if EV_CHECK_ENABLE
3208void 3388void
3209ev_check_start (EV_P_ ev_check *w) 3389ev_check_start (EV_P_ ev_check *w)
3210{ 3390{
3211 if (expect_false (ev_is_active (w))) 3391 if (expect_false (ev_is_active (w)))
3212 return; 3392 return;
… …
3238 3418
3239 ev_stop (EV_A_ (W)w); 3419 ev_stop (EV_A_ (W)w);
3240 3420
3241 EV_FREQUENT_CHECK; 3421 EV_FREQUENT_CHECK;
3242} 3422}
3423#endif
3243 3424
3244#if EV_EMBED_ENABLE 3425#if EV_EMBED_ENABLE
3245void noinline 3426void noinline
3246ev_embed_sweep (EV_P_ ev_embed *w) 3427ev_embed_sweep (EV_P_ ev_embed *w)
3247{ 3428{
… …
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3444embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3445{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3446 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3447
3267 { 3448 {
3268 struct ev_loop *loop = w->other; 3449 EV_P = w->other;
3269 3450
3270 while (fdchangecnt) 3451 while (fdchangecnt)
3271 { 3452 {
3272 fd_reify (EV_A); 3453 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3454 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3281 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));
3282 3463
3283 ev_embed_stop (EV_A_ w); 3464 ev_embed_stop (EV_A_ w);
3284 3465
3285 { 3466 {
3286 struct ev_loop *loop = w->other; 3467 EV_P = w->other;
3287 3468
3288 ev_loop_fork (EV_A); 3469 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3470 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3471 }
3291 3472
… …
3305{ 3486{
3306 if (expect_false (ev_is_active (w))) 3487 if (expect_false (ev_is_active (w)))
3307 return; 3488 return;
3308 3489
3309 { 3490 {
3310 struct ev_loop *loop = w->other; 3491 EV_P = w->other;
3311 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 ()));
3312 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);
3313 } 3494 }
3314 3495
3315 EV_FREQUENT_CHECK; 3496 EV_FREQUENT_CHECK;
… …
3342 3523
3343 ev_io_stop (EV_A_ &w->io); 3524 ev_io_stop (EV_A_ &w->io);
3344 ev_prepare_stop (EV_A_ &w->prepare); 3525 ev_prepare_stop (EV_A_ &w->prepare);
3345 ev_fork_stop (EV_A_ &w->fork); 3526 ev_fork_stop (EV_A_ &w->fork);
3346 3527
3528 ev_stop (EV_A_ (W)w);
3529
3347 EV_FREQUENT_CHECK; 3530 EV_FREQUENT_CHECK;
3348} 3531}
3349#endif 3532#endif
3350 3533
3351#if EV_FORK_ENABLE 3534#if EV_FORK_ENABLE
… …
3427 3610
3428void 3611void
3429ev_async_send (EV_P_ ev_async *w) 3612ev_async_send (EV_P_ ev_async *w)
3430{ 3613{
3431 w->sent = 1; 3614 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3615 evpipe_write (EV_A_ &async_pending);
3433} 3616}
3434#endif 3617#endif
3435 3618
3436/*****************************************************************************/ 3619/*****************************************************************************/
3437 3620
… …
3477{ 3660{
3478 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));
3479 3662
3480 if (expect_false (!once)) 3663 if (expect_false (!once))
3481 { 3664 {
3482 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3665 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3483 return; 3666 return;
3484 } 3667 }
3485 3668
3486 once->cb = cb; 3669 once->cb = cb;
3487 once->arg = arg; 3670 once->arg = arg;
… …
3574 if (types & EV_ASYNC) 3757 if (types & EV_ASYNC)
3575 for (i = asynccnt; i--; ) 3758 for (i = asynccnt; i--; )
3576 cb (EV_A_ EV_ASYNC, asyncs [i]); 3759 cb (EV_A_ EV_ASYNC, asyncs [i]);
3577#endif 3760#endif
3578 3761
3762#if EV_PREPARE_ENABLE
3579 if (types & EV_PREPARE) 3763 if (types & EV_PREPARE)
3580 for (i = preparecnt; i--; ) 3764 for (i = preparecnt; i--; )
3581#if EV_EMBED_ENABLE 3765# if EV_EMBED_ENABLE
3582 if (ev_cb (prepares [i]) != embed_prepare_cb) 3766 if (ev_cb (prepares [i]) != embed_prepare_cb)
3583#endif 3767# endif
3584 cb (EV_A_ EV_PREPARE, prepares [i]); 3768 cb (EV_A_ EV_PREPARE, prepares [i]);
3769#endif
3585 3770
3771#if EV_CHECK_ENABLE
3586 if (types & EV_CHECK) 3772 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3773 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3774 cb (EV_A_ EV_CHECK, checks [i]);
3775#endif
3589 3776
3777#if EV_SIGNAL_ENABLE
3590 if (types & EV_SIGNAL) 3778 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3779 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3780 for (wl = signals [i].head; wl; )
3593 { 3781 {
3594 wn = wl->next; 3782 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3783 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3784 wl = wn;
3597 } 3785 }
3786#endif
3598 3787
3788#if EV_CHILD_ENABLE
3599 if (types & EV_CHILD) 3789 if (types & EV_CHILD)
3600 for (i = EV_PID_HASHSIZE; i--; ) 3790 for (i = (EV_PID_HASHSIZE); i--; )
3601 for (wl = childs [i]; wl; ) 3791 for (wl = childs [i]; wl; )
3602 { 3792 {
3603 wn = wl->next; 3793 wn = wl->next;
3604 cb (EV_A_ EV_CHILD, wl); 3794 cb (EV_A_ EV_CHILD, wl);
3605 wl = wn; 3795 wl = wn;
3606 } 3796 }
3797#endif
3607/* EV_STAT 0x00001000 /* stat data changed */ 3798/* EV_STAT 0x00001000 /* stat data changed */
3608/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3799/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3609} 3800}
3610#endif 3801#endif
3611 3802

Diff Legend

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