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

Comparing libev/ev.c (file contents):
Revision 1.172 by root, Sun Dec 9 02:27:44 2007 UTC vs.
Revision 1.274 by root, Thu Nov 20 00:35:10 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 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 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
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-
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-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
50# endif
51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
41# endif 62# endif
42 63
43# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
45# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
… …
51# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
53# endif 74# endif
54# ifndef EV_USE_REALTIME 75# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 76# define EV_USE_REALTIME 0
77# endif
78# endif
79
80# ifndef EV_USE_NANOSLEEP
81# if HAVE_NANOSLEEP
82# define EV_USE_NANOSLEEP 1
83# else
84# define EV_USE_NANOSLEEP 0
56# endif 85# endif
57# endif 86# endif
58 87
59# ifndef EV_USE_SELECT 88# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 89# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
102# else 131# else
103# define EV_USE_INOTIFY 0 132# define EV_USE_INOTIFY 0
104# endif 133# endif
105# endif 134# endif
106 135
136# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1
139# else
140# define EV_USE_EVENTFD 0
141# endif
142# endif
143
107#endif 144#endif
108 145
109#include <math.h> 146#include <math.h>
110#include <stdlib.h> 147#include <stdlib.h>
111#include <fcntl.h> 148#include <fcntl.h>
… …
129#ifndef _WIN32 166#ifndef _WIN32
130# include <sys/time.h> 167# include <sys/time.h>
131# include <sys/wait.h> 168# include <sys/wait.h>
132# include <unistd.h> 169# include <unistd.h>
133#else 170#else
171# include <io.h>
134# define WIN32_LEAN_AND_MEAN 172# define WIN32_LEAN_AND_MEAN
135# include <windows.h> 173# include <windows.h>
136# ifndef EV_SELECT_IS_WINSOCKET 174# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1 175# define EV_SELECT_IS_WINSOCKET 1
138# endif 176# endif
139#endif 177#endif
140 178
141/**/ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
142 188
143#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1
192# else
144# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif
145#endif 195#endif
146 196
147#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME 0
199#endif
200
201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1
204# else
205# define EV_USE_NANOSLEEP 0
206# endif
149#endif 207#endif
150 208
151#ifndef EV_USE_SELECT 209#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 210# define EV_USE_SELECT 1
153#endif 211#endif
… …
159# define EV_USE_POLL 1 217# define EV_USE_POLL 1
160# endif 218# endif
161#endif 219#endif
162 220
163#ifndef EV_USE_EPOLL 221#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1
224# else
164# define EV_USE_EPOLL 0 225# define EV_USE_EPOLL 0
226# endif
165#endif 227#endif
166 228
167#ifndef EV_USE_KQUEUE 229#ifndef EV_USE_KQUEUE
168# define EV_USE_KQUEUE 0 230# define EV_USE_KQUEUE 0
169#endif 231#endif
… …
171#ifndef EV_USE_PORT 233#ifndef EV_USE_PORT
172# define EV_USE_PORT 0 234# define EV_USE_PORT 0
173#endif 235#endif
174 236
175#ifndef EV_USE_INOTIFY 237#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1
240# else
176# define EV_USE_INOTIFY 0 241# define EV_USE_INOTIFY 0
242# endif
177#endif 243#endif
178 244
179#ifndef EV_PID_HASHSIZE 245#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL 246# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1 247# define EV_PID_HASHSIZE 1
… …
190# else 256# else
191# define EV_INOTIFY_HASHSIZE 16 257# define EV_INOTIFY_HASHSIZE 16
192# endif 258# endif
193#endif 259#endif
194 260
195/**/ 261#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1
264# else
265# define EV_USE_EVENTFD 0
266# endif
267#endif
268
269#if 0 /* debugging */
270# define EV_VERIFY 3
271# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1
273#endif
274
275#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL
277#endif
278
279#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL
281#endif
282
283#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif
286
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */
196 288
197#ifndef CLOCK_MONOTONIC 289#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 290# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 291# define EV_USE_MONOTONIC 0
200#endif 292#endif
… …
202#ifndef CLOCK_REALTIME 294#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 295# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 296# define EV_USE_REALTIME 0
205#endif 297#endif
206 298
299#if !EV_STAT_ENABLE
300# undef EV_USE_INOTIFY
301# define EV_USE_INOTIFY 0
302#endif
303
304#if !EV_USE_NANOSLEEP
305# ifndef _WIN32
306# include <sys/select.h>
307# endif
308#endif
309
310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
313# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318# endif
319#endif
320
207#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 322# include <winsock.h>
209#endif 323#endif
210 324
211#if !EV_STAT_ENABLE 325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
212# define EV_USE_INOTIFY 0 331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h>
337# ifdef __cplusplus
338extern "C" {
213#endif 339# endif
214 340int eventfd (unsigned int initval, int flags);
215#if EV_USE_INOTIFY 341# ifdef __cplusplus
216# include <sys/inotify.h> 342}
343# endif
217#endif 344#endif
218 345
219/**/ 346/**/
347
348#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
350#else
351# define EV_FREQUENT_CHECK do { } while (0)
352#endif
353
354/*
355 * This is used to avoid floating point rounding problems.
356 * It is added to ev_rt_now when scheduling periodics
357 * to ensure progress, time-wise, even when rounding
358 * errors are against us.
359 * This value is good at least till the year 4000.
360 * Better solutions welcome.
361 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 363
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 367
225#if __GNUC__ >= 3 368#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 369# define expect(expr,value) __builtin_expect ((expr),(value))
227# define noinline __attribute__ ((noinline)) 370# define noinline __attribute__ ((noinline))
228#else 371#else
229# define expect(expr,value) (expr) 372# define expect(expr,value) (expr)
230# define noinline 373# define noinline
231# if __STDC_VERSION__ < 199901L 374# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
232# define inline 375# define inline
233# endif 376# endif
234#endif 377#endif
235 378
236#define expect_false(expr) expect ((expr) != 0, 0) 379#define expect_false(expr) expect ((expr) != 0, 0)
… …
251 394
252typedef ev_watcher *W; 395typedef ev_watcher *W;
253typedef ev_watcher_list *WL; 396typedef ev_watcher_list *WL;
254typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
255 398
399#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at
401
402#if EV_USE_MONOTONIC
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */
256static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 405static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
406#endif
257 407
258#ifdef _WIN32 408#ifdef _WIN32
259# include "ev_win32.c" 409# include "ev_win32.c"
260#endif 410#endif
261 411
… …
268{ 418{
269 syserr_cb = cb; 419 syserr_cb = cb;
270} 420}
271 421
272static void noinline 422static void noinline
273syserr (const char *msg) 423ev_syserr (const char *msg)
274{ 424{
275 if (!msg) 425 if (!msg)
276 msg = "(libev) system error"; 426 msg = "(libev) system error";
277 427
278 if (syserr_cb) 428 if (syserr_cb)
… …
282 perror (msg); 432 perror (msg);
283 abort (); 433 abort ();
284 } 434 }
285} 435}
286 436
437static void *
438ev_realloc_emul (void *ptr, long size)
439{
440 /* some systems, notably openbsd and darwin, fail to properly
441 * implement realloc (x, 0) (as required by both ansi c-98 and
442 * the single unix specification, so work around them here.
443 */
444
445 if (size)
446 return realloc (ptr, size);
447
448 free (ptr);
449 return 0;
450}
451
287static void *(*alloc)(void *ptr, long size); 452static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
288 453
289void 454void
290ev_set_allocator (void *(*cb)(void *ptr, long size)) 455ev_set_allocator (void *(*cb)(void *ptr, long size))
291{ 456{
292 alloc = cb; 457 alloc = cb;
293} 458}
294 459
295inline_speed void * 460inline_speed void *
296ev_realloc (void *ptr, long size) 461ev_realloc (void *ptr, long size)
297{ 462{
298 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 463 ptr = alloc (ptr, size);
299 464
300 if (!ptr && size) 465 if (!ptr && size)
301 { 466 {
302 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 467 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
303 abort (); 468 abort ();
… …
314typedef struct 479typedef struct
315{ 480{
316 WL head; 481 WL head;
317 unsigned char events; 482 unsigned char events;
318 unsigned char reify; 483 unsigned char reify;
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
319#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
320 SOCKET handle; 490 SOCKET handle;
321#endif 491#endif
322} ANFD; 492} ANFD;
323 493
… …
326 W w; 496 W w;
327 int events; 497 int events;
328} ANPENDING; 498} ANPENDING;
329 499
330#if EV_USE_INOTIFY 500#if EV_USE_INOTIFY
501/* hash table entry per inotify-id */
331typedef struct 502typedef struct
332{ 503{
333 WL head; 504 WL head;
334} ANFS; 505} ANFS;
506#endif
507
508/* Heap Entry */
509#if EV_HEAP_CACHE_AT
510 typedef struct {
511 ev_tstamp at;
512 WT w;
513 } ANHE;
514
515 #define ANHE_w(he) (he).w /* access watcher, read-write */
516 #define ANHE_at(he) (he).at /* access cached at, read-only */
517 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
518#else
519 typedef WT ANHE;
520
521 #define ANHE_w(he) (he)
522 #define ANHE_at(he) (he)->at
523 #define ANHE_at_cache(he)
335#endif 524#endif
336 525
337#if EV_MULTIPLICITY 526#if EV_MULTIPLICITY
338 527
339 struct ev_loop 528 struct ev_loop
… …
397{ 586{
398 return ev_rt_now; 587 return ev_rt_now;
399} 588}
400#endif 589#endif
401 590
591void
592ev_sleep (ev_tstamp delay)
593{
594 if (delay > 0.)
595 {
596#if EV_USE_NANOSLEEP
597 struct timespec ts;
598
599 ts.tv_sec = (time_t)delay;
600 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
601
602 nanosleep (&ts, 0);
603#elif defined(_WIN32)
604 Sleep ((unsigned long)(delay * 1e3));
605#else
606 struct timeval tv;
607
608 tv.tv_sec = (time_t)delay;
609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
610
611 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
612 /* somehting nto guaranteed by newer posix versions, but guaranteed */
613 /* by older ones */
614 select (0, 0, 0, 0, &tv);
615#endif
616 }
617}
618
619/*****************************************************************************/
620
621#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
622
402int inline_size 623int inline_size
403array_nextsize (int elem, int cur, int cnt) 624array_nextsize (int elem, int cur, int cnt)
404{ 625{
405 int ncur = cur + 1; 626 int ncur = cur + 1;
406 627
407 do 628 do
408 ncur <<= 1; 629 ncur <<= 1;
409 while (cnt > ncur); 630 while (cnt > ncur);
410 631
411 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 632 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
412 if (elem * ncur > 4096) 633 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
413 { 634 {
414 ncur *= elem; 635 ncur *= elem;
415 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 636 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
416 ncur = ncur - sizeof (void *) * 4; 637 ncur = ncur - sizeof (void *) * 4;
417 ncur /= elem; 638 ncur /= elem;
418 } 639 }
419 640
420 return ncur; 641 return ncur;
… …
424array_realloc (int elem, void *base, int *cur, int cnt) 645array_realloc (int elem, void *base, int *cur, int cnt)
425{ 646{
426 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
427 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
428} 649}
650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
429 653
430#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
431 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
432 { \ 656 { \
433 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
… …
466 pendings [pri][w_->pending - 1].w = w_; 690 pendings [pri][w_->pending - 1].w = w_;
467 pendings [pri][w_->pending - 1].events = revents; 691 pendings [pri][w_->pending - 1].events = revents;
468 } 692 }
469} 693}
470 694
471void inline_size 695void inline_speed
472queue_events (EV_P_ W *events, int eventcnt, int type) 696queue_events (EV_P_ W *events, int eventcnt, int type)
473{ 697{
474 int i; 698 int i;
475 699
476 for (i = 0; i < eventcnt; ++i) 700 for (i = 0; i < eventcnt; ++i)
477 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
478} 702}
479 703
480/*****************************************************************************/ 704/*****************************************************************************/
481
482void inline_size
483anfds_init (ANFD *base, int count)
484{
485 while (count--)
486 {
487 base->head = 0;
488 base->events = EV_NONE;
489 base->reify = 0;
490
491 ++base;
492 }
493}
494 705
495void inline_speed 706void inline_speed
496fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
497{ 708{
498 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
… …
523 { 734 {
524 int fd = fdchanges [i]; 735 int fd = fdchanges [i];
525 ANFD *anfd = anfds + fd; 736 ANFD *anfd = anfds + fd;
526 ev_io *w; 737 ev_io *w;
527 738
528 int events = 0; 739 unsigned char events = 0;
529 740
530 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 741 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
531 events |= w->events; 742 events |= (unsigned char)w->events;
532 743
533#if EV_SELECT_IS_WINSOCKET 744#if EV_SELECT_IS_WINSOCKET
534 if (events) 745 if (events)
535 { 746 {
536 unsigned long argp; 747 unsigned long arg;
748 #ifdef EV_FD_TO_WIN32_HANDLE
749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
750 #else
537 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
752 #endif
538 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 753 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
539 } 754 }
540#endif 755#endif
541 756
757 {
758 unsigned char o_events = anfd->events;
759 unsigned char o_reify = anfd->reify;
760
542 anfd->reify = 0; 761 anfd->reify = 0;
543
544 backend_modify (EV_A_ fd, anfd->events, events);
545 anfd->events = events; 762 anfd->events = events;
763
764 if (o_events != events || o_reify & EV_IOFDSET)
765 backend_modify (EV_A_ fd, o_events, events);
766 }
546 } 767 }
547 768
548 fdchangecnt = 0; 769 fdchangecnt = 0;
549} 770}
550 771
551void inline_size 772void inline_size
552fd_change (EV_P_ int fd) 773fd_change (EV_P_ int fd, int flags)
553{ 774{
554 if (expect_false (anfds [fd].reify)) 775 unsigned char reify = anfds [fd].reify;
555 return;
556
557 anfds [fd].reify = 1; 776 anfds [fd].reify |= flags;
558 777
778 if (expect_true (!reify))
779 {
559 ++fdchangecnt; 780 ++fdchangecnt;
560 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 781 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
561 fdchanges [fdchangecnt - 1] = fd; 782 fdchanges [fdchangecnt - 1] = fd;
783 }
562} 784}
563 785
564void inline_speed 786void inline_speed
565fd_kill (EV_P_ int fd) 787fd_kill (EV_P_ int fd)
566{ 788{
… …
589{ 811{
590 int fd; 812 int fd;
591 813
592 for (fd = 0; fd < anfdmax; ++fd) 814 for (fd = 0; fd < anfdmax; ++fd)
593 if (anfds [fd].events) 815 if (anfds [fd].events)
594 if (!fd_valid (fd) == -1 && errno == EBADF) 816 if (!fd_valid (fd) && errno == EBADF)
595 fd_kill (EV_A_ fd); 817 fd_kill (EV_A_ fd);
596} 818}
597 819
598/* called on ENOMEM in select/poll to kill some fds and retry */ 820/* called on ENOMEM in select/poll to kill some fds and retry */
599static void noinline 821static void noinline
… …
617 839
618 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
619 if (anfds [fd].events) 841 if (anfds [fd].events)
620 { 842 {
621 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
622 fd_change (EV_A_ fd); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
623 } 846 }
624} 847}
625 848
626/*****************************************************************************/ 849/*****************************************************************************/
627 850
851/*
852 * the heap functions want a real array index. array index 0 uis guaranteed to not
853 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
854 * the branching factor of the d-tree.
855 */
856
857/*
858 * at the moment we allow libev the luxury of two heaps,
859 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
860 * which is more cache-efficient.
861 * the difference is about 5% with 50000+ watchers.
862 */
863#if EV_USE_4HEAP
864
865#define DHEAP 4
866#define HEAP0 (DHEAP - 1) /* index of first element in heap */
867#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
868#define UPHEAP_DONE(p,k) ((p) == (k))
869
870/* away from the root */
628void inline_speed 871void inline_speed
629upheap (WT *heap, int k) 872downheap (ANHE *heap, int N, int k)
630{ 873{
631 WT w = heap [k]; 874 ANHE he = heap [k];
875 ANHE *E = heap + N + HEAP0;
632 876
633 while (k && heap [k >> 1]->at > w->at) 877 for (;;)
634 {
635 heap [k] = heap [k >> 1];
636 ((W)heap [k])->active = k + 1;
637 k >>= 1;
638 } 878 {
879 ev_tstamp minat;
880 ANHE *minpos;
881 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
639 882
883 /* find minimum child */
884 if (expect_true (pos + DHEAP - 1 < E))
885 {
886 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
887 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
888 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
889 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
890 }
891 else if (pos < E)
892 {
893 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
894 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
895 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
896 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
897 }
898 else
899 break;
900
901 if (ANHE_at (he) <= minat)
902 break;
903
904 heap [k] = *minpos;
905 ev_active (ANHE_w (*minpos)) = k;
906
907 k = minpos - heap;
908 }
909
640 heap [k] = w; 910 heap [k] = he;
641 ((W)heap [k])->active = k + 1; 911 ev_active (ANHE_w (he)) = k;
642
643} 912}
644 913
914#else /* 4HEAP */
915
916#define HEAP0 1
917#define HPARENT(k) ((k) >> 1)
918#define UPHEAP_DONE(p,k) (!(p))
919
920/* away from the root */
645void inline_speed 921void inline_speed
646downheap (WT *heap, int N, int k) 922downheap (ANHE *heap, int N, int k)
647{ 923{
648 WT w = heap [k]; 924 ANHE he = heap [k];
649 925
650 while (k < (N >> 1)) 926 for (;;)
651 { 927 {
652 int j = k << 1; 928 int c = k << 1;
653 929
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 930 if (c > N + HEAP0 - 1)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 931 break;
659 932
933 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
934 ? 1 : 0;
935
936 if (ANHE_at (he) <= ANHE_at (heap [c]))
937 break;
938
660 heap [k] = heap [j]; 939 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 940 ev_active (ANHE_w (heap [k])) = k;
941
662 k = j; 942 k = c;
663 } 943 }
664 944
665 heap [k] = w; 945 heap [k] = he;
666 ((W)heap [k])->active = k + 1; 946 ev_active (ANHE_w (he)) = k;
947}
948#endif
949
950/* towards the root */
951void inline_speed
952upheap (ANHE *heap, int k)
953{
954 ANHE he = heap [k];
955
956 for (;;)
957 {
958 int p = HPARENT (k);
959
960 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
961 break;
962
963 heap [k] = heap [p];
964 ev_active (ANHE_w (heap [k])) = k;
965 k = p;
966 }
967
968 heap [k] = he;
969 ev_active (ANHE_w (he)) = k;
667} 970}
668 971
669void inline_size 972void inline_size
670adjustheap (WT *heap, int N, int k) 973adjustheap (ANHE *heap, int N, int k)
671{ 974{
975 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
672 upheap (heap, k); 976 upheap (heap, k);
977 else
673 downheap (heap, N, k); 978 downheap (heap, N, k);
979}
980
981/* rebuild the heap: this function is used only once and executed rarely */
982void inline_size
983reheap (ANHE *heap, int N)
984{
985 int i;
986
987 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
988 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
989 for (i = 0; i < N; ++i)
990 upheap (heap, i + HEAP0);
674} 991}
675 992
676/*****************************************************************************/ 993/*****************************************************************************/
677 994
678typedef struct 995typedef struct
679{ 996{
680 WL head; 997 WL head;
681 sig_atomic_t volatile gotsig; 998 EV_ATOMIC_T gotsig;
682} ANSIG; 999} ANSIG;
683 1000
684static ANSIG *signals; 1001static ANSIG *signals;
685static int signalmax; 1002static int signalmax;
686 1003
687static int sigpipe [2]; 1004static EV_ATOMIC_T gotsig;
688static sig_atomic_t volatile gotsig;
689static ev_io sigev;
690 1005
691void inline_size 1006/*****************************************************************************/
692signals_init (ANSIG *base, int count)
693{
694 while (count--)
695 {
696 base->head = 0;
697 base->gotsig = 0;
698
699 ++base;
700 }
701}
702
703static void
704sighandler (int signum)
705{
706#if _WIN32
707 signal (signum, sighandler);
708#endif
709
710 signals [signum - 1].gotsig = 1;
711
712 if (!gotsig)
713 {
714 int old_errno = errno;
715 gotsig = 1;
716 write (sigpipe [1], &signum, 1);
717 errno = old_errno;
718 }
719}
720
721void noinline
722ev_feed_signal_event (EV_P_ int signum)
723{
724 WL w;
725
726#if EV_MULTIPLICITY
727 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
728#endif
729
730 --signum;
731
732 if (signum < 0 || signum >= signalmax)
733 return;
734
735 signals [signum].gotsig = 0;
736
737 for (w = signals [signum].head; w; w = w->next)
738 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
739}
740
741static void
742sigcb (EV_P_ ev_io *iow, int revents)
743{
744 int signum;
745
746 read (sigpipe [0], &revents, 1);
747 gotsig = 0;
748
749 for (signum = signalmax; signum--; )
750 if (signals [signum].gotsig)
751 ev_feed_signal_event (EV_A_ signum + 1);
752}
753 1007
754void inline_speed 1008void inline_speed
755fd_intern (int fd) 1009fd_intern (int fd)
756{ 1010{
757#ifdef _WIN32 1011#ifdef _WIN32
758 int arg = 1; 1012 unsigned long arg = 1;
759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
760#else 1014#else
761 fcntl (fd, F_SETFD, FD_CLOEXEC); 1015 fcntl (fd, F_SETFD, FD_CLOEXEC);
762 fcntl (fd, F_SETFL, O_NONBLOCK); 1016 fcntl (fd, F_SETFL, O_NONBLOCK);
763#endif 1017#endif
764} 1018}
765 1019
766static void noinline 1020static void noinline
767siginit (EV_P) 1021evpipe_init (EV_P)
768{ 1022{
1023 if (!ev_is_active (&pipeev))
1024 {
1025#if EV_USE_EVENTFD
1026 if ((evfd = eventfd (0, 0)) >= 0)
1027 {
1028 evpipe [0] = -1;
1029 fd_intern (evfd);
1030 ev_io_set (&pipeev, evfd, EV_READ);
1031 }
1032 else
1033#endif
1034 {
1035 while (pipe (evpipe))
1036 ev_syserr ("(libev) error creating signal/async pipe");
1037
769 fd_intern (sigpipe [0]); 1038 fd_intern (evpipe [0]);
770 fd_intern (sigpipe [1]); 1039 fd_intern (evpipe [1]);
1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1041 }
771 1042
772 ev_io_set (&sigev, sigpipe [0], EV_READ);
773 ev_io_start (EV_A_ &sigev); 1043 ev_io_start (EV_A_ &pipeev);
774 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1044 ev_unref (EV_A); /* watcher should not keep loop alive */
1045 }
1046}
1047
1048void inline_size
1049evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1050{
1051 if (!*flag)
1052 {
1053 int old_errno = errno; /* save errno because write might clobber it */
1054
1055 *flag = 1;
1056
1057#if EV_USE_EVENTFD
1058 if (evfd >= 0)
1059 {
1060 uint64_t counter = 1;
1061 write (evfd, &counter, sizeof (uint64_t));
1062 }
1063 else
1064#endif
1065 write (evpipe [1], &old_errno, 1);
1066
1067 errno = old_errno;
1068 }
1069}
1070
1071static void
1072pipecb (EV_P_ ev_io *iow, int revents)
1073{
1074#if EV_USE_EVENTFD
1075 if (evfd >= 0)
1076 {
1077 uint64_t counter;
1078 read (evfd, &counter, sizeof (uint64_t));
1079 }
1080 else
1081#endif
1082 {
1083 char dummy;
1084 read (evpipe [0], &dummy, 1);
1085 }
1086
1087 if (gotsig && ev_is_default_loop (EV_A))
1088 {
1089 int signum;
1090 gotsig = 0;
1091
1092 for (signum = signalmax; signum--; )
1093 if (signals [signum].gotsig)
1094 ev_feed_signal_event (EV_A_ signum + 1);
1095 }
1096
1097#if EV_ASYNC_ENABLE
1098 if (gotasync)
1099 {
1100 int i;
1101 gotasync = 0;
1102
1103 for (i = asynccnt; i--; )
1104 if (asyncs [i]->sent)
1105 {
1106 asyncs [i]->sent = 0;
1107 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1108 }
1109 }
1110#endif
775} 1111}
776 1112
777/*****************************************************************************/ 1113/*****************************************************************************/
778 1114
1115static void
1116ev_sighandler (int signum)
1117{
1118#if EV_MULTIPLICITY
1119 struct ev_loop *loop = &default_loop_struct;
1120#endif
1121
1122#if _WIN32
1123 signal (signum, ev_sighandler);
1124#endif
1125
1126 signals [signum - 1].gotsig = 1;
1127 evpipe_write (EV_A_ &gotsig);
1128}
1129
1130void noinline
1131ev_feed_signal_event (EV_P_ int signum)
1132{
1133 WL w;
1134
1135#if EV_MULTIPLICITY
1136 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1137#endif
1138
1139 --signum;
1140
1141 if (signum < 0 || signum >= signalmax)
1142 return;
1143
1144 signals [signum].gotsig = 0;
1145
1146 for (w = signals [signum].head; w; w = w->next)
1147 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1148}
1149
1150/*****************************************************************************/
1151
779static ev_child *childs [EV_PID_HASHSIZE]; 1152static WL childs [EV_PID_HASHSIZE];
780 1153
781#ifndef _WIN32 1154#ifndef _WIN32
782 1155
783static ev_signal childev; 1156static ev_signal childev;
784 1157
1158#ifndef WIFCONTINUED
1159# define WIFCONTINUED(status) 0
1160#endif
1161
785void inline_speed 1162void inline_speed
786child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1163child_reap (EV_P_ int chain, int pid, int status)
787{ 1164{
788 ev_child *w; 1165 ev_child *w;
1166 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
789 1167
790 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1168 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1169 {
791 if (w->pid == pid || !w->pid) 1170 if ((w->pid == pid || !w->pid)
1171 && (!traced || (w->flags & 1)))
792 { 1172 {
793 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1173 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
794 w->rpid = pid; 1174 w->rpid = pid;
795 w->rstatus = status; 1175 w->rstatus = status;
796 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1176 ev_feed_event (EV_A_ (W)w, EV_CHILD);
797 } 1177 }
1178 }
798} 1179}
799 1180
800#ifndef WCONTINUED 1181#ifndef WCONTINUED
801# define WCONTINUED 0 1182# define WCONTINUED 0
802#endif 1183#endif
… …
811 if (!WCONTINUED 1192 if (!WCONTINUED
812 || errno != EINVAL 1193 || errno != EINVAL
813 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1194 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
814 return; 1195 return;
815 1196
816 /* make sure we are called again until all childs have been reaped */ 1197 /* make sure we are called again until all children have been reaped */
817 /* we need to do it this way so that the callback gets called before we continue */ 1198 /* we need to do it this way so that the callback gets called before we continue */
818 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1199 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
819 1200
820 child_reap (EV_A_ sw, pid, pid, status); 1201 child_reap (EV_A_ pid, pid, status);
821 if (EV_PID_HASHSIZE > 1) 1202 if (EV_PID_HASHSIZE > 1)
822 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1203 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
823} 1204}
824 1205
825#endif 1206#endif
826 1207
827/*****************************************************************************/ 1208/*****************************************************************************/
… …
899} 1280}
900 1281
901unsigned int 1282unsigned int
902ev_embeddable_backends (void) 1283ev_embeddable_backends (void)
903{ 1284{
904 return EVBACKEND_EPOLL 1285 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
905 | EVBACKEND_KQUEUE 1286
906 | EVBACKEND_PORT; 1287 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1288 /* please fix it and tell me how to detect the fix */
1289 flags &= ~EVBACKEND_EPOLL;
1290
1291 return flags;
907} 1292}
908 1293
909unsigned int 1294unsigned int
910ev_backend (EV_P) 1295ev_backend (EV_P)
911{ 1296{
… …
914 1299
915unsigned int 1300unsigned int
916ev_loop_count (EV_P) 1301ev_loop_count (EV_P)
917{ 1302{
918 return loop_count; 1303 return loop_count;
1304}
1305
1306void
1307ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1308{
1309 io_blocktime = interval;
1310}
1311
1312void
1313ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1314{
1315 timeout_blocktime = interval;
919} 1316}
920 1317
921static void noinline 1318static void noinline
922loop_init (EV_P_ unsigned int flags) 1319loop_init (EV_P_ unsigned int flags)
923{ 1320{
… …
929 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1326 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
930 have_monotonic = 1; 1327 have_monotonic = 1;
931 } 1328 }
932#endif 1329#endif
933 1330
934 ev_rt_now = ev_time (); 1331 ev_rt_now = ev_time ();
935 mn_now = get_clock (); 1332 mn_now = get_clock ();
936 now_floor = mn_now; 1333 now_floor = mn_now;
937 rtmn_diff = ev_rt_now - mn_now; 1334 rtmn_diff = ev_rt_now - mn_now;
1335
1336 io_blocktime = 0.;
1337 timeout_blocktime = 0.;
1338 backend = 0;
1339 backend_fd = -1;
1340 gotasync = 0;
1341#if EV_USE_INOTIFY
1342 fs_fd = -2;
1343#endif
938 1344
939 /* pid check not overridable via env */ 1345 /* pid check not overridable via env */
940#ifndef _WIN32 1346#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK) 1347 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid (); 1348 curpid = getpid ();
… …
945 if (!(flags & EVFLAG_NOENV) 1351 if (!(flags & EVFLAG_NOENV)
946 && !enable_secure () 1352 && !enable_secure ()
947 && getenv ("LIBEV_FLAGS")) 1353 && getenv ("LIBEV_FLAGS"))
948 flags = atoi (getenv ("LIBEV_FLAGS")); 1354 flags = atoi (getenv ("LIBEV_FLAGS"));
949 1355
950 if (!(flags & 0x0000ffffUL)) 1356 if (!(flags & 0x0000ffffU))
951 flags |= ev_recommended_backends (); 1357 flags |= ev_recommended_backends ();
952
953 backend = 0;
954 backend_fd = -1;
955#if EV_USE_INOTIFY
956 fs_fd = -2;
957#endif
958 1358
959#if EV_USE_PORT 1359#if EV_USE_PORT
960 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1360 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
961#endif 1361#endif
962#if EV_USE_KQUEUE 1362#if EV_USE_KQUEUE
… …
970#endif 1370#endif
971#if EV_USE_SELECT 1371#if EV_USE_SELECT
972 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1372 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
973#endif 1373#endif
974 1374
975 ev_init (&sigev, sigcb); 1375 ev_init (&pipeev, pipecb);
976 ev_set_priority (&sigev, EV_MAXPRI); 1376 ev_set_priority (&pipeev, EV_MAXPRI);
977 } 1377 }
978} 1378}
979 1379
980static void noinline 1380static void noinline
981loop_destroy (EV_P) 1381loop_destroy (EV_P)
982{ 1382{
983 int i; 1383 int i;
1384
1385 if (ev_is_active (&pipeev))
1386 {
1387 ev_ref (EV_A); /* signal watcher */
1388 ev_io_stop (EV_A_ &pipeev);
1389
1390#if EV_USE_EVENTFD
1391 if (evfd >= 0)
1392 close (evfd);
1393#endif
1394
1395 if (evpipe [0] >= 0)
1396 {
1397 close (evpipe [0]);
1398 close (evpipe [1]);
1399 }
1400 }
984 1401
985#if EV_USE_INOTIFY 1402#if EV_USE_INOTIFY
986 if (fs_fd >= 0) 1403 if (fs_fd >= 0)
987 close (fs_fd); 1404 close (fs_fd);
988#endif 1405#endif
… …
1011 array_free (pending, [i]); 1428 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE 1429#if EV_IDLE_ENABLE
1013 array_free (idle, [i]); 1430 array_free (idle, [i]);
1014#endif 1431#endif
1015 } 1432 }
1433
1434 ev_free (anfds); anfdmax = 0;
1016 1435
1017 /* have to use the microsoft-never-gets-it-right macro */ 1436 /* have to use the microsoft-never-gets-it-right macro */
1018 array_free (fdchange, EMPTY); 1437 array_free (fdchange, EMPTY);
1019 array_free (timer, EMPTY); 1438 array_free (timer, EMPTY);
1020#if EV_PERIODIC_ENABLE 1439#if EV_PERIODIC_ENABLE
1021 array_free (periodic, EMPTY); 1440 array_free (periodic, EMPTY);
1022#endif 1441#endif
1442#if EV_FORK_ENABLE
1443 array_free (fork, EMPTY);
1444#endif
1023 array_free (prepare, EMPTY); 1445 array_free (prepare, EMPTY);
1024 array_free (check, EMPTY); 1446 array_free (check, EMPTY);
1447#if EV_ASYNC_ENABLE
1448 array_free (async, EMPTY);
1449#endif
1025 1450
1026 backend = 0; 1451 backend = 0;
1027} 1452}
1028 1453
1454#if EV_USE_INOTIFY
1029void inline_size infy_fork (EV_P); 1455void inline_size infy_fork (EV_P);
1456#endif
1030 1457
1031void inline_size 1458void inline_size
1032loop_fork (EV_P) 1459loop_fork (EV_P)
1033{ 1460{
1034#if EV_USE_PORT 1461#if EV_USE_PORT
… …
1042#endif 1469#endif
1043#if EV_USE_INOTIFY 1470#if EV_USE_INOTIFY
1044 infy_fork (EV_A); 1471 infy_fork (EV_A);
1045#endif 1472#endif
1046 1473
1047 if (ev_is_active (&sigev)) 1474 if (ev_is_active (&pipeev))
1048 { 1475 {
1049 /* default loop */ 1476 /* this "locks" the handlers against writing to the pipe */
1477 /* while we modify the fd vars */
1478 gotsig = 1;
1479#if EV_ASYNC_ENABLE
1480 gotasync = 1;
1481#endif
1050 1482
1051 ev_ref (EV_A); 1483 ev_ref (EV_A);
1052 ev_io_stop (EV_A_ &sigev); 1484 ev_io_stop (EV_A_ &pipeev);
1485
1486#if EV_USE_EVENTFD
1487 if (evfd >= 0)
1488 close (evfd);
1489#endif
1490
1491 if (evpipe [0] >= 0)
1492 {
1053 close (sigpipe [0]); 1493 close (evpipe [0]);
1054 close (sigpipe [1]); 1494 close (evpipe [1]);
1495 }
1055 1496
1056 while (pipe (sigpipe))
1057 syserr ("(libev) error creating pipe");
1058
1059 siginit (EV_A); 1497 evpipe_init (EV_A);
1498 /* now iterate over everything, in case we missed something */
1499 pipecb (EV_A_ &pipeev, EV_READ);
1060 } 1500 }
1061 1501
1062 postfork = 0; 1502 postfork = 0;
1063} 1503}
1064 1504
1065#if EV_MULTIPLICITY 1505#if EV_MULTIPLICITY
1506
1066struct ev_loop * 1507struct ev_loop *
1067ev_loop_new (unsigned int flags) 1508ev_loop_new (unsigned int flags)
1068{ 1509{
1069 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1510 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1070 1511
… …
1086} 1527}
1087 1528
1088void 1529void
1089ev_loop_fork (EV_P) 1530ev_loop_fork (EV_P)
1090{ 1531{
1091 postfork = 1; 1532 postfork = 1; /* must be in line with ev_default_fork */
1092} 1533}
1093 1534
1535#if EV_VERIFY
1536static void noinline
1537verify_watcher (EV_P_ W w)
1538{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540
1541 if (w->pending)
1542 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1543}
1544
1545static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N)
1547{
1548 int i;
1549
1550 for (i = HEAP0; i < N + HEAP0; ++i)
1551 {
1552 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1553 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1554 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1555
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 }
1558}
1559
1560static void noinline
1561array_verify (EV_P_ W *ws, int cnt)
1562{
1563 while (cnt--)
1564 {
1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]);
1567 }
1568}
1569#endif
1570
1571void
1572ev_loop_verify (EV_P)
1573{
1574#if EV_VERIFY
1575 int i;
1576 WL w;
1577
1578 assert (activecnt >= -1);
1579
1580 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1583
1584 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next)
1587 {
1588 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1590 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1591 }
1592
1593 assert (timermax >= timercnt);
1594 verify_heap (EV_A_ timers, timercnt);
1595
1596#if EV_PERIODIC_ENABLE
1597 assert (periodicmax >= periodiccnt);
1598 verify_heap (EV_A_ periodics, periodiccnt);
1599#endif
1600
1601 for (i = NUMPRI; i--; )
1602 {
1603 assert (pendingmax [i] >= pendingcnt [i]);
1604#if EV_IDLE_ENABLE
1605 assert (idleall >= 0);
1606 assert (idlemax [i] >= idlecnt [i]);
1607 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1608#endif
1609 }
1610
1611#if EV_FORK_ENABLE
1612 assert (forkmax >= forkcnt);
1613 array_verify (EV_A_ (W *)forks, forkcnt);
1614#endif
1615
1616#if EV_ASYNC_ENABLE
1617 assert (asyncmax >= asynccnt);
1618 array_verify (EV_A_ (W *)asyncs, asynccnt);
1619#endif
1620
1621 assert (preparemax >= preparecnt);
1622 array_verify (EV_A_ (W *)prepares, preparecnt);
1623
1624 assert (checkmax >= checkcnt);
1625 array_verify (EV_A_ (W *)checks, checkcnt);
1626
1627# if 0
1628 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1629 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1094#endif 1630# endif
1631#endif
1632}
1633
1634#endif /* multiplicity */
1095 1635
1096#if EV_MULTIPLICITY 1636#if EV_MULTIPLICITY
1097struct ev_loop * 1637struct ev_loop *
1098ev_default_loop_init (unsigned int flags) 1638ev_default_loop_init (unsigned int flags)
1099#else 1639#else
1100int 1640int
1101ev_default_loop (unsigned int flags) 1641ev_default_loop (unsigned int flags)
1102#endif 1642#endif
1103{ 1643{
1104 if (sigpipe [0] == sigpipe [1])
1105 if (pipe (sigpipe))
1106 return 0;
1107
1108 if (!ev_default_loop_ptr) 1644 if (!ev_default_loop_ptr)
1109 { 1645 {
1110#if EV_MULTIPLICITY 1646#if EV_MULTIPLICITY
1111 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1647 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1112#else 1648#else
… …
1115 1651
1116 loop_init (EV_A_ flags); 1652 loop_init (EV_A_ flags);
1117 1653
1118 if (ev_backend (EV_A)) 1654 if (ev_backend (EV_A))
1119 { 1655 {
1120 siginit (EV_A);
1121
1122#ifndef _WIN32 1656#ifndef _WIN32
1123 ev_signal_init (&childev, childcb, SIGCHLD); 1657 ev_signal_init (&childev, childcb, SIGCHLD);
1124 ev_set_priority (&childev, EV_MAXPRI); 1658 ev_set_priority (&childev, EV_MAXPRI);
1125 ev_signal_start (EV_A_ &childev); 1659 ev_signal_start (EV_A_ &childev);
1126 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1660 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1138{ 1672{
1139#if EV_MULTIPLICITY 1673#if EV_MULTIPLICITY
1140 struct ev_loop *loop = ev_default_loop_ptr; 1674 struct ev_loop *loop = ev_default_loop_ptr;
1141#endif 1675#endif
1142 1676
1677 ev_default_loop_ptr = 0;
1678
1143#ifndef _WIN32 1679#ifndef _WIN32
1144 ev_ref (EV_A); /* child watcher */ 1680 ev_ref (EV_A); /* child watcher */
1145 ev_signal_stop (EV_A_ &childev); 1681 ev_signal_stop (EV_A_ &childev);
1146#endif 1682#endif
1147 1683
1148 ev_ref (EV_A); /* signal watcher */
1149 ev_io_stop (EV_A_ &sigev);
1150
1151 close (sigpipe [0]); sigpipe [0] = 0;
1152 close (sigpipe [1]); sigpipe [1] = 0;
1153
1154 loop_destroy (EV_A); 1684 loop_destroy (EV_A);
1155} 1685}
1156 1686
1157void 1687void
1158ev_default_fork (void) 1688ev_default_fork (void)
1159{ 1689{
1160#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1161 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1162#endif 1692#endif
1163 1693
1164 if (backend) 1694 postfork = 1; /* must be in line with ev_loop_fork */
1165 postfork = 1;
1166} 1695}
1167 1696
1168/*****************************************************************************/ 1697/*****************************************************************************/
1169 1698
1170void 1699void
… …
1187 { 1716 {
1188 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1717 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1189 1718
1190 p->w->pending = 0; 1719 p->w->pending = 0;
1191 EV_CB_INVOKE (p->w, p->events); 1720 EV_CB_INVOKE (p->w, p->events);
1721 EV_FREQUENT_CHECK;
1192 } 1722 }
1193 } 1723 }
1194} 1724}
1195
1196void inline_size
1197timers_reify (EV_P)
1198{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 {
1201 ev_timer *w = timers [0];
1202
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204
1205 /* first reschedule or stop timer */
1206 if (w->repeat)
1207 {
1208 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1209
1210 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now;
1213
1214 downheap ((WT *)timers, timercnt, 0);
1215 }
1216 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1220 }
1221}
1222
1223#if EV_PERIODIC_ENABLE
1224void inline_size
1225periodics_reify (EV_P)
1226{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 {
1229 ev_periodic *w = periodics [0];
1230
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232
1233 /* first reschedule or stop timer */
1234 if (w->reschedule_cb)
1235 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0);
1239 }
1240 else if (w->interval)
1241 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0);
1245 }
1246 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1250 }
1251}
1252
1253static void noinline
1254periodics_reschedule (EV_P)
1255{
1256 int i;
1257
1258 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i)
1260 {
1261 ev_periodic *w = periodics [i];
1262
1263 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1267 }
1268
1269 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i);
1272}
1273#endif
1274 1725
1275#if EV_IDLE_ENABLE 1726#if EV_IDLE_ENABLE
1276void inline_size 1727void inline_size
1277idle_reify (EV_P) 1728idle_reify (EV_P)
1278{ 1729{
… …
1293 } 1744 }
1294 } 1745 }
1295} 1746}
1296#endif 1747#endif
1297 1748
1298int inline_size 1749void inline_size
1299time_update_monotonic (EV_P) 1750timers_reify (EV_P)
1300{ 1751{
1752 EV_FREQUENT_CHECK;
1753
1754 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1755 {
1756 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1757
1758 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1759
1760 /* first reschedule or stop timer */
1761 if (w->repeat)
1762 {
1763 ev_at (w) += w->repeat;
1764 if (ev_at (w) < mn_now)
1765 ev_at (w) = mn_now;
1766
1767 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1768
1769 ANHE_at_cache (timers [HEAP0]);
1770 downheap (timers, timercnt, HEAP0);
1771 }
1772 else
1773 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1774
1775 EV_FREQUENT_CHECK;
1776 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1777 }
1778}
1779
1780#if EV_PERIODIC_ENABLE
1781void inline_size
1782periodics_reify (EV_P)
1783{
1784 EV_FREQUENT_CHECK;
1785
1786 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1787 {
1788 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1789
1790 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1791
1792 /* first reschedule or stop timer */
1793 if (w->reschedule_cb)
1794 {
1795 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1796
1797 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1798
1799 ANHE_at_cache (periodics [HEAP0]);
1800 downheap (periodics, periodiccnt, HEAP0);
1801 }
1802 else if (w->interval)
1803 {
1804 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1805 /* if next trigger time is not sufficiently in the future, put it there */
1806 /* this might happen because of floating point inexactness */
1807 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1808 {
1809 ev_at (w) += w->interval;
1810
1811 /* if interval is unreasonably low we might still have a time in the past */
1812 /* so correct this. this will make the periodic very inexact, but the user */
1813 /* has effectively asked to get triggered more often than possible */
1814 if (ev_at (w) < ev_rt_now)
1815 ev_at (w) = ev_rt_now;
1816 }
1817
1818 ANHE_at_cache (periodics [HEAP0]);
1819 downheap (periodics, periodiccnt, HEAP0);
1820 }
1821 else
1822 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1823
1824 EV_FREQUENT_CHECK;
1825 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1826 }
1827}
1828
1829static void noinline
1830periodics_reschedule (EV_P)
1831{
1832 int i;
1833
1834 /* adjust periodics after time jump */
1835 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1836 {
1837 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1838
1839 if (w->reschedule_cb)
1840 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1841 else if (w->interval)
1842 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1843
1844 ANHE_at_cache (periodics [i]);
1845 }
1846
1847 reheap (periodics, periodiccnt);
1848}
1849#endif
1850
1851void inline_speed
1852time_update (EV_P_ ev_tstamp max_block)
1853{
1854 int i;
1855
1856#if EV_USE_MONOTONIC
1857 if (expect_true (have_monotonic))
1858 {
1859 ev_tstamp odiff = rtmn_diff;
1860
1301 mn_now = get_clock (); 1861 mn_now = get_clock ();
1302 1862
1863 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1864 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1865 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1866 {
1305 ev_rt_now = rtmn_diff + mn_now; 1867 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1868 return;
1307 } 1869 }
1308 else 1870
1309 {
1310 now_floor = mn_now; 1871 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1872 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1873
1316void inline_size 1874 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1875 * on the choice of "4": one iteration isn't enough,
1318{ 1876 * in case we get preempted during the calls to
1319 int i; 1877 * ev_time and get_clock. a second call is almost guaranteed
1320 1878 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1879 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1880 * in the unlikely event of having been preempted here.
1323 { 1881 */
1324 if (time_update_monotonic (EV_A)) 1882 for (i = 4; --i; )
1325 { 1883 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1328 /* loop a few times, before making important decisions.
1329 * on the choice of "4": one iteration isn't enough,
1330 * in case we get preempted during the calls to
1331 * ev_time and get_clock. a second call is almost guaranteed
1332 * to succeed in that case, though. and looping a few more times
1333 * doesn't hurt either as we only do this on time-jumps or
1334 * in the unlikely event of having been preempted here.
1335 */
1336 for (i = 4; --i; )
1337 {
1338 rtmn_diff = ev_rt_now - mn_now; 1884 rtmn_diff = ev_rt_now - mn_now;
1339 1885
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1886 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1341 return; /* all is well */ 1887 return; /* all is well */
1342 1888
1343 ev_rt_now = ev_time (); 1889 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1890 mn_now = get_clock ();
1345 now_floor = mn_now; 1891 now_floor = mn_now;
1346 } 1892 }
1347 1893
1348# if EV_PERIODIC_ENABLE 1894# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1895 periodics_reschedule (EV_A);
1350# endif 1896# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1897 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1898 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1899 }
1355 else 1900 else
1356#endif 1901#endif
1357 { 1902 {
1358 ev_rt_now = ev_time (); 1903 ev_rt_now = ev_time ();
1359 1904
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1905 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1906 {
1362#if EV_PERIODIC_ENABLE 1907#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1908 periodics_reschedule (EV_A);
1364#endif 1909#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1910 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1911 for (i = 0; i < timercnt; ++i)
1912 {
1913 ANHE *he = timers + i + HEAP0;
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1914 ANHE_w (*he)->at += ev_rt_now - mn_now;
1915 ANHE_at_cache (*he);
1916 }
1369 } 1917 }
1370 1918
1371 mn_now = ev_rt_now; 1919 mn_now = ev_rt_now;
1372 } 1920 }
1373} 1921}
… …
1382ev_unref (EV_P) 1930ev_unref (EV_P)
1383{ 1931{
1384 --activecnt; 1932 --activecnt;
1385} 1933}
1386 1934
1935void
1936ev_now_update (EV_P)
1937{
1938 time_update (EV_A_ 1e100);
1939}
1940
1387static int loop_done; 1941static int loop_done;
1388 1942
1389void 1943void
1390ev_loop (EV_P_ int flags) 1944ev_loop (EV_P_ int flags)
1391{ 1945{
1392 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1946 loop_done = EVUNLOOP_CANCEL;
1393 ? EVUNLOOP_ONE
1394 : EVUNLOOP_CANCEL;
1395 1947
1396 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1948 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1397 1949
1398 do 1950 do
1399 { 1951 {
1952#if EV_VERIFY >= 2
1953 ev_loop_verify (EV_A);
1954#endif
1955
1400#ifndef _WIN32 1956#ifndef _WIN32
1401 if (expect_false (curpid)) /* penalise the forking check even more */ 1957 if (expect_false (curpid)) /* penalise the forking check even more */
1402 if (expect_false (getpid () != curpid)) 1958 if (expect_false (getpid () != curpid))
1403 { 1959 {
1404 curpid = getpid (); 1960 curpid = getpid ();
… …
1433 /* update fd-related kernel structures */ 1989 /* update fd-related kernel structures */
1434 fd_reify (EV_A); 1990 fd_reify (EV_A);
1435 1991
1436 /* calculate blocking time */ 1992 /* calculate blocking time */
1437 { 1993 {
1438 ev_tstamp block; 1994 ev_tstamp waittime = 0.;
1995 ev_tstamp sleeptime = 0.;
1439 1996
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1997 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1441 block = 0.; /* do not block at all */
1442 else
1443 { 1998 {
1444 /* update time to cancel out callback processing overhead */ 1999 /* update time to cancel out callback processing overhead */
1445#if EV_USE_MONOTONIC
1446 if (expect_true (have_monotonic))
1447 time_update_monotonic (EV_A); 2000 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 2001
1455 block = MAX_BLOCKTIME; 2002 waittime = MAX_BLOCKTIME;
1456 2003
1457 if (timercnt) 2004 if (timercnt)
1458 { 2005 {
1459 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 2006 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1460 if (block > to) block = to; 2007 if (waittime > to) waittime = to;
1461 } 2008 }
1462 2009
1463#if EV_PERIODIC_ENABLE 2010#if EV_PERIODIC_ENABLE
1464 if (periodiccnt) 2011 if (periodiccnt)
1465 { 2012 {
1466 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 2013 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1467 if (block > to) block = to; 2014 if (waittime > to) waittime = to;
1468 } 2015 }
1469#endif 2016#endif
1470 2017
1471 if (expect_false (block < 0.)) block = 0.; 2018 if (expect_false (waittime < timeout_blocktime))
2019 waittime = timeout_blocktime;
2020
2021 sleeptime = waittime - backend_fudge;
2022
2023 if (expect_true (sleeptime > io_blocktime))
2024 sleeptime = io_blocktime;
2025
2026 if (sleeptime)
2027 {
2028 ev_sleep (sleeptime);
2029 waittime -= sleeptime;
2030 }
1472 } 2031 }
1473 2032
1474 ++loop_count; 2033 ++loop_count;
1475 backend_poll (EV_A_ block); 2034 backend_poll (EV_A_ waittime);
2035
2036 /* update ev_rt_now, do magic */
2037 time_update (EV_A_ waittime + sleeptime);
1476 } 2038 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 2039
1481 /* queue pending timers and reschedule them */ 2040 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 2041 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 2042#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 2043 periodics_reify (EV_A); /* absolute timers called first */
… …
1492 /* queue check watchers, to be executed first */ 2051 /* queue check watchers, to be executed first */
1493 if (expect_false (checkcnt)) 2052 if (expect_false (checkcnt))
1494 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2053 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1495 2054
1496 call_pending (EV_A); 2055 call_pending (EV_A);
1497
1498 } 2056 }
1499 while (expect_true (activecnt && !loop_done)); 2057 while (expect_true (
2058 activecnt
2059 && !loop_done
2060 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2061 ));
1500 2062
1501 if (loop_done == EVUNLOOP_ONE) 2063 if (loop_done == EVUNLOOP_ONE)
1502 loop_done = EVUNLOOP_CANCEL; 2064 loop_done = EVUNLOOP_CANCEL;
1503} 2065}
1504 2066
… …
1592 2154
1593 if (expect_false (ev_is_active (w))) 2155 if (expect_false (ev_is_active (w)))
1594 return; 2156 return;
1595 2157
1596 assert (("ev_io_start called with negative fd", fd >= 0)); 2158 assert (("ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2160
2161 EV_FREQUENT_CHECK;
1597 2162
1598 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
1599 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1600 wlist_add ((WL *)&anfds[fd].head, (WL)w); 2165 wlist_add (&anfds[fd].head, (WL)w);
1601 2166
1602 fd_change (EV_A_ fd); 2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2168 w->events &= ~EV_IOFDSET;
2169
2170 EV_FREQUENT_CHECK;
1603} 2171}
1604 2172
1605void noinline 2173void noinline
1606ev_io_stop (EV_P_ ev_io *w) 2174ev_io_stop (EV_P_ ev_io *w)
1607{ 2175{
1608 clear_pending (EV_A_ (W)w); 2176 clear_pending (EV_A_ (W)w);
1609 if (expect_false (!ev_is_active (w))) 2177 if (expect_false (!ev_is_active (w)))
1610 return; 2178 return;
1611 2179
1612 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2180 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1613 2181
2182 EV_FREQUENT_CHECK;
2183
1614 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 2184 wlist_del (&anfds[w->fd].head, (WL)w);
1615 ev_stop (EV_A_ (W)w); 2185 ev_stop (EV_A_ (W)w);
1616 2186
1617 fd_change (EV_A_ w->fd); 2187 fd_change (EV_A_ w->fd, 1);
2188
2189 EV_FREQUENT_CHECK;
1618} 2190}
1619 2191
1620void noinline 2192void noinline
1621ev_timer_start (EV_P_ ev_timer *w) 2193ev_timer_start (EV_P_ ev_timer *w)
1622{ 2194{
1623 if (expect_false (ev_is_active (w))) 2195 if (expect_false (ev_is_active (w)))
1624 return; 2196 return;
1625 2197
1626 ((WT)w)->at += mn_now; 2198 ev_at (w) += mn_now;
1627 2199
1628 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2200 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1629 2201
2202 EV_FREQUENT_CHECK;
2203
2204 ++timercnt;
1630 ev_start (EV_A_ (W)w, ++timercnt); 2205 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1631 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 2206 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1632 timers [timercnt - 1] = w; 2207 ANHE_w (timers [ev_active (w)]) = (WT)w;
1633 upheap ((WT *)timers, timercnt - 1); 2208 ANHE_at_cache (timers [ev_active (w)]);
2209 upheap (timers, ev_active (w));
1634 2210
2211 EV_FREQUENT_CHECK;
2212
1635 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2213 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1636} 2214}
1637 2215
1638void noinline 2216void noinline
1639ev_timer_stop (EV_P_ ev_timer *w) 2217ev_timer_stop (EV_P_ ev_timer *w)
1640{ 2218{
1641 clear_pending (EV_A_ (W)w); 2219 clear_pending (EV_A_ (W)w);
1642 if (expect_false (!ev_is_active (w))) 2220 if (expect_false (!ev_is_active (w)))
1643 return; 2221 return;
1644 2222
1645 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 2223 EV_FREQUENT_CHECK;
1646 2224
1647 { 2225 {
1648 int active = ((W)w)->active; 2226 int active = ev_active (w);
1649 2227
2228 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2229
2230 --timercnt;
2231
1650 if (expect_true (--active < --timercnt)) 2232 if (expect_true (active < timercnt + HEAP0))
1651 { 2233 {
1652 timers [active] = timers [timercnt]; 2234 timers [active] = timers [timercnt + HEAP0];
1653 adjustheap ((WT *)timers, timercnt, active); 2235 adjustheap (timers, timercnt, active);
1654 } 2236 }
1655 } 2237 }
1656 2238
1657 ((WT)w)->at -= mn_now; 2239 EV_FREQUENT_CHECK;
2240
2241 ev_at (w) -= mn_now;
1658 2242
1659 ev_stop (EV_A_ (W)w); 2243 ev_stop (EV_A_ (W)w);
1660} 2244}
1661 2245
1662void noinline 2246void noinline
1663ev_timer_again (EV_P_ ev_timer *w) 2247ev_timer_again (EV_P_ ev_timer *w)
1664{ 2248{
2249 EV_FREQUENT_CHECK;
2250
1665 if (ev_is_active (w)) 2251 if (ev_is_active (w))
1666 { 2252 {
1667 if (w->repeat) 2253 if (w->repeat)
1668 { 2254 {
1669 ((WT)w)->at = mn_now + w->repeat; 2255 ev_at (w) = mn_now + w->repeat;
2256 ANHE_at_cache (timers [ev_active (w)]);
1670 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2257 adjustheap (timers, timercnt, ev_active (w));
1671 } 2258 }
1672 else 2259 else
1673 ev_timer_stop (EV_A_ w); 2260 ev_timer_stop (EV_A_ w);
1674 } 2261 }
1675 else if (w->repeat) 2262 else if (w->repeat)
1676 { 2263 {
1677 w->at = w->repeat; 2264 ev_at (w) = w->repeat;
1678 ev_timer_start (EV_A_ w); 2265 ev_timer_start (EV_A_ w);
1679 } 2266 }
2267
2268 EV_FREQUENT_CHECK;
1680} 2269}
1681 2270
1682#if EV_PERIODIC_ENABLE 2271#if EV_PERIODIC_ENABLE
1683void noinline 2272void noinline
1684ev_periodic_start (EV_P_ ev_periodic *w) 2273ev_periodic_start (EV_P_ ev_periodic *w)
1685{ 2274{
1686 if (expect_false (ev_is_active (w))) 2275 if (expect_false (ev_is_active (w)))
1687 return; 2276 return;
1688 2277
1689 if (w->reschedule_cb) 2278 if (w->reschedule_cb)
1690 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2279 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1691 else if (w->interval) 2280 else if (w->interval)
1692 { 2281 {
1693 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2282 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1694 /* this formula differs from the one in periodic_reify because we do not always round up */ 2283 /* this formula differs from the one in periodic_reify because we do not always round up */
1695 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 2284 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1696 } 2285 }
2286 else
2287 ev_at (w) = w->offset;
1697 2288
2289 EV_FREQUENT_CHECK;
2290
2291 ++periodiccnt;
1698 ev_start (EV_A_ (W)w, ++periodiccnt); 2292 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1699 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2293 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1700 periodics [periodiccnt - 1] = w; 2294 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1701 upheap ((WT *)periodics, periodiccnt - 1); 2295 ANHE_at_cache (periodics [ev_active (w)]);
2296 upheap (periodics, ev_active (w));
1702 2297
2298 EV_FREQUENT_CHECK;
2299
1703 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2300 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1704} 2301}
1705 2302
1706void noinline 2303void noinline
1707ev_periodic_stop (EV_P_ ev_periodic *w) 2304ev_periodic_stop (EV_P_ ev_periodic *w)
1708{ 2305{
1709 clear_pending (EV_A_ (W)w); 2306 clear_pending (EV_A_ (W)w);
1710 if (expect_false (!ev_is_active (w))) 2307 if (expect_false (!ev_is_active (w)))
1711 return; 2308 return;
1712 2309
1713 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2310 EV_FREQUENT_CHECK;
1714 2311
1715 { 2312 {
1716 int active = ((W)w)->active; 2313 int active = ev_active (w);
1717 2314
2315 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2316
2317 --periodiccnt;
2318
1718 if (expect_true (--active < --periodiccnt)) 2319 if (expect_true (active < periodiccnt + HEAP0))
1719 { 2320 {
1720 periodics [active] = periodics [periodiccnt]; 2321 periodics [active] = periodics [periodiccnt + HEAP0];
1721 adjustheap ((WT *)periodics, periodiccnt, active); 2322 adjustheap (periodics, periodiccnt, active);
1722 } 2323 }
1723 } 2324 }
2325
2326 EV_FREQUENT_CHECK;
1724 2327
1725 ev_stop (EV_A_ (W)w); 2328 ev_stop (EV_A_ (W)w);
1726} 2329}
1727 2330
1728void noinline 2331void noinline
… …
1747 if (expect_false (ev_is_active (w))) 2350 if (expect_false (ev_is_active (w)))
1748 return; 2351 return;
1749 2352
1750 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2353 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1751 2354
2355 evpipe_init (EV_A);
2356
2357 EV_FREQUENT_CHECK;
2358
2359 {
2360#ifndef _WIN32
2361 sigset_t full, prev;
2362 sigfillset (&full);
2363 sigprocmask (SIG_SETMASK, &full, &prev);
2364#endif
2365
2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2367
2368#ifndef _WIN32
2369 sigprocmask (SIG_SETMASK, &prev, 0);
2370#endif
2371 }
2372
1752 ev_start (EV_A_ (W)w, 1); 2373 ev_start (EV_A_ (W)w, 1);
1753 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1754 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2374 wlist_add (&signals [w->signum - 1].head, (WL)w);
1755 2375
1756 if (!((WL)w)->next) 2376 if (!((WL)w)->next)
1757 { 2377 {
1758#if _WIN32 2378#if _WIN32
1759 signal (w->signum, sighandler); 2379 signal (w->signum, ev_sighandler);
1760#else 2380#else
1761 struct sigaction sa; 2381 struct sigaction sa;
1762 sa.sa_handler = sighandler; 2382 sa.sa_handler = ev_sighandler;
1763 sigfillset (&sa.sa_mask); 2383 sigfillset (&sa.sa_mask);
1764 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2384 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1765 sigaction (w->signum, &sa, 0); 2385 sigaction (w->signum, &sa, 0);
1766#endif 2386#endif
1767 } 2387 }
2388
2389 EV_FREQUENT_CHECK;
1768} 2390}
1769 2391
1770void noinline 2392void noinline
1771ev_signal_stop (EV_P_ ev_signal *w) 2393ev_signal_stop (EV_P_ ev_signal *w)
1772{ 2394{
1773 clear_pending (EV_A_ (W)w); 2395 clear_pending (EV_A_ (W)w);
1774 if (expect_false (!ev_is_active (w))) 2396 if (expect_false (!ev_is_active (w)))
1775 return; 2397 return;
1776 2398
2399 EV_FREQUENT_CHECK;
2400
1777 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2401 wlist_del (&signals [w->signum - 1].head, (WL)w);
1778 ev_stop (EV_A_ (W)w); 2402 ev_stop (EV_A_ (W)w);
1779 2403
1780 if (!signals [w->signum - 1].head) 2404 if (!signals [w->signum - 1].head)
1781 signal (w->signum, SIG_DFL); 2405 signal (w->signum, SIG_DFL);
2406
2407 EV_FREQUENT_CHECK;
1782} 2408}
1783 2409
1784void 2410void
1785ev_child_start (EV_P_ ev_child *w) 2411ev_child_start (EV_P_ ev_child *w)
1786{ 2412{
… …
1788 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2414 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1789#endif 2415#endif
1790 if (expect_false (ev_is_active (w))) 2416 if (expect_false (ev_is_active (w)))
1791 return; 2417 return;
1792 2418
2419 EV_FREQUENT_CHECK;
2420
1793 ev_start (EV_A_ (W)w, 1); 2421 ev_start (EV_A_ (W)w, 1);
1794 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2422 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2423
2424 EV_FREQUENT_CHECK;
1795} 2425}
1796 2426
1797void 2427void
1798ev_child_stop (EV_P_ ev_child *w) 2428ev_child_stop (EV_P_ ev_child *w)
1799{ 2429{
1800 clear_pending (EV_A_ (W)w); 2430 clear_pending (EV_A_ (W)w);
1801 if (expect_false (!ev_is_active (w))) 2431 if (expect_false (!ev_is_active (w)))
1802 return; 2432 return;
1803 2433
2434 EV_FREQUENT_CHECK;
2435
1804 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2436 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1805 ev_stop (EV_A_ (W)w); 2437 ev_stop (EV_A_ (W)w);
2438
2439 EV_FREQUENT_CHECK;
1806} 2440}
1807 2441
1808#if EV_STAT_ENABLE 2442#if EV_STAT_ENABLE
1809 2443
1810# ifdef _WIN32 2444# ifdef _WIN32
1811# undef lstat 2445# undef lstat
1812# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
1813# endif 2447# endif
1814 2448
1815#define DEF_STAT_INTERVAL 5.0074891 2449#define DEF_STAT_INTERVAL 5.0074891
2450#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
1816#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
1817 2452
1818static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2453static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1819 2454
1820#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
1821# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
… …
1825{ 2460{
1826 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); 2461 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);
1827 2462
1828 if (w->wd < 0) 2463 if (w->wd < 0)
1829 { 2464 {
2465 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
1830 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2466 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1831 2467
1832 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2470 /* but an efficiency issue only */
1833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1834 { 2472 {
1835 char path [4096]; 2473 char path [4096];
1836 strcpy (path, w->path); 2474 strcpy (path, w->path);
1837 2475
… …
1850 } 2488 }
1851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1852 } 2490 }
1853 } 2491 }
1854 else 2492 else
1855 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2493 {
1856
1857 if (w->wd >= 0)
1858 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2494 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2495
2496 /* now local changes will be tracked by inotify, but remote changes won't */
2497 /* unless the filesystem it known to be local, we therefore still poll */
2498 /* also do poll on <2.6.25, but with normal frequency */
2499 struct statfs sfs;
2500
2501 if (fs_2625 && !statfs (w->path, &sfs))
2502 if (sfs.f_type == 0x1373 /* devfs */
2503 || sfs.f_type == 0xEF53 /* ext2/3 */
2504 || sfs.f_type == 0x3153464a /* jfs */
2505 || sfs.f_type == 0x52654973 /* reiser3 */
2506 || sfs.f_type == 0x01021994 /* tempfs */
2507 || sfs.f_type == 0x58465342 /* xfs */)
2508 return;
2509
2510 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2511 ev_timer_again (EV_A_ &w->timer);
2512 }
1859} 2513}
1860 2514
1861static void noinline 2515static void noinline
1862infy_del (EV_P_ ev_stat *w) 2516infy_del (EV_P_ ev_stat *w)
1863{ 2517{
… …
1877 2531
1878static void noinline 2532static void noinline
1879infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2533infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1880{ 2534{
1881 if (slot < 0) 2535 if (slot < 0)
1882 /* overflow, need to check for all hahs slots */ 2536 /* overflow, need to check for all hash slots */
1883 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2537 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1884 infy_wd (EV_A_ slot, wd, ev); 2538 infy_wd (EV_A_ slot, wd, ev);
1885 else 2539 else
1886 { 2540 {
1887 WL w_; 2541 WL w_;
… …
1916 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2570 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1917 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2571 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1918} 2572}
1919 2573
1920void inline_size 2574void inline_size
2575check_2625 (EV_P)
2576{
2577 /* kernels < 2.6.25 are borked
2578 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2579 */
2580 struct utsname buf;
2581 int major, minor, micro;
2582
2583 if (uname (&buf))
2584 return;
2585
2586 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2587 return;
2588
2589 if (major < 2
2590 || (major == 2 && minor < 6)
2591 || (major == 2 && minor == 6 && micro < 25))
2592 return;
2593
2594 fs_2625 = 1;
2595}
2596
2597void inline_size
1921infy_init (EV_P) 2598infy_init (EV_P)
1922{ 2599{
1923 if (fs_fd != -2) 2600 if (fs_fd != -2)
1924 return; 2601 return;
2602
2603 fs_fd = -1;
2604
2605 check_2625 (EV_A);
1925 2606
1926 fs_fd = inotify_init (); 2607 fs_fd = inotify_init ();
1927 2608
1928 if (fs_fd >= 0) 2609 if (fs_fd >= 0)
1929 { 2610 {
… …
1957 w->wd = -1; 2638 w->wd = -1;
1958 2639
1959 if (fs_fd >= 0) 2640 if (fs_fd >= 0)
1960 infy_add (EV_A_ w); /* re-add, no matter what */ 2641 infy_add (EV_A_ w); /* re-add, no matter what */
1961 else 2642 else
1962 ev_timer_start (EV_A_ &w->timer); 2643 ev_timer_again (EV_A_ &w->timer);
1963 } 2644 }
1964
1965 } 2645 }
1966} 2646}
1967 2647
2648#endif
2649
2650#ifdef _WIN32
2651# define EV_LSTAT(p,b) _stati64 (p, b)
2652#else
2653# define EV_LSTAT(p,b) lstat (p, b)
1968#endif 2654#endif
1969 2655
1970void 2656void
1971ev_stat_stat (EV_P_ ev_stat *w) 2657ev_stat_stat (EV_P_ ev_stat *w)
1972{ 2658{
… …
1999 || w->prev.st_atime != w->attr.st_atime 2685 || w->prev.st_atime != w->attr.st_atime
2000 || w->prev.st_mtime != w->attr.st_mtime 2686 || w->prev.st_mtime != w->attr.st_mtime
2001 || w->prev.st_ctime != w->attr.st_ctime 2687 || w->prev.st_ctime != w->attr.st_ctime
2002 ) { 2688 ) {
2003 #if EV_USE_INOTIFY 2689 #if EV_USE_INOTIFY
2690 if (fs_fd >= 0)
2691 {
2004 infy_del (EV_A_ w); 2692 infy_del (EV_A_ w);
2005 infy_add (EV_A_ w); 2693 infy_add (EV_A_ w);
2006 ev_stat_stat (EV_A_ w); /* avoid race... */ 2694 ev_stat_stat (EV_A_ w); /* avoid race... */
2695 }
2007 #endif 2696 #endif
2008 2697
2009 ev_feed_event (EV_A_ w, EV_STAT); 2698 ev_feed_event (EV_A_ w, EV_STAT);
2010 } 2699 }
2011} 2700}
… …
2014ev_stat_start (EV_P_ ev_stat *w) 2703ev_stat_start (EV_P_ ev_stat *w)
2015{ 2704{
2016 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2017 return; 2706 return;
2018 2707
2019 /* since we use memcmp, we need to clear any padding data etc. */
2020 memset (&w->prev, 0, sizeof (ev_statdata));
2021 memset (&w->attr, 0, sizeof (ev_statdata));
2022
2023 ev_stat_stat (EV_A_ w); 2708 ev_stat_stat (EV_A_ w);
2024 2709
2710 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2025 if (w->interval < MIN_STAT_INTERVAL) 2711 w->interval = MIN_STAT_INTERVAL;
2026 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2027 2712
2028 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2713 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2029 ev_set_priority (&w->timer, ev_priority (w)); 2714 ev_set_priority (&w->timer, ev_priority (w));
2030 2715
2031#if EV_USE_INOTIFY 2716#if EV_USE_INOTIFY
2032 infy_init (EV_A); 2717 infy_init (EV_A);
2033 2718
2034 if (fs_fd >= 0) 2719 if (fs_fd >= 0)
2035 infy_add (EV_A_ w); 2720 infy_add (EV_A_ w);
2036 else 2721 else
2037#endif 2722#endif
2038 ev_timer_start (EV_A_ &w->timer); 2723 ev_timer_again (EV_A_ &w->timer);
2039 2724
2040 ev_start (EV_A_ (W)w, 1); 2725 ev_start (EV_A_ (W)w, 1);
2726
2727 EV_FREQUENT_CHECK;
2041} 2728}
2042 2729
2043void 2730void
2044ev_stat_stop (EV_P_ ev_stat *w) 2731ev_stat_stop (EV_P_ ev_stat *w)
2045{ 2732{
2046 clear_pending (EV_A_ (W)w); 2733 clear_pending (EV_A_ (W)w);
2047 if (expect_false (!ev_is_active (w))) 2734 if (expect_false (!ev_is_active (w)))
2048 return; 2735 return;
2049 2736
2737 EV_FREQUENT_CHECK;
2738
2050#if EV_USE_INOTIFY 2739#if EV_USE_INOTIFY
2051 infy_del (EV_A_ w); 2740 infy_del (EV_A_ w);
2052#endif 2741#endif
2053 ev_timer_stop (EV_A_ &w->timer); 2742 ev_timer_stop (EV_A_ &w->timer);
2054 2743
2055 ev_stop (EV_A_ (W)w); 2744 ev_stop (EV_A_ (W)w);
2745
2746 EV_FREQUENT_CHECK;
2056} 2747}
2057#endif 2748#endif
2058 2749
2059#if EV_IDLE_ENABLE 2750#if EV_IDLE_ENABLE
2060void 2751void
… …
2062{ 2753{
2063 if (expect_false (ev_is_active (w))) 2754 if (expect_false (ev_is_active (w)))
2064 return; 2755 return;
2065 2756
2066 pri_adjust (EV_A_ (W)w); 2757 pri_adjust (EV_A_ (W)w);
2758
2759 EV_FREQUENT_CHECK;
2067 2760
2068 { 2761 {
2069 int active = ++idlecnt [ABSPRI (w)]; 2762 int active = ++idlecnt [ABSPRI (w)];
2070 2763
2071 ++idleall; 2764 ++idleall;
2072 ev_start (EV_A_ (W)w, active); 2765 ev_start (EV_A_ (W)w, active);
2073 2766
2074 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2767 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2075 idles [ABSPRI (w)][active - 1] = w; 2768 idles [ABSPRI (w)][active - 1] = w;
2076 } 2769 }
2770
2771 EV_FREQUENT_CHECK;
2077} 2772}
2078 2773
2079void 2774void
2080ev_idle_stop (EV_P_ ev_idle *w) 2775ev_idle_stop (EV_P_ ev_idle *w)
2081{ 2776{
2082 clear_pending (EV_A_ (W)w); 2777 clear_pending (EV_A_ (W)w);
2083 if (expect_false (!ev_is_active (w))) 2778 if (expect_false (!ev_is_active (w)))
2084 return; 2779 return;
2085 2780
2781 EV_FREQUENT_CHECK;
2782
2086 { 2783 {
2087 int active = ((W)w)->active; 2784 int active = ev_active (w);
2088 2785
2089 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2786 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2090 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2787 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2091 2788
2092 ev_stop (EV_A_ (W)w); 2789 ev_stop (EV_A_ (W)w);
2093 --idleall; 2790 --idleall;
2094 } 2791 }
2792
2793 EV_FREQUENT_CHECK;
2095} 2794}
2096#endif 2795#endif
2097 2796
2098void 2797void
2099ev_prepare_start (EV_P_ ev_prepare *w) 2798ev_prepare_start (EV_P_ ev_prepare *w)
2100{ 2799{
2101 if (expect_false (ev_is_active (w))) 2800 if (expect_false (ev_is_active (w)))
2102 return; 2801 return;
2802
2803 EV_FREQUENT_CHECK;
2103 2804
2104 ev_start (EV_A_ (W)w, ++preparecnt); 2805 ev_start (EV_A_ (W)w, ++preparecnt);
2105 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2806 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2106 prepares [preparecnt - 1] = w; 2807 prepares [preparecnt - 1] = w;
2808
2809 EV_FREQUENT_CHECK;
2107} 2810}
2108 2811
2109void 2812void
2110ev_prepare_stop (EV_P_ ev_prepare *w) 2813ev_prepare_stop (EV_P_ ev_prepare *w)
2111{ 2814{
2112 clear_pending (EV_A_ (W)w); 2815 clear_pending (EV_A_ (W)w);
2113 if (expect_false (!ev_is_active (w))) 2816 if (expect_false (!ev_is_active (w)))
2114 return; 2817 return;
2115 2818
2819 EV_FREQUENT_CHECK;
2820
2116 { 2821 {
2117 int active = ((W)w)->active; 2822 int active = ev_active (w);
2823
2118 prepares [active - 1] = prepares [--preparecnt]; 2824 prepares [active - 1] = prepares [--preparecnt];
2119 ((W)prepares [active - 1])->active = active; 2825 ev_active (prepares [active - 1]) = active;
2120 } 2826 }
2121 2827
2122 ev_stop (EV_A_ (W)w); 2828 ev_stop (EV_A_ (W)w);
2829
2830 EV_FREQUENT_CHECK;
2123} 2831}
2124 2832
2125void 2833void
2126ev_check_start (EV_P_ ev_check *w) 2834ev_check_start (EV_P_ ev_check *w)
2127{ 2835{
2128 if (expect_false (ev_is_active (w))) 2836 if (expect_false (ev_is_active (w)))
2129 return; 2837 return;
2838
2839 EV_FREQUENT_CHECK;
2130 2840
2131 ev_start (EV_A_ (W)w, ++checkcnt); 2841 ev_start (EV_A_ (W)w, ++checkcnt);
2132 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2842 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2133 checks [checkcnt - 1] = w; 2843 checks [checkcnt - 1] = w;
2844
2845 EV_FREQUENT_CHECK;
2134} 2846}
2135 2847
2136void 2848void
2137ev_check_stop (EV_P_ ev_check *w) 2849ev_check_stop (EV_P_ ev_check *w)
2138{ 2850{
2139 clear_pending (EV_A_ (W)w); 2851 clear_pending (EV_A_ (W)w);
2140 if (expect_false (!ev_is_active (w))) 2852 if (expect_false (!ev_is_active (w)))
2141 return; 2853 return;
2142 2854
2855 EV_FREQUENT_CHECK;
2856
2143 { 2857 {
2144 int active = ((W)w)->active; 2858 int active = ev_active (w);
2859
2145 checks [active - 1] = checks [--checkcnt]; 2860 checks [active - 1] = checks [--checkcnt];
2146 ((W)checks [active - 1])->active = active; 2861 ev_active (checks [active - 1]) = active;
2147 } 2862 }
2148 2863
2149 ev_stop (EV_A_ (W)w); 2864 ev_stop (EV_A_ (W)w);
2865
2866 EV_FREQUENT_CHECK;
2150} 2867}
2151 2868
2152#if EV_EMBED_ENABLE 2869#if EV_EMBED_ENABLE
2153void noinline 2870void noinline
2154ev_embed_sweep (EV_P_ ev_embed *w) 2871ev_embed_sweep (EV_P_ ev_embed *w)
2155{ 2872{
2156 ev_loop (w->loop, EVLOOP_NONBLOCK); 2873 ev_loop (w->other, EVLOOP_NONBLOCK);
2157} 2874}
2158 2875
2159static void 2876static void
2160embed_cb (EV_P_ ev_io *io, int revents) 2877embed_io_cb (EV_P_ ev_io *io, int revents)
2161{ 2878{
2162 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2879 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2163 2880
2164 if (ev_cb (w)) 2881 if (ev_cb (w))
2165 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2882 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2166 else 2883 else
2167 ev_embed_sweep (loop, w); 2884 ev_loop (w->other, EVLOOP_NONBLOCK);
2168} 2885}
2886
2887static void
2888embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2889{
2890 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2891
2892 {
2893 struct ev_loop *loop = w->other;
2894
2895 while (fdchangecnt)
2896 {
2897 fd_reify (EV_A);
2898 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2899 }
2900 }
2901}
2902
2903static void
2904embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2905{
2906 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2907
2908 {
2909 struct ev_loop *loop = w->other;
2910
2911 ev_loop_fork (EV_A);
2912 }
2913}
2914
2915#if 0
2916static void
2917embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2918{
2919 ev_idle_stop (EV_A_ idle);
2920}
2921#endif
2169 2922
2170void 2923void
2171ev_embed_start (EV_P_ ev_embed *w) 2924ev_embed_start (EV_P_ ev_embed *w)
2172{ 2925{
2173 if (expect_false (ev_is_active (w))) 2926 if (expect_false (ev_is_active (w)))
2174 return; 2927 return;
2175 2928
2176 { 2929 {
2177 struct ev_loop *loop = w->loop; 2930 struct ev_loop *loop = w->other;
2178 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2931 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2179 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2932 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2180 } 2933 }
2934
2935 EV_FREQUENT_CHECK;
2181 2936
2182 ev_set_priority (&w->io, ev_priority (w)); 2937 ev_set_priority (&w->io, ev_priority (w));
2183 ev_io_start (EV_A_ &w->io); 2938 ev_io_start (EV_A_ &w->io);
2184 2939
2940 ev_prepare_init (&w->prepare, embed_prepare_cb);
2941 ev_set_priority (&w->prepare, EV_MINPRI);
2942 ev_prepare_start (EV_A_ &w->prepare);
2943
2944 ev_fork_init (&w->fork, embed_fork_cb);
2945 ev_fork_start (EV_A_ &w->fork);
2946
2947 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2948
2185 ev_start (EV_A_ (W)w, 1); 2949 ev_start (EV_A_ (W)w, 1);
2950
2951 EV_FREQUENT_CHECK;
2186} 2952}
2187 2953
2188void 2954void
2189ev_embed_stop (EV_P_ ev_embed *w) 2955ev_embed_stop (EV_P_ ev_embed *w)
2190{ 2956{
2191 clear_pending (EV_A_ (W)w); 2957 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2958 if (expect_false (!ev_is_active (w)))
2193 return; 2959 return;
2194 2960
2961 EV_FREQUENT_CHECK;
2962
2195 ev_io_stop (EV_A_ &w->io); 2963 ev_io_stop (EV_A_ &w->io);
2964 ev_prepare_stop (EV_A_ &w->prepare);
2965 ev_fork_stop (EV_A_ &w->fork);
2196 2966
2197 ev_stop (EV_A_ (W)w); 2967 EV_FREQUENT_CHECK;
2198} 2968}
2199#endif 2969#endif
2200 2970
2201#if EV_FORK_ENABLE 2971#if EV_FORK_ENABLE
2202void 2972void
2203ev_fork_start (EV_P_ ev_fork *w) 2973ev_fork_start (EV_P_ ev_fork *w)
2204{ 2974{
2205 if (expect_false (ev_is_active (w))) 2975 if (expect_false (ev_is_active (w)))
2206 return; 2976 return;
2977
2978 EV_FREQUENT_CHECK;
2207 2979
2208 ev_start (EV_A_ (W)w, ++forkcnt); 2980 ev_start (EV_A_ (W)w, ++forkcnt);
2209 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2981 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2210 forks [forkcnt - 1] = w; 2982 forks [forkcnt - 1] = w;
2983
2984 EV_FREQUENT_CHECK;
2211} 2985}
2212 2986
2213void 2987void
2214ev_fork_stop (EV_P_ ev_fork *w) 2988ev_fork_stop (EV_P_ ev_fork *w)
2215{ 2989{
2216 clear_pending (EV_A_ (W)w); 2990 clear_pending (EV_A_ (W)w);
2217 if (expect_false (!ev_is_active (w))) 2991 if (expect_false (!ev_is_active (w)))
2218 return; 2992 return;
2219 2993
2994 EV_FREQUENT_CHECK;
2995
2220 { 2996 {
2221 int active = ((W)w)->active; 2997 int active = ev_active (w);
2998
2222 forks [active - 1] = forks [--forkcnt]; 2999 forks [active - 1] = forks [--forkcnt];
2223 ((W)forks [active - 1])->active = active; 3000 ev_active (forks [active - 1]) = active;
2224 } 3001 }
2225 3002
2226 ev_stop (EV_A_ (W)w); 3003 ev_stop (EV_A_ (W)w);
3004
3005 EV_FREQUENT_CHECK;
3006}
3007#endif
3008
3009#if EV_ASYNC_ENABLE
3010void
3011ev_async_start (EV_P_ ev_async *w)
3012{
3013 if (expect_false (ev_is_active (w)))
3014 return;
3015
3016 evpipe_init (EV_A);
3017
3018 EV_FREQUENT_CHECK;
3019
3020 ev_start (EV_A_ (W)w, ++asynccnt);
3021 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
3022 asyncs [asynccnt - 1] = w;
3023
3024 EV_FREQUENT_CHECK;
3025}
3026
3027void
3028ev_async_stop (EV_P_ ev_async *w)
3029{
3030 clear_pending (EV_A_ (W)w);
3031 if (expect_false (!ev_is_active (w)))
3032 return;
3033
3034 EV_FREQUENT_CHECK;
3035
3036 {
3037 int active = ev_active (w);
3038
3039 asyncs [active - 1] = asyncs [--asynccnt];
3040 ev_active (asyncs [active - 1]) = active;
3041 }
3042
3043 ev_stop (EV_A_ (W)w);
3044
3045 EV_FREQUENT_CHECK;
3046}
3047
3048void
3049ev_async_send (EV_P_ ev_async *w)
3050{
3051 w->sent = 1;
3052 evpipe_write (EV_A_ &gotasync);
2227} 3053}
2228#endif 3054#endif
2229 3055
2230/*****************************************************************************/ 3056/*****************************************************************************/
2231 3057
… …
2241once_cb (EV_P_ struct ev_once *once, int revents) 3067once_cb (EV_P_ struct ev_once *once, int revents)
2242{ 3068{
2243 void (*cb)(int revents, void *arg) = once->cb; 3069 void (*cb)(int revents, void *arg) = once->cb;
2244 void *arg = once->arg; 3070 void *arg = once->arg;
2245 3071
2246 ev_io_stop (EV_A_ &once->io); 3072 ev_io_stop (EV_A_ &once->io);
2247 ev_timer_stop (EV_A_ &once->to); 3073 ev_timer_stop (EV_A_ &once->to);
2248 ev_free (once); 3074 ev_free (once);
2249 3075
2250 cb (revents, arg); 3076 cb (revents, arg);
2251} 3077}
2252 3078
2253static void 3079static void
2254once_cb_io (EV_P_ ev_io *w, int revents) 3080once_cb_io (EV_P_ ev_io *w, int revents)
2255{ 3081{
2256 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3082 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3083
3084 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2257} 3085}
2258 3086
2259static void 3087static void
2260once_cb_to (EV_P_ ev_timer *w, int revents) 3088once_cb_to (EV_P_ ev_timer *w, int revents)
2261{ 3089{
2262 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3090 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3091
3092 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2263} 3093}
2264 3094
2265void 3095void
2266ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3096ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2267{ 3097{
… …
2289 ev_timer_set (&once->to, timeout, 0.); 3119 ev_timer_set (&once->to, timeout, 0.);
2290 ev_timer_start (EV_A_ &once->to); 3120 ev_timer_start (EV_A_ &once->to);
2291 } 3121 }
2292} 3122}
2293 3123
3124#if EV_MULTIPLICITY
3125 #include "ev_wrap.h"
3126#endif
3127
2294#ifdef __cplusplus 3128#ifdef __cplusplus
2295} 3129}
2296#endif 3130#endif
2297 3131

Diff Legend

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