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

Comparing libev/ev.c (file contents):
Revision 1.285 by root, Wed Apr 15 19:35:53 2009 UTC vs.
Revision 1.352 by root, Thu Oct 21 02:33:08 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
… …
75# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
77# endif 79# endif
78# endif 80# endif
79 81
82# if HAVE_NANOSLEEP
80# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
81# if HAVE_NANOSLEEP
82# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
83# else 86# else
87# undef EV_USE_NANOSLEEP
84# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
85# endif 94# endif
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
86# endif 98# endif
87 99
100# if HAVE_POLL && HAVE_POLL_H
88# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
89# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
90# define EV_USE_SELECT 1
91# else
92# define EV_USE_SELECT 0
93# endif 103# endif
94# endif
95
96# ifndef EV_USE_POLL
97# if HAVE_POLL && HAVE_POLL_H
98# define EV_USE_POLL 1
99# else 104# else
105# undef EV_USE_POLL
100# define EV_USE_POLL 0 106# define EV_USE_POLL 0
101# endif
102# endif 107# endif
103 108
104# ifndef EV_USE_EPOLL
105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
107# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 0
109# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
110# endif 116# endif
111 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
112# ifndef EV_USE_KQUEUE 119# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
114# define EV_USE_KQUEUE 1
115# else
116# define EV_USE_KQUEUE 0
117# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
118# endif 125# endif
119 126
120# ifndef EV_USE_PORT
121# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
122# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
123# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
124# define EV_USE_PORT 0
125# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
126# endif 134# endif
127 135
128# ifndef EV_USE_INOTIFY
129# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
130# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
131# else
132# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
133# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
134# endif 143# endif
135 144
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_SIGNALFD
137# if HAVE_EVENTFD 147# define EV_USE_SIGNALFD EV_FEATURE_OS
138# define EV_USE_EVENTFD 1
139# else
140# define EV_USE_EVENTFD 0
141# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
152# endif
153
154# if HAVE_EVENTFD
155# ifndef EV_USE_EVENTFD
156# define EV_USE_EVENTFD EV_FEATURE_OS
157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
142# endif 161# endif
143 162
144#endif 163#endif
145 164
146#include <math.h> 165#include <math.h>
147#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
148#include <fcntl.h> 168#include <fcntl.h>
149#include <stddef.h> 169#include <stddef.h>
150 170
151#include <stdio.h> 171#include <stdio.h>
152 172
153#include <assert.h> 173#include <assert.h>
154#include <errno.h> 174#include <errno.h>
155#include <sys/types.h> 175#include <sys/types.h>
156#include <time.h> 176#include <time.h>
177#include <limits.h>
157 178
158#include <signal.h> 179#include <signal.h>
159 180
160#ifdef EV_H 181#ifdef EV_H
161# include EV_H 182# include EV_H
… …
172# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 194# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
176# endif 197# endif
198# undef EV_AVOID_STDIO
177#endif 199#endif
200
201/* OS X, in its infinite idiocy, actually HARDCODES
202 * a limit of 1024 into their select. Where people have brains,
203 * OS X engineers apparently have a vacuum. Or maybe they were
204 * ordered to have a vacuum, or they do anything for money.
205 * This might help. Or not.
206 */
207#define _DARWIN_UNLIMITED_SELECT 1
178 208
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 209/* this block tries to deduce configuration from header-defined symbols and defaults */
210
211/* try to deduce the maximum number of signals on this platform */
212#if defined (EV_NSIG)
213/* use what's provided */
214#elif defined (NSIG)
215# define EV_NSIG (NSIG)
216#elif defined(_NSIG)
217# define EV_NSIG (_NSIG)
218#elif defined (SIGMAX)
219# define EV_NSIG (SIGMAX+1)
220#elif defined (SIG_MAX)
221# define EV_NSIG (SIG_MAX+1)
222#elif defined (_SIG_MAX)
223# define EV_NSIG (_SIG_MAX+1)
224#elif defined (MAXSIG)
225# define EV_NSIG (MAXSIG+1)
226#elif defined (MAX_SIG)
227# define EV_NSIG (MAX_SIG+1)
228#elif defined (SIGARRAYSIZE)
229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
230#elif defined (_sys_nsig)
231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
232#else
233# error "unable to find value for NSIG, please report"
234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
236# define EV_NSIG 65
237#endif
180 238
181#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
184# else 242# else
185# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
186# endif 244# endif
187#endif 245#endif
188 246
189#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
192# else 250# else
193# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
194# endif 252# endif
195#endif 253#endif
196 254
… …
198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 257#endif
200 258
201#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
204# else 262# else
205# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
206# endif 264# endif
207#endif 265#endif
208 266
209#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
210# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
211#endif 269#endif
212 270
213#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
214# ifdef _WIN32 272# ifdef _WIN32
215# define EV_USE_POLL 0 273# define EV_USE_POLL 0
216# else 274# else
217# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
218# endif 276# endif
219#endif 277#endif
220 278
221#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
224# else 282# else
225# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
226# endif 284# endif
227#endif 285#endif
228 286
… …
234# define EV_USE_PORT 0 292# define EV_USE_PORT 0
235#endif 293#endif
236 294
237#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
240# else 298# else
241# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
242# endif 300# endif
243#endif 301#endif
244 302
245#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
246# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
247# define EV_PID_HASHSIZE 1
248# else
249# define EV_PID_HASHSIZE 16
250# endif
251#endif 305#endif
252 306
253#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
254# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
255# define EV_INOTIFY_HASHSIZE 1
256# else
257# define EV_INOTIFY_HASHSIZE 16
258# endif
259#endif 309#endif
260 310
261#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
264# else 314# else
265# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
316# endif
317#endif
318
319#ifndef EV_USE_SIGNALFD
320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
321# define EV_USE_SIGNALFD EV_FEATURE_OS
322# else
323# define EV_USE_SIGNALFD 0
266# endif 324# endif
267#endif 325#endif
268 326
269#if 0 /* debugging */ 327#if 0 /* debugging */
270# define EV_VERIFY 3 328# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
273#endif 331#endif
274 332
275#ifndef EV_VERIFY 333#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
277#endif 335#endif
278 336
279#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
281#endif 339#endif
282 340
283#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
343#endif
344
345/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
346/* which makes programs even slower. might work on other unices, too. */
347#if EV_USE_CLOCK_SYSCALL
348# include <syscall.h>
349# ifdef SYS_clock_gettime
350# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
351# undef EV_USE_MONOTONIC
352# define EV_USE_MONOTONIC 1
353# else
354# undef EV_USE_CLOCK_SYSCALL
355# define EV_USE_CLOCK_SYSCALL 0
356# endif
285#endif 357#endif
286 358
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 359/* this block fixes any misconfiguration where we know we run into trouble otherwise */
360
361#ifdef _AIX
362/* AIX has a completely broken poll.h header */
363# undef EV_USE_POLL
364# define EV_USE_POLL 0
365#endif
288 366
289#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
292#endif 370#endif
… …
320 398
321#if EV_SELECT_IS_WINSOCKET 399#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 400# include <winsock.h>
323#endif 401#endif
324 402
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 403#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 404/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 405# include <stdint.h>
406# ifndef EFD_NONBLOCK
407# define EFD_NONBLOCK O_NONBLOCK
408# endif
409# ifndef EFD_CLOEXEC
410# ifdef O_CLOEXEC
411# define EFD_CLOEXEC O_CLOEXEC
412# else
413# define EFD_CLOEXEC 02000000
414# endif
415# endif
337# ifdef __cplusplus 416# ifdef __cplusplus
338extern "C" { 417extern "C" {
339# endif 418# endif
340int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 420# ifdef __cplusplus
342} 421}
343# endif 422# endif
344#endif 423#endif
345 424
425#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h>
428# ifndef SFD_NONBLOCK
429# define SFD_NONBLOCK O_NONBLOCK
430# endif
431# ifndef SFD_CLOEXEC
432# ifdef O_CLOEXEC
433# define SFD_CLOEXEC O_CLOEXEC
434# else
435# define SFD_CLOEXEC 02000000
436# endif
437# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags);
442
443struct signalfd_siginfo
444{
445 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)];
447};
448# ifdef __cplusplus
449}
450# endif
451#endif
452
346/**/ 453/**/
347 454
348#if EV_VERIFY >= 3 455#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 456# define EV_FREQUENT_CHECK ev_verify (EV_A)
350#else 457#else
351# define EV_FREQUENT_CHECK do { } while (0) 458# define EV_FREQUENT_CHECK do { } while (0)
352#endif 459#endif
353 460
354/* 461/*
… …
361 */ 468 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 469#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 470
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 471#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 472#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 473
474#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
475#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
367 476
368#if __GNUC__ >= 4 477#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 478# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 479# define noinline __attribute__ ((noinline))
371#else 480#else
… …
378 487
379#define expect_false(expr) expect ((expr) != 0, 0) 488#define expect_false(expr) expect ((expr) != 0, 0)
380#define expect_true(expr) expect ((expr) != 0, 1) 489#define expect_true(expr) expect ((expr) != 0, 1)
381#define inline_size static inline 490#define inline_size static inline
382 491
383#if EV_MINIMAL 492#if EV_FEATURE_CODE
493# define inline_speed static inline
494#else
384# define inline_speed static noinline 495# define inline_speed static noinline
496#endif
497
498#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
499
500#if EV_MINPRI == EV_MAXPRI
501# define ABSPRI(w) (((W)w), 0)
385#else 502#else
386# define inline_speed static inline
387#endif
388
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 503# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
504#endif
391 505
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 506#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 507#define EMPTY2(a,b) /* used to suppress some warnings */
394 508
395typedef ev_watcher *W; 509typedef ev_watcher *W;
… …
399#define ev_active(w) ((W)(w))->active 513#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 514#define ev_at(w) ((WT)(w))->at
401 515
402#if EV_USE_REALTIME 516#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 517/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */ 518/* giving it a reasonably high chance of working on typical architectures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 519static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif 520#endif
407 521
408#if EV_USE_MONOTONIC 522#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 523static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 524#endif
411 525
526#ifndef EV_FD_TO_WIN32_HANDLE
527# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
528#endif
529#ifndef EV_WIN32_HANDLE_TO_FD
530# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
531#endif
532#ifndef EV_WIN32_CLOSE_FD
533# define EV_WIN32_CLOSE_FD(fd) close (fd)
534#endif
535
412#ifdef _WIN32 536#ifdef _WIN32
413# include "ev_win32.c" 537# include "ev_win32.c"
414#endif 538#endif
415 539
416/*****************************************************************************/ 540/*****************************************************************************/
541
542#if EV_AVOID_STDIO
543static void noinline
544ev_printerr (const char *msg)
545{
546 write (STDERR_FILENO, msg, strlen (msg));
547}
548#endif
417 549
418static void (*syserr_cb)(const char *msg); 550static void (*syserr_cb)(const char *msg);
419 551
420void 552void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 553ev_set_syserr_cb (void (*cb)(const char *msg))
… …
431 563
432 if (syserr_cb) 564 if (syserr_cb)
433 syserr_cb (msg); 565 syserr_cb (msg);
434 else 566 else
435 { 567 {
568#if EV_AVOID_STDIO
569 const char *err = strerror (errno);
570
571 ev_printerr (msg);
572 ev_printerr (": ");
573 ev_printerr (err);
574 ev_printerr ("\n");
575#else
436 perror (msg); 576 perror (msg);
577#endif
437 abort (); 578 abort ();
438 } 579 }
439} 580}
440 581
441static void * 582static void *
442ev_realloc_emul (void *ptr, long size) 583ev_realloc_emul (void *ptr, long size)
443{ 584{
585#if __GLIBC__
586 return realloc (ptr, size);
587#else
444 /* some systems, notably openbsd and darwin, fail to properly 588 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 589 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 590 * the single unix specification, so work around them here.
447 */ 591 */
448 592
449 if (size) 593 if (size)
450 return realloc (ptr, size); 594 return realloc (ptr, size);
451 595
452 free (ptr); 596 free (ptr);
453 return 0; 597 return 0;
598#endif
454} 599}
455 600
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 601static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 602
458void 603void
… …
466{ 611{
467 ptr = alloc (ptr, size); 612 ptr = alloc (ptr, size);
468 613
469 if (!ptr && size) 614 if (!ptr && size)
470 { 615 {
616#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n");
618#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
620#endif
472 abort (); 621 abort ();
473 } 622 }
474 623
475 return ptr; 624 return ptr;
476} 625}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 627#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 628#define ev_free(ptr) ev_realloc ((ptr), 0)
480 629
481/*****************************************************************************/ 630/*****************************************************************************/
482 631
632/* set in reify when reification needed */
633#define EV_ANFD_REIFY 1
634
635/* file descriptor info structure */
483typedef struct 636typedef struct
484{ 637{
485 WL head; 638 WL head;
486 unsigned char events; 639 unsigned char events; /* the events watched for */
487 unsigned char reify; 640 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 641 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 642 unsigned char unused;
490#if EV_USE_EPOLL 643#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 644 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 645#endif
493#if EV_SELECT_IS_WINSOCKET 646#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 647 SOCKET handle;
495#endif 648#endif
496} ANFD; 649} ANFD;
497 650
651/* stores the pending event set for a given watcher */
498typedef struct 652typedef struct
499{ 653{
500 W w; 654 W w;
501 int events; 655 int events; /* the pending event set for the given watcher */
502} ANPENDING; 656} ANPENDING;
503 657
504#if EV_USE_INOTIFY 658#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 659/* hash table entry per inotify-id */
506typedef struct 660typedef struct
… …
509} ANFS; 663} ANFS;
510#endif 664#endif
511 665
512/* Heap Entry */ 666/* Heap Entry */
513#if EV_HEAP_CACHE_AT 667#if EV_HEAP_CACHE_AT
668 /* a heap element */
514 typedef struct { 669 typedef struct {
515 ev_tstamp at; 670 ev_tstamp at;
516 WT w; 671 WT w;
517 } ANHE; 672 } ANHE;
518 673
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 674 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 675 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 676 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 677#else
678 /* a heap element */
523 typedef WT ANHE; 679 typedef WT ANHE;
524 680
525 #define ANHE_w(he) (he) 681 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 682 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 683 #define ANHE_at_cache(he)
… …
551 707
552 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
553 709
554#endif 710#endif
555 711
712#if EV_FEATURE_API
713# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
714# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
715# define EV_INVOKE_PENDING invoke_cb (EV_A)
716#else
717# define EV_RELEASE_CB (void)0
718# define EV_ACQUIRE_CB (void)0
719# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
720#endif
721
722#define EVUNLOOP_RECURSE 0x80
723
556/*****************************************************************************/ 724/*****************************************************************************/
557 725
726#ifndef EV_HAVE_EV_TIME
558ev_tstamp 727ev_tstamp
559ev_time (void) 728ev_time (void)
560{ 729{
561#if EV_USE_REALTIME 730#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 731 if (expect_true (have_realtime))
… …
569 738
570 struct timeval tv; 739 struct timeval tv;
571 gettimeofday (&tv, 0); 740 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 741 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 742}
743#endif
574 744
575inline_size ev_tstamp 745inline_size ev_tstamp
576get_clock (void) 746get_clock (void)
577{ 747{
578#if EV_USE_MONOTONIC 748#if EV_USE_MONOTONIC
… …
601 if (delay > 0.) 771 if (delay > 0.)
602 { 772 {
603#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
604 struct timespec ts; 774 struct timespec ts;
605 775
606 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
607 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
608
609 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
610#elif defined(_WIN32) 778#elif defined(_WIN32)
611 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
612#else 780#else
613 struct timeval tv; 781 struct timeval tv;
614 782
615 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
621 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
622#endif 788#endif
623 } 789 }
624} 790}
625 791
626/*****************************************************************************/ 792/*****************************************************************************/
627 793
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 794#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 795
796/* find a suitable new size for the given array, */
797/* hopefully by rounding to a nice-to-malloc size */
630inline_size int 798inline_size int
631array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
632{ 800{
633 int ncur = cur + 1; 801 int ncur = cur + 1;
634 802
… …
680#define array_free(stem, idx) \ 848#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 849 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 850
683/*****************************************************************************/ 851/*****************************************************************************/
684 852
853/* dummy callback for pending events */
854static void noinline
855pendingcb (EV_P_ ev_prepare *w, int revents)
856{
857}
858
685void noinline 859void noinline
686ev_feed_event (EV_P_ void *w, int revents) 860ev_feed_event (EV_P_ void *w, int revents)
687{ 861{
688 W w_ = (W)w; 862 W w_ = (W)w;
689 int pri = ABSPRI (w_); 863 int pri = ABSPRI (w_);
… …
724} 898}
725 899
726/*****************************************************************************/ 900/*****************************************************************************/
727 901
728inline_speed void 902inline_speed void
729fd_event (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
730{ 904{
731 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
732 ev_io *w; 906 ev_io *w;
733 907
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 908 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
738 if (ev) 912 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 913 ev_feed_event (EV_A_ (W)w, ev);
740 } 914 }
741} 915}
742 916
917/* do not submit kernel events for fds that have reify set */
918/* because that means they changed while we were polling for new events */
919inline_speed void
920fd_event (EV_P_ int fd, int revents)
921{
922 ANFD *anfd = anfds + fd;
923
924 if (expect_true (!anfd->reify))
925 fd_event_nocheck (EV_A_ fd, revents);
926}
927
743void 928void
744ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 930{
746 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
748} 933}
749 934
935/* make sure the external fd watch events are in-sync */
936/* with the kernel/libev internal state */
750inline_size void 937inline_size void
751fd_reify (EV_P) 938fd_reify (EV_P)
752{ 939{
753 int i; 940 int i;
754 941
… …
756 { 943 {
757 int fd = fdchanges [i]; 944 int fd = fdchanges [i];
758 ANFD *anfd = anfds + fd; 945 ANFD *anfd = anfds + fd;
759 ev_io *w; 946 ev_io *w;
760 947
761 unsigned char events = 0; 948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
762 950
763 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 951 anfd->reify = 0;
764 events |= (unsigned char)w->events;
765 952
766#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
767 if (events) 954 if (o_reify & EV__IOFDSET)
768 { 955 {
769 unsigned long arg; 956 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 959 }
777#endif 960#endif
778 961
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
779 { 963 {
780 unsigned char o_events = anfd->events;
781 unsigned char o_reify = anfd->reify;
782
783 anfd->reify = 0;
784 anfd->events = events; 964 anfd->events = 0;
785 965
786 if (o_events != events || o_reify & EV__IOFDSET) 966 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
967 anfd->events |= (unsigned char)w->events;
968
969 if (o_events != anfd->events)
970 o_reify = EV__IOFDSET; /* actually |= */
971 }
972
973 if (o_reify & EV__IOFDSET)
787 backend_modify (EV_A_ fd, o_events, events); 974 backend_modify (EV_A_ fd, o_events, anfd->events);
788 }
789 } 975 }
790 976
791 fdchangecnt = 0; 977 fdchangecnt = 0;
792} 978}
793 979
980/* something about the given fd changed */
794inline_size void 981inline_size void
795fd_change (EV_P_ int fd, int flags) 982fd_change (EV_P_ int fd, int flags)
796{ 983{
797 unsigned char reify = anfds [fd].reify; 984 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 985 anfds [fd].reify |= flags;
… …
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 990 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 991 fdchanges [fdchangecnt - 1] = fd;
805 } 992 }
806} 993}
807 994
995/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 996inline_speed void
809fd_kill (EV_P_ int fd) 997fd_kill (EV_P_ int fd)
810{ 998{
811 ev_io *w; 999 ev_io *w;
812 1000
… …
815 ev_io_stop (EV_A_ w); 1003 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1004 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 1005 }
818} 1006}
819 1007
1008/* check whether the given fd is actually valid, for error recovery */
820inline_size int 1009inline_size int
821fd_valid (int fd) 1010fd_valid (int fd)
822{ 1011{
823#ifdef _WIN32 1012#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 1013 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 1014#else
826 return fcntl (fd, F_GETFD) != -1; 1015 return fcntl (fd, F_GETFD) != -1;
827#endif 1016#endif
828} 1017}
829 1018
… …
847 1036
848 for (fd = anfdmax; fd--; ) 1037 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1038 if (anfds [fd].events)
850 { 1039 {
851 fd_kill (EV_A_ fd); 1040 fd_kill (EV_A_ fd);
852 return; 1041 break;
853 } 1042 }
854} 1043}
855 1044
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1045/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1046static void noinline
… …
862 for (fd = 0; fd < anfdmax; ++fd) 1051 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1052 if (anfds [fd].events)
864 { 1053 {
865 anfds [fd].events = 0; 1054 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1055 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1056 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1057 }
869} 1058}
870 1059
1060/* used to prepare libev internal fd's */
1061/* this is not fork-safe */
1062inline_speed void
1063fd_intern (int fd)
1064{
1065#ifdef _WIN32
1066 unsigned long arg = 1;
1067 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1068#else
1069 fcntl (fd, F_SETFD, FD_CLOEXEC);
1070 fcntl (fd, F_SETFL, O_NONBLOCK);
1071#endif
1072}
1073
871/*****************************************************************************/ 1074/*****************************************************************************/
872 1075
873/* 1076/*
874 * the heap functions want a real array index. array index 0 uis guaranteed to not 1077 * the heap functions want a real array index. array index 0 is guaranteed to not
875 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1078 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
876 * the branching factor of the d-tree. 1079 * the branching factor of the d-tree.
877 */ 1080 */
878 1081
879/* 1082/*
… …
947 1150
948 for (;;) 1151 for (;;)
949 { 1152 {
950 int c = k << 1; 1153 int c = k << 1;
951 1154
952 if (c > N + HEAP0 - 1) 1155 if (c >= N + HEAP0)
953 break; 1156 break;
954 1157
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1158 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1159 ? 1 : 0;
957 1160
… …
989 1192
990 heap [k] = he; 1193 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1194 ev_active (ANHE_w (he)) = k;
992} 1195}
993 1196
1197/* move an element suitably so it is in a correct place */
994inline_size void 1198inline_size void
995adjustheap (ANHE *heap, int N, int k) 1199adjustheap (ANHE *heap, int N, int k)
996{ 1200{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1201 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1202 upheap (heap, k);
999 else 1203 else
1000 downheap (heap, N, k); 1204 downheap (heap, N, k);
1001} 1205}
1002 1206
… …
1012 upheap (heap, i + HEAP0); 1216 upheap (heap, i + HEAP0);
1013} 1217}
1014 1218
1015/*****************************************************************************/ 1219/*****************************************************************************/
1016 1220
1221/* associate signal watchers to a signal signal */
1017typedef struct 1222typedef struct
1018{ 1223{
1224 EV_ATOMIC_T pending;
1225#if EV_MULTIPLICITY
1226 EV_P;
1227#endif
1019 WL head; 1228 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1229} ANSIG;
1022 1230
1023static ANSIG *signals; 1231static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1232
1028/*****************************************************************************/ 1233/*****************************************************************************/
1029 1234
1030inline_speed void 1235#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1031fd_intern (int fd)
1032{
1033#ifdef _WIN32
1034 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1036#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif
1040}
1041 1236
1042static void noinline 1237static void noinline
1043evpipe_init (EV_P) 1238evpipe_init (EV_P)
1044{ 1239{
1045 if (!ev_is_active (&pipeev)) 1240 if (!ev_is_active (&pipe_w))
1046 { 1241 {
1047#if EV_USE_EVENTFD 1242# if EV_USE_EVENTFD
1243 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1244 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1245 evfd = eventfd (0, 0);
1246
1247 if (evfd >= 0)
1049 { 1248 {
1050 evpipe [0] = -1; 1249 evpipe [0] = -1;
1051 fd_intern (evfd); 1250 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1251 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1252 }
1054 else 1253 else
1055#endif 1254# endif
1056 { 1255 {
1057 while (pipe (evpipe)) 1256 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1257 ev_syserr ("(libev) error creating signal/async pipe");
1059 1258
1060 fd_intern (evpipe [0]); 1259 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1260 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1261 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1262 }
1064 1263
1065 ev_io_start (EV_A_ &pipeev); 1264 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1265 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1266 }
1068} 1267}
1069 1268
1070inline_size void 1269inline_size void
1071evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1270evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1072{ 1271{
1073 if (!*flag) 1272 if (!*flag)
1074 { 1273 {
1075 int old_errno = errno; /* save errno because write might clobber it */ 1274 int old_errno = errno; /* save errno because write might clobber it */
1275 char dummy;
1076 1276
1077 *flag = 1; 1277 *flag = 1;
1078 1278
1079#if EV_USE_EVENTFD 1279#if EV_USE_EVENTFD
1080 if (evfd >= 0) 1280 if (evfd >= 0)
… …
1082 uint64_t counter = 1; 1282 uint64_t counter = 1;
1083 write (evfd, &counter, sizeof (uint64_t)); 1283 write (evfd, &counter, sizeof (uint64_t));
1084 } 1284 }
1085 else 1285 else
1086#endif 1286#endif
1287 /* win32 people keep sending patches that change this write() to send() */
1288 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1289 /* so when you think this write should be a send instead, please find out */
1290 /* where your send() is from - it's definitely not the microsoft send, and */
1291 /* tell me. thank you. */
1087 write (evpipe [1], &old_errno, 1); 1292 write (evpipe [1], &dummy, 1);
1088 1293
1089 errno = old_errno; 1294 errno = old_errno;
1090 } 1295 }
1091} 1296}
1092 1297
1298/* called whenever the libev signal pipe */
1299/* got some events (signal, async) */
1093static void 1300static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1301pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1302{
1303 int i;
1304
1096#if EV_USE_EVENTFD 1305#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1306 if (evfd >= 0)
1098 { 1307 {
1099 uint64_t counter; 1308 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1309 read (evfd, &counter, sizeof (uint64_t));
1101 } 1310 }
1102 else 1311 else
1103#endif 1312#endif
1104 { 1313 {
1105 char dummy; 1314 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1106 read (evpipe [0], &dummy, 1); 1316 read (evpipe [0], &dummy, 1);
1107 } 1317 }
1108 1318
1109 if (gotsig && ev_is_default_loop (EV_A)) 1319 if (sig_pending)
1110 { 1320 {
1111 int signum; 1321 sig_pending = 0;
1112 gotsig = 0;
1113 1322
1114 for (signum = signalmax; signum--; ) 1323 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1324 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1325 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1326 }
1118 1327
1119#if EV_ASYNC_ENABLE 1328#if EV_ASYNC_ENABLE
1120 if (gotasync) 1329 if (async_pending)
1121 { 1330 {
1122 int i; 1331 async_pending = 0;
1123 gotasync = 0;
1124 1332
1125 for (i = asynccnt; i--; ) 1333 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1334 if (asyncs [i]->sent)
1127 { 1335 {
1128 asyncs [i]->sent = 0; 1336 asyncs [i]->sent = 0;
… …
1136 1344
1137static void 1345static void
1138ev_sighandler (int signum) 1346ev_sighandler (int signum)
1139{ 1347{
1140#if EV_MULTIPLICITY 1348#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1349 EV_P = signals [signum - 1].loop;
1142#endif 1350#endif
1143 1351
1144#if _WIN32 1352#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1353 signal (signum, ev_sighandler);
1146#endif 1354#endif
1147 1355
1148 signals [signum - 1].gotsig = 1; 1356 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1357 evpipe_write (EV_A_ &sig_pending);
1150} 1358}
1151 1359
1152void noinline 1360void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1361ev_feed_signal_event (EV_P_ int signum)
1154{ 1362{
1155 WL w; 1363 WL w;
1156 1364
1365 if (expect_false (signum <= 0 || signum > EV_NSIG))
1366 return;
1367
1368 --signum;
1369
1157#if EV_MULTIPLICITY 1370#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1371 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1372 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1373
1161 --signum; 1374 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1375 return;
1376#endif
1165 1377
1166 signals [signum].gotsig = 0; 1378 signals [signum].pending = 0;
1167 1379
1168 for (w = signals [signum].head; w; w = w->next) 1380 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1381 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1382}
1171 1383
1384#if EV_USE_SIGNALFD
1385static void
1386sigfdcb (EV_P_ ev_io *iow, int revents)
1387{
1388 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1389
1390 for (;;)
1391 {
1392 ssize_t res = read (sigfd, si, sizeof (si));
1393
1394 /* not ISO-C, as res might be -1, but works with SuS */
1395 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1396 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1397
1398 if (res < (ssize_t)sizeof (si))
1399 break;
1400 }
1401}
1402#endif
1403
1404#endif
1405
1172/*****************************************************************************/ 1406/*****************************************************************************/
1173 1407
1408#if EV_CHILD_ENABLE
1174static WL childs [EV_PID_HASHSIZE]; 1409static WL childs [EV_PID_HASHSIZE];
1175
1176#ifndef _WIN32
1177 1410
1178static ev_signal childev; 1411static ev_signal childev;
1179 1412
1180#ifndef WIFCONTINUED 1413#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1414# define WIFCONTINUED(status) 0
1182#endif 1415#endif
1183 1416
1417/* handle a single child status event */
1184inline_speed void 1418inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1419child_reap (EV_P_ int chain, int pid, int status)
1186{ 1420{
1187 ev_child *w; 1421 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1422 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1189 1423
1190 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1424 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1191 { 1425 {
1192 if ((w->pid == pid || !w->pid) 1426 if ((w->pid == pid || !w->pid)
1193 && (!traced || (w->flags & 1))) 1427 && (!traced || (w->flags & 1)))
1194 { 1428 {
1195 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1429 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1202 1436
1203#ifndef WCONTINUED 1437#ifndef WCONTINUED
1204# define WCONTINUED 0 1438# define WCONTINUED 0
1205#endif 1439#endif
1206 1440
1441/* called on sigchld etc., calls waitpid */
1207static void 1442static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1443childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1444{
1210 int pid, status; 1445 int pid, status;
1211 1446
… …
1219 /* make sure we are called again until all children have been reaped */ 1454 /* make sure we are called again until all children have been reaped */
1220 /* we need to do it this way so that the callback gets called before we continue */ 1455 /* we need to do it this way so that the callback gets called before we continue */
1221 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1456 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1222 1457
1223 child_reap (EV_A_ pid, pid, status); 1458 child_reap (EV_A_ pid, pid, status);
1224 if (EV_PID_HASHSIZE > 1) 1459 if ((EV_PID_HASHSIZE) > 1)
1225 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1460 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1226} 1461}
1227 1462
1228#endif 1463#endif
1229 1464
… …
1296#ifdef __APPLE__ 1531#ifdef __APPLE__
1297 /* only select works correctly on that "unix-certified" platform */ 1532 /* only select works correctly on that "unix-certified" platform */
1298 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1533 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1299 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1534 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1300#endif 1535#endif
1536#ifdef __FreeBSD__
1537 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1538#endif
1301 1539
1302 return flags; 1540 return flags;
1303} 1541}
1304 1542
1305unsigned int 1543unsigned int
… …
1318ev_backend (EV_P) 1556ev_backend (EV_P)
1319{ 1557{
1320 return backend; 1558 return backend;
1321} 1559}
1322 1560
1561#if EV_FEATURE_API
1323unsigned int 1562unsigned int
1324ev_loop_count (EV_P) 1563ev_iteration (EV_P)
1325{ 1564{
1326 return loop_count; 1565 return loop_count;
1327} 1566}
1328 1567
1568unsigned int
1569ev_depth (EV_P)
1570{
1571 return loop_depth;
1572}
1573
1329void 1574void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1575ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1576{
1332 io_blocktime = interval; 1577 io_blocktime = interval;
1333} 1578}
… …
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1581ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1582{
1338 timeout_blocktime = interval; 1583 timeout_blocktime = interval;
1339} 1584}
1340 1585
1586void
1587ev_set_userdata (EV_P_ void *data)
1588{
1589 userdata = data;
1590}
1591
1592void *
1593ev_userdata (EV_P)
1594{
1595 return userdata;
1596}
1597
1598void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1599{
1600 invoke_cb = invoke_pending_cb;
1601}
1602
1603void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1604{
1605 release_cb = release;
1606 acquire_cb = acquire;
1607}
1608#endif
1609
1610/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1611static void noinline
1342loop_init (EV_P_ unsigned int flags) 1612loop_init (EV_P_ unsigned int flags)
1343{ 1613{
1344 if (!backend) 1614 if (!backend)
1345 { 1615 {
… …
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1631 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1632 have_monotonic = 1;
1363 } 1633 }
1364#endif 1634#endif
1365 1635
1636 /* pid check not overridable via env */
1637#ifndef _WIN32
1638 if (flags & EVFLAG_FORKCHECK)
1639 curpid = getpid ();
1640#endif
1641
1642 if (!(flags & EVFLAG_NOENV)
1643 && !enable_secure ()
1644 && getenv ("LIBEV_FLAGS"))
1645 flags = atoi (getenv ("LIBEV_FLAGS"));
1646
1366 ev_rt_now = ev_time (); 1647 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1648 mn_now = get_clock ();
1368 now_floor = mn_now; 1649 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1650 rtmn_diff = ev_rt_now - mn_now;
1651#if EV_FEATURE_API
1652 invoke_cb = ev_invoke_pending;
1653#endif
1370 1654
1371 io_blocktime = 0.; 1655 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1656 timeout_blocktime = 0.;
1373 backend = 0; 1657 backend = 0;
1374 backend_fd = -1; 1658 backend_fd = -1;
1375 gotasync = 0; 1659 sig_pending = 0;
1660#if EV_ASYNC_ENABLE
1661 async_pending = 0;
1662#endif
1376#if EV_USE_INOTIFY 1663#if EV_USE_INOTIFY
1377 fs_fd = -2; 1664 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1665#endif
1379 1666#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1667 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1668#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1669
1391 if (!(flags & 0x0000ffffU)) 1670 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1671 flags |= ev_recommended_backends ();
1393 1672
1394#if EV_USE_PORT 1673#if EV_USE_PORT
… …
1405#endif 1684#endif
1406#if EV_USE_SELECT 1685#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1686 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1687#endif
1409 1688
1689 ev_prepare_init (&pending_w, pendingcb);
1690
1691#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1410 ev_init (&pipeev, pipecb); 1692 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1693 ev_set_priority (&pipe_w, EV_MAXPRI);
1694#endif
1412 } 1695 }
1413} 1696}
1414 1697
1698/* free up a loop structure */
1415static void noinline 1699static void noinline
1416loop_destroy (EV_P) 1700loop_destroy (EV_P)
1417{ 1701{
1418 int i; 1702 int i;
1419 1703
1420 if (ev_is_active (&pipeev)) 1704 if (ev_is_active (&pipe_w))
1421 { 1705 {
1422 ev_ref (EV_A); /* signal watcher */ 1706 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1707 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1708
1425#if EV_USE_EVENTFD 1709#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1710 if (evfd >= 0)
1427 close (evfd); 1711 close (evfd);
1428#endif 1712#endif
1429 1713
1430 if (evpipe [0] >= 0) 1714 if (evpipe [0] >= 0)
1431 { 1715 {
1432 close (evpipe [0]); 1716 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1717 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1718 }
1435 } 1719 }
1720
1721#if EV_USE_SIGNALFD
1722 if (ev_is_active (&sigfd_w))
1723 close (sigfd);
1724#endif
1436 1725
1437#if EV_USE_INOTIFY 1726#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1727 if (fs_fd >= 0)
1439 close (fs_fd); 1728 close (fs_fd);
1440#endif 1729#endif
… …
1464#if EV_IDLE_ENABLE 1753#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1754 array_free (idle, [i]);
1466#endif 1755#endif
1467 } 1756 }
1468 1757
1469 ev_free (anfds); anfdmax = 0; 1758 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1759
1471 /* have to use the microsoft-never-gets-it-right macro */ 1760 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1761 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1762 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1763 array_free (timer, EMPTY);
… …
1505#endif 1794#endif
1506#if EV_USE_INOTIFY 1795#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1796 infy_fork (EV_A);
1508#endif 1797#endif
1509 1798
1510 if (ev_is_active (&pipeev)) 1799 if (ev_is_active (&pipe_w))
1511 { 1800 {
1512 /* this "locks" the handlers against writing to the pipe */ 1801 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1802 /* while we modify the fd vars */
1514 gotsig = 1; 1803 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1804#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1805 async_pending = 1;
1517#endif 1806#endif
1518 1807
1519 ev_ref (EV_A); 1808 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1809 ev_io_stop (EV_A_ &pipe_w);
1521 1810
1522#if EV_USE_EVENTFD 1811#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1812 if (evfd >= 0)
1524 close (evfd); 1813 close (evfd);
1525#endif 1814#endif
1526 1815
1527 if (evpipe [0] >= 0) 1816 if (evpipe [0] >= 0)
1528 { 1817 {
1529 close (evpipe [0]); 1818 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1819 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1820 }
1532 1821
1822#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1533 evpipe_init (EV_A); 1823 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1824 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1825 pipecb (EV_A_ &pipe_w, EV_READ);
1826#endif
1536 } 1827 }
1537 1828
1538 postfork = 0; 1829 postfork = 0;
1539} 1830}
1540 1831
1541#if EV_MULTIPLICITY 1832#if EV_MULTIPLICITY
1542 1833
1543struct ev_loop * 1834struct ev_loop *
1544ev_loop_new (unsigned int flags) 1835ev_loop_new (unsigned int flags)
1545{ 1836{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1837 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1838
1548 memset (loop, 0, sizeof (struct ev_loop)); 1839 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1840 loop_init (EV_A_ flags);
1551 1841
1552 if (ev_backend (EV_A)) 1842 if (ev_backend (EV_A))
1553 return loop; 1843 return EV_A;
1554 1844
1555 return 0; 1845 return 0;
1556} 1846}
1557 1847
1558void 1848void
… …
1565void 1855void
1566ev_loop_fork (EV_P) 1856ev_loop_fork (EV_P)
1567{ 1857{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1858 postfork = 1; /* must be in line with ev_default_fork */
1569} 1859}
1860#endif /* multiplicity */
1570 1861
1571#if EV_VERIFY 1862#if EV_VERIFY
1572static void noinline 1863static void noinline
1573verify_watcher (EV_P_ W w) 1864verify_watcher (EV_P_ W w)
1574{ 1865{
… …
1602 verify_watcher (EV_A_ ws [cnt]); 1893 verify_watcher (EV_A_ ws [cnt]);
1603 } 1894 }
1604} 1895}
1605#endif 1896#endif
1606 1897
1898#if EV_FEATURE_API
1607void 1899void
1608ev_loop_verify (EV_P) 1900ev_verify (EV_P)
1609{ 1901{
1610#if EV_VERIFY 1902#if EV_VERIFY
1611 int i; 1903 int i;
1612 WL w; 1904 WL w;
1613 1905
… …
1652#if EV_ASYNC_ENABLE 1944#if EV_ASYNC_ENABLE
1653 assert (asyncmax >= asynccnt); 1945 assert (asyncmax >= asynccnt);
1654 array_verify (EV_A_ (W *)asyncs, asynccnt); 1946 array_verify (EV_A_ (W *)asyncs, asynccnt);
1655#endif 1947#endif
1656 1948
1949#if EV_PREPARE_ENABLE
1657 assert (preparemax >= preparecnt); 1950 assert (preparemax >= preparecnt);
1658 array_verify (EV_A_ (W *)prepares, preparecnt); 1951 array_verify (EV_A_ (W *)prepares, preparecnt);
1952#endif
1659 1953
1954#if EV_CHECK_ENABLE
1660 assert (checkmax >= checkcnt); 1955 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1956 array_verify (EV_A_ (W *)checks, checkcnt);
1957#endif
1662 1958
1663# if 0 1959# if 0
1960#if EV_CHILD_ENABLE
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1961 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1962 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1963#endif
1666# endif 1964# endif
1667#endif 1965#endif
1668} 1966}
1669 1967#endif
1670#endif /* multiplicity */
1671 1968
1672#if EV_MULTIPLICITY 1969#if EV_MULTIPLICITY
1673struct ev_loop * 1970struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1971ev_default_loop_init (unsigned int flags)
1675#else 1972#else
… …
1678#endif 1975#endif
1679{ 1976{
1680 if (!ev_default_loop_ptr) 1977 if (!ev_default_loop_ptr)
1681 { 1978 {
1682#if EV_MULTIPLICITY 1979#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1980 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1981#else
1685 ev_default_loop_ptr = 1; 1982 ev_default_loop_ptr = 1;
1686#endif 1983#endif
1687 1984
1688 loop_init (EV_A_ flags); 1985 loop_init (EV_A_ flags);
1689 1986
1690 if (ev_backend (EV_A)) 1987 if (ev_backend (EV_A))
1691 { 1988 {
1692#ifndef _WIN32 1989#if EV_CHILD_ENABLE
1693 ev_signal_init (&childev, childcb, SIGCHLD); 1990 ev_signal_init (&childev, childcb, SIGCHLD);
1694 ev_set_priority (&childev, EV_MAXPRI); 1991 ev_set_priority (&childev, EV_MAXPRI);
1695 ev_signal_start (EV_A_ &childev); 1992 ev_signal_start (EV_A_ &childev);
1696 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1993 ev_unref (EV_A); /* child watcher should not keep loop alive */
1697#endif 1994#endif
… …
1705 2002
1706void 2003void
1707ev_default_destroy (void) 2004ev_default_destroy (void)
1708{ 2005{
1709#if EV_MULTIPLICITY 2006#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 2007 EV_P = ev_default_loop_ptr;
1711#endif 2008#endif
1712 2009
1713 ev_default_loop_ptr = 0; 2010 ev_default_loop_ptr = 0;
1714 2011
1715#ifndef _WIN32 2012#if EV_CHILD_ENABLE
1716 ev_ref (EV_A); /* child watcher */ 2013 ev_ref (EV_A); /* child watcher */
1717 ev_signal_stop (EV_A_ &childev); 2014 ev_signal_stop (EV_A_ &childev);
1718#endif 2015#endif
1719 2016
1720 loop_destroy (EV_A); 2017 loop_destroy (EV_A);
… …
1722 2019
1723void 2020void
1724ev_default_fork (void) 2021ev_default_fork (void)
1725{ 2022{
1726#if EV_MULTIPLICITY 2023#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 2024 EV_P = ev_default_loop_ptr;
1728#endif 2025#endif
1729 2026
1730 postfork = 1; /* must be in line with ev_loop_fork */ 2027 postfork = 1; /* must be in line with ev_loop_fork */
1731} 2028}
1732 2029
… …
1736ev_invoke (EV_P_ void *w, int revents) 2033ev_invoke (EV_P_ void *w, int revents)
1737{ 2034{
1738 EV_CB_INVOKE ((W)w, revents); 2035 EV_CB_INVOKE ((W)w, revents);
1739} 2036}
1740 2037
1741inline_speed void 2038unsigned int
1742call_pending (EV_P) 2039ev_pending_count (EV_P)
2040{
2041 int pri;
2042 unsigned int count = 0;
2043
2044 for (pri = NUMPRI; pri--; )
2045 count += pendingcnt [pri];
2046
2047 return count;
2048}
2049
2050void noinline
2051ev_invoke_pending (EV_P)
1743{ 2052{
1744 int pri; 2053 int pri;
1745 2054
1746 for (pri = NUMPRI; pri--; ) 2055 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2056 while (pendingcnt [pri])
1748 { 2057 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2058 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2059
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2060 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2061 /* ^ this is no longer true, as pending_w could be here */
1754 2062
1755 p->w->pending = 0; 2063 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2064 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2065 EV_FREQUENT_CHECK;
1758 }
1759 } 2066 }
1760} 2067}
1761 2068
1762#if EV_IDLE_ENABLE 2069#if EV_IDLE_ENABLE
2070/* make idle watchers pending. this handles the "call-idle */
2071/* only when higher priorities are idle" logic */
1763inline_size void 2072inline_size void
1764idle_reify (EV_P) 2073idle_reify (EV_P)
1765{ 2074{
1766 if (expect_false (idleall)) 2075 if (expect_false (idleall))
1767 { 2076 {
… …
1780 } 2089 }
1781 } 2090 }
1782} 2091}
1783#endif 2092#endif
1784 2093
2094/* make timers pending */
1785inline_size void 2095inline_size void
1786timers_reify (EV_P) 2096timers_reify (EV_P)
1787{ 2097{
1788 EV_FREQUENT_CHECK; 2098 EV_FREQUENT_CHECK;
1789 2099
… …
1813 EV_FREQUENT_CHECK; 2123 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w); 2124 feed_reverse (EV_A_ (W)w);
1815 } 2125 }
1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2126 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1817 2127
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2128 feed_reverse_done (EV_A_ EV_TIMER);
1819 } 2129 }
1820} 2130}
1821 2131
1822#if EV_PERIODIC_ENABLE 2132#if EV_PERIODIC_ENABLE
2133/* make periodics pending */
1823inline_size void 2134inline_size void
1824periodics_reify (EV_P) 2135periodics_reify (EV_P)
1825{ 2136{
1826 EV_FREQUENT_CHECK; 2137 EV_FREQUENT_CHECK;
1827 2138
… …
1874 2185
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2186 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2187 }
1877} 2188}
1878 2189
2190/* simply recalculate all periodics */
2191/* TODO: maybe ensure that at least one event happens when jumping forward? */
1879static void noinline 2192static void noinline
1880periodics_reschedule (EV_P) 2193periodics_reschedule (EV_P)
1881{ 2194{
1882 int i; 2195 int i;
1883 2196
… …
1896 2209
1897 reheap (periodics, periodiccnt); 2210 reheap (periodics, periodiccnt);
1898} 2211}
1899#endif 2212#endif
1900 2213
2214/* adjust all timers by a given offset */
1901static void noinline 2215static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2216timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2217{
1904 int i; 2218 int i;
1905 2219
… …
1909 ANHE_w (*he)->at += adjust; 2223 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2224 ANHE_at_cache (*he);
1911 } 2225 }
1912} 2226}
1913 2227
2228/* fetch new monotonic and realtime times from the kernel */
2229/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2230inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2231time_update (EV_P_ ev_tstamp max_block)
1916{ 2232{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2233#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2234 if (expect_true (have_monotonic))
1921 { 2235 {
2236 int i;
1922 ev_tstamp odiff = rtmn_diff; 2237 ev_tstamp odiff = rtmn_diff;
1923 2238
1924 mn_now = get_clock (); 2239 mn_now = get_clock ();
1925 2240
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2241 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1976 2291
1977 mn_now = ev_rt_now; 2292 mn_now = ev_rt_now;
1978 } 2293 }
1979} 2294}
1980 2295
1981static int loop_done;
1982
1983void 2296void
1984ev_loop (EV_P_ int flags) 2297ev_loop (EV_P_ int flags)
1985{ 2298{
2299#if EV_FEATURE_API
2300 ++loop_depth;
2301#endif
2302
2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2304
1986 loop_done = EVUNLOOP_CANCEL; 2305 loop_done = EVUNLOOP_CANCEL;
1987 2306
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2307 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2308
1990 do 2309 do
1991 { 2310 {
1992#if EV_VERIFY >= 2 2311#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2312 ev_verify (EV_A);
1994#endif 2313#endif
1995 2314
1996#ifndef _WIN32 2315#ifndef _WIN32
1997 if (expect_false (curpid)) /* penalise the forking check even more */ 2316 if (expect_false (curpid)) /* penalise the forking check even more */
1998 if (expect_false (getpid () != curpid)) 2317 if (expect_false (getpid () != curpid))
… …
2006 /* we might have forked, so queue fork handlers */ 2325 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2326 if (expect_false (postfork))
2008 if (forkcnt) 2327 if (forkcnt)
2009 { 2328 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2329 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2330 EV_INVOKE_PENDING;
2012 } 2331 }
2013#endif 2332#endif
2014 2333
2334#if EV_PREPARE_ENABLE
2015 /* queue prepare watchers (and execute them) */ 2335 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2336 if (expect_false (preparecnt))
2017 { 2337 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2338 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2339 EV_INVOKE_PENDING;
2020 } 2340 }
2341#endif
2342
2343 if (expect_false (loop_done))
2344 break;
2021 2345
2022 /* we might have forked, so reify kernel state if necessary */ 2346 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2347 if (expect_false (postfork))
2024 loop_fork (EV_A); 2348 loop_fork (EV_A);
2025 2349
… …
2031 ev_tstamp waittime = 0.; 2355 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2356 ev_tstamp sleeptime = 0.;
2033 2357
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2358 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2359 {
2360 /* remember old timestamp for io_blocktime calculation */
2361 ev_tstamp prev_mn_now = mn_now;
2362
2036 /* update time to cancel out callback processing overhead */ 2363 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2364 time_update (EV_A_ 1e100);
2365
2366 waittime = MAX_BLOCKTIME;
2038 2367
2039 if (timercnt) 2368 if (timercnt)
2040 { 2369 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2370 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2371 if (waittime > to) waittime = to;
… …
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2377 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2378 if (waittime > to) waittime = to;
2050 } 2379 }
2051#endif 2380#endif
2052 2381
2382 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2383 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2384 waittime = timeout_blocktime;
2055 2385
2056 sleeptime = waittime - backend_fudge; 2386 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2387 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2388 {
2389 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2390
2391 if (sleeptime > waittime - backend_fudge)
2392 sleeptime = waittime - backend_fudge;
2393
2394 if (expect_true (sleeptime > 0.))
2395 {
2063 ev_sleep (sleeptime); 2396 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2397 waittime -= sleeptime;
2398 }
2065 } 2399 }
2066 } 2400 }
2067 2401
2402#if EV_FEATURE_API
2068 ++loop_count; 2403 ++loop_count;
2404#endif
2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2406 backend_poll (EV_A_ waittime);
2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2408
2071 /* update ev_rt_now, do magic */ 2409 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2410 time_update (EV_A_ waittime + sleeptime);
2073 } 2411 }
2074 2412
… …
2081#if EV_IDLE_ENABLE 2419#if EV_IDLE_ENABLE
2082 /* queue idle watchers unless other events are pending */ 2420 /* queue idle watchers unless other events are pending */
2083 idle_reify (EV_A); 2421 idle_reify (EV_A);
2084#endif 2422#endif
2085 2423
2424#if EV_CHECK_ENABLE
2086 /* queue check watchers, to be executed first */ 2425 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2426 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2427 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2428#endif
2089 2429
2090 call_pending (EV_A); 2430 EV_INVOKE_PENDING;
2091 } 2431 }
2092 while (expect_true ( 2432 while (expect_true (
2093 activecnt 2433 activecnt
2094 && !loop_done 2434 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2435 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2436 ));
2097 2437
2098 if (loop_done == EVUNLOOP_ONE) 2438 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2439 loop_done = EVUNLOOP_CANCEL;
2440
2441#if EV_FEATURE_API
2442 --loop_depth;
2443#endif
2100} 2444}
2101 2445
2102void 2446void
2103ev_unloop (EV_P_ int how) 2447ev_unloop (EV_P_ int how)
2104{ 2448{
… …
2133ev_resume (EV_P) 2477ev_resume (EV_P)
2134{ 2478{
2135 ev_tstamp mn_prev = mn_now; 2479 ev_tstamp mn_prev = mn_now;
2136 2480
2137 ev_now_update (EV_A); 2481 ev_now_update (EV_A);
2138 printf ("update %f\n", mn_now - mn_prev);//D
2139 timers_reschedule (EV_A_ mn_now - mn_prev); 2482 timers_reschedule (EV_A_ mn_now - mn_prev);
2483#if EV_PERIODIC_ENABLE
2484 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2485 periodics_reschedule (EV_A);
2486#endif
2141} 2487}
2142 2488
2143/*****************************************************************************/ 2489/*****************************************************************************/
2490/* singly-linked list management, used when the expected list length is short */
2144 2491
2145inline_size void 2492inline_size void
2146wlist_add (WL *head, WL elem) 2493wlist_add (WL *head, WL elem)
2147{ 2494{
2148 elem->next = *head; 2495 elem->next = *head;
… …
2152inline_size void 2499inline_size void
2153wlist_del (WL *head, WL elem) 2500wlist_del (WL *head, WL elem)
2154{ 2501{
2155 while (*head) 2502 while (*head)
2156 { 2503 {
2157 if (*head == elem) 2504 if (expect_true (*head == elem))
2158 { 2505 {
2159 *head = elem->next; 2506 *head = elem->next;
2160 return; 2507 break;
2161 } 2508 }
2162 2509
2163 head = &(*head)->next; 2510 head = &(*head)->next;
2164 } 2511 }
2165} 2512}
2166 2513
2514/* internal, faster, version of ev_clear_pending */
2167inline_speed void 2515inline_speed void
2168clear_pending (EV_P_ W w) 2516clear_pending (EV_P_ W w)
2169{ 2517{
2170 if (w->pending) 2518 if (w->pending)
2171 { 2519 {
2172 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2520 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2173 w->pending = 0; 2521 w->pending = 0;
2174 } 2522 }
2175} 2523}
2176 2524
2177int 2525int
… …
2181 int pending = w_->pending; 2529 int pending = w_->pending;
2182 2530
2183 if (expect_true (pending)) 2531 if (expect_true (pending))
2184 { 2532 {
2185 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2533 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2534 p->w = (W)&pending_w;
2186 w_->pending = 0; 2535 w_->pending = 0;
2187 p->w = 0;
2188 return p->events; 2536 return p->events;
2189 } 2537 }
2190 else 2538 else
2191 return 0; 2539 return 0;
2192} 2540}
2193 2541
2194inline_size void 2542inline_size void
2195pri_adjust (EV_P_ W w) 2543pri_adjust (EV_P_ W w)
2196{ 2544{
2197 int pri = w->priority; 2545 int pri = ev_priority (w);
2198 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2546 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2199 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2547 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2200 w->priority = pri; 2548 ev_set_priority (w, pri);
2201} 2549}
2202 2550
2203inline_speed void 2551inline_speed void
2204ev_start (EV_P_ W w, int active) 2552ev_start (EV_P_ W w, int active)
2205{ 2553{
… …
2224 2572
2225 if (expect_false (ev_is_active (w))) 2573 if (expect_false (ev_is_active (w)))
2226 return; 2574 return;
2227 2575
2228 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2576 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2229 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2577 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2230 2578
2231 EV_FREQUENT_CHECK; 2579 EV_FREQUENT_CHECK;
2232 2580
2233 ev_start (EV_A_ (W)w, 1); 2581 ev_start (EV_A_ (W)w, 1);
2234 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2582 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2235 wlist_add (&anfds[fd].head, (WL)w); 2583 wlist_add (&anfds[fd].head, (WL)w);
2236 2584
2237 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2585 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2238 w->events &= ~EV__IOFDSET; 2586 w->events &= ~EV__IOFDSET;
2239 2587
2240 EV_FREQUENT_CHECK; 2588 EV_FREQUENT_CHECK;
2241} 2589}
2242 2590
… …
2252 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2253 2601
2254 wlist_del (&anfds[w->fd].head, (WL)w); 2602 wlist_del (&anfds[w->fd].head, (WL)w);
2255 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2256 2604
2257 fd_change (EV_A_ w->fd, 1); 2605 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2258 2606
2259 EV_FREQUENT_CHECK; 2607 EV_FREQUENT_CHECK;
2260} 2608}
2261 2609
2262void noinline 2610void noinline
… …
2304 timers [active] = timers [timercnt + HEAP0]; 2652 timers [active] = timers [timercnt + HEAP0];
2305 adjustheap (timers, timercnt, active); 2653 adjustheap (timers, timercnt, active);
2306 } 2654 }
2307 } 2655 }
2308 2656
2309 EV_FREQUENT_CHECK;
2310
2311 ev_at (w) -= mn_now; 2657 ev_at (w) -= mn_now;
2312 2658
2313 ev_stop (EV_A_ (W)w); 2659 ev_stop (EV_A_ (W)w);
2660
2661 EV_FREQUENT_CHECK;
2314} 2662}
2315 2663
2316void noinline 2664void noinline
2317ev_timer_again (EV_P_ ev_timer *w) 2665ev_timer_again (EV_P_ ev_timer *w)
2318{ 2666{
… …
2336 } 2684 }
2337 2685
2338 EV_FREQUENT_CHECK; 2686 EV_FREQUENT_CHECK;
2339} 2687}
2340 2688
2689ev_tstamp
2690ev_timer_remaining (EV_P_ ev_timer *w)
2691{
2692 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2693}
2694
2341#if EV_PERIODIC_ENABLE 2695#if EV_PERIODIC_ENABLE
2342void noinline 2696void noinline
2343ev_periodic_start (EV_P_ ev_periodic *w) 2697ev_periodic_start (EV_P_ ev_periodic *w)
2344{ 2698{
2345 if (expect_false (ev_is_active (w))) 2699 if (expect_false (ev_is_active (w)))
… …
2391 periodics [active] = periodics [periodiccnt + HEAP0]; 2745 periodics [active] = periodics [periodiccnt + HEAP0];
2392 adjustheap (periodics, periodiccnt, active); 2746 adjustheap (periodics, periodiccnt, active);
2393 } 2747 }
2394 } 2748 }
2395 2749
2396 EV_FREQUENT_CHECK;
2397
2398 ev_stop (EV_A_ (W)w); 2750 ev_stop (EV_A_ (W)w);
2751
2752 EV_FREQUENT_CHECK;
2399} 2753}
2400 2754
2401void noinline 2755void noinline
2402ev_periodic_again (EV_P_ ev_periodic *w) 2756ev_periodic_again (EV_P_ ev_periodic *w)
2403{ 2757{
… …
2409 2763
2410#ifndef SA_RESTART 2764#ifndef SA_RESTART
2411# define SA_RESTART 0 2765# define SA_RESTART 0
2412#endif 2766#endif
2413 2767
2768#if EV_SIGNAL_ENABLE
2769
2414void noinline 2770void noinline
2415ev_signal_start (EV_P_ ev_signal *w) 2771ev_signal_start (EV_P_ ev_signal *w)
2416{ 2772{
2417#if EV_MULTIPLICITY
2418 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2419#endif
2420 if (expect_false (ev_is_active (w))) 2773 if (expect_false (ev_is_active (w)))
2421 return; 2774 return;
2422 2775
2423 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2776 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2424 2777
2425 evpipe_init (EV_A); 2778#if EV_MULTIPLICITY
2779 assert (("libev: a signal must not be attached to two different loops",
2780 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2426 2781
2427 EV_FREQUENT_CHECK; 2782 signals [w->signum - 1].loop = EV_A;
2783#endif
2428 2784
2785 EV_FREQUENT_CHECK;
2786
2787#if EV_USE_SIGNALFD
2788 if (sigfd == -2)
2429 { 2789 {
2430#ifndef _WIN32 2790 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2431 sigset_t full, prev; 2791 if (sigfd < 0 && errno == EINVAL)
2432 sigfillset (&full); 2792 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2433 sigprocmask (SIG_SETMASK, &full, &prev);
2434#endif
2435 2793
2436 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2794 if (sigfd >= 0)
2795 {
2796 fd_intern (sigfd); /* doing it twice will not hurt */
2437 2797
2438#ifndef _WIN32 2798 sigemptyset (&sigfd_set);
2439 sigprocmask (SIG_SETMASK, &prev, 0); 2799
2440#endif 2800 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2801 ev_set_priority (&sigfd_w, EV_MAXPRI);
2802 ev_io_start (EV_A_ &sigfd_w);
2803 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2804 }
2441 } 2805 }
2806
2807 if (sigfd >= 0)
2808 {
2809 /* TODO: check .head */
2810 sigaddset (&sigfd_set, w->signum);
2811 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2812
2813 signalfd (sigfd, &sigfd_set, 0);
2814 }
2815#endif
2442 2816
2443 ev_start (EV_A_ (W)w, 1); 2817 ev_start (EV_A_ (W)w, 1);
2444 wlist_add (&signals [w->signum - 1].head, (WL)w); 2818 wlist_add (&signals [w->signum - 1].head, (WL)w);
2445 2819
2446 if (!((WL)w)->next) 2820 if (!((WL)w)->next)
2821# if EV_USE_SIGNALFD
2822 if (sigfd < 0) /*TODO*/
2823# endif
2447 { 2824 {
2448#if _WIN32 2825# ifdef _WIN32
2826 evpipe_init (EV_A);
2827
2449 signal (w->signum, ev_sighandler); 2828 signal (w->signum, ev_sighandler);
2450#else 2829# else
2451 struct sigaction sa; 2830 struct sigaction sa;
2831
2832 evpipe_init (EV_A);
2833
2452 sa.sa_handler = ev_sighandler; 2834 sa.sa_handler = ev_sighandler;
2453 sigfillset (&sa.sa_mask); 2835 sigfillset (&sa.sa_mask);
2454 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2836 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2455 sigaction (w->signum, &sa, 0); 2837 sigaction (w->signum, &sa, 0);
2838
2839 sigemptyset (&sa.sa_mask);
2840 sigaddset (&sa.sa_mask, w->signum);
2841 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2456#endif 2842#endif
2457 } 2843 }
2458 2844
2459 EV_FREQUENT_CHECK; 2845 EV_FREQUENT_CHECK;
2460} 2846}
2461 2847
2462void noinline 2848void noinline
… …
2470 2856
2471 wlist_del (&signals [w->signum - 1].head, (WL)w); 2857 wlist_del (&signals [w->signum - 1].head, (WL)w);
2472 ev_stop (EV_A_ (W)w); 2858 ev_stop (EV_A_ (W)w);
2473 2859
2474 if (!signals [w->signum - 1].head) 2860 if (!signals [w->signum - 1].head)
2861 {
2862#if EV_MULTIPLICITY
2863 signals [w->signum - 1].loop = 0; /* unattach from signal */
2864#endif
2865#if EV_USE_SIGNALFD
2866 if (sigfd >= 0)
2867 {
2868 sigset_t ss;
2869
2870 sigemptyset (&ss);
2871 sigaddset (&ss, w->signum);
2872 sigdelset (&sigfd_set, w->signum);
2873
2874 signalfd (sigfd, &sigfd_set, 0);
2875 sigprocmask (SIG_UNBLOCK, &ss, 0);
2876 }
2877 else
2878#endif
2475 signal (w->signum, SIG_DFL); 2879 signal (w->signum, SIG_DFL);
2880 }
2476 2881
2477 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
2478} 2883}
2884
2885#endif
2886
2887#if EV_CHILD_ENABLE
2479 2888
2480void 2889void
2481ev_child_start (EV_P_ ev_child *w) 2890ev_child_start (EV_P_ ev_child *w)
2482{ 2891{
2483#if EV_MULTIPLICITY 2892#if EV_MULTIPLICITY
… …
2487 return; 2896 return;
2488 2897
2489 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2490 2899
2491 ev_start (EV_A_ (W)w, 1); 2900 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2493 2902
2494 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2495} 2904}
2496 2905
2497void 2906void
… …
2501 if (expect_false (!ev_is_active (w))) 2910 if (expect_false (!ev_is_active (w)))
2502 return; 2911 return;
2503 2912
2504 EV_FREQUENT_CHECK; 2913 EV_FREQUENT_CHECK;
2505 2914
2506 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2915 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2507 ev_stop (EV_A_ (W)w); 2916 ev_stop (EV_A_ (W)w);
2508 2917
2509 EV_FREQUENT_CHECK; 2918 EV_FREQUENT_CHECK;
2510} 2919}
2920
2921#endif
2511 2922
2512#if EV_STAT_ENABLE 2923#if EV_STAT_ENABLE
2513 2924
2514# ifdef _WIN32 2925# ifdef _WIN32
2515# undef lstat 2926# undef lstat
… …
2521#define MIN_STAT_INTERVAL 0.1074891 2932#define MIN_STAT_INTERVAL 0.1074891
2522 2933
2523static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2934static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2524 2935
2525#if EV_USE_INOTIFY 2936#if EV_USE_INOTIFY
2526# define EV_INOTIFY_BUFSIZE 8192 2937
2938/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2939# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2527 2940
2528static void noinline 2941static void noinline
2529infy_add (EV_P_ ev_stat *w) 2942infy_add (EV_P_ ev_stat *w)
2530{ 2943{
2531 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2944 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2532 2945
2533 if (w->wd < 0) 2946 if (w->wd >= 0)
2947 {
2948 struct statfs sfs;
2949
2950 /* now local changes will be tracked by inotify, but remote changes won't */
2951 /* unless the filesystem is known to be local, we therefore still poll */
2952 /* also do poll on <2.6.25, but with normal frequency */
2953
2954 if (!fs_2625)
2955 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2956 else if (!statfs (w->path, &sfs)
2957 && (sfs.f_type == 0x1373 /* devfs */
2958 || sfs.f_type == 0xEF53 /* ext2/3 */
2959 || sfs.f_type == 0x3153464a /* jfs */
2960 || sfs.f_type == 0x52654973 /* reiser3 */
2961 || sfs.f_type == 0x01021994 /* tempfs */
2962 || sfs.f_type == 0x58465342 /* xfs */))
2963 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2964 else
2965 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2534 { 2966 }
2967 else
2968 {
2969 /* can't use inotify, continue to stat */
2535 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2970 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2536 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2537 2971
2538 /* monitor some parent directory for speedup hints */ 2972 /* if path is not there, monitor some parent directory for speedup hints */
2539 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2973 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2540 /* but an efficiency issue only */ 2974 /* but an efficiency issue only */
2541 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2975 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2542 { 2976 {
2543 char path [4096]; 2977 char path [4096];
… …
2559 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2993 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2560 } 2994 }
2561 } 2995 }
2562 2996
2563 if (w->wd >= 0) 2997 if (w->wd >= 0)
2564 {
2565 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2998 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2566 2999
2567 /* now local changes will be tracked by inotify, but remote changes won't */ 3000 /* now re-arm timer, if required */
2568 /* unless the filesystem it known to be local, we therefore still poll */ 3001 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2569 /* also do poll on <2.6.25, but with normal frequency */
2570 struct statfs sfs;
2571
2572 if (fs_2625 && !statfs (w->path, &sfs))
2573 if (sfs.f_type == 0x1373 /* devfs */
2574 || sfs.f_type == 0xEF53 /* ext2/3 */
2575 || sfs.f_type == 0x3153464a /* jfs */
2576 || sfs.f_type == 0x52654973 /* reiser3 */
2577 || sfs.f_type == 0x01021994 /* tempfs */
2578 || sfs.f_type == 0x58465342 /* xfs */)
2579 return;
2580
2581 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2582 ev_timer_again (EV_A_ &w->timer); 3002 ev_timer_again (EV_A_ &w->timer);
2583 } 3003 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2584} 3004}
2585 3005
2586static void noinline 3006static void noinline
2587infy_del (EV_P_ ev_stat *w) 3007infy_del (EV_P_ ev_stat *w)
2588{ 3008{
… …
2591 3011
2592 if (wd < 0) 3012 if (wd < 0)
2593 return; 3013 return;
2594 3014
2595 w->wd = -2; 3015 w->wd = -2;
2596 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3016 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2597 wlist_del (&fs_hash [slot].head, (WL)w); 3017 wlist_del (&fs_hash [slot].head, (WL)w);
2598 3018
2599 /* remove this watcher, if others are watching it, they will rearm */ 3019 /* remove this watcher, if others are watching it, they will rearm */
2600 inotify_rm_watch (fs_fd, wd); 3020 inotify_rm_watch (fs_fd, wd);
2601} 3021}
… …
2603static void noinline 3023static void noinline
2604infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3024infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2605{ 3025{
2606 if (slot < 0) 3026 if (slot < 0)
2607 /* overflow, need to check for all hash slots */ 3027 /* overflow, need to check for all hash slots */
2608 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3028 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2609 infy_wd (EV_A_ slot, wd, ev); 3029 infy_wd (EV_A_ slot, wd, ev);
2610 else 3030 else
2611 { 3031 {
2612 WL w_; 3032 WL w_;
2613 3033
2614 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3034 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2615 { 3035 {
2616 ev_stat *w = (ev_stat *)w_; 3036 ev_stat *w = (ev_stat *)w_;
2617 w_ = w_->next; /* lets us remove this watcher and all before it */ 3037 w_ = w_->next; /* lets us remove this watcher and all before it */
2618 3038
2619 if (w->wd == wd || wd == -1) 3039 if (w->wd == wd || wd == -1)
2620 { 3040 {
2621 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3041 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2622 { 3042 {
2623 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3043 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2624 w->wd = -1; 3044 w->wd = -1;
2625 infy_add (EV_A_ w); /* re-add, no matter what */ 3045 infy_add (EV_A_ w); /* re-add, no matter what */
2626 } 3046 }
2627 3047
2628 stat_timer_cb (EV_A_ &w->timer, 0); 3048 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2633 3053
2634static void 3054static void
2635infy_cb (EV_P_ ev_io *w, int revents) 3055infy_cb (EV_P_ ev_io *w, int revents)
2636{ 3056{
2637 char buf [EV_INOTIFY_BUFSIZE]; 3057 char buf [EV_INOTIFY_BUFSIZE];
2638 struct inotify_event *ev = (struct inotify_event *)buf;
2639 int ofs; 3058 int ofs;
2640 int len = read (fs_fd, buf, sizeof (buf)); 3059 int len = read (fs_fd, buf, sizeof (buf));
2641 3060
2642 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3061 for (ofs = 0; ofs < len; )
3062 {
3063 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2643 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3064 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3065 ofs += sizeof (struct inotify_event) + ev->len;
3066 }
3067}
3068
3069inline_size unsigned int
3070ev_linux_version (void)
3071{
3072 struct utsname buf;
3073 unsigned int v;
3074 int i;
3075 char *p = buf.release;
3076
3077 if (uname (&buf))
3078 return 0;
3079
3080 for (i = 3+1; --i; )
3081 {
3082 unsigned int c = 0;
3083
3084 for (;;)
3085 {
3086 if (*p >= '0' && *p <= '9')
3087 c = c * 10 + *p++ - '0';
3088 else
3089 {
3090 p += *p == '.';
3091 break;
3092 }
3093 }
3094
3095 v = (v << 8) | c;
3096 }
3097
3098 return v;
2644} 3099}
2645 3100
2646inline_size void 3101inline_size void
2647check_2625 (EV_P) 3102ev_check_2625 (EV_P)
2648{ 3103{
2649 /* kernels < 2.6.25 are borked 3104 /* kernels < 2.6.25 are borked
2650 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3105 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2651 */ 3106 */
2652 struct utsname buf; 3107 if (ev_linux_version () < 0x020619)
2653 int major, minor, micro;
2654
2655 if (uname (&buf))
2656 return; 3108 return;
2657 3109
2658 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2659 return;
2660
2661 if (major < 2
2662 || (major == 2 && minor < 6)
2663 || (major == 2 && minor == 6 && micro < 25))
2664 return;
2665
2666 fs_2625 = 1; 3110 fs_2625 = 1;
3111}
3112
3113inline_size int
3114infy_newfd (void)
3115{
3116#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3117 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3118 if (fd >= 0)
3119 return fd;
3120#endif
3121 return inotify_init ();
2667} 3122}
2668 3123
2669inline_size void 3124inline_size void
2670infy_init (EV_P) 3125infy_init (EV_P)
2671{ 3126{
2672 if (fs_fd != -2) 3127 if (fs_fd != -2)
2673 return; 3128 return;
2674 3129
2675 fs_fd = -1; 3130 fs_fd = -1;
2676 3131
2677 check_2625 (EV_A); 3132 ev_check_2625 (EV_A);
2678 3133
2679 fs_fd = inotify_init (); 3134 fs_fd = infy_newfd ();
2680 3135
2681 if (fs_fd >= 0) 3136 if (fs_fd >= 0)
2682 { 3137 {
3138 fd_intern (fs_fd);
2683 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3139 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2684 ev_set_priority (&fs_w, EV_MAXPRI); 3140 ev_set_priority (&fs_w, EV_MAXPRI);
2685 ev_io_start (EV_A_ &fs_w); 3141 ev_io_start (EV_A_ &fs_w);
3142 ev_unref (EV_A);
2686 } 3143 }
2687} 3144}
2688 3145
2689inline_size void 3146inline_size void
2690infy_fork (EV_P) 3147infy_fork (EV_P)
… …
2692 int slot; 3149 int slot;
2693 3150
2694 if (fs_fd < 0) 3151 if (fs_fd < 0)
2695 return; 3152 return;
2696 3153
3154 ev_ref (EV_A);
3155 ev_io_stop (EV_A_ &fs_w);
2697 close (fs_fd); 3156 close (fs_fd);
2698 fs_fd = inotify_init (); 3157 fs_fd = infy_newfd ();
2699 3158
3159 if (fs_fd >= 0)
3160 {
3161 fd_intern (fs_fd);
3162 ev_io_set (&fs_w, fs_fd, EV_READ);
3163 ev_io_start (EV_A_ &fs_w);
3164 ev_unref (EV_A);
3165 }
3166
2700 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3167 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2701 { 3168 {
2702 WL w_ = fs_hash [slot].head; 3169 WL w_ = fs_hash [slot].head;
2703 fs_hash [slot].head = 0; 3170 fs_hash [slot].head = 0;
2704 3171
2705 while (w_) 3172 while (w_)
… …
2710 w->wd = -1; 3177 w->wd = -1;
2711 3178
2712 if (fs_fd >= 0) 3179 if (fs_fd >= 0)
2713 infy_add (EV_A_ w); /* re-add, no matter what */ 3180 infy_add (EV_A_ w); /* re-add, no matter what */
2714 else 3181 else
3182 {
3183 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3184 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2715 ev_timer_again (EV_A_ &w->timer); 3185 ev_timer_again (EV_A_ &w->timer);
3186 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3187 }
2716 } 3188 }
2717 } 3189 }
2718} 3190}
2719 3191
2720#endif 3192#endif
… …
2737static void noinline 3209static void noinline
2738stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3210stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2739{ 3211{
2740 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3212 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2741 3213
2742 /* we copy this here each the time so that */ 3214 ev_statdata prev = w->attr;
2743 /* prev has the old value when the callback gets invoked */
2744 w->prev = w->attr;
2745 ev_stat_stat (EV_A_ w); 3215 ev_stat_stat (EV_A_ w);
2746 3216
2747 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3217 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2748 if ( 3218 if (
2749 w->prev.st_dev != w->attr.st_dev 3219 prev.st_dev != w->attr.st_dev
2750 || w->prev.st_ino != w->attr.st_ino 3220 || prev.st_ino != w->attr.st_ino
2751 || w->prev.st_mode != w->attr.st_mode 3221 || prev.st_mode != w->attr.st_mode
2752 || w->prev.st_nlink != w->attr.st_nlink 3222 || prev.st_nlink != w->attr.st_nlink
2753 || w->prev.st_uid != w->attr.st_uid 3223 || prev.st_uid != w->attr.st_uid
2754 || w->prev.st_gid != w->attr.st_gid 3224 || prev.st_gid != w->attr.st_gid
2755 || w->prev.st_rdev != w->attr.st_rdev 3225 || prev.st_rdev != w->attr.st_rdev
2756 || w->prev.st_size != w->attr.st_size 3226 || prev.st_size != w->attr.st_size
2757 || w->prev.st_atime != w->attr.st_atime 3227 || prev.st_atime != w->attr.st_atime
2758 || w->prev.st_mtime != w->attr.st_mtime 3228 || prev.st_mtime != w->attr.st_mtime
2759 || w->prev.st_ctime != w->attr.st_ctime 3229 || prev.st_ctime != w->attr.st_ctime
2760 ) { 3230 ) {
3231 /* we only update w->prev on actual differences */
3232 /* in case we test more often than invoke the callback, */
3233 /* to ensure that prev is always different to attr */
3234 w->prev = prev;
3235
2761 #if EV_USE_INOTIFY 3236 #if EV_USE_INOTIFY
2762 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
2763 { 3238 {
2764 infy_del (EV_A_ w); 3239 infy_del (EV_A_ w);
2765 infy_add (EV_A_ w); 3240 infy_add (EV_A_ w);
… …
2790 3265
2791 if (fs_fd >= 0) 3266 if (fs_fd >= 0)
2792 infy_add (EV_A_ w); 3267 infy_add (EV_A_ w);
2793 else 3268 else
2794#endif 3269#endif
3270 {
2795 ev_timer_again (EV_A_ &w->timer); 3271 ev_timer_again (EV_A_ &w->timer);
3272 ev_unref (EV_A);
3273 }
2796 3274
2797 ev_start (EV_A_ (W)w, 1); 3275 ev_start (EV_A_ (W)w, 1);
2798 3276
2799 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
2800} 3278}
… …
2809 EV_FREQUENT_CHECK; 3287 EV_FREQUENT_CHECK;
2810 3288
2811#if EV_USE_INOTIFY 3289#if EV_USE_INOTIFY
2812 infy_del (EV_A_ w); 3290 infy_del (EV_A_ w);
2813#endif 3291#endif
3292
3293 if (ev_is_active (&w->timer))
3294 {
3295 ev_ref (EV_A);
2814 ev_timer_stop (EV_A_ &w->timer); 3296 ev_timer_stop (EV_A_ &w->timer);
3297 }
2815 3298
2816 ev_stop (EV_A_ (W)w); 3299 ev_stop (EV_A_ (W)w);
2817 3300
2818 EV_FREQUENT_CHECK; 3301 EV_FREQUENT_CHECK;
2819} 3302}
… …
2864 3347
2865 EV_FREQUENT_CHECK; 3348 EV_FREQUENT_CHECK;
2866} 3349}
2867#endif 3350#endif
2868 3351
3352#if EV_PREPARE_ENABLE
2869void 3353void
2870ev_prepare_start (EV_P_ ev_prepare *w) 3354ev_prepare_start (EV_P_ ev_prepare *w)
2871{ 3355{
2872 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
2873 return; 3357 return;
… …
2899 3383
2900 ev_stop (EV_A_ (W)w); 3384 ev_stop (EV_A_ (W)w);
2901 3385
2902 EV_FREQUENT_CHECK; 3386 EV_FREQUENT_CHECK;
2903} 3387}
3388#endif
2904 3389
3390#if EV_CHECK_ENABLE
2905void 3391void
2906ev_check_start (EV_P_ ev_check *w) 3392ev_check_start (EV_P_ ev_check *w)
2907{ 3393{
2908 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
2909 return; 3395 return;
… …
2935 3421
2936 ev_stop (EV_A_ (W)w); 3422 ev_stop (EV_A_ (W)w);
2937 3423
2938 EV_FREQUENT_CHECK; 3424 EV_FREQUENT_CHECK;
2939} 3425}
3426#endif
2940 3427
2941#if EV_EMBED_ENABLE 3428#if EV_EMBED_ENABLE
2942void noinline 3429void noinline
2943ev_embed_sweep (EV_P_ ev_embed *w) 3430ev_embed_sweep (EV_P_ ev_embed *w)
2944{ 3431{
… …
2960embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2961{ 3448{
2962 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3449 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2963 3450
2964 { 3451 {
2965 struct ev_loop *loop = w->other; 3452 EV_P = w->other;
2966 3453
2967 while (fdchangecnt) 3454 while (fdchangecnt)
2968 { 3455 {
2969 fd_reify (EV_A); 3456 fd_reify (EV_A);
2970 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3457 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2978 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3465 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2979 3466
2980 ev_embed_stop (EV_A_ w); 3467 ev_embed_stop (EV_A_ w);
2981 3468
2982 { 3469 {
2983 struct ev_loop *loop = w->other; 3470 EV_P = w->other;
2984 3471
2985 ev_loop_fork (EV_A); 3472 ev_loop_fork (EV_A);
2986 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3473 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2987 } 3474 }
2988 3475
… …
3002{ 3489{
3003 if (expect_false (ev_is_active (w))) 3490 if (expect_false (ev_is_active (w)))
3004 return; 3491 return;
3005 3492
3006 { 3493 {
3007 struct ev_loop *loop = w->other; 3494 EV_P = w->other;
3008 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3495 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3009 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3496 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3010 } 3497 }
3011 3498
3012 EV_FREQUENT_CHECK; 3499 EV_FREQUENT_CHECK;
… …
3039 3526
3040 ev_io_stop (EV_A_ &w->io); 3527 ev_io_stop (EV_A_ &w->io);
3041 ev_prepare_stop (EV_A_ &w->prepare); 3528 ev_prepare_stop (EV_A_ &w->prepare);
3042 ev_fork_stop (EV_A_ &w->fork); 3529 ev_fork_stop (EV_A_ &w->fork);
3043 3530
3531 ev_stop (EV_A_ (W)w);
3532
3044 EV_FREQUENT_CHECK; 3533 EV_FREQUENT_CHECK;
3045} 3534}
3046#endif 3535#endif
3047 3536
3048#if EV_FORK_ENABLE 3537#if EV_FORK_ENABLE
… …
3088ev_async_start (EV_P_ ev_async *w) 3577ev_async_start (EV_P_ ev_async *w)
3089{ 3578{
3090 if (expect_false (ev_is_active (w))) 3579 if (expect_false (ev_is_active (w)))
3091 return; 3580 return;
3092 3581
3582 w->sent = 0;
3583
3093 evpipe_init (EV_A); 3584 evpipe_init (EV_A);
3094 3585
3095 EV_FREQUENT_CHECK; 3586 EV_FREQUENT_CHECK;
3096 3587
3097 ev_start (EV_A_ (W)w, ++asynccnt); 3588 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3124 3615
3125void 3616void
3126ev_async_send (EV_P_ ev_async *w) 3617ev_async_send (EV_P_ ev_async *w)
3127{ 3618{
3128 w->sent = 1; 3619 w->sent = 1;
3129 evpipe_write (EV_A_ &gotasync); 3620 evpipe_write (EV_A_ &async_pending);
3130} 3621}
3131#endif 3622#endif
3132 3623
3133/*****************************************************************************/ 3624/*****************************************************************************/
3134 3625
… …
3174{ 3665{
3175 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3666 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3176 3667
3177 if (expect_false (!once)) 3668 if (expect_false (!once))
3178 { 3669 {
3179 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3670 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3180 return; 3671 return;
3181 } 3672 }
3182 3673
3183 once->cb = cb; 3674 once->cb = cb;
3184 once->arg = arg; 3675 once->arg = arg;
… …
3198 } 3689 }
3199} 3690}
3200 3691
3201/*****************************************************************************/ 3692/*****************************************************************************/
3202 3693
3203#if 0 3694#if EV_WALK_ENABLE
3204void 3695void
3205ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3696ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3206{ 3697{
3207 int i, j; 3698 int i, j;
3208 ev_watcher_list *wl, *wn; 3699 ev_watcher_list *wl, *wn;
… …
3224#if EV_USE_INOTIFY 3715#if EV_USE_INOTIFY
3225 if (ev_cb ((ev_io *)wl) == infy_cb) 3716 if (ev_cb ((ev_io *)wl) == infy_cb)
3226 ; 3717 ;
3227 else 3718 else
3228#endif 3719#endif
3229 if ((ev_io *)wl != &pipeev) 3720 if ((ev_io *)wl != &pipe_w)
3230 if (types & EV_IO) 3721 if (types & EV_IO)
3231 cb (EV_A_ EV_IO, wl); 3722 cb (EV_A_ EV_IO, wl);
3232 3723
3233 wl = wn; 3724 wl = wn;
3234 } 3725 }
… …
3271 if (types & EV_ASYNC) 3762 if (types & EV_ASYNC)
3272 for (i = asynccnt; i--; ) 3763 for (i = asynccnt; i--; )
3273 cb (EV_A_ EV_ASYNC, asyncs [i]); 3764 cb (EV_A_ EV_ASYNC, asyncs [i]);
3274#endif 3765#endif
3275 3766
3767#if EV_PREPARE_ENABLE
3276 if (types & EV_PREPARE) 3768 if (types & EV_PREPARE)
3277 for (i = preparecnt; i--; ) 3769 for (i = preparecnt; i--; )
3278#if EV_EMBED_ENABLE 3770# if EV_EMBED_ENABLE
3279 if (ev_cb (prepares [i]) != embed_prepare_cb) 3771 if (ev_cb (prepares [i]) != embed_prepare_cb)
3280#endif 3772# endif
3281 cb (EV_A_ EV_PREPARE, prepares [i]); 3773 cb (EV_A_ EV_PREPARE, prepares [i]);
3774#endif
3282 3775
3776#if EV_CHECK_ENABLE
3283 if (types & EV_CHECK) 3777 if (types & EV_CHECK)
3284 for (i = checkcnt; i--; ) 3778 for (i = checkcnt; i--; )
3285 cb (EV_A_ EV_CHECK, checks [i]); 3779 cb (EV_A_ EV_CHECK, checks [i]);
3780#endif
3286 3781
3782#if EV_SIGNAL_ENABLE
3287 if (types & EV_SIGNAL) 3783 if (types & EV_SIGNAL)
3288 for (i = 0; i < signalmax; ++i) 3784 for (i = 0; i < EV_NSIG - 1; ++i)
3289 for (wl = signals [i].head; wl; ) 3785 for (wl = signals [i].head; wl; )
3290 { 3786 {
3291 wn = wl->next; 3787 wn = wl->next;
3292 cb (EV_A_ EV_SIGNAL, wl); 3788 cb (EV_A_ EV_SIGNAL, wl);
3293 wl = wn; 3789 wl = wn;
3294 } 3790 }
3791#endif
3295 3792
3793#if EV_CHILD_ENABLE
3296 if (types & EV_CHILD) 3794 if (types & EV_CHILD)
3297 for (i = EV_PID_HASHSIZE; i--; ) 3795 for (i = (EV_PID_HASHSIZE); i--; )
3298 for (wl = childs [i]; wl; ) 3796 for (wl = childs [i]; wl; )
3299 { 3797 {
3300 wn = wl->next; 3798 wn = wl->next;
3301 cb (EV_A_ EV_CHILD, wl); 3799 cb (EV_A_ EV_CHILD, wl);
3302 wl = wn; 3800 wl = wn;
3303 } 3801 }
3802#endif
3304/* EV_STAT 0x00001000 /* stat data changed */ 3803/* EV_STAT 0x00001000 /* stat data changed */
3305/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3804/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3306} 3805}
3307#endif 3806#endif
3308 3807

Diff Legend

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