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

Comparing libev/ev.c (file contents):
Revision 1.322 by root, Thu Jan 7 06:49:31 2010 UTC vs.
Revision 1.345 by sf-exg, Sat Jul 31 22:33:26 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
88# endif 98# endif
89 99
100# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
103# endif
104# endif 107# endif
105 108
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
109# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
112# endif 116# endif
113 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 119# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
120# endif 125# endif
121 126
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
125# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
128# endif 134# endif
129 135
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
136# endif 143# endif
137 144
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 146# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 147# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
144# endif 152# endif
145 153
154# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 155# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 156# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
… …
163 172
164#include <assert.h> 173#include <assert.h>
165#include <errno.h> 174#include <errno.h>
166#include <sys/types.h> 175#include <sys/types.h>
167#include <time.h> 176#include <time.h>
177#include <limits.h>
168 178
169#include <signal.h> 179#include <signal.h>
170 180
171#ifdef EV_H 181#ifdef EV_H
172# include EV_H 182# include EV_H
… …
183# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
184# include <windows.h> 194# include <windows.h>
185# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
186# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
187# endif 197# endif
198# undef EV_AVOID_STDIO
188#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
189 208
190/* 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 */
191 210
192/* try to deduce the maximum number of signals on this platform */ 211/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG) 212#if defined (EV_NSIG)
… …
205#elif defined (MAXSIG) 224#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 225# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 226#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 227# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 228#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 230#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 232#else
214# error "unable to find value for NSIG, please report" 233# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */ 234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
216# define EV_NSIG 65 236# define EV_NSIG 65
217#endif 237#endif
218 238
219#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 242# else
223# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
224# endif 244# endif
225#endif 245#endif
226 246
227#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 250# else
231# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
232# endif 252# endif
233#endif 253#endif
234 254
… …
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 257#endif
238 258
239#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 262# else
243# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
244# endif 264# endif
245#endif 265#endif
246 266
247#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 269#endif
250 270
251#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
252# ifdef _WIN32 272# ifdef _WIN32
253# define EV_USE_POLL 0 273# define EV_USE_POLL 0
254# else 274# else
255# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 276# endif
257#endif 277#endif
258 278
259#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 282# else
263# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
264# endif 284# endif
265#endif 285#endif
266 286
… …
272# define EV_USE_PORT 0 292# define EV_USE_PORT 0
273#endif 293#endif
274 294
275#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 298# else
279# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
280# endif 300# endif
281#endif 301#endif
282 302
283#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 305#endif
290 306
291#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 309#endif
298 310
299#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 314# else
303# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
304# endif 316# endif
305#endif 317#endif
306 318
307#ifndef EV_USE_SIGNALFD 319#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 321# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 322# else
311# define EV_USE_SIGNALFD 0 323# define EV_USE_SIGNALFD 0
312# endif 324# endif
313#endif 325#endif
314 326
… …
317# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
319#endif 331#endif
320 332
321#ifndef EV_VERIFY 333#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 335#endif
324 336
325#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 339#endif
328 340
329#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 343#endif
332 344
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 345/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
… …
343# define EV_USE_CLOCK_SYSCALL 0 355# define EV_USE_CLOCK_SYSCALL 0
344# endif 356# endif
345#endif 357#endif
346 358
347/* 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
348 366
349#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
352#endif 370#endif
… …
396# endif 414# endif
397# endif 415# endif
398# ifdef __cplusplus 416# ifdef __cplusplus
399extern "C" { 417extern "C" {
400# endif 418# endif
401int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
402# ifdef __cplusplus 420# ifdef __cplusplus
403} 421}
404# endif 422# endif
405#endif 423#endif
406 424
… …
434 452
435 453
436/**/ 454/**/
437 455
438#if EV_VERIFY >= 3 456#if EV_VERIFY >= 3
439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 457# define EV_FREQUENT_CHECK ev_verify (EV_A)
440#else 458#else
441# define EV_FREQUENT_CHECK do { } while (0) 459# define EV_FREQUENT_CHECK do { } while (0)
442#endif 460#endif
443 461
444/* 462/*
… …
467 485
468#define expect_false(expr) expect ((expr) != 0, 0) 486#define expect_false(expr) expect ((expr) != 0, 0)
469#define expect_true(expr) expect ((expr) != 0, 1) 487#define expect_true(expr) expect ((expr) != 0, 1)
470#define inline_size static inline 488#define inline_size static inline
471 489
472#if EV_MINIMAL 490#if EV_FEATURE_CODE
491# define inline_speed static inline
492#else
473# define inline_speed static noinline 493# define inline_speed static noinline
474#else
475# define inline_speed static inline
476#endif 494#endif
477 495
478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 496#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479 497
480#if EV_MINPRI == EV_MAXPRI 498#if EV_MINPRI == EV_MAXPRI
… …
493#define ev_active(w) ((W)(w))->active 511#define ev_active(w) ((W)(w))->active
494#define ev_at(w) ((WT)(w))->at 512#define ev_at(w) ((WT)(w))->at
495 513
496#if EV_USE_REALTIME 514#if EV_USE_REALTIME
497/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 515/* sig_atomic_t is used to avoid per-thread variables or locking but still */
498/* giving it a reasonably high chance of working on typical architetcures */ 516/* giving it a reasonably high chance of working on typical architectures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 517static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif 518#endif
501 519
502#if EV_USE_MONOTONIC 520#if EV_USE_MONOTONIC
503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
516#ifdef _WIN32 534#ifdef _WIN32
517# include "ev_win32.c" 535# include "ev_win32.c"
518#endif 536#endif
519 537
520/*****************************************************************************/ 538/*****************************************************************************/
539
540#if EV_AVOID_STDIO
541static void noinline
542ev_printerr (const char *msg)
543{
544 write (STDERR_FILENO, msg, strlen (msg));
545}
546#endif
521 547
522static void (*syserr_cb)(const char *msg); 548static void (*syserr_cb)(const char *msg);
523 549
524void 550void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 551ev_set_syserr_cb (void (*cb)(const char *msg))
… …
535 561
536 if (syserr_cb) 562 if (syserr_cb)
537 syserr_cb (msg); 563 syserr_cb (msg);
538 else 564 else
539 { 565 {
566#if EV_AVOID_STDIO
567 const char *err = strerror (errno);
568
569 ev_printerr (msg);
570 ev_printerr (": ");
571 ev_printerr (err);
572 ev_printerr ("\n");
573#else
540 perror (msg); 574 perror (msg);
575#endif
541 abort (); 576 abort ();
542 } 577 }
543} 578}
544 579
545static void * 580static void *
546ev_realloc_emul (void *ptr, long size) 581ev_realloc_emul (void *ptr, long size)
547{ 582{
583#if __GLIBC__
584 return realloc (ptr, size);
585#else
548 /* some systems, notably openbsd and darwin, fail to properly 586 /* some systems, notably openbsd and darwin, fail to properly
549 * implement realloc (x, 0) (as required by both ansi c-98 and 587 * implement realloc (x, 0) (as required by both ansi c-89 and
550 * the single unix specification, so work around them here. 588 * the single unix specification, so work around them here.
551 */ 589 */
552 590
553 if (size) 591 if (size)
554 return realloc (ptr, size); 592 return realloc (ptr, size);
555 593
556 free (ptr); 594 free (ptr);
557 return 0; 595 return 0;
596#endif
558} 597}
559 598
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 599static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 600
562void 601void
… …
570{ 609{
571 ptr = alloc (ptr, size); 610 ptr = alloc (ptr, size);
572 611
573 if (!ptr && size) 612 if (!ptr && size)
574 { 613 {
614#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n");
616#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
618#endif
576 abort (); 619 abort ();
577 } 620 }
578 621
579 return ptr; 622 return ptr;
580} 623}
… …
662 705
663 static int ev_default_loop_ptr; 706 static int ev_default_loop_ptr;
664 707
665#endif 708#endif
666 709
667#if EV_MINIMAL < 2 710#if EV_FEATURE_API
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 711# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 712# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A) 713# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else 714#else
672# define EV_RELEASE_CB (void)0 715# define EV_RELEASE_CB (void)0
… …
751/*****************************************************************************/ 794/*****************************************************************************/
752 795
753#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 796#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
754 797
755/* find a suitable new size for the given array, */ 798/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */ 799/* hopefully by rounding to a nice-to-malloc size */
757inline_size int 800inline_size int
758array_nextsize (int elem, int cur, int cnt) 801array_nextsize (int elem, int cur, int cnt)
759{ 802{
760 int ncur = cur + 1; 803 int ncur = cur + 1;
761 804
… …
857} 900}
858 901
859/*****************************************************************************/ 902/*****************************************************************************/
860 903
861inline_speed void 904inline_speed void
862fd_event_nc (EV_P_ int fd, int revents) 905fd_event_nocheck (EV_P_ int fd, int revents)
863{ 906{
864 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
865 ev_io *w; 908 ev_io *w;
866 909
867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 910 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
879fd_event (EV_P_ int fd, int revents) 922fd_event (EV_P_ int fd, int revents)
880{ 923{
881 ANFD *anfd = anfds + fd; 924 ANFD *anfd = anfds + fd;
882 925
883 if (expect_true (!anfd->reify)) 926 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents); 927 fd_event_nocheck (EV_A_ fd, revents);
885} 928}
886 929
887void 930void
888ev_feed_fd_event (EV_P_ int fd, int revents) 931ev_feed_fd_event (EV_P_ int fd, int revents)
889{ 932{
890 if (fd >= 0 && fd < anfdmax) 933 if (fd >= 0 && fd < anfdmax)
891 fd_event_nc (EV_A_ fd, revents); 934 fd_event_nocheck (EV_A_ fd, revents);
892} 935}
893 936
894/* make sure the external fd watch events are in-sync */ 937/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */ 938/* with the kernel/libev internal state */
896inline_size void 939inline_size void
… …
959 ev_io_stop (EV_A_ w); 1002 ev_io_stop (EV_A_ w);
960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1003 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
961 } 1004 }
962} 1005}
963 1006
964/* check whether the given fd is atcually valid, for error recovery */ 1007/* check whether the given fd is actually valid, for error recovery */
965inline_size int 1008inline_size int
966fd_valid (int fd) 1009fd_valid (int fd)
967{ 1010{
968#ifdef _WIN32 1011#ifdef _WIN32
969 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1012 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1011 anfds [fd].emask = 0; 1054 anfds [fd].emask = 0;
1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1055 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1013 } 1056 }
1014} 1057}
1015 1058
1059/* used to prepare libev internal fd's */
1060/* this is not fork-safe */
1061inline_speed void
1062fd_intern (int fd)
1063{
1064#ifdef _WIN32
1065 unsigned long arg = 1;
1066 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1067#else
1068 fcntl (fd, F_SETFD, FD_CLOEXEC);
1069 fcntl (fd, F_SETFL, O_NONBLOCK);
1070#endif
1071}
1072
1016/*****************************************************************************/ 1073/*****************************************************************************/
1017 1074
1018/* 1075/*
1019 * the heap functions want a real array index. array index 0 uis guaranteed to not 1076 * the heap functions want a real array index. array index 0 is guaranteed to not
1020 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1077 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1021 * the branching factor of the d-tree. 1078 * the branching factor of the d-tree.
1022 */ 1079 */
1023 1080
1024/* 1081/*
… …
1172 1229
1173static ANSIG signals [EV_NSIG - 1]; 1230static ANSIG signals [EV_NSIG - 1];
1174 1231
1175/*****************************************************************************/ 1232/*****************************************************************************/
1176 1233
1177/* used to prepare libev internal fd's */ 1234#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1178/* this is not fork-safe */
1179inline_speed void
1180fd_intern (int fd)
1181{
1182#ifdef _WIN32
1183 unsigned long arg = 1;
1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif
1189}
1190 1235
1191static void noinline 1236static void noinline
1192evpipe_init (EV_P) 1237evpipe_init (EV_P)
1193{ 1238{
1194 if (!ev_is_active (&pipe_w)) 1239 if (!ev_is_active (&pipe_w))
1195 { 1240 {
1196#if EV_USE_EVENTFD 1241# if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1242 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL) 1243 if (evfd < 0 && errno == EINVAL)
1199 evfd = eventfd (0, 0); 1244 evfd = eventfd (0, 0);
1200 1245
1201 if (evfd >= 0) 1246 if (evfd >= 0)
… …
1203 evpipe [0] = -1; 1248 evpipe [0] = -1;
1204 fd_intern (evfd); /* doing it twice doesn't hurt */ 1249 fd_intern (evfd); /* doing it twice doesn't hurt */
1205 ev_io_set (&pipe_w, evfd, EV_READ); 1250 ev_io_set (&pipe_w, evfd, EV_READ);
1206 } 1251 }
1207 else 1252 else
1208#endif 1253# endif
1209 { 1254 {
1210 while (pipe (evpipe)) 1255 while (pipe (evpipe))
1211 ev_syserr ("(libev) error creating signal/async pipe"); 1256 ev_syserr ("(libev) error creating signal/async pipe");
1212 1257
1213 fd_intern (evpipe [0]); 1258 fd_intern (evpipe [0]);
… …
1224evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1269evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1225{ 1270{
1226 if (!*flag) 1271 if (!*flag)
1227 { 1272 {
1228 int old_errno = errno; /* save errno because write might clobber it */ 1273 int old_errno = errno; /* save errno because write might clobber it */
1274 char dummy;
1229 1275
1230 *flag = 1; 1276 *flag = 1;
1231 1277
1232#if EV_USE_EVENTFD 1278#if EV_USE_EVENTFD
1233 if (evfd >= 0) 1279 if (evfd >= 0)
… …
1235 uint64_t counter = 1; 1281 uint64_t counter = 1;
1236 write (evfd, &counter, sizeof (uint64_t)); 1282 write (evfd, &counter, sizeof (uint64_t));
1237 } 1283 }
1238 else 1284 else
1239#endif 1285#endif
1240 write (evpipe [1], &old_errno, 1); 1286 write (evpipe [1], &dummy, 1);
1241 1287
1242 errno = old_errno; 1288 errno = old_errno;
1243 } 1289 }
1244} 1290}
1245 1291
… …
1346 break; 1392 break;
1347 } 1393 }
1348} 1394}
1349#endif 1395#endif
1350 1396
1397#endif
1398
1351/*****************************************************************************/ 1399/*****************************************************************************/
1352 1400
1401#if EV_CHILD_ENABLE
1353static WL childs [EV_PID_HASHSIZE]; 1402static WL childs [EV_PID_HASHSIZE];
1354
1355#ifndef _WIN32
1356 1403
1357static ev_signal childev; 1404static ev_signal childev;
1358 1405
1359#ifndef WIFCONTINUED 1406#ifndef WIFCONTINUED
1360# define WIFCONTINUED(status) 0 1407# define WIFCONTINUED(status) 0
… …
1365child_reap (EV_P_ int chain, int pid, int status) 1412child_reap (EV_P_ int chain, int pid, int status)
1366{ 1413{
1367 ev_child *w; 1414 ev_child *w;
1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1415 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1369 1416
1370 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1417 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1371 { 1418 {
1372 if ((w->pid == pid || !w->pid) 1419 if ((w->pid == pid || !w->pid)
1373 && (!traced || (w->flags & 1))) 1420 && (!traced || (w->flags & 1)))
1374 { 1421 {
1375 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1422 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1400 /* make sure we are called again until all children have been reaped */ 1447 /* make sure we are called again until all children have been reaped */
1401 /* we need to do it this way so that the callback gets called before we continue */ 1448 /* we need to do it this way so that the callback gets called before we continue */
1402 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1449 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1403 1450
1404 child_reap (EV_A_ pid, pid, status); 1451 child_reap (EV_A_ pid, pid, status);
1405 if (EV_PID_HASHSIZE > 1) 1452 if ((EV_PID_HASHSIZE) > 1)
1406 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1453 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1407} 1454}
1408 1455
1409#endif 1456#endif
1410 1457
… …
1477#ifdef __APPLE__ 1524#ifdef __APPLE__
1478 /* only select works correctly on that "unix-certified" platform */ 1525 /* only select works correctly on that "unix-certified" platform */
1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1526 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1527 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1481#endif 1528#endif
1529#ifdef __FreeBSD__
1530 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1531#endif
1482 1532
1483 return flags; 1533 return flags;
1484} 1534}
1485 1535
1486unsigned int 1536unsigned int
… …
1499ev_backend (EV_P) 1549ev_backend (EV_P)
1500{ 1550{
1501 return backend; 1551 return backend;
1502} 1552}
1503 1553
1504#if EV_MINIMAL < 2 1554#if EV_FEATURE_API
1505unsigned int 1555unsigned int
1506ev_loop_count (EV_P) 1556ev_iteration (EV_P)
1507{ 1557{
1508 return loop_count; 1558 return loop_count;
1509} 1559}
1510 1560
1511unsigned int 1561unsigned int
1512ev_loop_depth (EV_P) 1562ev_depth (EV_P)
1513{ 1563{
1514 return loop_depth; 1564 return loop_depth;
1515} 1565}
1516 1566
1517void 1567void
… …
1589 1639
1590 ev_rt_now = ev_time (); 1640 ev_rt_now = ev_time ();
1591 mn_now = get_clock (); 1641 mn_now = get_clock ();
1592 now_floor = mn_now; 1642 now_floor = mn_now;
1593 rtmn_diff = ev_rt_now - mn_now; 1643 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2 1644#if EV_FEATURE_API
1595 invoke_cb = ev_invoke_pending; 1645 invoke_cb = ev_invoke_pending;
1596#endif 1646#endif
1597 1647
1598 io_blocktime = 0.; 1648 io_blocktime = 0.;
1599 timeout_blocktime = 0.; 1649 timeout_blocktime = 0.;
… …
1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1679 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1630#endif 1680#endif
1631 1681
1632 ev_prepare_init (&pending_w, pendingcb); 1682 ev_prepare_init (&pending_w, pendingcb);
1633 1683
1684#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1634 ev_init (&pipe_w, pipecb); 1685 ev_init (&pipe_w, pipecb);
1635 ev_set_priority (&pipe_w, EV_MAXPRI); 1686 ev_set_priority (&pipe_w, EV_MAXPRI);
1687#endif
1636 } 1688 }
1637} 1689}
1638 1690
1639/* free up a loop structure */ 1691/* free up a loop structure */
1640static void noinline 1692static void noinline
… …
1758 { 1810 {
1759 EV_WIN32_CLOSE_FD (evpipe [0]); 1811 EV_WIN32_CLOSE_FD (evpipe [0]);
1760 EV_WIN32_CLOSE_FD (evpipe [1]); 1812 EV_WIN32_CLOSE_FD (evpipe [1]);
1761 } 1813 }
1762 1814
1815#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1763 evpipe_init (EV_A); 1816 evpipe_init (EV_A);
1764 /* now iterate over everything, in case we missed something */ 1817 /* now iterate over everything, in case we missed something */
1765 pipecb (EV_A_ &pipe_w, EV_READ); 1818 pipecb (EV_A_ &pipe_w, EV_READ);
1819#endif
1766 } 1820 }
1767 1821
1768 postfork = 0; 1822 postfork = 0;
1769} 1823}
1770 1824
… …
1832 verify_watcher (EV_A_ ws [cnt]); 1886 verify_watcher (EV_A_ ws [cnt]);
1833 } 1887 }
1834} 1888}
1835#endif 1889#endif
1836 1890
1837#if EV_MINIMAL < 2 1891#if EV_FEATURE_API
1838void 1892void
1839ev_loop_verify (EV_P) 1893ev_verify (EV_P)
1840{ 1894{
1841#if EV_VERIFY 1895#if EV_VERIFY
1842 int i; 1896 int i;
1843 WL w; 1897 WL w;
1844 1898
… …
1883#if EV_ASYNC_ENABLE 1937#if EV_ASYNC_ENABLE
1884 assert (asyncmax >= asynccnt); 1938 assert (asyncmax >= asynccnt);
1885 array_verify (EV_A_ (W *)asyncs, asynccnt); 1939 array_verify (EV_A_ (W *)asyncs, asynccnt);
1886#endif 1940#endif
1887 1941
1942#if EV_PREPARE_ENABLE
1888 assert (preparemax >= preparecnt); 1943 assert (preparemax >= preparecnt);
1889 array_verify (EV_A_ (W *)prepares, preparecnt); 1944 array_verify (EV_A_ (W *)prepares, preparecnt);
1945#endif
1890 1946
1947#if EV_CHECK_ENABLE
1891 assert (checkmax >= checkcnt); 1948 assert (checkmax >= checkcnt);
1892 array_verify (EV_A_ (W *)checks, checkcnt); 1949 array_verify (EV_A_ (W *)checks, checkcnt);
1950#endif
1893 1951
1894# if 0 1952# if 0
1953#if EV_CHILD_ENABLE
1895 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1954 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1955 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1956#endif
1897# endif 1957# endif
1898#endif 1958#endif
1899} 1959}
1900#endif 1960#endif
1901 1961
… …
1917 1977
1918 loop_init (EV_A_ flags); 1978 loop_init (EV_A_ flags);
1919 1979
1920 if (ev_backend (EV_A)) 1980 if (ev_backend (EV_A))
1921 { 1981 {
1922#ifndef _WIN32 1982#if EV_CHILD_ENABLE
1923 ev_signal_init (&childev, childcb, SIGCHLD); 1983 ev_signal_init (&childev, childcb, SIGCHLD);
1924 ev_set_priority (&childev, EV_MAXPRI); 1984 ev_set_priority (&childev, EV_MAXPRI);
1925 ev_signal_start (EV_A_ &childev); 1985 ev_signal_start (EV_A_ &childev);
1926 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1986 ev_unref (EV_A); /* child watcher should not keep loop alive */
1927#endif 1987#endif
… …
1940 EV_P = ev_default_loop_ptr; 2000 EV_P = ev_default_loop_ptr;
1941#endif 2001#endif
1942 2002
1943 ev_default_loop_ptr = 0; 2003 ev_default_loop_ptr = 0;
1944 2004
1945#ifndef _WIN32 2005#if EV_CHILD_ENABLE
1946 ev_ref (EV_A); /* child watcher */ 2006 ev_ref (EV_A); /* child watcher */
1947 ev_signal_stop (EV_A_ &childev); 2007 ev_signal_stop (EV_A_ &childev);
1948#endif 2008#endif
1949 2009
1950 loop_destroy (EV_A); 2010 loop_destroy (EV_A);
… …
2056 EV_FREQUENT_CHECK; 2116 EV_FREQUENT_CHECK;
2057 feed_reverse (EV_A_ (W)w); 2117 feed_reverse (EV_A_ (W)w);
2058 } 2118 }
2059 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2119 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2060 2120
2061 feed_reverse_done (EV_A_ EV_TIMEOUT); 2121 feed_reverse_done (EV_A_ EV_TIMER);
2062 } 2122 }
2063} 2123}
2064 2124
2065#if EV_PERIODIC_ENABLE 2125#if EV_PERIODIC_ENABLE
2066/* make periodics pending */ 2126/* make periodics pending */
… …
2119 feed_reverse_done (EV_A_ EV_PERIODIC); 2179 feed_reverse_done (EV_A_ EV_PERIODIC);
2120 } 2180 }
2121} 2181}
2122 2182
2123/* simply recalculate all periodics */ 2183/* simply recalculate all periodics */
2124/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2184/* TODO: maybe ensure that at least one event happens when jumping forward? */
2125static void noinline 2185static void noinline
2126periodics_reschedule (EV_P) 2186periodics_reschedule (EV_P)
2127{ 2187{
2128 int i; 2188 int i;
2129 2189
… …
2157 ANHE_at_cache (*he); 2217 ANHE_at_cache (*he);
2158 } 2218 }
2159} 2219}
2160 2220
2161/* fetch new monotonic and realtime times from the kernel */ 2221/* fetch new monotonic and realtime times from the kernel */
2162/* also detetc if there was a timejump, and act accordingly */ 2222/* also detect if there was a timejump, and act accordingly */
2163inline_speed void 2223inline_speed void
2164time_update (EV_P_ ev_tstamp max_block) 2224time_update (EV_P_ ev_tstamp max_block)
2165{ 2225{
2166#if EV_USE_MONOTONIC 2226#if EV_USE_MONOTONIC
2167 if (expect_true (have_monotonic)) 2227 if (expect_true (have_monotonic))
… …
2227} 2287}
2228 2288
2229void 2289void
2230ev_loop (EV_P_ int flags) 2290ev_loop (EV_P_ int flags)
2231{ 2291{
2232#if EV_MINIMAL < 2 2292#if EV_FEATURE_API
2233 ++loop_depth; 2293 ++loop_depth;
2234#endif 2294#endif
2235 2295
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2296 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2237 2297
… …
2240 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2300 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2241 2301
2242 do 2302 do
2243 { 2303 {
2244#if EV_VERIFY >= 2 2304#if EV_VERIFY >= 2
2245 ev_loop_verify (EV_A); 2305 ev_verify (EV_A);
2246#endif 2306#endif
2247 2307
2248#ifndef _WIN32 2308#ifndef _WIN32
2249 if (expect_false (curpid)) /* penalise the forking check even more */ 2309 if (expect_false (curpid)) /* penalise the forking check even more */
2250 if (expect_false (getpid () != curpid)) 2310 if (expect_false (getpid () != curpid))
… …
2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2322 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2263 EV_INVOKE_PENDING; 2323 EV_INVOKE_PENDING;
2264 } 2324 }
2265#endif 2325#endif
2266 2326
2327#if EV_PREPARE_ENABLE
2267 /* queue prepare watchers (and execute them) */ 2328 /* queue prepare watchers (and execute them) */
2268 if (expect_false (preparecnt)) 2329 if (expect_false (preparecnt))
2269 { 2330 {
2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2331 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2271 EV_INVOKE_PENDING; 2332 EV_INVOKE_PENDING;
2272 } 2333 }
2334#endif
2273 2335
2274 if (expect_false (loop_done)) 2336 if (expect_false (loop_done))
2275 break; 2337 break;
2276 2338
2277 /* we might have forked, so reify kernel state if necessary */ 2339 /* we might have forked, so reify kernel state if necessary */
… …
2328 waittime -= sleeptime; 2390 waittime -= sleeptime;
2329 } 2391 }
2330 } 2392 }
2331 } 2393 }
2332 2394
2333#if EV_MINIMAL < 2 2395#if EV_FEATURE_API
2334 ++loop_count; 2396 ++loop_count;
2335#endif 2397#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2398 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2337 backend_poll (EV_A_ waittime); 2399 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2400 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2350#if EV_IDLE_ENABLE 2412#if EV_IDLE_ENABLE
2351 /* queue idle watchers unless other events are pending */ 2413 /* queue idle watchers unless other events are pending */
2352 idle_reify (EV_A); 2414 idle_reify (EV_A);
2353#endif 2415#endif
2354 2416
2417#if EV_CHECK_ENABLE
2355 /* queue check watchers, to be executed first */ 2418 /* queue check watchers, to be executed first */
2356 if (expect_false (checkcnt)) 2419 if (expect_false (checkcnt))
2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2420 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2421#endif
2358 2422
2359 EV_INVOKE_PENDING; 2423 EV_INVOKE_PENDING;
2360 } 2424 }
2361 while (expect_true ( 2425 while (expect_true (
2362 activecnt 2426 activecnt
… …
2365 )); 2429 ));
2366 2430
2367 if (loop_done == EVUNLOOP_ONE) 2431 if (loop_done == EVUNLOOP_ONE)
2368 loop_done = EVUNLOOP_CANCEL; 2432 loop_done = EVUNLOOP_CANCEL;
2369 2433
2370#if EV_MINIMAL < 2 2434#if EV_FEATURE_API
2371 --loop_depth; 2435 --loop_depth;
2372#endif 2436#endif
2373} 2437}
2374 2438
2375void 2439void
… …
2501 2565
2502 if (expect_false (ev_is_active (w))) 2566 if (expect_false (ev_is_active (w)))
2503 return; 2567 return;
2504 2568
2505 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2569 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2506 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2570 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2507 2571
2508 EV_FREQUENT_CHECK; 2572 EV_FREQUENT_CHECK;
2509 2573
2510 ev_start (EV_A_ (W)w, 1); 2574 ev_start (EV_A_ (W)w, 1);
2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2575 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2581 timers [active] = timers [timercnt + HEAP0]; 2645 timers [active] = timers [timercnt + HEAP0];
2582 adjustheap (timers, timercnt, active); 2646 adjustheap (timers, timercnt, active);
2583 } 2647 }
2584 } 2648 }
2585 2649
2586 EV_FREQUENT_CHECK;
2587
2588 ev_at (w) -= mn_now; 2650 ev_at (w) -= mn_now;
2589 2651
2590 ev_stop (EV_A_ (W)w); 2652 ev_stop (EV_A_ (W)w);
2653
2654 EV_FREQUENT_CHECK;
2591} 2655}
2592 2656
2593void noinline 2657void noinline
2594ev_timer_again (EV_P_ ev_timer *w) 2658ev_timer_again (EV_P_ ev_timer *w)
2595{ 2659{
… …
2674 periodics [active] = periodics [periodiccnt + HEAP0]; 2738 periodics [active] = periodics [periodiccnt + HEAP0];
2675 adjustheap (periodics, periodiccnt, active); 2739 adjustheap (periodics, periodiccnt, active);
2676 } 2740 }
2677 } 2741 }
2678 2742
2679 EV_FREQUENT_CHECK;
2680
2681 ev_stop (EV_A_ (W)w); 2743 ev_stop (EV_A_ (W)w);
2744
2745 EV_FREQUENT_CHECK;
2682} 2746}
2683 2747
2684void noinline 2748void noinline
2685ev_periodic_again (EV_P_ ev_periodic *w) 2749ev_periodic_again (EV_P_ ev_periodic *w)
2686{ 2750{
… …
2691#endif 2755#endif
2692 2756
2693#ifndef SA_RESTART 2757#ifndef SA_RESTART
2694# define SA_RESTART 0 2758# define SA_RESTART 0
2695#endif 2759#endif
2760
2761#if EV_SIGNAL_ENABLE
2696 2762
2697void noinline 2763void noinline
2698ev_signal_start (EV_P_ ev_signal *w) 2764ev_signal_start (EV_P_ ev_signal *w)
2699{ 2765{
2700 if (expect_false (ev_is_active (w))) 2766 if (expect_false (ev_is_active (w)))
… …
2807 } 2873 }
2808 2874
2809 EV_FREQUENT_CHECK; 2875 EV_FREQUENT_CHECK;
2810} 2876}
2811 2877
2878#endif
2879
2880#if EV_CHILD_ENABLE
2881
2812void 2882void
2813ev_child_start (EV_P_ ev_child *w) 2883ev_child_start (EV_P_ ev_child *w)
2814{ 2884{
2815#if EV_MULTIPLICITY 2885#if EV_MULTIPLICITY
2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2886 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2819 return; 2889 return;
2820 2890
2821 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2822 2892
2823 ev_start (EV_A_ (W)w, 1); 2893 ev_start (EV_A_ (W)w, 1);
2824 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2894 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2825 2895
2826 EV_FREQUENT_CHECK; 2896 EV_FREQUENT_CHECK;
2827} 2897}
2828 2898
2829void 2899void
… …
2833 if (expect_false (!ev_is_active (w))) 2903 if (expect_false (!ev_is_active (w)))
2834 return; 2904 return;
2835 2905
2836 EV_FREQUENT_CHECK; 2906 EV_FREQUENT_CHECK;
2837 2907
2838 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2908 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2839 ev_stop (EV_A_ (W)w); 2909 ev_stop (EV_A_ (W)w);
2840 2910
2841 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2842} 2912}
2913
2914#endif
2843 2915
2844#if EV_STAT_ENABLE 2916#if EV_STAT_ENABLE
2845 2917
2846# ifdef _WIN32 2918# ifdef _WIN32
2847# undef lstat 2919# undef lstat
… …
2853#define MIN_STAT_INTERVAL 0.1074891 2925#define MIN_STAT_INTERVAL 0.1074891
2854 2926
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2927static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 2928
2857#if EV_USE_INOTIFY 2929#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 2930
2931/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2932# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 2933
2860static void noinline 2934static void noinline
2861infy_add (EV_P_ ev_stat *w) 2935infy_add (EV_P_ ev_stat *w)
2862{ 2936{
2863 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); 2937 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);
… …
2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2986 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2913 } 2987 }
2914 } 2988 }
2915 2989
2916 if (w->wd >= 0) 2990 if (w->wd >= 0)
2917 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2991 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2918 2992
2919 /* now re-arm timer, if required */ 2993 /* now re-arm timer, if required */
2920 if (ev_is_active (&w->timer)) ev_ref (EV_A); 2994 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2921 ev_timer_again (EV_A_ &w->timer); 2995 ev_timer_again (EV_A_ &w->timer);
2922 if (ev_is_active (&w->timer)) ev_unref (EV_A); 2996 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2930 3004
2931 if (wd < 0) 3005 if (wd < 0)
2932 return; 3006 return;
2933 3007
2934 w->wd = -2; 3008 w->wd = -2;
2935 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3009 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2936 wlist_del (&fs_hash [slot].head, (WL)w); 3010 wlist_del (&fs_hash [slot].head, (WL)w);
2937 3011
2938 /* remove this watcher, if others are watching it, they will rearm */ 3012 /* remove this watcher, if others are watching it, they will rearm */
2939 inotify_rm_watch (fs_fd, wd); 3013 inotify_rm_watch (fs_fd, wd);
2940} 3014}
… …
2942static void noinline 3016static void noinline
2943infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3017infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2944{ 3018{
2945 if (slot < 0) 3019 if (slot < 0)
2946 /* overflow, need to check for all hash slots */ 3020 /* overflow, need to check for all hash slots */
2947 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3021 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2948 infy_wd (EV_A_ slot, wd, ev); 3022 infy_wd (EV_A_ slot, wd, ev);
2949 else 3023 else
2950 { 3024 {
2951 WL w_; 3025 WL w_;
2952 3026
2953 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3027 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2954 { 3028 {
2955 ev_stat *w = (ev_stat *)w_; 3029 ev_stat *w = (ev_stat *)w_;
2956 w_ = w_->next; /* lets us remove this watcher and all before it */ 3030 w_ = w_->next; /* lets us remove this watcher and all before it */
2957 3031
2958 if (w->wd == wd || wd == -1) 3032 if (w->wd == wd || wd == -1)
2959 { 3033 {
2960 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3034 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2961 { 3035 {
2962 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3036 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2963 w->wd = -1; 3037 w->wd = -1;
2964 infy_add (EV_A_ w); /* re-add, no matter what */ 3038 infy_add (EV_A_ w); /* re-add, no matter what */
2965 } 3039 }
2966 3040
2967 stat_timer_cb (EV_A_ &w->timer, 0); 3041 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2972 3046
2973static void 3047static void
2974infy_cb (EV_P_ ev_io *w, int revents) 3048infy_cb (EV_P_ ev_io *w, int revents)
2975{ 3049{
2976 char buf [EV_INOTIFY_BUFSIZE]; 3050 char buf [EV_INOTIFY_BUFSIZE];
2977 struct inotify_event *ev = (struct inotify_event *)buf;
2978 int ofs; 3051 int ofs;
2979 int len = read (fs_fd, buf, sizeof (buf)); 3052 int len = read (fs_fd, buf, sizeof (buf));
2980 3053
2981 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3054 for (ofs = 0; ofs < len; )
3055 {
3056 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2982 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3057 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3058 ofs += sizeof (struct inotify_event) + ev->len;
3059 }
3060}
3061
3062inline_size unsigned int
3063ev_linux_version (void)
3064{
3065 struct utsname buf;
3066 unsigned int v;
3067 int i;
3068 char *p = buf.release;
3069
3070 if (uname (&buf))
3071 return 0;
3072
3073 for (i = 3+1; --i; )
3074 {
3075 unsigned int c = 0;
3076
3077 for (;;)
3078 {
3079 if (*p >= '0' && *p <= '9')
3080 c = c * 10 + *p++ - '0';
3081 else
3082 {
3083 p += *p == '.';
3084 break;
3085 }
3086 }
3087
3088 v = (v << 8) | c;
3089 }
3090
3091 return v;
2983} 3092}
2984 3093
2985inline_size void 3094inline_size void
2986check_2625 (EV_P) 3095ev_check_2625 (EV_P)
2987{ 3096{
2988 /* kernels < 2.6.25 are borked 3097 /* kernels < 2.6.25 are borked
2989 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3098 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2990 */ 3099 */
2991 struct utsname buf; 3100 if (ev_linux_version () < 0x020619)
2992 int major, minor, micro;
2993
2994 if (uname (&buf))
2995 return;
2996
2997 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2998 return;
2999
3000 if (major < 2
3001 || (major == 2 && minor < 6)
3002 || (major == 2 && minor == 6 && micro < 25))
3003 return; 3101 return;
3004 3102
3005 fs_2625 = 1; 3103 fs_2625 = 1;
3006} 3104}
3007 3105
… …
3022 if (fs_fd != -2) 3120 if (fs_fd != -2)
3023 return; 3121 return;
3024 3122
3025 fs_fd = -1; 3123 fs_fd = -1;
3026 3124
3027 check_2625 (EV_A); 3125 ev_check_2625 (EV_A);
3028 3126
3029 fs_fd = infy_newfd (); 3127 fs_fd = infy_newfd ();
3030 3128
3031 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
3032 { 3130 {
… …
3057 ev_io_set (&fs_w, fs_fd, EV_READ); 3155 ev_io_set (&fs_w, fs_fd, EV_READ);
3058 ev_io_start (EV_A_ &fs_w); 3156 ev_io_start (EV_A_ &fs_w);
3059 ev_unref (EV_A); 3157 ev_unref (EV_A);
3060 } 3158 }
3061 3159
3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3160 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3063 { 3161 {
3064 WL w_ = fs_hash [slot].head; 3162 WL w_ = fs_hash [slot].head;
3065 fs_hash [slot].head = 0; 3163 fs_hash [slot].head = 0;
3066 3164
3067 while (w_) 3165 while (w_)
… …
3242 3340
3243 EV_FREQUENT_CHECK; 3341 EV_FREQUENT_CHECK;
3244} 3342}
3245#endif 3343#endif
3246 3344
3345#if EV_PREPARE_ENABLE
3247void 3346void
3248ev_prepare_start (EV_P_ ev_prepare *w) 3347ev_prepare_start (EV_P_ ev_prepare *w)
3249{ 3348{
3250 if (expect_false (ev_is_active (w))) 3349 if (expect_false (ev_is_active (w)))
3251 return; 3350 return;
… …
3277 3376
3278 ev_stop (EV_A_ (W)w); 3377 ev_stop (EV_A_ (W)w);
3279 3378
3280 EV_FREQUENT_CHECK; 3379 EV_FREQUENT_CHECK;
3281} 3380}
3381#endif
3282 3382
3383#if EV_CHECK_ENABLE
3283void 3384void
3284ev_check_start (EV_P_ ev_check *w) 3385ev_check_start (EV_P_ ev_check *w)
3285{ 3386{
3286 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
3287 return; 3388 return;
… …
3313 3414
3314 ev_stop (EV_A_ (W)w); 3415 ev_stop (EV_A_ (W)w);
3315 3416
3316 EV_FREQUENT_CHECK; 3417 EV_FREQUENT_CHECK;
3317} 3418}
3419#endif
3318 3420
3319#if EV_EMBED_ENABLE 3421#if EV_EMBED_ENABLE
3320void noinline 3422void noinline
3321ev_embed_sweep (EV_P_ ev_embed *w) 3423ev_embed_sweep (EV_P_ ev_embed *w)
3322{ 3424{
… …
3417 3519
3418 ev_io_stop (EV_A_ &w->io); 3520 ev_io_stop (EV_A_ &w->io);
3419 ev_prepare_stop (EV_A_ &w->prepare); 3521 ev_prepare_stop (EV_A_ &w->prepare);
3420 ev_fork_stop (EV_A_ &w->fork); 3522 ev_fork_stop (EV_A_ &w->fork);
3421 3523
3524 ev_stop (EV_A_ (W)w);
3525
3422 EV_FREQUENT_CHECK; 3526 EV_FREQUENT_CHECK;
3423} 3527}
3424#endif 3528#endif
3425 3529
3426#if EV_FORK_ENABLE 3530#if EV_FORK_ENABLE
… …
3552{ 3656{
3553 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3657 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3554 3658
3555 if (expect_false (!once)) 3659 if (expect_false (!once))
3556 { 3660 {
3557 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3661 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3558 return; 3662 return;
3559 } 3663 }
3560 3664
3561 once->cb = cb; 3665 once->cb = cb;
3562 once->arg = arg; 3666 once->arg = arg;
… …
3649 if (types & EV_ASYNC) 3753 if (types & EV_ASYNC)
3650 for (i = asynccnt; i--; ) 3754 for (i = asynccnt; i--; )
3651 cb (EV_A_ EV_ASYNC, asyncs [i]); 3755 cb (EV_A_ EV_ASYNC, asyncs [i]);
3652#endif 3756#endif
3653 3757
3758#if EV_PREPARE_ENABLE
3654 if (types & EV_PREPARE) 3759 if (types & EV_PREPARE)
3655 for (i = preparecnt; i--; ) 3760 for (i = preparecnt; i--; )
3656#if EV_EMBED_ENABLE 3761# if EV_EMBED_ENABLE
3657 if (ev_cb (prepares [i]) != embed_prepare_cb) 3762 if (ev_cb (prepares [i]) != embed_prepare_cb)
3658#endif 3763# endif
3659 cb (EV_A_ EV_PREPARE, prepares [i]); 3764 cb (EV_A_ EV_PREPARE, prepares [i]);
3765#endif
3660 3766
3767#if EV_CHECK_ENABLE
3661 if (types & EV_CHECK) 3768 if (types & EV_CHECK)
3662 for (i = checkcnt; i--; ) 3769 for (i = checkcnt; i--; )
3663 cb (EV_A_ EV_CHECK, checks [i]); 3770 cb (EV_A_ EV_CHECK, checks [i]);
3771#endif
3664 3772
3773#if EV_SIGNAL_ENABLE
3665 if (types & EV_SIGNAL) 3774 if (types & EV_SIGNAL)
3666 for (i = 0; i < EV_NSIG - 1; ++i) 3775 for (i = 0; i < EV_NSIG - 1; ++i)
3667 for (wl = signals [i].head; wl; ) 3776 for (wl = signals [i].head; wl; )
3668 { 3777 {
3669 wn = wl->next; 3778 wn = wl->next;
3670 cb (EV_A_ EV_SIGNAL, wl); 3779 cb (EV_A_ EV_SIGNAL, wl);
3671 wl = wn; 3780 wl = wn;
3672 } 3781 }
3782#endif
3673 3783
3784#if EV_CHILD_ENABLE
3674 if (types & EV_CHILD) 3785 if (types & EV_CHILD)
3675 for (i = EV_PID_HASHSIZE; i--; ) 3786 for (i = (EV_PID_HASHSIZE); i--; )
3676 for (wl = childs [i]; wl; ) 3787 for (wl = childs [i]; wl; )
3677 { 3788 {
3678 wn = wl->next; 3789 wn = wl->next;
3679 cb (EV_A_ EV_CHILD, wl); 3790 cb (EV_A_ EV_CHILD, wl);
3680 wl = wn; 3791 wl = wn;
3681 } 3792 }
3793#endif
3682/* EV_STAT 0x00001000 /* stat data changed */ 3794/* EV_STAT 0x00001000 /* stat data changed */
3683/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3795/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3684} 3796}
3685#endif 3797#endif
3686 3798

Diff Legend

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