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

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

Diff Legend

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