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

Comparing libev/ev.c (file contents):
Revision 1.337 by root, Wed Mar 10 09:18:24 2010 UTC vs.
Revision 1.388 by root, Fri Jul 29 12:17:26 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
49# include "config.h" 45# include "config.h"
50# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
51 53
52# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
77# ifndef EV_USE_REALTIME 79# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 80# define EV_USE_REALTIME 0
79# endif 81# endif
80# endif 82# endif
81 83
84# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 85# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 86# define EV_USE_NANOSLEEP EV_FEATURE_OS
87# endif
85# else 88# else
89# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 90# define EV_USE_NANOSLEEP 0
91# endif
92
93# if HAVE_SELECT && HAVE_SYS_SELECT_H
94# ifndef EV_USE_SELECT
95# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 96# endif
97# else
98# undef EV_USE_SELECT
99# define EV_USE_SELECT 0
88# endif 100# endif
89 101
102# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 103# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 104# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 105# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 106# else
107# undef EV_USE_POLL
102# define EV_USE_POLL 0 108# define EV_USE_POLL 0
103# endif
104# endif 109# endif
105 110
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 111# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 112# ifndef EV_USE_EPOLL
109# else 113# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 114# endif
115# else
116# undef EV_USE_EPOLL
117# define EV_USE_EPOLL 0
112# endif 118# endif
113 119
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 120# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 121# ifndef EV_USE_KQUEUE
117# else 122# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
118# define EV_USE_KQUEUE 0
119# endif 123# endif
124# else
125# undef EV_USE_KQUEUE
126# define EV_USE_KQUEUE 0
120# endif 127# endif
121 128
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 129# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 130# ifndef EV_USE_PORT
125# else 131# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 132# endif
133# else
134# undef EV_USE_PORT
135# define EV_USE_PORT 0
128# endif 136# endif
129 137
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 138# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 139# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 140# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 141# endif
142# else
143# undef EV_USE_INOTIFY
144# define EV_USE_INOTIFY 0
136# endif 145# endif
137 146
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 147# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 148# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 149# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 150# endif
151# else
152# undef EV_USE_SIGNALFD
153# define EV_USE_SIGNALFD 0
144# endif 154# endif
145 155
156# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 157# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 158# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 159# endif
160# else
161# undef EV_USE_EVENTFD
162# define EV_USE_EVENTFD 0
152# endif 163# endif
153 164
154#endif 165#endif
155 166
156#include <math.h>
157#include <stdlib.h> 167#include <stdlib.h>
158#include <string.h> 168#include <string.h>
159#include <fcntl.h> 169#include <fcntl.h>
160#include <stddef.h> 170#include <stddef.h>
161 171
… …
172#ifdef EV_H 182#ifdef EV_H
173# include EV_H 183# include EV_H
174#else 184#else
175# include "ev.h" 185# include "ev.h"
176#endif 186#endif
187
188EV_CPP(extern "C" {)
177 189
178#ifndef _WIN32 190#ifndef _WIN32
179# include <sys/time.h> 191# include <sys/time.h>
180# include <sys/wait.h> 192# include <sys/wait.h>
181# include <unistd.h> 193# include <unistd.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 198# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 199# define EV_SELECT_IS_WINSOCKET 1
188# endif 200# endif
189# undef EV_AVOID_STDIO 201# undef EV_AVOID_STDIO
190#endif 202#endif
203
204/* OS X, in its infinite idiocy, actually HARDCODES
205 * a limit of 1024 into their select. Where people have brains,
206 * OS X engineers apparently have a vacuum. Or maybe they were
207 * ordered to have a vacuum, or they do anything for money.
208 * This might help. Or not.
209 */
210#define _DARWIN_UNLIMITED_SELECT 1
191 211
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 212/* this block tries to deduce configuration from header-defined symbols and defaults */
193 213
194/* try to deduce the maximum number of signals on this platform */ 214/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 215#if defined (EV_NSIG)
… …
217/* to make it compile regardless, just remove the above line, */ 237/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */ 238/* but consider reporting it, too! :) */
219# define EV_NSIG 65 239# define EV_NSIG 65
220#endif 240#endif
221 241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
245
222#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
223# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
224# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
225# else 249# else
226# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
227# endif 251# endif
228#endif 252#endif
229 253
230#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
232# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
233# else 257# else
234# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
235# endif 259# endif
236#endif 260#endif
237 261
… …
239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
240#endif 264#endif
241 265
242#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
243# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
244# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
245# else 269# else
246# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
247# endif 271# endif
248#endif 272#endif
249 273
250#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
251# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
252#endif 276#endif
253 277
254#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
255# ifdef _WIN32 279# ifdef _WIN32
256# define EV_USE_POLL 0 280# define EV_USE_POLL 0
257# else 281# else
258# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
259# endif 283# endif
260#endif 284#endif
261 285
262#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
264# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
265# else 289# else
266# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
267# endif 291# endif
268#endif 292#endif
269 293
… …
275# define EV_USE_PORT 0 299# define EV_USE_PORT 0
276#endif 300#endif
277 301
278#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
280# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
281# else 305# else
282# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
283# endif 307# endif
284#endif 308#endif
285 309
286#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
287# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
288# define EV_PID_HASHSIZE 1
289# else
290# define EV_PID_HASHSIZE 16
291# endif
292#endif 312#endif
293 313
294#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
295# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
296# define EV_INOTIFY_HASHSIZE 1
297# else
298# define EV_INOTIFY_HASHSIZE 16
299# endif
300#endif 316#endif
301 317
302#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
304# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
305# else 321# else
306# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
307# endif 323# endif
308#endif 324#endif
309 325
310#ifndef EV_USE_SIGNALFD 326#ifndef EV_USE_SIGNALFD
311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
312# define EV_USE_SIGNALFD 1 328# define EV_USE_SIGNALFD EV_FEATURE_OS
313# else 329# else
314# define EV_USE_SIGNALFD 0 330# define EV_USE_SIGNALFD 0
315# endif 331# endif
316#endif 332#endif
317 333
… …
320# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
321# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
322#endif 338#endif
323 339
324#ifndef EV_VERIFY 340#ifndef EV_VERIFY
325# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
326#endif 342#endif
327 343
328#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
329# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
330#endif 346#endif
331 347
332#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
333# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
334#endif 350#endif
335 351
336/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 352/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
337/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
338#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
369# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
370# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
371#endif 387#endif
372 388
373#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
374# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
375# include <sys/select.h> 392# include <sys/select.h>
376# endif 393# endif
377#endif 394#endif
378 395
379#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
380# include <sys/utsname.h>
381# include <sys/statfs.h> 397# include <sys/statfs.h>
382# include <sys/inotify.h> 398# include <sys/inotify.h>
383/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 399/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
384# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
385# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
402# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
403# else 419# else
404# define EFD_CLOEXEC 02000000 420# define EFD_CLOEXEC 02000000
405# endif 421# endif
406# endif 422# endif
407# ifdef __cplusplus
408extern "C" {
409# endif
410int (eventfd) (unsigned int initval, int flags); 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
411# ifdef __cplusplus
412}
413# endif
414#endif 424#endif
415 425
416#if EV_USE_SIGNALFD 426#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 427/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h> 428# include <stdint.h>
… …
424# define SFD_CLOEXEC O_CLOEXEC 434# define SFD_CLOEXEC O_CLOEXEC
425# else 435# else
426# define SFD_CLOEXEC 02000000 436# define SFD_CLOEXEC 02000000
427# endif 437# endif
428# endif 438# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags); 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
433 440
434struct signalfd_siginfo 441struct signalfd_siginfo
435{ 442{
436 uint32_t ssi_signo; 443 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)]; 444 char pad[128 - sizeof (uint32_t)];
438}; 445};
439# ifdef __cplusplus
440}
441# endif 446#endif
442#endif
443
444 447
445/**/ 448/**/
446 449
447#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
449#else 452#else
450# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
451#endif 454#endif
452 455
453/* 456/*
454 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
455 * It is added to ev_rt_now when scheduling periodics
456 * to ensure progress, time-wise, even when rounding
457 * errors are against us.
458 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
459 * Better solutions welcome.
460 */ 459 */
461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
461/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
462 462
463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
465 465
466#if __GNUC__ >= 4 466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467# define expect(expr,value) __builtin_expect ((expr),(value)) 467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
468# define noinline __attribute__ ((noinline)) 468
469/* the following are taken from libecb */
470/* ecb.h start */
471
472/* many compilers define _GNUC_ to some versions but then only implement
473 * what their idiot authors think are the "more important" extensions,
474 * causing enourmous grief in return for some better fake benchmark numbers.
475 * or so.
476 * we try to detect these and simply assume they are not gcc - if they have
477 * an issue with that they should have done it right in the first place.
478 */
479#ifndef ECB_GCC_VERSION
480 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
481 #define ECB_GCC_VERSION(major,minor) 0
482 #else
483 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
484 #endif
485#endif
486
487#if __cplusplus
488 #define ecb_inline static inline
489#elif ECB_GCC_VERSION(2,5)
490 #define ecb_inline static __inline__
491#elif ECB_C99
492 #define ecb_inline static inline
469#else 493#else
470# define expect(expr,value) (expr) 494 #define ecb_inline static
471# define noinline
472# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
473# define inline
474# endif 495#endif
496
497#ifndef ECB_MEMORY_FENCE
498 #if ECB_GCC_VERSION(2,5)
499 #if __x86
500 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
501 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
502 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE /* better be safe than sorry */
503 #elif __amd64
504 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
505 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
506 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence")
507 #endif
475#endif 508 #endif
509#endif
476 510
511#ifndef ECB_MEMORY_FENCE
512 #if ECB_GCC_VERSION(4,4)
513 #define ECB_MEMORY_FENCE __sync_synchronize ()
514 #define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); })
515 #define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); })
516 #elif _MSC_VER >= 1400 && 0 /* TODO: only true when using volatiles */
517 #define ECB_MEMORY_FENCE do { } while (0)
518 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
519 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
520 #elif defined(_WIN32)
521 #include <WinNT.h>
522 #define ECB_MEMORY_FENCE MemoryBarrier ()
523 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
524 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
525 #endif
526#endif
527
528#ifndef ECB_MEMORY_FENCE
529 #include <pthread.h>
530
531 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
532 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
533 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
534 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
535#endif
536
537#if ECB_GCC_VERSION(3,1)
538 #define ecb_attribute(attrlist) __attribute__(attrlist)
539 #define ecb_is_constant(expr) __builtin_constant_p (expr)
540 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
541 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
542#else
543 #define ecb_attribute(attrlist)
544 #define ecb_is_constant(expr) 0
545 #define ecb_expect(expr,value) (expr)
546 #define ecb_prefetch(addr,rw,locality)
547#endif
548
549#define ecb_noinline ecb_attribute ((__noinline__))
550#define ecb_noreturn ecb_attribute ((__noreturn__))
551#define ecb_unused ecb_attribute ((__unused__))
552#define ecb_const ecb_attribute ((__const__))
553#define ecb_pure ecb_attribute ((__pure__))
554
555#if ECB_GCC_VERSION(4,3)
556 #define ecb_artificial ecb_attribute ((__artificial__))
557 #define ecb_hot ecb_attribute ((__hot__))
558 #define ecb_cold ecb_attribute ((__cold__))
559#else
560 #define ecb_artificial
561 #define ecb_hot
562 #define ecb_cold
563#endif
564
565/* put around conditional expressions if you are very sure that the */
566/* expression is mostly true or mostly false. note that these return */
567/* booleans, not the expression. */
477#define expect_false(expr) expect ((expr) != 0, 0) 568#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
478#define expect_true(expr) expect ((expr) != 0, 1) 569#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
570/* ecb.h end */
571
572#define expect_false(cond) ecb_expect_false (cond)
573#define expect_true(cond) ecb_expect_true (cond)
574#define noinline ecb_noinline
575
479#define inline_size static inline 576#define inline_size ecb_inline
480 577
481#if EV_MINIMAL 578#if EV_FEATURE_CODE
579# define inline_speed ecb_inline
580#else
482# define inline_speed static noinline 581# define inline_speed static noinline
483#else
484# define inline_speed static inline
485#endif 582#endif
486 583
487#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 584#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
488 585
489#if EV_MINPRI == EV_MAXPRI 586#if EV_MINPRI == EV_MAXPRI
… …
502#define ev_active(w) ((W)(w))->active 599#define ev_active(w) ((W)(w))->active
503#define ev_at(w) ((WT)(w))->at 600#define ev_at(w) ((WT)(w))->at
504 601
505#if EV_USE_REALTIME 602#if EV_USE_REALTIME
506/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 603/* sig_atomic_t is used to avoid per-thread variables or locking but still */
507/* giving it a reasonably high chance of working on typical architetcures */ 604/* giving it a reasonably high chance of working on typical architectures */
508static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 605static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
509#endif 606#endif
510 607
511#if EV_USE_MONOTONIC 608#if EV_USE_MONOTONIC
512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 609static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
526# include "ev_win32.c" 623# include "ev_win32.c"
527#endif 624#endif
528 625
529/*****************************************************************************/ 626/*****************************************************************************/
530 627
628/* define a suitable floor function (only used by periodics atm) */
629
630#if EV_USE_FLOOR
631# include <math.h>
632# define ev_floor(v) floor (v)
633#else
634
635#include <float.h>
636
637/* a floor() replacement function, should be independent of ev_tstamp type */
638static ev_tstamp noinline
639ev_floor (ev_tstamp v)
640{
641 /* the choice of shift factor is not terribly important */
642#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
643 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
644#else
645 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
646#endif
647
648 /* argument too large for an unsigned long? */
649 if (expect_false (v >= shift))
650 {
651 ev_tstamp f;
652
653 if (v == v - 1.)
654 return v; /* very large number */
655
656 f = shift * ev_floor (v * (1. / shift));
657 return f + ev_floor (v - f);
658 }
659
660 /* special treatment for negative args? */
661 if (expect_false (v < 0.))
662 {
663 ev_tstamp f = -ev_floor (-v);
664
665 return f - (f == v ? 0 : 1);
666 }
667
668 /* fits into an unsigned long */
669 return (unsigned long)v;
670}
671
672#endif
673
674/*****************************************************************************/
675
676#ifdef __linux
677# include <sys/utsname.h>
678#endif
679
680static unsigned int noinline ecb_cold
681ev_linux_version (void)
682{
683#ifdef __linux
684 unsigned int v = 0;
685 struct utsname buf;
686 int i;
687 char *p = buf.release;
688
689 if (uname (&buf))
690 return 0;
691
692 for (i = 3+1; --i; )
693 {
694 unsigned int c = 0;
695
696 for (;;)
697 {
698 if (*p >= '0' && *p <= '9')
699 c = c * 10 + *p++ - '0';
700 else
701 {
702 p += *p == '.';
703 break;
704 }
705 }
706
707 v = (v << 8) | c;
708 }
709
710 return v;
711#else
712 return 0;
713#endif
714}
715
716/*****************************************************************************/
717
531#if EV_AVOID_STDIO 718#if EV_AVOID_STDIO
532static void noinline 719static void noinline ecb_cold
533ev_printerr (const char *msg) 720ev_printerr (const char *msg)
534{ 721{
535 write (STDERR_FILENO, msg, strlen (msg)); 722 write (STDERR_FILENO, msg, strlen (msg));
536} 723}
537#endif 724#endif
538 725
539static void (*syserr_cb)(const char *msg); 726static void (*syserr_cb)(const char *msg);
540 727
541void 728void ecb_cold
542ev_set_syserr_cb (void (*cb)(const char *msg)) 729ev_set_syserr_cb (void (*cb)(const char *msg))
543{ 730{
544 syserr_cb = cb; 731 syserr_cb = cb;
545} 732}
546 733
547static void noinline 734static void noinline ecb_cold
548ev_syserr (const char *msg) 735ev_syserr (const char *msg)
549{ 736{
550 if (!msg) 737 if (!msg)
551 msg = "(libev) system error"; 738 msg = "(libev) system error";
552 739
553 if (syserr_cb) 740 if (syserr_cb)
554 syserr_cb (msg); 741 syserr_cb (msg);
555 else 742 else
556 { 743 {
557#if EV_AVOID_STDIO 744#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg); 745 ev_printerr (msg);
561 ev_printerr (": "); 746 ev_printerr (": ");
562 ev_printerr (err); 747 ev_printerr (strerror (errno));
563 ev_printerr ("\n"); 748 ev_printerr ("\n");
564#else 749#else
565 perror (msg); 750 perror (msg);
566#endif 751#endif
567 abort (); 752 abort ();
… …
587#endif 772#endif
588} 773}
589 774
590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 775static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
591 776
592void 777void ecb_cold
593ev_set_allocator (void *(*cb)(void *ptr, long size)) 778ev_set_allocator (void *(*cb)(void *ptr, long size))
594{ 779{
595 alloc = cb; 780 alloc = cb;
596} 781}
597 782
… …
601 ptr = alloc (ptr, size); 786 ptr = alloc (ptr, size);
602 787
603 if (!ptr && size) 788 if (!ptr && size)
604 { 789 {
605#if EV_AVOID_STDIO 790#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n"); 791 ev_printerr ("(libev) memory allocation failed, aborting.\n");
607#else 792#else
608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 793 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
609#endif 794#endif
610 abort (); 795 abort ();
611 } 796 }
612 797
613 return ptr; 798 return ptr;
… …
630 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 815 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
631 unsigned char unused; 816 unsigned char unused;
632#if EV_USE_EPOLL 817#if EV_USE_EPOLL
633 unsigned int egen; /* generation counter to counter epoll bugs */ 818 unsigned int egen; /* generation counter to counter epoll bugs */
634#endif 819#endif
635#if EV_SELECT_IS_WINSOCKET 820#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
636 SOCKET handle; 821 SOCKET handle;
822#endif
823#if EV_USE_IOCP
824 OVERLAPPED or, ow;
637#endif 825#endif
638} ANFD; 826} ANFD;
639 827
640/* stores the pending event set for a given watcher */ 828/* stores the pending event set for a given watcher */
641typedef struct 829typedef struct
… …
696 884
697 static int ev_default_loop_ptr; 885 static int ev_default_loop_ptr;
698 886
699#endif 887#endif
700 888
701#if EV_MINIMAL < 2 889#if EV_FEATURE_API
702# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 890# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
703# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 891# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
704# define EV_INVOKE_PENDING invoke_cb (EV_A) 892# define EV_INVOKE_PENDING invoke_cb (EV_A)
705#else 893#else
706# define EV_RELEASE_CB (void)0 894# define EV_RELEASE_CB (void)0
707# define EV_ACQUIRE_CB (void)0 895# define EV_ACQUIRE_CB (void)0
708# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 896# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
709#endif 897#endif
710 898
711#define EVUNLOOP_RECURSE 0x80 899#define EVBREAK_RECURSE 0x80
712 900
713/*****************************************************************************/ 901/*****************************************************************************/
714 902
715#ifndef EV_HAVE_EV_TIME 903#ifndef EV_HAVE_EV_TIME
716ev_tstamp 904ev_tstamp
… …
760 if (delay > 0.) 948 if (delay > 0.)
761 { 949 {
762#if EV_USE_NANOSLEEP 950#if EV_USE_NANOSLEEP
763 struct timespec ts; 951 struct timespec ts;
764 952
765 ts.tv_sec = (time_t)delay; 953 EV_TS_SET (ts, delay);
766 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
767
768 nanosleep (&ts, 0); 954 nanosleep (&ts, 0);
769#elif defined(_WIN32) 955#elif defined(_WIN32)
770 Sleep ((unsigned long)(delay * 1e3)); 956 Sleep ((unsigned long)(delay * 1e3));
771#else 957#else
772 struct timeval tv; 958 struct timeval tv;
773 959
774 tv.tv_sec = (time_t)delay;
775 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
776
777 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 960 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
778 /* something not guaranteed by newer posix versions, but guaranteed */ 961 /* something not guaranteed by newer posix versions, but guaranteed */
779 /* by older ones */ 962 /* by older ones */
963 EV_TV_SET (tv, delay);
780 select (0, 0, 0, 0, &tv); 964 select (0, 0, 0, 0, &tv);
781#endif 965#endif
782 } 966 }
783} 967}
784 968
785/*****************************************************************************/ 969/*****************************************************************************/
786 970
787#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 971#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
788 972
789/* find a suitable new size for the given array, */ 973/* find a suitable new size for the given array, */
790/* hopefully by rounding to a ncie-to-malloc size */ 974/* hopefully by rounding to a nice-to-malloc size */
791inline_size int 975inline_size int
792array_nextsize (int elem, int cur, int cnt) 976array_nextsize (int elem, int cur, int cnt)
793{ 977{
794 int ncur = cur + 1; 978 int ncur = cur + 1;
795 979
… …
807 } 991 }
808 992
809 return ncur; 993 return ncur;
810} 994}
811 995
812static noinline void * 996static void * noinline ecb_cold
813array_realloc (int elem, void *base, int *cur, int cnt) 997array_realloc (int elem, void *base, int *cur, int cnt)
814{ 998{
815 *cur = array_nextsize (elem, *cur, cnt); 999 *cur = array_nextsize (elem, *cur, cnt);
816 return ev_realloc (base, elem * *cur); 1000 return ev_realloc (base, elem * *cur);
817} 1001}
… …
820 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1004 memset ((void *)(base), 0, sizeof (*(base)) * (count))
821 1005
822#define array_needsize(type,base,cur,cnt,init) \ 1006#define array_needsize(type,base,cur,cnt,init) \
823 if (expect_false ((cnt) > (cur))) \ 1007 if (expect_false ((cnt) > (cur))) \
824 { \ 1008 { \
825 int ocur_ = (cur); \ 1009 int ecb_unused ocur_ = (cur); \
826 (base) = (type *)array_realloc \ 1010 (base) = (type *)array_realloc \
827 (sizeof (type), (base), &(cur), (cnt)); \ 1011 (sizeof (type), (base), &(cur), (cnt)); \
828 init ((base) + (ocur_), (cur) - ocur_); \ 1012 init ((base) + (ocur_), (cur) - ocur_); \
829 } 1013 }
830 1014
… …
930inline_size void 1114inline_size void
931fd_reify (EV_P) 1115fd_reify (EV_P)
932{ 1116{
933 int i; 1117 int i;
934 1118
1119#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1120 for (i = 0; i < fdchangecnt; ++i)
1121 {
1122 int fd = fdchanges [i];
1123 ANFD *anfd = anfds + fd;
1124
1125 if (anfd->reify & EV__IOFDSET && anfd->head)
1126 {
1127 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1128
1129 if (handle != anfd->handle)
1130 {
1131 unsigned long arg;
1132
1133 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1134
1135 /* handle changed, but fd didn't - we need to do it in two steps */
1136 backend_modify (EV_A_ fd, anfd->events, 0);
1137 anfd->events = 0;
1138 anfd->handle = handle;
1139 }
1140 }
1141 }
1142#endif
1143
935 for (i = 0; i < fdchangecnt; ++i) 1144 for (i = 0; i < fdchangecnt; ++i)
936 { 1145 {
937 int fd = fdchanges [i]; 1146 int fd = fdchanges [i];
938 ANFD *anfd = anfds + fd; 1147 ANFD *anfd = anfds + fd;
939 ev_io *w; 1148 ev_io *w;
940 1149
941 unsigned char events = 0; 1150 unsigned char o_events = anfd->events;
1151 unsigned char o_reify = anfd->reify;
942 1152
943 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1153 anfd->reify = 0;
944 events |= (unsigned char)w->events;
945 1154
946#if EV_SELECT_IS_WINSOCKET 1155 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
947 if (events)
948 { 1156 {
949 unsigned long arg; 1157 anfd->events = 0;
950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1158
951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1159 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1160 anfd->events |= (unsigned char)w->events;
1161
1162 if (o_events != anfd->events)
1163 o_reify = EV__IOFDSET; /* actually |= */
952 } 1164 }
953#endif
954 1165
955 { 1166 if (o_reify & EV__IOFDSET)
956 unsigned char o_events = anfd->events;
957 unsigned char o_reify = anfd->reify;
958
959 anfd->reify = 0;
960 anfd->events = events;
961
962 if (o_events != events || o_reify & EV__IOFDSET)
963 backend_modify (EV_A_ fd, o_events, events); 1167 backend_modify (EV_A_ fd, o_events, anfd->events);
964 }
965 } 1168 }
966 1169
967 fdchangecnt = 0; 1170 fdchangecnt = 0;
968} 1171}
969 1172
… …
981 fdchanges [fdchangecnt - 1] = fd; 1184 fdchanges [fdchangecnt - 1] = fd;
982 } 1185 }
983} 1186}
984 1187
985/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1188/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
986inline_speed void 1189inline_speed void ecb_cold
987fd_kill (EV_P_ int fd) 1190fd_kill (EV_P_ int fd)
988{ 1191{
989 ev_io *w; 1192 ev_io *w;
990 1193
991 while ((w = (ev_io *)anfds [fd].head)) 1194 while ((w = (ev_io *)anfds [fd].head))
… …
994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1197 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
995 } 1198 }
996} 1199}
997 1200
998/* check whether the given fd is actually valid, for error recovery */ 1201/* check whether the given fd is actually valid, for error recovery */
999inline_size int 1202inline_size int ecb_cold
1000fd_valid (int fd) 1203fd_valid (int fd)
1001{ 1204{
1002#ifdef _WIN32 1205#ifdef _WIN32
1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1206 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1004#else 1207#else
1005 return fcntl (fd, F_GETFD) != -1; 1208 return fcntl (fd, F_GETFD) != -1;
1006#endif 1209#endif
1007} 1210}
1008 1211
1009/* called on EBADF to verify fds */ 1212/* called on EBADF to verify fds */
1010static void noinline 1213static void noinline ecb_cold
1011fd_ebadf (EV_P) 1214fd_ebadf (EV_P)
1012{ 1215{
1013 int fd; 1216 int fd;
1014 1217
1015 for (fd = 0; fd < anfdmax; ++fd) 1218 for (fd = 0; fd < anfdmax; ++fd)
… …
1017 if (!fd_valid (fd) && errno == EBADF) 1220 if (!fd_valid (fd) && errno == EBADF)
1018 fd_kill (EV_A_ fd); 1221 fd_kill (EV_A_ fd);
1019} 1222}
1020 1223
1021/* called on ENOMEM in select/poll to kill some fds and retry */ 1224/* called on ENOMEM in select/poll to kill some fds and retry */
1022static void noinline 1225static void noinline ecb_cold
1023fd_enomem (EV_P) 1226fd_enomem (EV_P)
1024{ 1227{
1025 int fd; 1228 int fd;
1026 1229
1027 for (fd = anfdmax; fd--; ) 1230 for (fd = anfdmax; fd--; )
… …
1062} 1265}
1063 1266
1064/*****************************************************************************/ 1267/*****************************************************************************/
1065 1268
1066/* 1269/*
1067 * the heap functions want a real array index. array index 0 uis guaranteed to not 1270 * the heap functions want a real array index. array index 0 is guaranteed to not
1068 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1271 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1069 * the branching factor of the d-tree. 1272 * the branching factor of the d-tree.
1070 */ 1273 */
1071 1274
1072/* 1275/*
… …
1222 1425
1223/*****************************************************************************/ 1426/*****************************************************************************/
1224 1427
1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1428#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1226 1429
1227static void noinline 1430static void noinline ecb_cold
1228evpipe_init (EV_P) 1431evpipe_init (EV_P)
1229{ 1432{
1230 if (!ev_is_active (&pipe_w)) 1433 if (!ev_is_active (&pipe_w))
1231 { 1434 {
1232# if EV_USE_EVENTFD 1435# if EV_USE_EVENTFD
… …
1254 ev_io_start (EV_A_ &pipe_w); 1457 ev_io_start (EV_A_ &pipe_w);
1255 ev_unref (EV_A); /* watcher should not keep loop alive */ 1458 ev_unref (EV_A); /* watcher should not keep loop alive */
1256 } 1459 }
1257} 1460}
1258 1461
1259inline_size void 1462inline_speed void
1260evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1463evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1261{ 1464{
1262 if (!*flag) 1465 if (expect_true (*flag))
1466 return;
1467
1468 *flag = 1;
1469
1470 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1471
1472 pipe_write_skipped = 1;
1473
1474 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1475
1476 if (pipe_write_wanted)
1263 { 1477 {
1478 int old_errno;
1479
1480 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */
1481
1264 int old_errno = errno; /* save errno because write might clobber it */ 1482 old_errno = errno; /* save errno because write will clobber it */
1265 char dummy;
1266
1267 *flag = 1;
1268 1483
1269#if EV_USE_EVENTFD 1484#if EV_USE_EVENTFD
1270 if (evfd >= 0) 1485 if (evfd >= 0)
1271 { 1486 {
1272 uint64_t counter = 1; 1487 uint64_t counter = 1;
1273 write (evfd, &counter, sizeof (uint64_t)); 1488 write (evfd, &counter, sizeof (uint64_t));
1274 } 1489 }
1275 else 1490 else
1276#endif 1491#endif
1492 {
1493 /* win32 people keep sending patches that change this write() to send() */
1494 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1495 /* so when you think this write should be a send instead, please find out */
1496 /* where your send() is from - it's definitely not the microsoft send, and */
1497 /* tell me. thank you. */
1277 write (evpipe [1], &dummy, 1); 1498 write (evpipe [1], &(evpipe [1]), 1);
1499 }
1278 1500
1279 errno = old_errno; 1501 errno = old_errno;
1280 } 1502 }
1281} 1503}
1282 1504
… …
1285static void 1507static void
1286pipecb (EV_P_ ev_io *iow, int revents) 1508pipecb (EV_P_ ev_io *iow, int revents)
1287{ 1509{
1288 int i; 1510 int i;
1289 1511
1512 if (revents & EV_READ)
1513 {
1290#if EV_USE_EVENTFD 1514#if EV_USE_EVENTFD
1291 if (evfd >= 0) 1515 if (evfd >= 0)
1292 { 1516 {
1293 uint64_t counter; 1517 uint64_t counter;
1294 read (evfd, &counter, sizeof (uint64_t)); 1518 read (evfd, &counter, sizeof (uint64_t));
1295 } 1519 }
1296 else 1520 else
1297#endif 1521#endif
1298 { 1522 {
1299 char dummy; 1523 char dummy;
1524 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1300 read (evpipe [0], &dummy, 1); 1525 read (evpipe [0], &dummy, 1);
1526 }
1301 } 1527 }
1302 1528
1529 pipe_write_skipped = 0;
1530
1531#if EV_SIGNAL_ENABLE
1303 if (sig_pending) 1532 if (sig_pending)
1304 { 1533 {
1305 sig_pending = 0; 1534 sig_pending = 0;
1306 1535
1307 for (i = EV_NSIG - 1; i--; ) 1536 for (i = EV_NSIG - 1; i--; )
1308 if (expect_false (signals [i].pending)) 1537 if (expect_false (signals [i].pending))
1309 ev_feed_signal_event (EV_A_ i + 1); 1538 ev_feed_signal_event (EV_A_ i + 1);
1310 } 1539 }
1540#endif
1311 1541
1312#if EV_ASYNC_ENABLE 1542#if EV_ASYNC_ENABLE
1313 if (async_pending) 1543 if (async_pending)
1314 { 1544 {
1315 async_pending = 0; 1545 async_pending = 0;
… …
1324#endif 1554#endif
1325} 1555}
1326 1556
1327/*****************************************************************************/ 1557/*****************************************************************************/
1328 1558
1559void
1560ev_feed_signal (int signum)
1561{
1562#if EV_MULTIPLICITY
1563 EV_P = signals [signum - 1].loop;
1564
1565 if (!EV_A)
1566 return;
1567#endif
1568
1569 if (!ev_active (&pipe_w))
1570 return;
1571
1572 signals [signum - 1].pending = 1;
1573 evpipe_write (EV_A_ &sig_pending);
1574}
1575
1329static void 1576static void
1330ev_sighandler (int signum) 1577ev_sighandler (int signum)
1331{ 1578{
1332#if EV_MULTIPLICITY
1333 EV_P = signals [signum - 1].loop;
1334#endif
1335
1336#ifdef _WIN32 1579#ifdef _WIN32
1337 signal (signum, ev_sighandler); 1580 signal (signum, ev_sighandler);
1338#endif 1581#endif
1339 1582
1340 signals [signum - 1].pending = 1; 1583 ev_feed_signal (signum);
1341 evpipe_write (EV_A_ &sig_pending);
1342} 1584}
1343 1585
1344void noinline 1586void noinline
1345ev_feed_signal_event (EV_P_ int signum) 1587ev_feed_signal_event (EV_P_ int signum)
1346{ 1588{
… …
1403child_reap (EV_P_ int chain, int pid, int status) 1645child_reap (EV_P_ int chain, int pid, int status)
1404{ 1646{
1405 ev_child *w; 1647 ev_child *w;
1406 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1648 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1407 1649
1408 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1650 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1409 { 1651 {
1410 if ((w->pid == pid || !w->pid) 1652 if ((w->pid == pid || !w->pid)
1411 && (!traced || (w->flags & 1))) 1653 && (!traced || (w->flags & 1)))
1412 { 1654 {
1413 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1655 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1438 /* make sure we are called again until all children have been reaped */ 1680 /* make sure we are called again until all children have been reaped */
1439 /* we need to do it this way so that the callback gets called before we continue */ 1681 /* we need to do it this way so that the callback gets called before we continue */
1440 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1682 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1441 1683
1442 child_reap (EV_A_ pid, pid, status); 1684 child_reap (EV_A_ pid, pid, status);
1443 if (EV_PID_HASHSIZE > 1) 1685 if ((EV_PID_HASHSIZE) > 1)
1444 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1686 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1445} 1687}
1446 1688
1447#endif 1689#endif
1448 1690
1449/*****************************************************************************/ 1691/*****************************************************************************/
1450 1692
1693#if EV_USE_IOCP
1694# include "ev_iocp.c"
1695#endif
1451#if EV_USE_PORT 1696#if EV_USE_PORT
1452# include "ev_port.c" 1697# include "ev_port.c"
1453#endif 1698#endif
1454#if EV_USE_KQUEUE 1699#if EV_USE_KQUEUE
1455# include "ev_kqueue.c" 1700# include "ev_kqueue.c"
… …
1462#endif 1707#endif
1463#if EV_USE_SELECT 1708#if EV_USE_SELECT
1464# include "ev_select.c" 1709# include "ev_select.c"
1465#endif 1710#endif
1466 1711
1467int 1712int ecb_cold
1468ev_version_major (void) 1713ev_version_major (void)
1469{ 1714{
1470 return EV_VERSION_MAJOR; 1715 return EV_VERSION_MAJOR;
1471} 1716}
1472 1717
1473int 1718int ecb_cold
1474ev_version_minor (void) 1719ev_version_minor (void)
1475{ 1720{
1476 return EV_VERSION_MINOR; 1721 return EV_VERSION_MINOR;
1477} 1722}
1478 1723
1479/* return true if we are running with elevated privileges and should ignore env variables */ 1724/* return true if we are running with elevated privileges and should ignore env variables */
1480int inline_size 1725int inline_size ecb_cold
1481enable_secure (void) 1726enable_secure (void)
1482{ 1727{
1483#ifdef _WIN32 1728#ifdef _WIN32
1484 return 0; 1729 return 0;
1485#else 1730#else
1486 return getuid () != geteuid () 1731 return getuid () != geteuid ()
1487 || getgid () != getegid (); 1732 || getgid () != getegid ();
1488#endif 1733#endif
1489} 1734}
1490 1735
1491unsigned int 1736unsigned int ecb_cold
1492ev_supported_backends (void) 1737ev_supported_backends (void)
1493{ 1738{
1494 unsigned int flags = 0; 1739 unsigned int flags = 0;
1495 1740
1496 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1741 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1500 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1745 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1501 1746
1502 return flags; 1747 return flags;
1503} 1748}
1504 1749
1505unsigned int 1750unsigned int ecb_cold
1506ev_recommended_backends (void) 1751ev_recommended_backends (void)
1507{ 1752{
1508 unsigned int flags = ev_supported_backends (); 1753 unsigned int flags = ev_supported_backends ();
1509 1754
1510#ifndef __NetBSD__ 1755#ifndef __NetBSD__
… …
1515#ifdef __APPLE__ 1760#ifdef __APPLE__
1516 /* only select works correctly on that "unix-certified" platform */ 1761 /* only select works correctly on that "unix-certified" platform */
1517 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1762 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1518 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1763 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1519#endif 1764#endif
1765#ifdef __FreeBSD__
1766 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1767#endif
1520 1768
1521 return flags; 1769 return flags;
1522} 1770}
1523 1771
1524unsigned int 1772unsigned int ecb_cold
1525ev_embeddable_backends (void) 1773ev_embeddable_backends (void)
1526{ 1774{
1527 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1775 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1528 1776
1529 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1777 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1530 /* please fix it and tell me how to detect the fix */ 1778 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1531 flags &= ~EVBACKEND_EPOLL; 1779 flags &= ~EVBACKEND_EPOLL;
1532 1780
1533 return flags; 1781 return flags;
1534} 1782}
1535 1783
1536unsigned int 1784unsigned int
1537ev_backend (EV_P) 1785ev_backend (EV_P)
1538{ 1786{
1539 return backend; 1787 return backend;
1540} 1788}
1541 1789
1542#if EV_MINIMAL < 2 1790#if EV_FEATURE_API
1543unsigned int 1791unsigned int
1544ev_loop_count (EV_P) 1792ev_iteration (EV_P)
1545{ 1793{
1546 return loop_count; 1794 return loop_count;
1547} 1795}
1548 1796
1549unsigned int 1797unsigned int
1550ev_loop_depth (EV_P) 1798ev_depth (EV_P)
1551{ 1799{
1552 return loop_depth; 1800 return loop_depth;
1553} 1801}
1554 1802
1555void 1803void
… …
1574ev_userdata (EV_P) 1822ev_userdata (EV_P)
1575{ 1823{
1576 return userdata; 1824 return userdata;
1577} 1825}
1578 1826
1827void
1579void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1828ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1580{ 1829{
1581 invoke_cb = invoke_pending_cb; 1830 invoke_cb = invoke_pending_cb;
1582} 1831}
1583 1832
1833void
1584void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1834ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1585{ 1835{
1586 release_cb = release; 1836 release_cb = release;
1587 acquire_cb = acquire; 1837 acquire_cb = acquire;
1588} 1838}
1589#endif 1839#endif
1590 1840
1591/* initialise a loop structure, must be zero-initialised */ 1841/* initialise a loop structure, must be zero-initialised */
1592static void noinline 1842static void noinline ecb_cold
1593loop_init (EV_P_ unsigned int flags) 1843loop_init (EV_P_ unsigned int flags)
1594{ 1844{
1595 if (!backend) 1845 if (!backend)
1596 { 1846 {
1847 origflags = flags;
1848
1597#if EV_USE_REALTIME 1849#if EV_USE_REALTIME
1598 if (!have_realtime) 1850 if (!have_realtime)
1599 { 1851 {
1600 struct timespec ts; 1852 struct timespec ts;
1601 1853
… …
1623 if (!(flags & EVFLAG_NOENV) 1875 if (!(flags & EVFLAG_NOENV)
1624 && !enable_secure () 1876 && !enable_secure ()
1625 && getenv ("LIBEV_FLAGS")) 1877 && getenv ("LIBEV_FLAGS"))
1626 flags = atoi (getenv ("LIBEV_FLAGS")); 1878 flags = atoi (getenv ("LIBEV_FLAGS"));
1627 1879
1628 ev_rt_now = ev_time (); 1880 ev_rt_now = ev_time ();
1629 mn_now = get_clock (); 1881 mn_now = get_clock ();
1630 now_floor = mn_now; 1882 now_floor = mn_now;
1631 rtmn_diff = ev_rt_now - mn_now; 1883 rtmn_diff = ev_rt_now - mn_now;
1632#if EV_MINIMAL < 2 1884#if EV_FEATURE_API
1633 invoke_cb = ev_invoke_pending; 1885 invoke_cb = ev_invoke_pending;
1634#endif 1886#endif
1635 1887
1636 io_blocktime = 0.; 1888 io_blocktime = 0.;
1637 timeout_blocktime = 0.; 1889 timeout_blocktime = 0.;
1638 backend = 0; 1890 backend = 0;
1639 backend_fd = -1; 1891 backend_fd = -1;
1640 sig_pending = 0; 1892 sig_pending = 0;
1641#if EV_ASYNC_ENABLE 1893#if EV_ASYNC_ENABLE
1642 async_pending = 0; 1894 async_pending = 0;
1643#endif 1895#endif
1896 pipe_write_skipped = 0;
1897 pipe_write_wanted = 0;
1644#if EV_USE_INOTIFY 1898#if EV_USE_INOTIFY
1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1899 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1646#endif 1900#endif
1647#if EV_USE_SIGNALFD 1901#if EV_USE_SIGNALFD
1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1902 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1649#endif 1903#endif
1650 1904
1651 if (!(flags & 0x0000ffffU)) 1905 if (!(flags & EVBACKEND_MASK))
1652 flags |= ev_recommended_backends (); 1906 flags |= ev_recommended_backends ();
1653 1907
1908#if EV_USE_IOCP
1909 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1910#endif
1654#if EV_USE_PORT 1911#if EV_USE_PORT
1655 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1912 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1656#endif 1913#endif
1657#if EV_USE_KQUEUE 1914#if EV_USE_KQUEUE
1658 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1915 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1675#endif 1932#endif
1676 } 1933 }
1677} 1934}
1678 1935
1679/* free up a loop structure */ 1936/* free up a loop structure */
1680static void noinline 1937void ecb_cold
1681loop_destroy (EV_P) 1938ev_loop_destroy (EV_P)
1682{ 1939{
1683 int i; 1940 int i;
1941
1942#if EV_MULTIPLICITY
1943 /* mimic free (0) */
1944 if (!EV_A)
1945 return;
1946#endif
1947
1948#if EV_CLEANUP_ENABLE
1949 /* queue cleanup watchers (and execute them) */
1950 if (expect_false (cleanupcnt))
1951 {
1952 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1953 EV_INVOKE_PENDING;
1954 }
1955#endif
1956
1957#if EV_CHILD_ENABLE
1958 if (ev_is_active (&childev))
1959 {
1960 ev_ref (EV_A); /* child watcher */
1961 ev_signal_stop (EV_A_ &childev);
1962 }
1963#endif
1684 1964
1685 if (ev_is_active (&pipe_w)) 1965 if (ev_is_active (&pipe_w))
1686 { 1966 {
1687 /*ev_ref (EV_A);*/ 1967 /*ev_ref (EV_A);*/
1688 /*ev_io_stop (EV_A_ &pipe_w);*/ 1968 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1710#endif 1990#endif
1711 1991
1712 if (backend_fd >= 0) 1992 if (backend_fd >= 0)
1713 close (backend_fd); 1993 close (backend_fd);
1714 1994
1995#if EV_USE_IOCP
1996 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1997#endif
1715#if EV_USE_PORT 1998#if EV_USE_PORT
1716 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1999 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1717#endif 2000#endif
1718#if EV_USE_KQUEUE 2001#if EV_USE_KQUEUE
1719 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 2002 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1746 array_free (periodic, EMPTY); 2029 array_free (periodic, EMPTY);
1747#endif 2030#endif
1748#if EV_FORK_ENABLE 2031#if EV_FORK_ENABLE
1749 array_free (fork, EMPTY); 2032 array_free (fork, EMPTY);
1750#endif 2033#endif
2034#if EV_CLEANUP_ENABLE
2035 array_free (cleanup, EMPTY);
2036#endif
1751 array_free (prepare, EMPTY); 2037 array_free (prepare, EMPTY);
1752 array_free (check, EMPTY); 2038 array_free (check, EMPTY);
1753#if EV_ASYNC_ENABLE 2039#if EV_ASYNC_ENABLE
1754 array_free (async, EMPTY); 2040 array_free (async, EMPTY);
1755#endif 2041#endif
1756 2042
1757 backend = 0; 2043 backend = 0;
2044
2045#if EV_MULTIPLICITY
2046 if (ev_is_default_loop (EV_A))
2047#endif
2048 ev_default_loop_ptr = 0;
2049#if EV_MULTIPLICITY
2050 else
2051 ev_free (EV_A);
2052#endif
1758} 2053}
1759 2054
1760#if EV_USE_INOTIFY 2055#if EV_USE_INOTIFY
1761inline_size void infy_fork (EV_P); 2056inline_size void infy_fork (EV_P);
1762#endif 2057#endif
… …
1777 infy_fork (EV_A); 2072 infy_fork (EV_A);
1778#endif 2073#endif
1779 2074
1780 if (ev_is_active (&pipe_w)) 2075 if (ev_is_active (&pipe_w))
1781 { 2076 {
1782 /* this "locks" the handlers against writing to the pipe */ 2077 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1783 /* while we modify the fd vars */
1784 sig_pending = 1;
1785#if EV_ASYNC_ENABLE
1786 async_pending = 1;
1787#endif
1788 2078
1789 ev_ref (EV_A); 2079 ev_ref (EV_A);
1790 ev_io_stop (EV_A_ &pipe_w); 2080 ev_io_stop (EV_A_ &pipe_w);
1791 2081
1792#if EV_USE_EVENTFD 2082#if EV_USE_EVENTFD
… …
1810 postfork = 0; 2100 postfork = 0;
1811} 2101}
1812 2102
1813#if EV_MULTIPLICITY 2103#if EV_MULTIPLICITY
1814 2104
1815struct ev_loop * 2105struct ev_loop * ecb_cold
1816ev_loop_new (unsigned int flags) 2106ev_loop_new (unsigned int flags)
1817{ 2107{
1818 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2108 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1819 2109
1820 memset (EV_A, 0, sizeof (struct ev_loop)); 2110 memset (EV_A, 0, sizeof (struct ev_loop));
1821 loop_init (EV_A_ flags); 2111 loop_init (EV_A_ flags);
1822 2112
1823 if (ev_backend (EV_A)) 2113 if (ev_backend (EV_A))
1824 return EV_A; 2114 return EV_A;
1825 2115
2116 ev_free (EV_A);
1826 return 0; 2117 return 0;
1827} 2118}
1828 2119
1829void
1830ev_loop_destroy (EV_P)
1831{
1832 loop_destroy (EV_A);
1833 ev_free (loop);
1834}
1835
1836void
1837ev_loop_fork (EV_P)
1838{
1839 postfork = 1; /* must be in line with ev_default_fork */
1840}
1841#endif /* multiplicity */ 2120#endif /* multiplicity */
1842 2121
1843#if EV_VERIFY 2122#if EV_VERIFY
1844static void noinline 2123static void noinline ecb_cold
1845verify_watcher (EV_P_ W w) 2124verify_watcher (EV_P_ W w)
1846{ 2125{
1847 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2126 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1848 2127
1849 if (w->pending) 2128 if (w->pending)
1850 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2129 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1851} 2130}
1852 2131
1853static void noinline 2132static void noinline ecb_cold
1854verify_heap (EV_P_ ANHE *heap, int N) 2133verify_heap (EV_P_ ANHE *heap, int N)
1855{ 2134{
1856 int i; 2135 int i;
1857 2136
1858 for (i = HEAP0; i < N + HEAP0; ++i) 2137 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1863 2142
1864 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2143 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1865 } 2144 }
1866} 2145}
1867 2146
1868static void noinline 2147static void noinline ecb_cold
1869array_verify (EV_P_ W *ws, int cnt) 2148array_verify (EV_P_ W *ws, int cnt)
1870{ 2149{
1871 while (cnt--) 2150 while (cnt--)
1872 { 2151 {
1873 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2152 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1874 verify_watcher (EV_A_ ws [cnt]); 2153 verify_watcher (EV_A_ ws [cnt]);
1875 } 2154 }
1876} 2155}
1877#endif 2156#endif
1878 2157
1879#if EV_MINIMAL < 2 2158#if EV_FEATURE_API
1880void 2159void ecb_cold
1881ev_loop_verify (EV_P) 2160ev_verify (EV_P)
1882{ 2161{
1883#if EV_VERIFY 2162#if EV_VERIFY
1884 int i; 2163 int i;
1885 WL w; 2164 WL w;
1886 2165
… …
1920#if EV_FORK_ENABLE 2199#if EV_FORK_ENABLE
1921 assert (forkmax >= forkcnt); 2200 assert (forkmax >= forkcnt);
1922 array_verify (EV_A_ (W *)forks, forkcnt); 2201 array_verify (EV_A_ (W *)forks, forkcnt);
1923#endif 2202#endif
1924 2203
2204#if EV_CLEANUP_ENABLE
2205 assert (cleanupmax >= cleanupcnt);
2206 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2207#endif
2208
1925#if EV_ASYNC_ENABLE 2209#if EV_ASYNC_ENABLE
1926 assert (asyncmax >= asynccnt); 2210 assert (asyncmax >= asynccnt);
1927 array_verify (EV_A_ (W *)asyncs, asynccnt); 2211 array_verify (EV_A_ (W *)asyncs, asynccnt);
1928#endif 2212#endif
1929 2213
… …
1937 array_verify (EV_A_ (W *)checks, checkcnt); 2221 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif 2222#endif
1939 2223
1940# if 0 2224# if 0
1941#if EV_CHILD_ENABLE 2225#if EV_CHILD_ENABLE
1942 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2226 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2227 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif 2228#endif
1945# endif 2229# endif
1946#endif 2230#endif
1947} 2231}
1948#endif 2232#endif
1949 2233
1950#if EV_MULTIPLICITY 2234#if EV_MULTIPLICITY
1951struct ev_loop * 2235struct ev_loop * ecb_cold
1952ev_default_loop_init (unsigned int flags)
1953#else 2236#else
1954int 2237int
2238#endif
1955ev_default_loop (unsigned int flags) 2239ev_default_loop (unsigned int flags)
1956#endif
1957{ 2240{
1958 if (!ev_default_loop_ptr) 2241 if (!ev_default_loop_ptr)
1959 { 2242 {
1960#if EV_MULTIPLICITY 2243#if EV_MULTIPLICITY
1961 EV_P = ev_default_loop_ptr = &default_loop_struct; 2244 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1980 2263
1981 return ev_default_loop_ptr; 2264 return ev_default_loop_ptr;
1982} 2265}
1983 2266
1984void 2267void
1985ev_default_destroy (void) 2268ev_loop_fork (EV_P)
1986{ 2269{
1987#if EV_MULTIPLICITY
1988 EV_P = ev_default_loop_ptr;
1989#endif
1990
1991 ev_default_loop_ptr = 0;
1992
1993#if EV_CHILD_ENABLE
1994 ev_ref (EV_A); /* child watcher */
1995 ev_signal_stop (EV_A_ &childev);
1996#endif
1997
1998 loop_destroy (EV_A);
1999}
2000
2001void
2002ev_default_fork (void)
2003{
2004#if EV_MULTIPLICITY
2005 EV_P = ev_default_loop_ptr;
2006#endif
2007
2008 postfork = 1; /* must be in line with ev_loop_fork */ 2270 postfork = 1; /* must be in line with ev_default_fork */
2009} 2271}
2010 2272
2011/*****************************************************************************/ 2273/*****************************************************************************/
2012 2274
2013void 2275void
… …
2035 2297
2036 for (pri = NUMPRI; pri--; ) 2298 for (pri = NUMPRI; pri--; )
2037 while (pendingcnt [pri]) 2299 while (pendingcnt [pri])
2038 { 2300 {
2039 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2301 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2040
2041 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2042 /* ^ this is no longer true, as pending_w could be here */
2043 2302
2044 p->w->pending = 0; 2303 p->w->pending = 0;
2045 EV_CB_INVOKE (p->w, p->events); 2304 EV_CB_INVOKE (p->w, p->events);
2046 EV_FREQUENT_CHECK; 2305 EV_FREQUENT_CHECK;
2047 } 2306 }
… …
2104 EV_FREQUENT_CHECK; 2363 EV_FREQUENT_CHECK;
2105 feed_reverse (EV_A_ (W)w); 2364 feed_reverse (EV_A_ (W)w);
2106 } 2365 }
2107 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2366 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2108 2367
2109 feed_reverse_done (EV_A_ EV_TIMEOUT); 2368 feed_reverse_done (EV_A_ EV_TIMER);
2110 } 2369 }
2111} 2370}
2112 2371
2113#if EV_PERIODIC_ENABLE 2372#if EV_PERIODIC_ENABLE
2373
2374static void noinline
2375periodic_recalc (EV_P_ ev_periodic *w)
2376{
2377 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2378 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2379
2380 /* the above almost always errs on the low side */
2381 while (at <= ev_rt_now)
2382 {
2383 ev_tstamp nat = at + w->interval;
2384
2385 /* when resolution fails us, we use ev_rt_now */
2386 if (expect_false (nat == at))
2387 {
2388 at = ev_rt_now;
2389 break;
2390 }
2391
2392 at = nat;
2393 }
2394
2395 ev_at (w) = at;
2396}
2397
2114/* make periodics pending */ 2398/* make periodics pending */
2115inline_size void 2399inline_size void
2116periodics_reify (EV_P) 2400periodics_reify (EV_P)
2117{ 2401{
2118 EV_FREQUENT_CHECK; 2402 EV_FREQUENT_CHECK;
… …
2137 ANHE_at_cache (periodics [HEAP0]); 2421 ANHE_at_cache (periodics [HEAP0]);
2138 downheap (periodics, periodiccnt, HEAP0); 2422 downheap (periodics, periodiccnt, HEAP0);
2139 } 2423 }
2140 else if (w->interval) 2424 else if (w->interval)
2141 { 2425 {
2142 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2426 periodic_recalc (EV_A_ w);
2143 /* if next trigger time is not sufficiently in the future, put it there */
2144 /* this might happen because of floating point inexactness */
2145 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2146 {
2147 ev_at (w) += w->interval;
2148
2149 /* if interval is unreasonably low we might still have a time in the past */
2150 /* so correct this. this will make the periodic very inexact, but the user */
2151 /* has effectively asked to get triggered more often than possible */
2152 if (ev_at (w) < ev_rt_now)
2153 ev_at (w) = ev_rt_now;
2154 }
2155
2156 ANHE_at_cache (periodics [HEAP0]); 2427 ANHE_at_cache (periodics [HEAP0]);
2157 downheap (periodics, periodiccnt, HEAP0); 2428 downheap (periodics, periodiccnt, HEAP0);
2158 } 2429 }
2159 else 2430 else
2160 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2431 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2167 feed_reverse_done (EV_A_ EV_PERIODIC); 2438 feed_reverse_done (EV_A_ EV_PERIODIC);
2168 } 2439 }
2169} 2440}
2170 2441
2171/* simply recalculate all periodics */ 2442/* simply recalculate all periodics */
2172/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2443/* TODO: maybe ensure that at least one event happens when jumping forward? */
2173static void noinline 2444static void noinline ecb_cold
2174periodics_reschedule (EV_P) 2445periodics_reschedule (EV_P)
2175{ 2446{
2176 int i; 2447 int i;
2177 2448
2178 /* adjust periodics after time jump */ 2449 /* adjust periodics after time jump */
… …
2181 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2452 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2182 2453
2183 if (w->reschedule_cb) 2454 if (w->reschedule_cb)
2184 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2455 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2185 else if (w->interval) 2456 else if (w->interval)
2186 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2457 periodic_recalc (EV_A_ w);
2187 2458
2188 ANHE_at_cache (periodics [i]); 2459 ANHE_at_cache (periodics [i]);
2189 } 2460 }
2190 2461
2191 reheap (periodics, periodiccnt); 2462 reheap (periodics, periodiccnt);
2192} 2463}
2193#endif 2464#endif
2194 2465
2195/* adjust all timers by a given offset */ 2466/* adjust all timers by a given offset */
2196static void noinline 2467static void noinline ecb_cold
2197timers_reschedule (EV_P_ ev_tstamp adjust) 2468timers_reschedule (EV_P_ ev_tstamp adjust)
2198{ 2469{
2199 int i; 2470 int i;
2200 2471
2201 for (i = 0; i < timercnt; ++i) 2472 for (i = 0; i < timercnt; ++i)
… …
2238 * doesn't hurt either as we only do this on time-jumps or 2509 * doesn't hurt either as we only do this on time-jumps or
2239 * in the unlikely event of having been preempted here. 2510 * in the unlikely event of having been preempted here.
2240 */ 2511 */
2241 for (i = 4; --i; ) 2512 for (i = 4; --i; )
2242 { 2513 {
2514 ev_tstamp diff;
2243 rtmn_diff = ev_rt_now - mn_now; 2515 rtmn_diff = ev_rt_now - mn_now;
2244 2516
2517 diff = odiff - rtmn_diff;
2518
2245 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2519 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2246 return; /* all is well */ 2520 return; /* all is well */
2247 2521
2248 ev_rt_now = ev_time (); 2522 ev_rt_now = ev_time ();
2249 mn_now = get_clock (); 2523 mn_now = get_clock ();
2250 now_floor = mn_now; 2524 now_floor = mn_now;
… …
2273 mn_now = ev_rt_now; 2547 mn_now = ev_rt_now;
2274 } 2548 }
2275} 2549}
2276 2550
2277void 2551void
2278ev_loop (EV_P_ int flags) 2552ev_run (EV_P_ int flags)
2279{ 2553{
2280#if EV_MINIMAL < 2 2554#if EV_FEATURE_API
2281 ++loop_depth; 2555 ++loop_depth;
2282#endif 2556#endif
2283 2557
2284 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2558 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2285 2559
2286 loop_done = EVUNLOOP_CANCEL; 2560 loop_done = EVBREAK_CANCEL;
2287 2561
2288 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2562 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2289 2563
2290 do 2564 do
2291 { 2565 {
2292#if EV_VERIFY >= 2 2566#if EV_VERIFY >= 2
2293 ev_loop_verify (EV_A); 2567 ev_verify (EV_A);
2294#endif 2568#endif
2295 2569
2296#ifndef _WIN32 2570#ifndef _WIN32
2297 if (expect_false (curpid)) /* penalise the forking check even more */ 2571 if (expect_false (curpid)) /* penalise the forking check even more */
2298 if (expect_false (getpid () != curpid)) 2572 if (expect_false (getpid () != curpid))
… …
2334 /* calculate blocking time */ 2608 /* calculate blocking time */
2335 { 2609 {
2336 ev_tstamp waittime = 0.; 2610 ev_tstamp waittime = 0.;
2337 ev_tstamp sleeptime = 0.; 2611 ev_tstamp sleeptime = 0.;
2338 2612
2613 /* remember old timestamp for io_blocktime calculation */
2614 ev_tstamp prev_mn_now = mn_now;
2615
2616 /* update time to cancel out callback processing overhead */
2617 time_update (EV_A_ 1e100);
2618
2619 /* from now on, we want a pipe-wake-up */
2620 pipe_write_wanted = 1;
2621
2622 ECB_MEMORY_FENCE; /* amke sure pipe_write_wanted is visible before we check for potential skips */
2623
2339 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2624 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2340 { 2625 {
2341 /* remember old timestamp for io_blocktime calculation */
2342 ev_tstamp prev_mn_now = mn_now;
2343
2344 /* update time to cancel out callback processing overhead */
2345 time_update (EV_A_ 1e100);
2346
2347 waittime = MAX_BLOCKTIME; 2626 waittime = MAX_BLOCKTIME;
2348 2627
2349 if (timercnt) 2628 if (timercnt)
2350 { 2629 {
2351 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2630 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2352 if (waittime > to) waittime = to; 2631 if (waittime > to) waittime = to;
2353 } 2632 }
2354 2633
2355#if EV_PERIODIC_ENABLE 2634#if EV_PERIODIC_ENABLE
2356 if (periodiccnt) 2635 if (periodiccnt)
2357 { 2636 {
2358 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2637 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2359 if (waittime > to) waittime = to; 2638 if (waittime > to) waittime = to;
2360 } 2639 }
2361#endif 2640#endif
2362 2641
2363 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2642 /* don't let timeouts decrease the waittime below timeout_blocktime */
2364 if (expect_false (waittime < timeout_blocktime)) 2643 if (expect_false (waittime < timeout_blocktime))
2365 waittime = timeout_blocktime; 2644 waittime = timeout_blocktime;
2645
2646 /* at this point, we NEED to wait, so we have to ensure */
2647 /* to pass a minimum nonzero value to the backend */
2648 if (expect_false (waittime < backend_mintime))
2649 waittime = backend_mintime;
2366 2650
2367 /* extra check because io_blocktime is commonly 0 */ 2651 /* extra check because io_blocktime is commonly 0 */
2368 if (expect_false (io_blocktime)) 2652 if (expect_false (io_blocktime))
2369 { 2653 {
2370 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2654 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2371 2655
2372 if (sleeptime > waittime - backend_fudge) 2656 if (sleeptime > waittime - backend_mintime)
2373 sleeptime = waittime - backend_fudge; 2657 sleeptime = waittime - backend_mintime;
2374 2658
2375 if (expect_true (sleeptime > 0.)) 2659 if (expect_true (sleeptime > 0.))
2376 { 2660 {
2377 ev_sleep (sleeptime); 2661 ev_sleep (sleeptime);
2378 waittime -= sleeptime; 2662 waittime -= sleeptime;
2379 } 2663 }
2380 } 2664 }
2381 } 2665 }
2382 2666
2383#if EV_MINIMAL < 2 2667#if EV_FEATURE_API
2384 ++loop_count; 2668 ++loop_count;
2385#endif 2669#endif
2386 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2670 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2387 backend_poll (EV_A_ waittime); 2671 backend_poll (EV_A_ waittime);
2388 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2672 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2673
2674 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2675
2676 if (pipe_write_skipped)
2677 {
2678 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2679 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2680 }
2681
2389 2682
2390 /* update ev_rt_now, do magic */ 2683 /* update ev_rt_now, do magic */
2391 time_update (EV_A_ waittime + sleeptime); 2684 time_update (EV_A_ waittime + sleeptime);
2392 } 2685 }
2393 2686
… …
2411 EV_INVOKE_PENDING; 2704 EV_INVOKE_PENDING;
2412 } 2705 }
2413 while (expect_true ( 2706 while (expect_true (
2414 activecnt 2707 activecnt
2415 && !loop_done 2708 && !loop_done
2416 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2709 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2417 )); 2710 ));
2418 2711
2419 if (loop_done == EVUNLOOP_ONE) 2712 if (loop_done == EVBREAK_ONE)
2420 loop_done = EVUNLOOP_CANCEL; 2713 loop_done = EVBREAK_CANCEL;
2421 2714
2422#if EV_MINIMAL < 2 2715#if EV_FEATURE_API
2423 --loop_depth; 2716 --loop_depth;
2424#endif 2717#endif
2425} 2718}
2426 2719
2427void 2720void
2428ev_unloop (EV_P_ int how) 2721ev_break (EV_P_ int how)
2429{ 2722{
2430 loop_done = how; 2723 loop_done = how;
2431} 2724}
2432 2725
2433void 2726void
… …
2581 EV_FREQUENT_CHECK; 2874 EV_FREQUENT_CHECK;
2582 2875
2583 wlist_del (&anfds[w->fd].head, (WL)w); 2876 wlist_del (&anfds[w->fd].head, (WL)w);
2584 ev_stop (EV_A_ (W)w); 2877 ev_stop (EV_A_ (W)w);
2585 2878
2586 fd_change (EV_A_ w->fd, 1); 2879 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2587 2880
2588 EV_FREQUENT_CHECK; 2881 EV_FREQUENT_CHECK;
2589} 2882}
2590 2883
2591void noinline 2884void noinline
… …
2683 if (w->reschedule_cb) 2976 if (w->reschedule_cb)
2684 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2977 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2685 else if (w->interval) 2978 else if (w->interval)
2686 { 2979 {
2687 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2980 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2688 /* this formula differs from the one in periodic_reify because we do not always round up */ 2981 periodic_recalc (EV_A_ w);
2689 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2690 } 2982 }
2691 else 2983 else
2692 ev_at (w) = w->offset; 2984 ev_at (w) = w->offset;
2693 2985
2694 EV_FREQUENT_CHECK; 2986 EV_FREQUENT_CHECK;
… …
2815 sa.sa_handler = ev_sighandler; 3107 sa.sa_handler = ev_sighandler;
2816 sigfillset (&sa.sa_mask); 3108 sigfillset (&sa.sa_mask);
2817 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 3109 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2818 sigaction (w->signum, &sa, 0); 3110 sigaction (w->signum, &sa, 0);
2819 3111
3112 if (origflags & EVFLAG_NOSIGMASK)
3113 {
2820 sigemptyset (&sa.sa_mask); 3114 sigemptyset (&sa.sa_mask);
2821 sigaddset (&sa.sa_mask, w->signum); 3115 sigaddset (&sa.sa_mask, w->signum);
2822 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 3116 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
3117 }
2823#endif 3118#endif
2824 } 3119 }
2825 3120
2826 EV_FREQUENT_CHECK; 3121 EV_FREQUENT_CHECK;
2827} 3122}
… …
2877 return; 3172 return;
2878 3173
2879 EV_FREQUENT_CHECK; 3174 EV_FREQUENT_CHECK;
2880 3175
2881 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
2882 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3177 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2883 3178
2884 EV_FREQUENT_CHECK; 3179 EV_FREQUENT_CHECK;
2885} 3180}
2886 3181
2887void 3182void
… …
2891 if (expect_false (!ev_is_active (w))) 3186 if (expect_false (!ev_is_active (w)))
2892 return; 3187 return;
2893 3188
2894 EV_FREQUENT_CHECK; 3189 EV_FREQUENT_CHECK;
2895 3190
2896 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3191 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2897 ev_stop (EV_A_ (W)w); 3192 ev_stop (EV_A_ (W)w);
2898 3193
2899 EV_FREQUENT_CHECK; 3194 EV_FREQUENT_CHECK;
2900} 3195}
2901 3196
… …
2968 if (!pend || pend == path) 3263 if (!pend || pend == path)
2969 break; 3264 break;
2970 3265
2971 *pend = 0; 3266 *pend = 0;
2972 w->wd = inotify_add_watch (fs_fd, path, mask); 3267 w->wd = inotify_add_watch (fs_fd, path, mask);
2973 } 3268 }
2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3269 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2975 } 3270 }
2976 } 3271 }
2977 3272
2978 if (w->wd >= 0) 3273 if (w->wd >= 0)
2979 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3274 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2980 3275
2981 /* now re-arm timer, if required */ 3276 /* now re-arm timer, if required */
2982 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3277 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2983 ev_timer_again (EV_A_ &w->timer); 3278 ev_timer_again (EV_A_ &w->timer);
2984 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3279 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2992 3287
2993 if (wd < 0) 3288 if (wd < 0)
2994 return; 3289 return;
2995 3290
2996 w->wd = -2; 3291 w->wd = -2;
2997 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3292 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2998 wlist_del (&fs_hash [slot].head, (WL)w); 3293 wlist_del (&fs_hash [slot].head, (WL)w);
2999 3294
3000 /* remove this watcher, if others are watching it, they will rearm */ 3295 /* remove this watcher, if others are watching it, they will rearm */
3001 inotify_rm_watch (fs_fd, wd); 3296 inotify_rm_watch (fs_fd, wd);
3002} 3297}
… …
3004static void noinline 3299static void noinline
3005infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3300infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
3006{ 3301{
3007 if (slot < 0) 3302 if (slot < 0)
3008 /* overflow, need to check for all hash slots */ 3303 /* overflow, need to check for all hash slots */
3009 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3304 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3010 infy_wd (EV_A_ slot, wd, ev); 3305 infy_wd (EV_A_ slot, wd, ev);
3011 else 3306 else
3012 { 3307 {
3013 WL w_; 3308 WL w_;
3014 3309
3015 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3310 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
3016 { 3311 {
3017 ev_stat *w = (ev_stat *)w_; 3312 ev_stat *w = (ev_stat *)w_;
3018 w_ = w_->next; /* lets us remove this watcher and all before it */ 3313 w_ = w_->next; /* lets us remove this watcher and all before it */
3019 3314
3020 if (w->wd == wd || wd == -1) 3315 if (w->wd == wd || wd == -1)
3021 { 3316 {
3022 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3317 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
3023 { 3318 {
3024 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3319 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
3025 w->wd = -1; 3320 w->wd = -1;
3026 infy_add (EV_A_ w); /* re-add, no matter what */ 3321 infy_add (EV_A_ w); /* re-add, no matter what */
3027 } 3322 }
3028 3323
3029 stat_timer_cb (EV_A_ &w->timer, 0); 3324 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3045 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3340 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3046 ofs += sizeof (struct inotify_event) + ev->len; 3341 ofs += sizeof (struct inotify_event) + ev->len;
3047 } 3342 }
3048} 3343}
3049 3344
3050inline_size unsigned int
3051ev_linux_version (void)
3052{
3053 struct utsname buf;
3054 unsigned int v;
3055 int i;
3056 char *p = buf.release;
3057
3058 if (uname (&buf))
3059 return 0;
3060
3061 for (i = 3+1; --i; )
3062 {
3063 unsigned int c = 0;
3064
3065 for (;;)
3066 {
3067 if (*p >= '0' && *p <= '9')
3068 c = c * 10 + *p++ - '0';
3069 else
3070 {
3071 p += *p == '.';
3072 break;
3073 }
3074 }
3075
3076 v = (v << 8) | c;
3077 }
3078
3079 return v;
3080}
3081
3082inline_size void 3345inline_size void ecb_cold
3083ev_check_2625 (EV_P) 3346ev_check_2625 (EV_P)
3084{ 3347{
3085 /* kernels < 2.6.25 are borked 3348 /* kernels < 2.6.25 are borked
3086 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3349 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3087 */ 3350 */
… …
3143 ev_io_set (&fs_w, fs_fd, EV_READ); 3406 ev_io_set (&fs_w, fs_fd, EV_READ);
3144 ev_io_start (EV_A_ &fs_w); 3407 ev_io_start (EV_A_ &fs_w);
3145 ev_unref (EV_A); 3408 ev_unref (EV_A);
3146 } 3409 }
3147 3410
3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3411 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3149 { 3412 {
3150 WL w_ = fs_hash [slot].head; 3413 WL w_ = fs_hash [slot].head;
3151 fs_hash [slot].head = 0; 3414 fs_hash [slot].head = 0;
3152 3415
3153 while (w_) 3416 while (w_)
… …
3408 3671
3409#if EV_EMBED_ENABLE 3672#if EV_EMBED_ENABLE
3410void noinline 3673void noinline
3411ev_embed_sweep (EV_P_ ev_embed *w) 3674ev_embed_sweep (EV_P_ ev_embed *w)
3412{ 3675{
3413 ev_loop (w->other, EVLOOP_NONBLOCK); 3676 ev_run (w->other, EVRUN_NOWAIT);
3414} 3677}
3415 3678
3416static void 3679static void
3417embed_io_cb (EV_P_ ev_io *io, int revents) 3680embed_io_cb (EV_P_ ev_io *io, int revents)
3418{ 3681{
3419 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3682 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3420 3683
3421 if (ev_cb (w)) 3684 if (ev_cb (w))
3422 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3685 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3423 else 3686 else
3424 ev_loop (w->other, EVLOOP_NONBLOCK); 3687 ev_run (w->other, EVRUN_NOWAIT);
3425} 3688}
3426 3689
3427static void 3690static void
3428embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3691embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3429{ 3692{
… …
3433 EV_P = w->other; 3696 EV_P = w->other;
3434 3697
3435 while (fdchangecnt) 3698 while (fdchangecnt)
3436 { 3699 {
3437 fd_reify (EV_A); 3700 fd_reify (EV_A);
3438 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3701 ev_run (EV_A_ EVRUN_NOWAIT);
3439 } 3702 }
3440 } 3703 }
3441} 3704}
3442 3705
3443static void 3706static void
… …
3449 3712
3450 { 3713 {
3451 EV_P = w->other; 3714 EV_P = w->other;
3452 3715
3453 ev_loop_fork (EV_A); 3716 ev_loop_fork (EV_A);
3454 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3717 ev_run (EV_A_ EVRUN_NOWAIT);
3455 } 3718 }
3456 3719
3457 ev_embed_start (EV_A_ w); 3720 ev_embed_start (EV_A_ w);
3458} 3721}
3459 3722
… …
3551 3814
3552 EV_FREQUENT_CHECK; 3815 EV_FREQUENT_CHECK;
3553} 3816}
3554#endif 3817#endif
3555 3818
3819#if EV_CLEANUP_ENABLE
3820void
3821ev_cleanup_start (EV_P_ ev_cleanup *w)
3822{
3823 if (expect_false (ev_is_active (w)))
3824 return;
3825
3826 EV_FREQUENT_CHECK;
3827
3828 ev_start (EV_A_ (W)w, ++cleanupcnt);
3829 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3830 cleanups [cleanupcnt - 1] = w;
3831
3832 /* cleanup watchers should never keep a refcount on the loop */
3833 ev_unref (EV_A);
3834 EV_FREQUENT_CHECK;
3835}
3836
3837void
3838ev_cleanup_stop (EV_P_ ev_cleanup *w)
3839{
3840 clear_pending (EV_A_ (W)w);
3841 if (expect_false (!ev_is_active (w)))
3842 return;
3843
3844 EV_FREQUENT_CHECK;
3845 ev_ref (EV_A);
3846
3847 {
3848 int active = ev_active (w);
3849
3850 cleanups [active - 1] = cleanups [--cleanupcnt];
3851 ev_active (cleanups [active - 1]) = active;
3852 }
3853
3854 ev_stop (EV_A_ (W)w);
3855
3856 EV_FREQUENT_CHECK;
3857}
3858#endif
3859
3556#if EV_ASYNC_ENABLE 3860#if EV_ASYNC_ENABLE
3557void 3861void
3558ev_async_start (EV_P_ ev_async *w) 3862ev_async_start (EV_P_ ev_async *w)
3559{ 3863{
3560 if (expect_false (ev_is_active (w))) 3864 if (expect_false (ev_is_active (w)))
3561 return; 3865 return;
3866
3867 w->sent = 0;
3562 3868
3563 evpipe_init (EV_A); 3869 evpipe_init (EV_A);
3564 3870
3565 EV_FREQUENT_CHECK; 3871 EV_FREQUENT_CHECK;
3566 3872
… …
3644{ 3950{
3645 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3951 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3646 3952
3647 if (expect_false (!once)) 3953 if (expect_false (!once))
3648 { 3954 {
3649 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3955 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3650 return; 3956 return;
3651 } 3957 }
3652 3958
3653 once->cb = cb; 3959 once->cb = cb;
3654 once->arg = arg; 3960 once->arg = arg;
… …
3669} 3975}
3670 3976
3671/*****************************************************************************/ 3977/*****************************************************************************/
3672 3978
3673#if EV_WALK_ENABLE 3979#if EV_WALK_ENABLE
3674void 3980void ecb_cold
3675ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3981ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3676{ 3982{
3677 int i, j; 3983 int i, j;
3678 ev_watcher_list *wl, *wn; 3984 ev_watcher_list *wl, *wn;
3679 3985
… …
3769 } 4075 }
3770#endif 4076#endif
3771 4077
3772#if EV_CHILD_ENABLE 4078#if EV_CHILD_ENABLE
3773 if (types & EV_CHILD) 4079 if (types & EV_CHILD)
3774 for (i = EV_PID_HASHSIZE; i--; ) 4080 for (i = (EV_PID_HASHSIZE); i--; )
3775 for (wl = childs [i]; wl; ) 4081 for (wl = childs [i]; wl; )
3776 { 4082 {
3777 wn = wl->next; 4083 wn = wl->next;
3778 cb (EV_A_ EV_CHILD, wl); 4084 cb (EV_A_ EV_CHILD, wl);
3779 wl = wn; 4085 wl = wn;
… …
3786 4092
3787#if EV_MULTIPLICITY 4093#if EV_MULTIPLICITY
3788 #include "ev_wrap.h" 4094 #include "ev_wrap.h"
3789#endif 4095#endif
3790 4096
3791#ifdef __cplusplus 4097EV_CPP(})
3792}
3793#endif
3794 4098

Diff Legend

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