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.368 by root, Mon Jan 17 12:11:11 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
157#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
158#include <fcntl.h> 164#include <fcntl.h>
159#include <stddef.h> 165#include <stddef.h>
160 166
161#include <stdio.h> 167#include <stdio.h>
162 168
163#include <assert.h> 169#include <assert.h>
164#include <errno.h> 170#include <errno.h>
165#include <sys/types.h> 171#include <sys/types.h>
166#include <time.h> 172#include <time.h>
173#include <limits.h>
167 174
168#include <signal.h> 175#include <signal.h>
169 176
170#ifdef EV_H 177#ifdef EV_H
171# include EV_H 178# include EV_H
172#else 179#else
173# include "ev.h" 180# include "ev.h"
174#endif 181#endif
182
183EV_CPP(extern "C" {)
175 184
176#ifndef _WIN32 185#ifndef _WIN32
177# include <sys/time.h> 186# include <sys/time.h>
178# include <sys/wait.h> 187# include <sys/wait.h>
179# include <unistd.h> 188# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 192# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
186# endif 195# endif
196# undef EV_AVOID_STDIO
187#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
188 206
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
190 208
191/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
204#elif defined (MAXSIG) 222#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 230#else
213# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
215# define EV_NSIG 64 234# define EV_NSIG 65
216#endif 235#endif
217 236
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
228# else 240# else
229# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
230# endif 242# endif
231#endif 243#endif
232 244
233#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
234# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
235# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
236# else 248# else
237# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
238# endif 250# endif
239#endif 251#endif
240 252
… …
242# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
243#endif 255#endif
244 256
245#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
246# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
247# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
248# else 260# else
249# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
250# endif 262# endif
251#endif 263#endif
252 264
253#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
254# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
255#endif 267#endif
256 268
257#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
258# ifdef _WIN32 270# ifdef _WIN32
259# define EV_USE_POLL 0 271# define EV_USE_POLL 0
260# else 272# else
261# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
262# endif 274# endif
263#endif 275#endif
264 276
265#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
266# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
267# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
268# else 280# else
269# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
270# endif 282# endif
271#endif 283#endif
272 284
… …
278# define EV_USE_PORT 0 290# define EV_USE_PORT 0
279#endif 291#endif
280 292
281#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
282# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
283# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
284# else 296# else
285# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
286# endif 298# endif
287#endif 299#endif
288 300
289#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
290# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
291# define EV_PID_HASHSIZE 1
292# else
293# define EV_PID_HASHSIZE 16
294# endif
295#endif 303#endif
296 304
297#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
298# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
299# define EV_INOTIFY_HASHSIZE 1
300# else
301# define EV_INOTIFY_HASHSIZE 16
302# endif
303#endif 307#endif
304 308
305#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
306# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
307# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
308# else 312# else
309# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
310# endif 314# endif
311#endif 315#endif
312 316
313#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
316# else 320# else
317# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
318# endif 322# endif
319#endif 323#endif
320 324
… …
323# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
324# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
325#endif 329#endif
326 330
327#ifndef EV_VERIFY 331#ifndef EV_VERIFY
328# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
329#endif 333#endif
330 334
331#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
332# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
333#endif 337#endif
334 338
335#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
336# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
337#endif 341#endif
338 342
339/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
340/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
341#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
350# endif 354# endif
351#endif 355#endif
352 356
353/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 357/* this block fixes any misconfiguration where we know we run into trouble otherwise */
354 358
359#ifdef _AIX
360/* AIX has a completely broken poll.h header */
361# undef EV_USE_POLL
362# define EV_USE_POLL 0
363#endif
364
355#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
358#endif 368#endif
359 369
… …
372# include <sys/select.h> 382# include <sys/select.h>
373# endif 383# endif
374#endif 384#endif
375 385
376#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
377# include <sys/utsname.h>
378# include <sys/statfs.h> 387# include <sys/statfs.h>
379# include <sys/inotify.h> 388# include <sys/inotify.h>
380/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
381# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
382# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
393# include <stdint.h> 402# include <stdint.h>
394# ifndef EFD_NONBLOCK 403# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 404# define EFD_NONBLOCK O_NONBLOCK
396# endif 405# endif
397# ifndef EFD_CLOEXEC 406# ifndef EFD_CLOEXEC
407# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
399# endif 412# endif
400# ifdef __cplusplus 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
401extern "C" { 414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
402# endif 421# endif
403int eventfd (unsigned int initval, int flags); 422# ifndef SFD_CLOEXEC
404# ifdef __cplusplus 423# ifdef O_CLOEXEC
405} 424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
406# endif 428# endif
407#endif 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
408 430
409#if EV_USE_SIGNALFD 431struct signalfd_siginfo
410# include <sys/signalfd.h> 432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
411#endif 436#endif
412 437
413/**/ 438/**/
414 439
415#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
417#else 442#else
418# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
419#endif 444#endif
420 445
421/* 446/*
… …
428 */ 453 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 455
431#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
432#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
433/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
434 461
435#if __GNUC__ >= 4 462#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
438#else 465#else
… …
445 472
446#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
447#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
448#define inline_size static inline 475#define inline_size static inline
449 476
450#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
451# define inline_speed static noinline 480# define inline_speed static noinline
452#else
453# define inline_speed static inline
454#endif 481#endif
455 482
456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457 484
458#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
471#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
472#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
473 500
474#if EV_USE_REALTIME 501#if EV_USE_REALTIME
475/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
476/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
477static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
478#endif 505#endif
479 506
480#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
482#endif 509#endif
483 510
511#ifndef EV_FD_TO_WIN32_HANDLE
512# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
513#endif
514#ifndef EV_WIN32_HANDLE_TO_FD
515# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
516#endif
517#ifndef EV_WIN32_CLOSE_FD
518# define EV_WIN32_CLOSE_FD(fd) close (fd)
519#endif
520
484#ifdef _WIN32 521#ifdef _WIN32
485# include "ev_win32.c" 522# include "ev_win32.c"
486#endif 523#endif
487 524
488/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
489 576
490static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
491 578
492void 579void
493ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
503 590
504 if (syserr_cb) 591 if (syserr_cb)
505 syserr_cb (msg); 592 syserr_cb (msg);
506 else 593 else
507 { 594 {
595#if EV_AVOID_STDIO
596 ev_printerr (msg);
597 ev_printerr (": ");
598 ev_printerr (strerror (errno));
599 ev_printerr ("\n");
600#else
508 perror (msg); 601 perror (msg);
602#endif
509 abort (); 603 abort ();
510 } 604 }
511} 605}
512 606
513static void * 607static void *
514ev_realloc_emul (void *ptr, long size) 608ev_realloc_emul (void *ptr, long size)
515{ 609{
610#if __GLIBC__
611 return realloc (ptr, size);
612#else
516 /* some systems, notably openbsd and darwin, fail to properly 613 /* some systems, notably openbsd and darwin, fail to properly
517 * implement realloc (x, 0) (as required by both ansi c-98 and 614 * implement realloc (x, 0) (as required by both ansi c-89 and
518 * the single unix specification, so work around them here. 615 * the single unix specification, so work around them here.
519 */ 616 */
520 617
521 if (size) 618 if (size)
522 return realloc (ptr, size); 619 return realloc (ptr, size);
523 620
524 free (ptr); 621 free (ptr);
525 return 0; 622 return 0;
623#endif
526} 624}
527 625
528static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 626static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
529 627
530void 628void
… …
538{ 636{
539 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
540 638
541 if (!ptr && size) 639 if (!ptr && size)
542 { 640 {
641#if EV_AVOID_STDIO
642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
643#else
543 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
645#endif
544 abort (); 646 abort ();
545 } 647 }
546 648
547 return ptr; 649 return ptr;
548} 650}
… …
564 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
565 unsigned char unused; 667 unsigned char unused;
566#if EV_USE_EPOLL 668#if EV_USE_EPOLL
567 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
568#endif 670#endif
569#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
570 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
571#endif 676#endif
572} ANFD; 677} ANFD;
573 678
574/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
575typedef struct 680typedef struct
… …
630 735
631 static int ev_default_loop_ptr; 736 static int ev_default_loop_ptr;
632 737
633#endif 738#endif
634 739
635#if EV_MINIMAL < 2 740#if EV_FEATURE_API
636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 741# 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) 742# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
638# define EV_INVOKE_PENDING invoke_cb (EV_A) 743# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else 744#else
640# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
641# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
642# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
643#endif 748#endif
644 749
645#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
646 751
647/*****************************************************************************/ 752/*****************************************************************************/
648 753
649#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
650ev_tstamp 755ev_tstamp
… …
694 if (delay > 0.) 799 if (delay > 0.)
695 { 800 {
696#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
697 struct timespec ts; 802 struct timespec ts;
698 803
699 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
700 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
701
702 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
703#elif defined(_WIN32) 806#elif defined(_WIN32)
704 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
705#else 808#else
706 struct timeval tv; 809 struct timeval tv;
707 810
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 */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
712 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
713 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
714 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
715#endif 816#endif
716 } 817 }
717} 818}
718 819
820inline_speed int
821ev_timeout_to_ms (ev_tstamp timeout)
822{
823 int ms = timeout * 1000. + .999999;
824
825 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
826}
827
719/*****************************************************************************/ 828/*****************************************************************************/
720 829
721#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
722 831
723/* find a suitable new size for the given array, */ 832/* find a suitable new size for the given array, */
724/* hopefully by rounding to a ncie-to-malloc size */ 833/* hopefully by rounding to a nice-to-malloc size */
725inline_size int 834inline_size int
726array_nextsize (int elem, int cur, int cnt) 835array_nextsize (int elem, int cur, int cnt)
727{ 836{
728 int ncur = cur + 1; 837 int ncur = cur + 1;
729 838
… …
825} 934}
826 935
827/*****************************************************************************/ 936/*****************************************************************************/
828 937
829inline_speed void 938inline_speed void
830fd_event_nc (EV_P_ int fd, int revents) 939fd_event_nocheck (EV_P_ int fd, int revents)
831{ 940{
832 ANFD *anfd = anfds + fd; 941 ANFD *anfd = anfds + fd;
833 ev_io *w; 942 ev_io *w;
834 943
835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 944 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
847fd_event (EV_P_ int fd, int revents) 956fd_event (EV_P_ int fd, int revents)
848{ 957{
849 ANFD *anfd = anfds + fd; 958 ANFD *anfd = anfds + fd;
850 959
851 if (expect_true (!anfd->reify)) 960 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents); 961 fd_event_nocheck (EV_A_ fd, revents);
853} 962}
854 963
855void 964void
856ev_feed_fd_event (EV_P_ int fd, int revents) 965ev_feed_fd_event (EV_P_ int fd, int revents)
857{ 966{
858 if (fd >= 0 && fd < anfdmax) 967 if (fd >= 0 && fd < anfdmax)
859 fd_event_nc (EV_A_ fd, revents); 968 fd_event_nocheck (EV_A_ fd, revents);
860} 969}
861 970
862/* make sure the external fd watch events are in-sync */ 971/* make sure the external fd watch events are in-sync */
863/* with the kernel/libev internal state */ 972/* with the kernel/libev internal state */
864inline_size void 973inline_size void
… …
870 { 979 {
871 int fd = fdchanges [i]; 980 int fd = fdchanges [i];
872 ANFD *anfd = anfds + fd; 981 ANFD *anfd = anfds + fd;
873 ev_io *w; 982 ev_io *w;
874 983
875 unsigned char events = 0; 984 unsigned char o_events = anfd->events;
985 unsigned char o_reify = anfd->reify;
876 986
877 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 987 anfd->reify = 0;
878 events |= (unsigned char)w->events;
879 988
880#if EV_SELECT_IS_WINSOCKET 989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
881 if (events) 990 if (o_reify & EV__IOFDSET)
882 { 991 {
883 unsigned long arg; 992 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 993 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)); 994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
890 } 996 }
891#endif 997#endif
892 998
999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
893 { 1000 {
894 unsigned char o_events = anfd->events;
895 unsigned char o_reify = anfd->reify;
896
897 anfd->reify = 0;
898 anfd->events = events; 1001 anfd->events = 0;
899 1002
900 if (o_events != events || o_reify & EV__IOFDSET) 1003 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1004 anfd->events |= (unsigned char)w->events;
1005
1006 if (o_events != anfd->events)
1007 o_reify = EV__IOFDSET; /* actually |= */
1008 }
1009
1010 if (o_reify & EV__IOFDSET)
901 backend_modify (EV_A_ fd, o_events, events); 1011 backend_modify (EV_A_ fd, o_events, anfd->events);
902 }
903 } 1012 }
904 1013
905 fdchangecnt = 0; 1014 fdchangecnt = 0;
906} 1015}
907 1016
… …
931 ev_io_stop (EV_A_ w); 1040 ev_io_stop (EV_A_ w);
932 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1041 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
933 } 1042 }
934} 1043}
935 1044
936/* check whether the given fd is atcually valid, for error recovery */ 1045/* check whether the given fd is actually valid, for error recovery */
937inline_size int 1046inline_size int
938fd_valid (int fd) 1047fd_valid (int fd)
939{ 1048{
940#ifdef _WIN32 1049#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 1050 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 1051#else
943 return fcntl (fd, F_GETFD) != -1; 1052 return fcntl (fd, F_GETFD) != -1;
944#endif 1053#endif
945} 1054}
946 1055
… …
964 1073
965 for (fd = anfdmax; fd--; ) 1074 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1075 if (anfds [fd].events)
967 { 1076 {
968 fd_kill (EV_A_ fd); 1077 fd_kill (EV_A_ fd);
969 return; 1078 break;
970 } 1079 }
971} 1080}
972 1081
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1082/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1083static void noinline
… …
983 anfds [fd].emask = 0; 1092 anfds [fd].emask = 0;
984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1093 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
985 } 1094 }
986} 1095}
987 1096
1097/* used to prepare libev internal fd's */
1098/* this is not fork-safe */
1099inline_speed void
1100fd_intern (int fd)
1101{
1102#ifdef _WIN32
1103 unsigned long arg = 1;
1104 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1105#else
1106 fcntl (fd, F_SETFD, FD_CLOEXEC);
1107 fcntl (fd, F_SETFL, O_NONBLOCK);
1108#endif
1109}
1110
988/*****************************************************************************/ 1111/*****************************************************************************/
989 1112
990/* 1113/*
991 * the heap functions want a real array index. array index 0 uis guaranteed to not 1114 * 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 1115 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
993 * the branching factor of the d-tree. 1116 * the branching factor of the d-tree.
994 */ 1117 */
995 1118
996/* 1119/*
… …
1064 1187
1065 for (;;) 1188 for (;;)
1066 { 1189 {
1067 int c = k << 1; 1190 int c = k << 1;
1068 1191
1069 if (c > N + HEAP0 - 1) 1192 if (c >= N + HEAP0)
1070 break; 1193 break;
1071 1194
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1195 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1196 ? 1 : 0;
1074 1197
… …
1110 1233
1111/* move an element suitably so it is in a correct place */ 1234/* move an element suitably so it is in a correct place */
1112inline_size void 1235inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1236adjustheap (ANHE *heap, int N, int k)
1114{ 1237{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1238 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1239 upheap (heap, k);
1117 else 1240 else
1118 downheap (heap, N, k); 1241 downheap (heap, N, k);
1119} 1242}
1120 1243
… …
1133/*****************************************************************************/ 1256/*****************************************************************************/
1134 1257
1135/* associate signal watchers to a signal signal */ 1258/* associate signal watchers to a signal signal */
1136typedef struct 1259typedef struct
1137{ 1260{
1261 EV_ATOMIC_T pending;
1262#if EV_MULTIPLICITY
1263 EV_P;
1264#endif
1138 WL head; 1265 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1266} ANSIG;
1141 1267
1142static ANSIG *signals; 1268static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1269
1147/*****************************************************************************/ 1270/*****************************************************************************/
1148 1271
1149/* used to prepare libev internal fd's */ 1272#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 1273
1163static void noinline 1274static void noinline
1164evpipe_init (EV_P) 1275evpipe_init (EV_P)
1165{ 1276{
1166 if (!ev_is_active (&pipe_w)) 1277 if (!ev_is_active (&pipe_w))
1167 { 1278 {
1168#if EV_USE_EVENTFD 1279# if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1280 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL) 1281 if (evfd < 0 && errno == EINVAL)
1171 evfd = eventfd (0, 0); 1282 evfd = eventfd (0, 0);
1172 1283
1173 if (evfd >= 0) 1284 if (evfd >= 0)
… …
1175 evpipe [0] = -1; 1286 evpipe [0] = -1;
1176 fd_intern (evfd); /* doing it twice doesn't hurt */ 1287 fd_intern (evfd); /* doing it twice doesn't hurt */
1177 ev_io_set (&pipe_w, evfd, EV_READ); 1288 ev_io_set (&pipe_w, evfd, EV_READ);
1178 } 1289 }
1179 else 1290 else
1180#endif 1291# endif
1181 { 1292 {
1182 while (pipe (evpipe)) 1293 while (pipe (evpipe))
1183 ev_syserr ("(libev) error creating signal/async pipe"); 1294 ev_syserr ("(libev) error creating signal/async pipe");
1184 1295
1185 fd_intern (evpipe [0]); 1296 fd_intern (evpipe [0]);
… …
1196evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1307evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1197{ 1308{
1198 if (!*flag) 1309 if (!*flag)
1199 { 1310 {
1200 int old_errno = errno; /* save errno because write might clobber it */ 1311 int old_errno = errno; /* save errno because write might clobber it */
1312 char dummy;
1201 1313
1202 *flag = 1; 1314 *flag = 1;
1203 1315
1204#if EV_USE_EVENTFD 1316#if EV_USE_EVENTFD
1205 if (evfd >= 0) 1317 if (evfd >= 0)
… …
1207 uint64_t counter = 1; 1319 uint64_t counter = 1;
1208 write (evfd, &counter, sizeof (uint64_t)); 1320 write (evfd, &counter, sizeof (uint64_t));
1209 } 1321 }
1210 else 1322 else
1211#endif 1323#endif
1324 /* win32 people keep sending patches that change this write() to send() */
1325 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1326 /* so when you think this write should be a send instead, please find out */
1327 /* where your send() is from - it's definitely not the microsoft send, and */
1328 /* tell me. thank you. */
1212 write (evpipe [1], &old_errno, 1); 1329 write (evpipe [1], &dummy, 1);
1213 1330
1214 errno = old_errno; 1331 errno = old_errno;
1215 } 1332 }
1216} 1333}
1217 1334
1218/* called whenever the libev signal pipe */ 1335/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1336/* got some events (signal, async) */
1220static void 1337static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1338pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1339{
1340 int i;
1341
1223#if EV_USE_EVENTFD 1342#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1343 if (evfd >= 0)
1225 { 1344 {
1226 uint64_t counter; 1345 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1346 read (evfd, &counter, sizeof (uint64_t));
1228 } 1347 }
1229 else 1348 else
1230#endif 1349#endif
1231 { 1350 {
1232 char dummy; 1351 char dummy;
1352 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1233 read (evpipe [0], &dummy, 1); 1353 read (evpipe [0], &dummy, 1);
1234 } 1354 }
1235 1355
1236 if (gotsig && ev_is_default_loop (EV_A)) 1356 if (sig_pending)
1237 { 1357 {
1238 int signum; 1358 sig_pending = 0;
1239 gotsig = 0;
1240 1359
1241 for (signum = signalmax; signum--; ) 1360 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1361 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1362 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1363 }
1245 1364
1246#if EV_ASYNC_ENABLE 1365#if EV_ASYNC_ENABLE
1247 if (gotasync) 1366 if (async_pending)
1248 { 1367 {
1249 int i; 1368 async_pending = 0;
1250 gotasync = 0;
1251 1369
1252 for (i = asynccnt; i--; ) 1370 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1371 if (asyncs [i]->sent)
1254 { 1372 {
1255 asyncs [i]->sent = 0; 1373 asyncs [i]->sent = 0;
… …
1259#endif 1377#endif
1260} 1378}
1261 1379
1262/*****************************************************************************/ 1380/*****************************************************************************/
1263 1381
1382void
1383ev_feed_signal (int signum)
1384{
1385#if EV_MULTIPLICITY
1386 EV_P = signals [signum - 1].loop;
1387
1388 if (!EV_A)
1389 return;
1390#endif
1391
1392 signals [signum - 1].pending = 1;
1393 evpipe_write (EV_A_ &sig_pending);
1394}
1395
1264static void 1396static void
1265ev_sighandler (int signum) 1397ev_sighandler (int signum)
1266{ 1398{
1267#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct;
1269#endif
1270
1271#if _WIN32 1399#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1400 signal (signum, ev_sighandler);
1273#endif 1401#endif
1274 1402
1275 signals [signum - 1].gotsig = 1; 1403 ev_feed_signal (signum);
1276 evpipe_write (EV_A_ &gotsig);
1277} 1404}
1278 1405
1279void noinline 1406void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1407ev_feed_signal_event (EV_P_ int signum)
1281{ 1408{
1282 WL w; 1409 WL w;
1283 1410
1411 if (expect_false (signum <= 0 || signum > EV_NSIG))
1412 return;
1413
1414 --signum;
1415
1284#if EV_MULTIPLICITY 1416#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1417 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1418 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1419
1288 --signum; 1420 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1421 return;
1422#endif
1292 1423
1293 signals [signum].gotsig = 0; 1424 signals [signum].pending = 0;
1294 1425
1295 for (w = signals [signum].head; w; w = w->next) 1426 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1427 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1428}
1298 1429
1299#if EV_USE_SIGNALFD 1430#if EV_USE_SIGNALFD
1300static void 1431static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1432sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1433{
1303 struct signalfd_siginfo si[4], *sip; 1434 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1435
1305 for (;;) 1436 for (;;)
1306 { 1437 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1438 ssize_t res = read (sigfd, si, sizeof (si));
1308 1439
… …
1314 break; 1445 break;
1315 } 1446 }
1316} 1447}
1317#endif 1448#endif
1318 1449
1450#endif
1451
1319/*****************************************************************************/ 1452/*****************************************************************************/
1320 1453
1454#if EV_CHILD_ENABLE
1321static WL childs [EV_PID_HASHSIZE]; 1455static WL childs [EV_PID_HASHSIZE];
1322
1323#ifndef _WIN32
1324 1456
1325static ev_signal childev; 1457static ev_signal childev;
1326 1458
1327#ifndef WIFCONTINUED 1459#ifndef WIFCONTINUED
1328# define WIFCONTINUED(status) 0 1460# define WIFCONTINUED(status) 0
… …
1333child_reap (EV_P_ int chain, int pid, int status) 1465child_reap (EV_P_ int chain, int pid, int status)
1334{ 1466{
1335 ev_child *w; 1467 ev_child *w;
1336 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1468 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1337 1469
1338 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1470 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1339 { 1471 {
1340 if ((w->pid == pid || !w->pid) 1472 if ((w->pid == pid || !w->pid)
1341 && (!traced || (w->flags & 1))) 1473 && (!traced || (w->flags & 1)))
1342 { 1474 {
1343 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1475 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 */ 1500 /* 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 */ 1501 /* 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); 1502 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1371 1503
1372 child_reap (EV_A_ pid, pid, status); 1504 child_reap (EV_A_ pid, pid, status);
1373 if (EV_PID_HASHSIZE > 1) 1505 if ((EV_PID_HASHSIZE) > 1)
1374 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1506 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1375} 1507}
1376 1508
1377#endif 1509#endif
1378 1510
1379/*****************************************************************************/ 1511/*****************************************************************************/
1380 1512
1513#if EV_USE_IOCP
1514# include "ev_iocp.c"
1515#endif
1381#if EV_USE_PORT 1516#if EV_USE_PORT
1382# include "ev_port.c" 1517# include "ev_port.c"
1383#endif 1518#endif
1384#if EV_USE_KQUEUE 1519#if EV_USE_KQUEUE
1385# include "ev_kqueue.c" 1520# include "ev_kqueue.c"
… …
1445#ifdef __APPLE__ 1580#ifdef __APPLE__
1446 /* only select works correctly on that "unix-certified" platform */ 1581 /* only select works correctly on that "unix-certified" platform */
1447 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1582 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1448 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1583 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1449#endif 1584#endif
1585#ifdef __FreeBSD__
1586 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1587#endif
1450 1588
1451 return flags; 1589 return flags;
1452} 1590}
1453 1591
1454unsigned int 1592unsigned int
1455ev_embeddable_backends (void) 1593ev_embeddable_backends (void)
1456{ 1594{
1457 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1595 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1458 1596
1459 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1597 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1460 /* please fix it and tell me how to detect the fix */ 1598 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1461 flags &= ~EVBACKEND_EPOLL; 1599 flags &= ~EVBACKEND_EPOLL;
1462 1600
1463 return flags; 1601 return flags;
1464} 1602}
1465 1603
1466unsigned int 1604unsigned int
1467ev_backend (EV_P) 1605ev_backend (EV_P)
1468{ 1606{
1469 return backend; 1607 return backend;
1470} 1608}
1471 1609
1472#if EV_MINIMAL < 2 1610#if EV_FEATURE_API
1473unsigned int 1611unsigned int
1474ev_loop_count (EV_P) 1612ev_iteration (EV_P)
1475{ 1613{
1476 return loop_count; 1614 return loop_count;
1477} 1615}
1478 1616
1479unsigned int 1617unsigned int
1480ev_loop_depth (EV_P) 1618ev_depth (EV_P)
1481{ 1619{
1482 return loop_depth; 1620 return loop_depth;
1483} 1621}
1484 1622
1485void 1623void
… …
1522static void noinline 1660static void noinline
1523loop_init (EV_P_ unsigned int flags) 1661loop_init (EV_P_ unsigned int flags)
1524{ 1662{
1525 if (!backend) 1663 if (!backend)
1526 { 1664 {
1665 origflags = flags;
1666
1527#if EV_USE_REALTIME 1667#if EV_USE_REALTIME
1528 if (!have_realtime) 1668 if (!have_realtime)
1529 { 1669 {
1530 struct timespec ts; 1670 struct timespec ts;
1531 1671
… …
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1682 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1683 have_monotonic = 1;
1544 } 1684 }
1545#endif 1685#endif
1546 1686
1687 /* pid check not overridable via env */
1688#ifndef _WIN32
1689 if (flags & EVFLAG_FORKCHECK)
1690 curpid = getpid ();
1691#endif
1692
1693 if (!(flags & EVFLAG_NOENV)
1694 && !enable_secure ()
1695 && getenv ("LIBEV_FLAGS"))
1696 flags = atoi (getenv ("LIBEV_FLAGS"));
1697
1547 ev_rt_now = ev_time (); 1698 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1699 mn_now = get_clock ();
1549 now_floor = mn_now; 1700 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1701 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1702#if EV_FEATURE_API
1552 invoke_cb = ev_invoke_pending; 1703 invoke_cb = ev_invoke_pending;
1553#endif 1704#endif
1554 1705
1555 io_blocktime = 0.; 1706 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1707 timeout_blocktime = 0.;
1557 backend = 0; 1708 backend = 0;
1558 backend_fd = -1; 1709 backend_fd = -1;
1559 gotasync = 0; 1710 sig_pending = 0;
1711#if EV_ASYNC_ENABLE
1712 async_pending = 0;
1713#endif
1560#if EV_USE_INOTIFY 1714#if EV_USE_INOTIFY
1561 fs_fd = -2; 1715 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1716#endif
1563#if EV_USE_SIGNALFD 1717#if EV_USE_SIGNALFD
1564 sigfd = -2; 1718 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1719#endif
1566 1720
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) 1721 if (!(flags & EVBACKEND_MASK))
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577
1578 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1722 flags |= ev_recommended_backends ();
1580 1723
1724#if EV_USE_IOCP
1725 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1726#endif
1581#if EV_USE_PORT 1727#if EV_USE_PORT
1582 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1728 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1583#endif 1729#endif
1584#if EV_USE_KQUEUE 1730#if EV_USE_KQUEUE
1585 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1740 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1741#endif
1596 1742
1597 ev_prepare_init (&pending_w, pendingcb); 1743 ev_prepare_init (&pending_w, pendingcb);
1598 1744
1745#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1746 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1747 ev_set_priority (&pipe_w, EV_MAXPRI);
1748#endif
1601 } 1749 }
1602} 1750}
1603 1751
1604/* free up a loop structure */ 1752/* free up a loop structure */
1605static void noinline 1753void
1606loop_destroy (EV_P) 1754ev_loop_destroy (EV_P)
1607{ 1755{
1608 int i; 1756 int i;
1757
1758#if EV_MULTIPLICITY
1759 /* mimic free (0) */
1760 if (!EV_A)
1761 return;
1762#endif
1763
1764#if EV_CLEANUP_ENABLE
1765 /* queue cleanup watchers (and execute them) */
1766 if (expect_false (cleanupcnt))
1767 {
1768 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1769 EV_INVOKE_PENDING;
1770 }
1771#endif
1772
1773#if EV_CHILD_ENABLE
1774 if (ev_is_active (&childev))
1775 {
1776 ev_ref (EV_A); /* child watcher */
1777 ev_signal_stop (EV_A_ &childev);
1778 }
1779#endif
1609 1780
1610 if (ev_is_active (&pipe_w)) 1781 if (ev_is_active (&pipe_w))
1611 { 1782 {
1612 /*ev_ref (EV_A);*/ 1783 /*ev_ref (EV_A);*/
1613 /*ev_io_stop (EV_A_ &pipe_w);*/ 1784 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1617 close (evfd); 1788 close (evfd);
1618#endif 1789#endif
1619 1790
1620 if (evpipe [0] >= 0) 1791 if (evpipe [0] >= 0)
1621 { 1792 {
1622 close (evpipe [0]); 1793 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1794 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1795 }
1625 } 1796 }
1626 1797
1627#if EV_USE_SIGNALFD 1798#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1799 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1800 close (sigfd);
1634 }
1635#endif 1801#endif
1636 1802
1637#if EV_USE_INOTIFY 1803#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1804 if (fs_fd >= 0)
1639 close (fs_fd); 1805 close (fs_fd);
1640#endif 1806#endif
1641 1807
1642 if (backend_fd >= 0) 1808 if (backend_fd >= 0)
1643 close (backend_fd); 1809 close (backend_fd);
1644 1810
1811#if EV_USE_IOCP
1812 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1813#endif
1645#if EV_USE_PORT 1814#if EV_USE_PORT
1646 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1815 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1647#endif 1816#endif
1648#if EV_USE_KQUEUE 1817#if EV_USE_KQUEUE
1649 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1818 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1676 array_free (periodic, EMPTY); 1845 array_free (periodic, EMPTY);
1677#endif 1846#endif
1678#if EV_FORK_ENABLE 1847#if EV_FORK_ENABLE
1679 array_free (fork, EMPTY); 1848 array_free (fork, EMPTY);
1680#endif 1849#endif
1850#if EV_CLEANUP_ENABLE
1851 array_free (cleanup, EMPTY);
1852#endif
1681 array_free (prepare, EMPTY); 1853 array_free (prepare, EMPTY);
1682 array_free (check, EMPTY); 1854 array_free (check, EMPTY);
1683#if EV_ASYNC_ENABLE 1855#if EV_ASYNC_ENABLE
1684 array_free (async, EMPTY); 1856 array_free (async, EMPTY);
1685#endif 1857#endif
1686 1858
1687 backend = 0; 1859 backend = 0;
1860
1861#if EV_MULTIPLICITY
1862 if (ev_is_default_loop (EV_A))
1863#endif
1864 ev_default_loop_ptr = 0;
1865#if EV_MULTIPLICITY
1866 else
1867 ev_free (EV_A);
1868#endif
1688} 1869}
1689 1870
1690#if EV_USE_INOTIFY 1871#if EV_USE_INOTIFY
1691inline_size void infy_fork (EV_P); 1872inline_size void infy_fork (EV_P);
1692#endif 1873#endif
… …
1709 1890
1710 if (ev_is_active (&pipe_w)) 1891 if (ev_is_active (&pipe_w))
1711 { 1892 {
1712 /* this "locks" the handlers against writing to the pipe */ 1893 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1894 /* while we modify the fd vars */
1714 gotsig = 1; 1895 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1896#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1897 async_pending = 1;
1717#endif 1898#endif
1718 1899
1719 ev_ref (EV_A); 1900 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1901 ev_io_stop (EV_A_ &pipe_w);
1721 1902
… …
1724 close (evfd); 1905 close (evfd);
1725#endif 1906#endif
1726 1907
1727 if (evpipe [0] >= 0) 1908 if (evpipe [0] >= 0)
1728 { 1909 {
1729 close (evpipe [0]); 1910 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1911 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1912 }
1732 1913
1914#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1915 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1916 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1917 pipecb (EV_A_ &pipe_w, EV_READ);
1918#endif
1736 } 1919 }
1737 1920
1738 postfork = 0; 1921 postfork = 0;
1739} 1922}
1740 1923
1741#if EV_MULTIPLICITY 1924#if EV_MULTIPLICITY
1742 1925
1743struct ev_loop * 1926struct ev_loop *
1744ev_loop_new (unsigned int flags) 1927ev_loop_new (unsigned int flags)
1745{ 1928{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1929 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1930
1748 memset (loop, 0, sizeof (struct ev_loop)); 1931 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1932 loop_init (EV_A_ flags);
1750 1933
1751 if (ev_backend (EV_A)) 1934 if (ev_backend (EV_A))
1752 return loop; 1935 return EV_A;
1753 1936
1937 ev_free (EV_A);
1754 return 0; 1938 return 0;
1755} 1939}
1756 1940
1757void
1758ev_loop_destroy (EV_P)
1759{
1760 loop_destroy (EV_A);
1761 ev_free (loop);
1762}
1763
1764void
1765ev_loop_fork (EV_P)
1766{
1767 postfork = 1; /* must be in line with ev_default_fork */
1768}
1769#endif /* multiplicity */ 1941#endif /* multiplicity */
1770 1942
1771#if EV_VERIFY 1943#if EV_VERIFY
1772static void noinline 1944static void noinline
1773verify_watcher (EV_P_ W w) 1945verify_watcher (EV_P_ W w)
… …
1802 verify_watcher (EV_A_ ws [cnt]); 1974 verify_watcher (EV_A_ ws [cnt]);
1803 } 1975 }
1804} 1976}
1805#endif 1977#endif
1806 1978
1807#if EV_MINIMAL < 2 1979#if EV_FEATURE_API
1808void 1980void
1809ev_loop_verify (EV_P) 1981ev_verify (EV_P)
1810{ 1982{
1811#if EV_VERIFY 1983#if EV_VERIFY
1812 int i; 1984 int i;
1813 WL w; 1985 WL w;
1814 1986
… …
1848#if EV_FORK_ENABLE 2020#if EV_FORK_ENABLE
1849 assert (forkmax >= forkcnt); 2021 assert (forkmax >= forkcnt);
1850 array_verify (EV_A_ (W *)forks, forkcnt); 2022 array_verify (EV_A_ (W *)forks, forkcnt);
1851#endif 2023#endif
1852 2024
2025#if EV_CLEANUP_ENABLE
2026 assert (cleanupmax >= cleanupcnt);
2027 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2028#endif
2029
1853#if EV_ASYNC_ENABLE 2030#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 2031 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 2032 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 2033#endif
1857 2034
2035#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 2036 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 2037 array_verify (EV_A_ (W *)prepares, preparecnt);
2038#endif
1860 2039
2040#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 2041 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 2042 array_verify (EV_A_ (W *)checks, checkcnt);
2043#endif
1863 2044
1864# if 0 2045# if 0
2046#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2047 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) 2048 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2049#endif
1867# endif 2050# endif
1868#endif 2051#endif
1869} 2052}
1870#endif 2053#endif
1871 2054
1872#if EV_MULTIPLICITY 2055#if EV_MULTIPLICITY
1873struct ev_loop * 2056struct ev_loop *
1874ev_default_loop_init (unsigned int flags)
1875#else 2057#else
1876int 2058int
2059#endif
1877ev_default_loop (unsigned int flags) 2060ev_default_loop (unsigned int flags)
1878#endif
1879{ 2061{
1880 if (!ev_default_loop_ptr) 2062 if (!ev_default_loop_ptr)
1881 { 2063 {
1882#if EV_MULTIPLICITY 2064#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2065 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 2066#else
1885 ev_default_loop_ptr = 1; 2067 ev_default_loop_ptr = 1;
1886#endif 2068#endif
1887 2069
1888 loop_init (EV_A_ flags); 2070 loop_init (EV_A_ flags);
1889 2071
1890 if (ev_backend (EV_A)) 2072 if (ev_backend (EV_A))
1891 { 2073 {
1892#ifndef _WIN32 2074#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 2075 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 2076 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 2077 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2078 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 2079#endif
… …
1902 2084
1903 return ev_default_loop_ptr; 2085 return ev_default_loop_ptr;
1904} 2086}
1905 2087
1906void 2088void
1907ev_default_destroy (void) 2089ev_loop_fork (EV_P)
1908{ 2090{
1909#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr;
1911#endif
1912
1913 ev_default_loop_ptr = 0;
1914
1915#ifndef _WIN32
1916 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev);
1918#endif
1919
1920 loop_destroy (EV_A);
1921}
1922
1923void
1924ev_default_fork (void)
1925{
1926#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr;
1928#endif
1929
1930 postfork = 1; /* must be in line with ev_loop_fork */ 2091 postfork = 1; /* must be in line with ev_default_fork */
1931} 2092}
1932 2093
1933/*****************************************************************************/ 2094/*****************************************************************************/
1934 2095
1935void 2096void
… …
1957 2118
1958 for (pri = NUMPRI; pri--; ) 2119 for (pri = NUMPRI; pri--; )
1959 while (pendingcnt [pri]) 2120 while (pendingcnt [pri])
1960 { 2121 {
1961 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2122 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1962
1963 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1964 /* ^ this is no longer true, as pending_w could be here */
1965 2123
1966 p->w->pending = 0; 2124 p->w->pending = 0;
1967 EV_CB_INVOKE (p->w, p->events); 2125 EV_CB_INVOKE (p->w, p->events);
1968 EV_FREQUENT_CHECK; 2126 EV_FREQUENT_CHECK;
1969 } 2127 }
… …
2026 EV_FREQUENT_CHECK; 2184 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2185 feed_reverse (EV_A_ (W)w);
2028 } 2186 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2187 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2188
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2189 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2190 }
2033} 2191}
2034 2192
2035#if EV_PERIODIC_ENABLE 2193#if EV_PERIODIC_ENABLE
2036/* make periodics pending */ 2194/* make periodics pending */
… …
2089 feed_reverse_done (EV_A_ EV_PERIODIC); 2247 feed_reverse_done (EV_A_ EV_PERIODIC);
2090 } 2248 }
2091} 2249}
2092 2250
2093/* simply recalculate all periodics */ 2251/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2252/* TODO: maybe ensure that at least one event happens when jumping forward? */
2095static void noinline 2253static void noinline
2096periodics_reschedule (EV_P) 2254periodics_reschedule (EV_P)
2097{ 2255{
2098 int i; 2256 int i;
2099 2257
… …
2127 ANHE_at_cache (*he); 2285 ANHE_at_cache (*he);
2128 } 2286 }
2129} 2287}
2130 2288
2131/* fetch new monotonic and realtime times from the kernel */ 2289/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2290/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2291inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2292time_update (EV_P_ ev_tstamp max_block)
2135{ 2293{
2136#if EV_USE_MONOTONIC 2294#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2295 if (expect_true (have_monotonic))
… …
2195 mn_now = ev_rt_now; 2353 mn_now = ev_rt_now;
2196 } 2354 }
2197} 2355}
2198 2356
2199void 2357void
2200ev_loop (EV_P_ int flags) 2358ev_run (EV_P_ int flags)
2201{ 2359{
2202#if EV_MINIMAL < 2 2360#if EV_FEATURE_API
2203 ++loop_depth; 2361 ++loop_depth;
2204#endif 2362#endif
2205 2363
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2364 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2207 2365
2208 loop_done = EVUNLOOP_CANCEL; 2366 loop_done = EVBREAK_CANCEL;
2209 2367
2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2368 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2211 2369
2212 do 2370 do
2213 { 2371 {
2214#if EV_VERIFY >= 2 2372#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2373 ev_verify (EV_A);
2216#endif 2374#endif
2217 2375
2218#ifndef _WIN32 2376#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2377 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2378 if (expect_false (getpid () != curpid))
… …
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2390 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2391 EV_INVOKE_PENDING;
2234 } 2392 }
2235#endif 2393#endif
2236 2394
2395#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2396 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2397 if (expect_false (preparecnt))
2239 { 2398 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2399 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2400 EV_INVOKE_PENDING;
2242 } 2401 }
2402#endif
2243 2403
2244 if (expect_false (loop_done)) 2404 if (expect_false (loop_done))
2245 break; 2405 break;
2246 2406
2247 /* we might have forked, so reify kernel state if necessary */ 2407 /* we might have forked, so reify kernel state if necessary */
… …
2254 /* calculate blocking time */ 2414 /* calculate blocking time */
2255 { 2415 {
2256 ev_tstamp waittime = 0.; 2416 ev_tstamp waittime = 0.;
2257 ev_tstamp sleeptime = 0.; 2417 ev_tstamp sleeptime = 0.;
2258 2418
2419 /* remember old timestamp for io_blocktime calculation */
2420 ev_tstamp prev_mn_now = mn_now;
2421
2422 /* update time to cancel out callback processing overhead */
2423 time_update (EV_A_ 1e100);
2424
2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2425 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2260 { 2426 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2264 /* update time to cancel out callback processing overhead */
2265 time_update (EV_A_ 1e100);
2266
2267 waittime = MAX_BLOCKTIME; 2427 waittime = MAX_BLOCKTIME;
2268 2428
2269 if (timercnt) 2429 if (timercnt)
2270 { 2430 {
2271 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2431 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2298 waittime -= sleeptime; 2458 waittime -= sleeptime;
2299 } 2459 }
2300 } 2460 }
2301 } 2461 }
2302 2462
2303#if EV_MINIMAL < 2 2463#if EV_FEATURE_API
2304 ++loop_count; 2464 ++loop_count;
2305#endif 2465#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2466 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2467 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2468 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2309 2469
2310 /* update ev_rt_now, do magic */ 2470 /* update ev_rt_now, do magic */
2311 time_update (EV_A_ waittime + sleeptime); 2471 time_update (EV_A_ waittime + sleeptime);
2312 } 2472 }
2313 2473
… …
2320#if EV_IDLE_ENABLE 2480#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2481 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2482 idle_reify (EV_A);
2323#endif 2483#endif
2324 2484
2485#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2486 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2487 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2488 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2489#endif
2328 2490
2329 EV_INVOKE_PENDING; 2491 EV_INVOKE_PENDING;
2330 } 2492 }
2331 while (expect_true ( 2493 while (expect_true (
2332 activecnt 2494 activecnt
2333 && !loop_done 2495 && !loop_done
2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2496 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2335 )); 2497 ));
2336 2498
2337 if (loop_done == EVUNLOOP_ONE) 2499 if (loop_done == EVBREAK_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2500 loop_done = EVBREAK_CANCEL;
2339 2501
2340#if EV_MINIMAL < 2 2502#if EV_FEATURE_API
2341 --loop_depth; 2503 --loop_depth;
2342#endif 2504#endif
2343} 2505}
2344 2506
2345void 2507void
2346ev_unloop (EV_P_ int how) 2508ev_break (EV_P_ int how)
2347{ 2509{
2348 loop_done = how; 2510 loop_done = how;
2349} 2511}
2350 2512
2351void 2513void
… …
2398inline_size void 2560inline_size void
2399wlist_del (WL *head, WL elem) 2561wlist_del (WL *head, WL elem)
2400{ 2562{
2401 while (*head) 2563 while (*head)
2402 { 2564 {
2403 if (*head == elem) 2565 if (expect_true (*head == elem))
2404 { 2566 {
2405 *head = elem->next; 2567 *head = elem->next;
2406 return; 2568 break;
2407 } 2569 }
2408 2570
2409 head = &(*head)->next; 2571 head = &(*head)->next;
2410 } 2572 }
2411} 2573}
… …
2471 2633
2472 if (expect_false (ev_is_active (w))) 2634 if (expect_false (ev_is_active (w)))
2473 return; 2635 return;
2474 2636
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2637 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)))); 2638 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2639
2478 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2479 2641
2480 ev_start (EV_A_ (W)w, 1); 2642 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2643 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2499 EV_FREQUENT_CHECK; 2661 EV_FREQUENT_CHECK;
2500 2662
2501 wlist_del (&anfds[w->fd].head, (WL)w); 2663 wlist_del (&anfds[w->fd].head, (WL)w);
2502 ev_stop (EV_A_ (W)w); 2664 ev_stop (EV_A_ (W)w);
2503 2665
2504 fd_change (EV_A_ w->fd, 1); 2666 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2505 2667
2506 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2507} 2669}
2508 2670
2509void noinline 2671void noinline
… …
2551 timers [active] = timers [timercnt + HEAP0]; 2713 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2714 adjustheap (timers, timercnt, active);
2553 } 2715 }
2554 } 2716 }
2555 2717
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2718 ev_at (w) -= mn_now;
2559 2719
2560 ev_stop (EV_A_ (W)w); 2720 ev_stop (EV_A_ (W)w);
2721
2722 EV_FREQUENT_CHECK;
2561} 2723}
2562 2724
2563void noinline 2725void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2726ev_timer_again (EV_P_ ev_timer *w)
2565{ 2727{
… …
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2806 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2807 adjustheap (periodics, periodiccnt, active);
2646 } 2808 }
2647 } 2809 }
2648 2810
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2811 ev_stop (EV_A_ (W)w);
2812
2813 EV_FREQUENT_CHECK;
2652} 2814}
2653 2815
2654void noinline 2816void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2817ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2818{
… …
2662 2824
2663#ifndef SA_RESTART 2825#ifndef SA_RESTART
2664# define SA_RESTART 0 2826# define SA_RESTART 0
2665#endif 2827#endif
2666 2828
2829#if EV_SIGNAL_ENABLE
2830
2667void noinline 2831void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2832ev_signal_start (EV_P_ ev_signal *w)
2669{ 2833{
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))) 2834 if (expect_false (ev_is_active (w)))
2674 return; 2835 return;
2675 2836
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2837 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2838
2839#if EV_MULTIPLICITY
2840 assert (("libev: a signal must not be attached to two different loops",
2841 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2842
2843 signals [w->signum - 1].loop = EV_A;
2844#endif
2677 2845
2678 EV_FREQUENT_CHECK; 2846 EV_FREQUENT_CHECK;
2679 2847
2680#if EV_USE_SIGNALFD 2848#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2849 if (sigfd == -2)
… …
2703 sigaddset (&sigfd_set, w->signum); 2871 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2872 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2873
2706 signalfd (sigfd, &sigfd_set, 0); 2874 signalfd (sigfd, &sigfd_set, 0);
2707 } 2875 }
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 2876#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2877
2730 ev_start (EV_A_ (W)w, 1); 2878 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2879 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2880
2733 if (!((WL)w)->next) 2881 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2882# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2883 if (sigfd < 0) /*TODO*/
2740# endif 2884# endif
2741 { 2885 {
2886# ifdef _WIN32
2887 evpipe_init (EV_A);
2888
2889 signal (w->signum, ev_sighandler);
2890# else
2742 struct sigaction sa = { }; 2891 struct sigaction sa;
2892
2893 evpipe_init (EV_A);
2894
2743 sa.sa_handler = ev_sighandler; 2895 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2896 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2897 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2898 sigaction (w->signum, &sa, 0);
2899
2900 if (origflags & EVFLAG_NOSIGMASK)
2901 {
2902 sigemptyset (&sa.sa_mask);
2903 sigaddset (&sa.sa_mask, w->signum);
2904 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2747 } 2905 }
2748#endif 2906#endif
2749 } 2907 }
2750 2908
2751 EV_FREQUENT_CHECK; 2909 EV_FREQUENT_CHECK;
2752} 2910}
2753 2911
2754void noinline 2912void noinline
… …
2762 2920
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2921 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2922 ev_stop (EV_A_ (W)w);
2765 2923
2766 if (!signals [w->signum - 1].head) 2924 if (!signals [w->signum - 1].head)
2925 {
2926#if EV_MULTIPLICITY
2927 signals [w->signum - 1].loop = 0; /* unattach from signal */
2928#endif
2767#if EV_USE_SIGNALFD 2929#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2930 if (sigfd >= 0)
2769 { 2931 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2932 sigset_t ss;
2933
2934 sigemptyset (&ss);
2935 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2936 sigdelset (&sigfd_set, w->signum);
2937
2772 signalfd (sigfd, &sigfd_set, 0); 2938 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2939 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2940 }
2776 else 2941 else
2777#endif 2942#endif
2778 signal (w->signum, SIG_DFL); 2943 signal (w->signum, SIG_DFL);
2944 }
2779 2945
2780 EV_FREQUENT_CHECK; 2946 EV_FREQUENT_CHECK;
2781} 2947}
2948
2949#endif
2950
2951#if EV_CHILD_ENABLE
2782 2952
2783void 2953void
2784ev_child_start (EV_P_ ev_child *w) 2954ev_child_start (EV_P_ ev_child *w)
2785{ 2955{
2786#if EV_MULTIPLICITY 2956#if EV_MULTIPLICITY
… …
2790 return; 2960 return;
2791 2961
2792 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2793 2963
2794 ev_start (EV_A_ (W)w, 1); 2964 ev_start (EV_A_ (W)w, 1);
2795 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2965 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2796 2966
2797 EV_FREQUENT_CHECK; 2967 EV_FREQUENT_CHECK;
2798} 2968}
2799 2969
2800void 2970void
… …
2804 if (expect_false (!ev_is_active (w))) 2974 if (expect_false (!ev_is_active (w)))
2805 return; 2975 return;
2806 2976
2807 EV_FREQUENT_CHECK; 2977 EV_FREQUENT_CHECK;
2808 2978
2809 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2979 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2810 ev_stop (EV_A_ (W)w); 2980 ev_stop (EV_A_ (W)w);
2811 2981
2812 EV_FREQUENT_CHECK; 2982 EV_FREQUENT_CHECK;
2813} 2983}
2984
2985#endif
2814 2986
2815#if EV_STAT_ENABLE 2987#if EV_STAT_ENABLE
2816 2988
2817# ifdef _WIN32 2989# ifdef _WIN32
2818# undef lstat 2990# undef lstat
… …
2824#define MIN_STAT_INTERVAL 0.1074891 2996#define MIN_STAT_INTERVAL 0.1074891
2825 2997
2826static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2998static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2827 2999
2828#if EV_USE_INOTIFY 3000#if EV_USE_INOTIFY
2829# define EV_INOTIFY_BUFSIZE 8192 3001
3002/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3003# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2830 3004
2831static void noinline 3005static void noinline
2832infy_add (EV_P_ ev_stat *w) 3006infy_add (EV_P_ ev_stat *w)
2833{ 3007{
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); 3008 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 3009
2836 if (w->wd < 0) 3010 if (w->wd >= 0)
3011 {
3012 struct statfs sfs;
3013
3014 /* now local changes will be tracked by inotify, but remote changes won't */
3015 /* unless the filesystem is known to be local, we therefore still poll */
3016 /* also do poll on <2.6.25, but with normal frequency */
3017
3018 if (!fs_2625)
3019 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3020 else if (!statfs (w->path, &sfs)
3021 && (sfs.f_type == 0x1373 /* devfs */
3022 || sfs.f_type == 0xEF53 /* ext2/3 */
3023 || sfs.f_type == 0x3153464a /* jfs */
3024 || sfs.f_type == 0x52654973 /* reiser3 */
3025 || sfs.f_type == 0x01021994 /* tempfs */
3026 || sfs.f_type == 0x58465342 /* xfs */))
3027 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3028 else
3029 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 3030 }
3031 else
3032 {
3033 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3034 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 3035
2841 /* monitor some parent directory for speedup hints */ 3036 /* 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, */ 3037 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 3038 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3039 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 3040 {
2846 char path [4096]; 3041 char path [4096];
… …
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3057 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 3058 }
2864 } 3059 }
2865 3060
2866 if (w->wd >= 0) 3061 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3062 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2869 3063
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 3064 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 3065 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); 3066 ev_timer_again (EV_A_ &w->timer);
2886 } 3067 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 3068}
2888 3069
2889static void noinline 3070static void noinline
2890infy_del (EV_P_ ev_stat *w) 3071infy_del (EV_P_ ev_stat *w)
2891{ 3072{
… …
2894 3075
2895 if (wd < 0) 3076 if (wd < 0)
2896 return; 3077 return;
2897 3078
2898 w->wd = -2; 3079 w->wd = -2;
2899 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3080 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2900 wlist_del (&fs_hash [slot].head, (WL)w); 3081 wlist_del (&fs_hash [slot].head, (WL)w);
2901 3082
2902 /* remove this watcher, if others are watching it, they will rearm */ 3083 /* remove this watcher, if others are watching it, they will rearm */
2903 inotify_rm_watch (fs_fd, wd); 3084 inotify_rm_watch (fs_fd, wd);
2904} 3085}
… …
2906static void noinline 3087static void noinline
2907infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3088infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2908{ 3089{
2909 if (slot < 0) 3090 if (slot < 0)
2910 /* overflow, need to check for all hash slots */ 3091 /* overflow, need to check for all hash slots */
2911 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3092 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2912 infy_wd (EV_A_ slot, wd, ev); 3093 infy_wd (EV_A_ slot, wd, ev);
2913 else 3094 else
2914 { 3095 {
2915 WL w_; 3096 WL w_;
2916 3097
2917 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3098 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2918 { 3099 {
2919 ev_stat *w = (ev_stat *)w_; 3100 ev_stat *w = (ev_stat *)w_;
2920 w_ = w_->next; /* lets us remove this watcher and all before it */ 3101 w_ = w_->next; /* lets us remove this watcher and all before it */
2921 3102
2922 if (w->wd == wd || wd == -1) 3103 if (w->wd == wd || wd == -1)
2923 { 3104 {
2924 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3105 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2925 { 3106 {
2926 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3107 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2927 w->wd = -1; 3108 w->wd = -1;
2928 infy_add (EV_A_ w); /* re-add, no matter what */ 3109 infy_add (EV_A_ w); /* re-add, no matter what */
2929 } 3110 }
2930 3111
2931 stat_timer_cb (EV_A_ &w->timer, 0); 3112 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2936 3117
2937static void 3118static void
2938infy_cb (EV_P_ ev_io *w, int revents) 3119infy_cb (EV_P_ ev_io *w, int revents)
2939{ 3120{
2940 char buf [EV_INOTIFY_BUFSIZE]; 3121 char buf [EV_INOTIFY_BUFSIZE];
2941 struct inotify_event *ev = (struct inotify_event *)buf;
2942 int ofs; 3122 int ofs;
2943 int len = read (fs_fd, buf, sizeof (buf)); 3123 int len = read (fs_fd, buf, sizeof (buf));
2944 3124
2945 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3125 for (ofs = 0; ofs < len; )
3126 {
3127 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2946 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3128 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3129 ofs += sizeof (struct inotify_event) + ev->len;
3130 }
2947} 3131}
2948 3132
2949inline_size void 3133inline_size void
2950check_2625 (EV_P) 3134ev_check_2625 (EV_P)
2951{ 3135{
2952 /* kernels < 2.6.25 are borked 3136 /* kernels < 2.6.25 are borked
2953 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3137 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2954 */ 3138 */
2955 struct utsname buf; 3139 if (ev_linux_version () < 0x020619)
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return; 3140 return;
2960 3141
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; 3142 fs_2625 = 1;
3143}
3144
3145inline_size int
3146infy_newfd (void)
3147{
3148#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3149 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3150 if (fd >= 0)
3151 return fd;
3152#endif
3153 return inotify_init ();
2970} 3154}
2971 3155
2972inline_size void 3156inline_size void
2973infy_init (EV_P) 3157infy_init (EV_P)
2974{ 3158{
2975 if (fs_fd != -2) 3159 if (fs_fd != -2)
2976 return; 3160 return;
2977 3161
2978 fs_fd = -1; 3162 fs_fd = -1;
2979 3163
2980 check_2625 (EV_A); 3164 ev_check_2625 (EV_A);
2981 3165
2982 fs_fd = inotify_init (); 3166 fs_fd = infy_newfd ();
2983 3167
2984 if (fs_fd >= 0) 3168 if (fs_fd >= 0)
2985 { 3169 {
3170 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3171 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3172 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3173 ev_io_start (EV_A_ &fs_w);
3174 ev_unref (EV_A);
2989 } 3175 }
2990} 3176}
2991 3177
2992inline_size void 3178inline_size void
2993infy_fork (EV_P) 3179infy_fork (EV_P)
… …
2995 int slot; 3181 int slot;
2996 3182
2997 if (fs_fd < 0) 3183 if (fs_fd < 0)
2998 return; 3184 return;
2999 3185
3186 ev_ref (EV_A);
3187 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3188 close (fs_fd);
3001 fs_fd = inotify_init (); 3189 fs_fd = infy_newfd ();
3002 3190
3191 if (fs_fd >= 0)
3192 {
3193 fd_intern (fs_fd);
3194 ev_io_set (&fs_w, fs_fd, EV_READ);
3195 ev_io_start (EV_A_ &fs_w);
3196 ev_unref (EV_A);
3197 }
3198
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3199 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3004 { 3200 {
3005 WL w_ = fs_hash [slot].head; 3201 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3202 fs_hash [slot].head = 0;
3007 3203
3008 while (w_) 3204 while (w_)
… …
3013 w->wd = -1; 3209 w->wd = -1;
3014 3210
3015 if (fs_fd >= 0) 3211 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3212 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3213 else
3214 {
3215 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3216 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3217 ev_timer_again (EV_A_ &w->timer);
3218 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3219 }
3019 } 3220 }
3020 } 3221 }
3021} 3222}
3022 3223
3023#endif 3224#endif
… …
3040static void noinline 3241static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3242stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3243{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3244 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3245
3045 /* we copy this here each the time so that */ 3246 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); 3247 ev_stat_stat (EV_A_ w);
3049 3248
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3249 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3250 if (
3052 w->prev.st_dev != w->attr.st_dev 3251 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3252 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3253 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3254 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3255 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3256 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3257 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3258 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3259 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3260 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3261 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3262 ) {
3263 /* we only update w->prev on actual differences */
3264 /* in case we test more often than invoke the callback, */
3265 /* to ensure that prev is always different to attr */
3266 w->prev = prev;
3267
3064 #if EV_USE_INOTIFY 3268 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3269 if (fs_fd >= 0)
3066 { 3270 {
3067 infy_del (EV_A_ w); 3271 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3272 infy_add (EV_A_ w);
… …
3093 3297
3094 if (fs_fd >= 0) 3298 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3299 infy_add (EV_A_ w);
3096 else 3300 else
3097#endif 3301#endif
3302 {
3098 ev_timer_again (EV_A_ &w->timer); 3303 ev_timer_again (EV_A_ &w->timer);
3304 ev_unref (EV_A);
3305 }
3099 3306
3100 ev_start (EV_A_ (W)w, 1); 3307 ev_start (EV_A_ (W)w, 1);
3101 3308
3102 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
3103} 3310}
… …
3112 EV_FREQUENT_CHECK; 3319 EV_FREQUENT_CHECK;
3113 3320
3114#if EV_USE_INOTIFY 3321#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3322 infy_del (EV_A_ w);
3116#endif 3323#endif
3324
3325 if (ev_is_active (&w->timer))
3326 {
3327 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3328 ev_timer_stop (EV_A_ &w->timer);
3329 }
3118 3330
3119 ev_stop (EV_A_ (W)w); 3331 ev_stop (EV_A_ (W)w);
3120 3332
3121 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
3122} 3334}
… …
3167 3379
3168 EV_FREQUENT_CHECK; 3380 EV_FREQUENT_CHECK;
3169} 3381}
3170#endif 3382#endif
3171 3383
3384#if EV_PREPARE_ENABLE
3172void 3385void
3173ev_prepare_start (EV_P_ ev_prepare *w) 3386ev_prepare_start (EV_P_ ev_prepare *w)
3174{ 3387{
3175 if (expect_false (ev_is_active (w))) 3388 if (expect_false (ev_is_active (w)))
3176 return; 3389 return;
… …
3202 3415
3203 ev_stop (EV_A_ (W)w); 3416 ev_stop (EV_A_ (W)w);
3204 3417
3205 EV_FREQUENT_CHECK; 3418 EV_FREQUENT_CHECK;
3206} 3419}
3420#endif
3207 3421
3422#if EV_CHECK_ENABLE
3208void 3423void
3209ev_check_start (EV_P_ ev_check *w) 3424ev_check_start (EV_P_ ev_check *w)
3210{ 3425{
3211 if (expect_false (ev_is_active (w))) 3426 if (expect_false (ev_is_active (w)))
3212 return; 3427 return;
… …
3238 3453
3239 ev_stop (EV_A_ (W)w); 3454 ev_stop (EV_A_ (W)w);
3240 3455
3241 EV_FREQUENT_CHECK; 3456 EV_FREQUENT_CHECK;
3242} 3457}
3458#endif
3243 3459
3244#if EV_EMBED_ENABLE 3460#if EV_EMBED_ENABLE
3245void noinline 3461void noinline
3246ev_embed_sweep (EV_P_ ev_embed *w) 3462ev_embed_sweep (EV_P_ ev_embed *w)
3247{ 3463{
3248 ev_loop (w->other, EVLOOP_NONBLOCK); 3464 ev_run (w->other, EVRUN_NOWAIT);
3249} 3465}
3250 3466
3251static void 3467static void
3252embed_io_cb (EV_P_ ev_io *io, int revents) 3468embed_io_cb (EV_P_ ev_io *io, int revents)
3253{ 3469{
3254 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3470 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3255 3471
3256 if (ev_cb (w)) 3472 if (ev_cb (w))
3257 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3473 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3258 else 3474 else
3259 ev_loop (w->other, EVLOOP_NONBLOCK); 3475 ev_run (w->other, EVRUN_NOWAIT);
3260} 3476}
3261 3477
3262static void 3478static void
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3479embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3480{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3481 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3482
3267 { 3483 {
3268 struct ev_loop *loop = w->other; 3484 EV_P = w->other;
3269 3485
3270 while (fdchangecnt) 3486 while (fdchangecnt)
3271 { 3487 {
3272 fd_reify (EV_A); 3488 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3489 ev_run (EV_A_ EVRUN_NOWAIT);
3274 } 3490 }
3275 } 3491 }
3276} 3492}
3277 3493
3278static void 3494static void
… …
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3497 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3498
3283 ev_embed_stop (EV_A_ w); 3499 ev_embed_stop (EV_A_ w);
3284 3500
3285 { 3501 {
3286 struct ev_loop *loop = w->other; 3502 EV_P = w->other;
3287 3503
3288 ev_loop_fork (EV_A); 3504 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3505 ev_run (EV_A_ EVRUN_NOWAIT);
3290 } 3506 }
3291 3507
3292 ev_embed_start (EV_A_ w); 3508 ev_embed_start (EV_A_ w);
3293} 3509}
3294 3510
… …
3305{ 3521{
3306 if (expect_false (ev_is_active (w))) 3522 if (expect_false (ev_is_active (w)))
3307 return; 3523 return;
3308 3524
3309 { 3525 {
3310 struct ev_loop *loop = w->other; 3526 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3527 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); 3528 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3529 }
3314 3530
3315 EV_FREQUENT_CHECK; 3531 EV_FREQUENT_CHECK;
… …
3342 3558
3343 ev_io_stop (EV_A_ &w->io); 3559 ev_io_stop (EV_A_ &w->io);
3344 ev_prepare_stop (EV_A_ &w->prepare); 3560 ev_prepare_stop (EV_A_ &w->prepare);
3345 ev_fork_stop (EV_A_ &w->fork); 3561 ev_fork_stop (EV_A_ &w->fork);
3346 3562
3563 ev_stop (EV_A_ (W)w);
3564
3347 EV_FREQUENT_CHECK; 3565 EV_FREQUENT_CHECK;
3348} 3566}
3349#endif 3567#endif
3350 3568
3351#if EV_FORK_ENABLE 3569#if EV_FORK_ENABLE
… …
3384 3602
3385 EV_FREQUENT_CHECK; 3603 EV_FREQUENT_CHECK;
3386} 3604}
3387#endif 3605#endif
3388 3606
3389#if EV_ASYNC_ENABLE 3607#if EV_CLEANUP_ENABLE
3390void 3608void
3391ev_async_start (EV_P_ ev_async *w) 3609ev_cleanup_start (EV_P_ ev_cleanup *w)
3392{ 3610{
3393 if (expect_false (ev_is_active (w))) 3611 if (expect_false (ev_is_active (w)))
3394 return; 3612 return;
3613
3614 EV_FREQUENT_CHECK;
3615
3616 ev_start (EV_A_ (W)w, ++cleanupcnt);
3617 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3618 cleanups [cleanupcnt - 1] = w;
3619
3620 /* cleanup watchers should never keep a refcount on the loop */
3621 ev_unref (EV_A);
3622 EV_FREQUENT_CHECK;
3623}
3624
3625void
3626ev_cleanup_stop (EV_P_ ev_cleanup *w)
3627{
3628 clear_pending (EV_A_ (W)w);
3629 if (expect_false (!ev_is_active (w)))
3630 return;
3631
3632 EV_FREQUENT_CHECK;
3633 ev_ref (EV_A);
3634
3635 {
3636 int active = ev_active (w);
3637
3638 cleanups [active - 1] = cleanups [--cleanupcnt];
3639 ev_active (cleanups [active - 1]) = active;
3640 }
3641
3642 ev_stop (EV_A_ (W)w);
3643
3644 EV_FREQUENT_CHECK;
3645}
3646#endif
3647
3648#if EV_ASYNC_ENABLE
3649void
3650ev_async_start (EV_P_ ev_async *w)
3651{
3652 if (expect_false (ev_is_active (w)))
3653 return;
3654
3655 w->sent = 0;
3395 3656
3396 evpipe_init (EV_A); 3657 evpipe_init (EV_A);
3397 3658
3398 EV_FREQUENT_CHECK; 3659 EV_FREQUENT_CHECK;
3399 3660
… …
3427 3688
3428void 3689void
3429ev_async_send (EV_P_ ev_async *w) 3690ev_async_send (EV_P_ ev_async *w)
3430{ 3691{
3431 w->sent = 1; 3692 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3693 evpipe_write (EV_A_ &async_pending);
3433} 3694}
3434#endif 3695#endif
3435 3696
3436/*****************************************************************************/ 3697/*****************************************************************************/
3437 3698
… …
3477{ 3738{
3478 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3739 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3479 3740
3480 if (expect_false (!once)) 3741 if (expect_false (!once))
3481 { 3742 {
3482 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3743 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3483 return; 3744 return;
3484 } 3745 }
3485 3746
3486 once->cb = cb; 3747 once->cb = cb;
3487 once->arg = arg; 3748 once->arg = arg;
… …
3574 if (types & EV_ASYNC) 3835 if (types & EV_ASYNC)
3575 for (i = asynccnt; i--; ) 3836 for (i = asynccnt; i--; )
3576 cb (EV_A_ EV_ASYNC, asyncs [i]); 3837 cb (EV_A_ EV_ASYNC, asyncs [i]);
3577#endif 3838#endif
3578 3839
3840#if EV_PREPARE_ENABLE
3579 if (types & EV_PREPARE) 3841 if (types & EV_PREPARE)
3580 for (i = preparecnt; i--; ) 3842 for (i = preparecnt; i--; )
3581#if EV_EMBED_ENABLE 3843# if EV_EMBED_ENABLE
3582 if (ev_cb (prepares [i]) != embed_prepare_cb) 3844 if (ev_cb (prepares [i]) != embed_prepare_cb)
3583#endif 3845# endif
3584 cb (EV_A_ EV_PREPARE, prepares [i]); 3846 cb (EV_A_ EV_PREPARE, prepares [i]);
3847#endif
3585 3848
3849#if EV_CHECK_ENABLE
3586 if (types & EV_CHECK) 3850 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3851 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3852 cb (EV_A_ EV_CHECK, checks [i]);
3853#endif
3589 3854
3855#if EV_SIGNAL_ENABLE
3590 if (types & EV_SIGNAL) 3856 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3857 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3858 for (wl = signals [i].head; wl; )
3593 { 3859 {
3594 wn = wl->next; 3860 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3861 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3862 wl = wn;
3597 } 3863 }
3864#endif
3598 3865
3866#if EV_CHILD_ENABLE
3599 if (types & EV_CHILD) 3867 if (types & EV_CHILD)
3600 for (i = EV_PID_HASHSIZE; i--; ) 3868 for (i = (EV_PID_HASHSIZE); i--; )
3601 for (wl = childs [i]; wl; ) 3869 for (wl = childs [i]; wl; )
3602 { 3870 {
3603 wn = wl->next; 3871 wn = wl->next;
3604 cb (EV_A_ EV_CHILD, wl); 3872 cb (EV_A_ EV_CHILD, wl);
3605 wl = wn; 3873 wl = wn;
3606 } 3874 }
3875#endif
3607/* EV_STAT 0x00001000 /* stat data changed */ 3876/* EV_STAT 0x00001000 /* stat data changed */
3608/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3877/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3609} 3878}
3610#endif 3879#endif
3611 3880
3612#if EV_MULTIPLICITY 3881#if EV_MULTIPLICITY
3613 #include "ev_wrap.h" 3882 #include "ev_wrap.h"
3614#endif 3883#endif
3615 3884
3616#ifdef __cplusplus 3885EV_CPP(})
3617}
3618#endif
3619 3886

Diff Legend

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