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

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

Diff Legend

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