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

Comparing libev/ev.c (file contents):
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs.
Revision 1.337 by root, Wed Mar 10 09:18:24 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
96# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
97# endif 111# endif
98# endif 112# endif
99 113
100# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
101# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
102# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
103# else 117# else
104# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
105# endif 119# endif
106# endif 120# endif
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
131 153
132#endif 154#endif
133 155
134#include <math.h> 156#include <math.h>
135#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
136#include <fcntl.h> 159#include <fcntl.h>
137#include <stddef.h> 160#include <stddef.h>
138 161
139#include <stdio.h> 162#include <stdio.h>
140 163
141#include <assert.h> 164#include <assert.h>
142#include <errno.h> 165#include <errno.h>
143#include <sys/types.h> 166#include <sys/types.h>
144#include <time.h> 167#include <time.h>
168#include <limits.h>
145 169
146#include <signal.h> 170#include <signal.h>
147 171
148#ifdef EV_H 172#ifdef EV_H
149# include EV_H 173# include EV_H
… …
160# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
161# include <windows.h> 185# include <windows.h>
162# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
163# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
164# endif 188# endif
189# undef EV_AVOID_STDIO
165#endif 190#endif
166 191
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
219# define EV_NSIG 65
220#endif
221
222#ifndef EV_USE_CLOCK_SYSCALL
223# if __linux && __GLIBC__ >= 2
224# define EV_USE_CLOCK_SYSCALL 1
225# else
226# define EV_USE_CLOCK_SYSCALL 0
227# endif
228#endif
168 229
169#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC 1
172# else 233# else
173# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
174# endif 235# endif
175#endif 236#endif
176 237
177#ifndef EV_USE_REALTIME 238#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 240#endif
180 241
181#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP 1
… …
244# else 305# else
245# define EV_USE_EVENTFD 0 306# define EV_USE_EVENTFD 0
246# endif 307# endif
247#endif 308#endif
248 309
310#ifndef EV_USE_SIGNALFD
311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
312# define EV_USE_SIGNALFD 1
313# else
314# define EV_USE_SIGNALFD 0
315# endif
316#endif
317
249#if 0 /* debugging */ 318#if 0 /* debugging */
250# define EV_VERIFY 3 319# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 320# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 321# define EV_HEAP_CACHE_AT 1
253#endif 322#endif
… …
262 331
263#ifndef EV_HEAP_CACHE_AT 332#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 333# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 334#endif
266 335
336/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
337/* which makes programs even slower. might work on other unices, too. */
338#if EV_USE_CLOCK_SYSCALL
339# include <syscall.h>
340# ifdef SYS_clock_gettime
341# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
342# undef EV_USE_MONOTONIC
343# define EV_USE_MONOTONIC 1
344# else
345# undef EV_USE_CLOCK_SYSCALL
346# define EV_USE_CLOCK_SYSCALL 0
347# endif
348#endif
349
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 350/* this block fixes any misconfiguration where we know we run into trouble otherwise */
351
352#ifdef _AIX
353/* AIX has a completely broken poll.h header */
354# undef EV_USE_POLL
355# define EV_USE_POLL 0
356#endif
268 357
269#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
272#endif 361#endif
… …
286# include <sys/select.h> 375# include <sys/select.h>
287# endif 376# endif
288#endif 377#endif
289 378
290#if EV_USE_INOTIFY 379#if EV_USE_INOTIFY
380# include <sys/utsname.h>
381# include <sys/statfs.h>
291# include <sys/inotify.h> 382# include <sys/inotify.h>
383/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
384# ifndef IN_DONT_FOLLOW
385# undef EV_USE_INOTIFY
386# define EV_USE_INOTIFY 0
387# endif
292#endif 388#endif
293 389
294#if EV_SELECT_IS_WINSOCKET 390#if EV_SELECT_IS_WINSOCKET
295# include <winsock.h> 391# include <winsock.h>
296#endif 392#endif
297 393
298#if EV_USE_EVENTFD 394#if EV_USE_EVENTFD
299/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 395/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
300# include <stdint.h> 396# include <stdint.h>
397# ifndef EFD_NONBLOCK
398# define EFD_NONBLOCK O_NONBLOCK
399# endif
400# ifndef EFD_CLOEXEC
401# ifdef O_CLOEXEC
402# define EFD_CLOEXEC O_CLOEXEC
403# else
404# define EFD_CLOEXEC 02000000
405# endif
406# endif
301# ifdef __cplusplus 407# ifdef __cplusplus
302extern "C" { 408extern "C" {
303# endif 409# endif
304int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
305# ifdef __cplusplus 411# ifdef __cplusplus
306} 412}
307# endif 413# endif
308#endif 414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags);
433
434struct signalfd_siginfo
435{
436 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)];
438};
439# ifdef __cplusplus
440}
441# endif
442#endif
443
309 444
310/**/ 445/**/
311 446
312#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
313# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
325 */ 460 */
326#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
327 462
328#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
329#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
330/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
331 465
332#if __GNUC__ >= 4 466#if __GNUC__ >= 4
333# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
334# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
335#else 469#else
… …
348# define inline_speed static noinline 482# define inline_speed static noinline
349#else 483#else
350# define inline_speed static inline 484# define inline_speed static inline
351#endif 485#endif
352 486
353#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 487#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
488
489#if EV_MINPRI == EV_MAXPRI
490# define ABSPRI(w) (((W)w), 0)
491#else
354#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 492# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
493#endif
355 494
356#define EMPTY /* required for microsofts broken pseudo-c compiler */ 495#define EMPTY /* required for microsofts broken pseudo-c compiler */
357#define EMPTY2(a,b) /* used to suppress some warnings */ 496#define EMPTY2(a,b) /* used to suppress some warnings */
358 497
359typedef ev_watcher *W; 498typedef ev_watcher *W;
… …
361typedef ev_watcher_time *WT; 500typedef ev_watcher_time *WT;
362 501
363#define ev_active(w) ((W)(w))->active 502#define ev_active(w) ((W)(w))->active
364#define ev_at(w) ((WT)(w))->at 503#define ev_at(w) ((WT)(w))->at
365 504
366#if EV_USE_MONOTONIC 505#if EV_USE_REALTIME
367/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 506/* 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 */ 507/* giving it a reasonably high chance of working on typical architetcures */
508static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
509#endif
510
511#if EV_USE_MONOTONIC
369static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
513#endif
514
515#ifndef EV_FD_TO_WIN32_HANDLE
516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
517#endif
518#ifndef EV_WIN32_HANDLE_TO_FD
519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
520#endif
521#ifndef EV_WIN32_CLOSE_FD
522# define EV_WIN32_CLOSE_FD(fd) close (fd)
370#endif 523#endif
371 524
372#ifdef _WIN32 525#ifdef _WIN32
373# include "ev_win32.c" 526# include "ev_win32.c"
374#endif 527#endif
375 528
376/*****************************************************************************/ 529/*****************************************************************************/
377 530
531#if EV_AVOID_STDIO
532static void noinline
533ev_printerr (const char *msg)
534{
535 write (STDERR_FILENO, msg, strlen (msg));
536}
537#endif
538
378static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
379 540
380void 541void
381ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
382{ 543{
383 syserr_cb = cb; 544 syserr_cb = cb;
384} 545}
385 546
386static void noinline 547static void noinline
387syserr (const char *msg) 548ev_syserr (const char *msg)
388{ 549{
389 if (!msg) 550 if (!msg)
390 msg = "(libev) system error"; 551 msg = "(libev) system error";
391 552
392 if (syserr_cb) 553 if (syserr_cb)
393 syserr_cb (msg); 554 syserr_cb (msg);
394 else 555 else
395 { 556 {
557#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg);
561 ev_printerr (": ");
562 ev_printerr (err);
563 ev_printerr ("\n");
564#else
396 perror (msg); 565 perror (msg);
566#endif
397 abort (); 567 abort ();
398 } 568 }
399} 569}
400 570
401static void * 571static void *
402ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
403{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
404 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
405 * implement realloc (x, 0) (as required by both ansi c-98 and 578 * implement realloc (x, 0) (as required by both ansi c-89 and
406 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
407 */ 580 */
408 581
409 if (size) 582 if (size)
410 return realloc (ptr, size); 583 return realloc (ptr, size);
411 584
412 free (ptr); 585 free (ptr);
413 return 0; 586 return 0;
587#endif
414} 588}
415 589
416static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
417 591
418void 592void
… …
426{ 600{
427 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
428 602
429 if (!ptr && size) 603 if (!ptr && size)
430 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
431 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
432 abort (); 610 abort ();
433 } 611 }
434 612
435 return ptr; 613 return ptr;
436} 614}
… …
438#define ev_malloc(size) ev_realloc (0, (size)) 616#define ev_malloc(size) ev_realloc (0, (size))
439#define ev_free(ptr) ev_realloc ((ptr), 0) 617#define ev_free(ptr) ev_realloc ((ptr), 0)
440 618
441/*****************************************************************************/ 619/*****************************************************************************/
442 620
621/* set in reify when reification needed */
622#define EV_ANFD_REIFY 1
623
624/* file descriptor info structure */
443typedef struct 625typedef struct
444{ 626{
445 WL head; 627 WL head;
446 unsigned char events; 628 unsigned char events; /* the events watched for */
629 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
630 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
447 unsigned char reify; 631 unsigned char unused;
632#if EV_USE_EPOLL
633 unsigned int egen; /* generation counter to counter epoll bugs */
634#endif
448#if EV_SELECT_IS_WINSOCKET 635#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 636 SOCKET handle;
450#endif 637#endif
451} ANFD; 638} ANFD;
452 639
640/* stores the pending event set for a given watcher */
453typedef struct 641typedef struct
454{ 642{
455 W w; 643 W w;
456 int events; 644 int events; /* the pending event set for the given watcher */
457} ANPENDING; 645} ANPENDING;
458 646
459#if EV_USE_INOTIFY 647#if EV_USE_INOTIFY
460/* hash table entry per inotify-id */ 648/* hash table entry per inotify-id */
461typedef struct 649typedef struct
… …
464} ANFS; 652} ANFS;
465#endif 653#endif
466 654
467/* Heap Entry */ 655/* Heap Entry */
468#if EV_HEAP_CACHE_AT 656#if EV_HEAP_CACHE_AT
657 /* a heap element */
469 typedef struct { 658 typedef struct {
470 ev_tstamp at; 659 ev_tstamp at;
471 WT w; 660 WT w;
472 } ANHE; 661 } ANHE;
473 662
474 #define ANHE_w(he) (he).w /* access watcher, read-write */ 663 #define ANHE_w(he) (he).w /* access watcher, read-write */
475 #define ANHE_at(he) (he).at /* access cached at, read-only */ 664 #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 */ 665 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
477#else 666#else
667 /* a heap element */
478 typedef WT ANHE; 668 typedef WT ANHE;
479 669
480 #define ANHE_w(he) (he) 670 #define ANHE_w(he) (he)
481 #define ANHE_at(he) (he)->at 671 #define ANHE_at(he) (he)->at
482 #define ANHE_at_cache(he) 672 #define ANHE_at_cache(he)
… …
506 696
507 static int ev_default_loop_ptr; 697 static int ev_default_loop_ptr;
508 698
509#endif 699#endif
510 700
701#if EV_MINIMAL < 2
702# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
703# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
704# define EV_INVOKE_PENDING invoke_cb (EV_A)
705#else
706# define EV_RELEASE_CB (void)0
707# define EV_ACQUIRE_CB (void)0
708# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
709#endif
710
711#define EVUNLOOP_RECURSE 0x80
712
511/*****************************************************************************/ 713/*****************************************************************************/
512 714
715#ifndef EV_HAVE_EV_TIME
513ev_tstamp 716ev_tstamp
514ev_time (void) 717ev_time (void)
515{ 718{
516#if EV_USE_REALTIME 719#if EV_USE_REALTIME
720 if (expect_true (have_realtime))
721 {
517 struct timespec ts; 722 struct timespec ts;
518 clock_gettime (CLOCK_REALTIME, &ts); 723 clock_gettime (CLOCK_REALTIME, &ts);
519 return ts.tv_sec + ts.tv_nsec * 1e-9; 724 return ts.tv_sec + ts.tv_nsec * 1e-9;
520#else 725 }
726#endif
727
521 struct timeval tv; 728 struct timeval tv;
522 gettimeofday (&tv, 0); 729 gettimeofday (&tv, 0);
523 return tv.tv_sec + tv.tv_usec * 1e-6; 730 return tv.tv_sec + tv.tv_usec * 1e-6;
524#endif
525} 731}
732#endif
526 733
527ev_tstamp inline_size 734inline_size ev_tstamp
528get_clock (void) 735get_clock (void)
529{ 736{
530#if EV_USE_MONOTONIC 737#if EV_USE_MONOTONIC
531 if (expect_true (have_monotonic)) 738 if (expect_true (have_monotonic))
532 { 739 {
… …
565 struct timeval tv; 772 struct timeval tv;
566 773
567 tv.tv_sec = (time_t)delay; 774 tv.tv_sec = (time_t)delay;
568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 775 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
569 776
777 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
778 /* something not guaranteed by newer posix versions, but guaranteed */
779 /* by older ones */
570 select (0, 0, 0, 0, &tv); 780 select (0, 0, 0, 0, &tv);
571#endif 781#endif
572 } 782 }
573} 783}
574 784
575/*****************************************************************************/ 785/*****************************************************************************/
576 786
577#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 787#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
578 788
579int inline_size 789/* find a suitable new size for the given array, */
790/* hopefully by rounding to a ncie-to-malloc size */
791inline_size int
580array_nextsize (int elem, int cur, int cnt) 792array_nextsize (int elem, int cur, int cnt)
581{ 793{
582 int ncur = cur + 1; 794 int ncur = cur + 1;
583 795
584 do 796 do
… …
601array_realloc (int elem, void *base, int *cur, int cnt) 813array_realloc (int elem, void *base, int *cur, int cnt)
602{ 814{
603 *cur = array_nextsize (elem, *cur, cnt); 815 *cur = array_nextsize (elem, *cur, cnt);
604 return ev_realloc (base, elem * *cur); 816 return ev_realloc (base, elem * *cur);
605} 817}
818
819#define array_init_zero(base,count) \
820 memset ((void *)(base), 0, sizeof (*(base)) * (count))
606 821
607#define array_needsize(type,base,cur,cnt,init) \ 822#define array_needsize(type,base,cur,cnt,init) \
608 if (expect_false ((cnt) > (cur))) \ 823 if (expect_false ((cnt) > (cur))) \
609 { \ 824 { \
610 int ocur_ = (cur); \ 825 int ocur_ = (cur); \
… …
622 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 837 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
623 } 838 }
624#endif 839#endif
625 840
626#define array_free(stem, idx) \ 841#define array_free(stem, idx) \
627 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 842 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
628 843
629/*****************************************************************************/ 844/*****************************************************************************/
845
846/* dummy callback for pending events */
847static void noinline
848pendingcb (EV_P_ ev_prepare *w, int revents)
849{
850}
630 851
631void noinline 852void noinline
632ev_feed_event (EV_P_ void *w, int revents) 853ev_feed_event (EV_P_ void *w, int revents)
633{ 854{
634 W w_ = (W)w; 855 W w_ = (W)w;
… …
643 pendings [pri][w_->pending - 1].w = w_; 864 pendings [pri][w_->pending - 1].w = w_;
644 pendings [pri][w_->pending - 1].events = revents; 865 pendings [pri][w_->pending - 1].events = revents;
645 } 866 }
646} 867}
647 868
648void inline_speed 869inline_speed void
870feed_reverse (EV_P_ W w)
871{
872 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
873 rfeeds [rfeedcnt++] = w;
874}
875
876inline_size void
877feed_reverse_done (EV_P_ int revents)
878{
879 do
880 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
881 while (rfeedcnt);
882}
883
884inline_speed void
649queue_events (EV_P_ W *events, int eventcnt, int type) 885queue_events (EV_P_ W *events, int eventcnt, int type)
650{ 886{
651 int i; 887 int i;
652 888
653 for (i = 0; i < eventcnt; ++i) 889 for (i = 0; i < eventcnt; ++i)
654 ev_feed_event (EV_A_ events [i], type); 890 ev_feed_event (EV_A_ events [i], type);
655} 891}
656 892
657/*****************************************************************************/ 893/*****************************************************************************/
658 894
659void inline_size 895inline_speed void
660anfds_init (ANFD *base, int count)
661{
662 while (count--)
663 {
664 base->head = 0;
665 base->events = EV_NONE;
666 base->reify = 0;
667
668 ++base;
669 }
670}
671
672void inline_speed
673fd_event (EV_P_ int fd, int revents) 896fd_event_nocheck (EV_P_ int fd, int revents)
674{ 897{
675 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
676 ev_io *w; 899 ev_io *w;
677 900
678 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 901 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
682 if (ev) 905 if (ev)
683 ev_feed_event (EV_A_ (W)w, ev); 906 ev_feed_event (EV_A_ (W)w, ev);
684 } 907 }
685} 908}
686 909
910/* do not submit kernel events for fds that have reify set */
911/* because that means they changed while we were polling for new events */
912inline_speed void
913fd_event (EV_P_ int fd, int revents)
914{
915 ANFD *anfd = anfds + fd;
916
917 if (expect_true (!anfd->reify))
918 fd_event_nocheck (EV_A_ fd, revents);
919}
920
687void 921void
688ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
689{ 923{
690 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
691 fd_event (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
692} 926}
693 927
694void inline_size 928/* make sure the external fd watch events are in-sync */
929/* with the kernel/libev internal state */
930inline_size void
695fd_reify (EV_P) 931fd_reify (EV_P)
696{ 932{
697 int i; 933 int i;
698 934
699 for (i = 0; i < fdchangecnt; ++i) 935 for (i = 0; i < fdchangecnt; ++i)
… …
709 945
710#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
711 if (events) 947 if (events)
712 { 948 {
713 unsigned long arg; 949 unsigned long arg;
714 #ifdef EV_FD_TO_WIN32_HANDLE
715 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
716 #else
717 anfd->handle = _get_osfhandle (fd);
718 #endif
719 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
720 } 952 }
721#endif 953#endif
722 954
723 { 955 {
724 unsigned char o_events = anfd->events; 956 unsigned char o_events = anfd->events;
725 unsigned char o_reify = anfd->reify; 957 unsigned char o_reify = anfd->reify;
726 958
727 anfd->reify = 0; 959 anfd->reify = 0;
728 anfd->events = events; 960 anfd->events = events;
729 961
730 if (o_events != events || o_reify & EV_IOFDSET) 962 if (o_events != events || o_reify & EV__IOFDSET)
731 backend_modify (EV_A_ fd, o_events, events); 963 backend_modify (EV_A_ fd, o_events, events);
732 } 964 }
733 } 965 }
734 966
735 fdchangecnt = 0; 967 fdchangecnt = 0;
736} 968}
737 969
738void inline_size 970/* something about the given fd changed */
971inline_size void
739fd_change (EV_P_ int fd, int flags) 972fd_change (EV_P_ int fd, int flags)
740{ 973{
741 unsigned char reify = anfds [fd].reify; 974 unsigned char reify = anfds [fd].reify;
742 anfds [fd].reify |= flags; 975 anfds [fd].reify |= flags;
743 976
… …
747 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 980 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
748 fdchanges [fdchangecnt - 1] = fd; 981 fdchanges [fdchangecnt - 1] = fd;
749 } 982 }
750} 983}
751 984
752void inline_speed 985/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
986inline_speed void
753fd_kill (EV_P_ int fd) 987fd_kill (EV_P_ int fd)
754{ 988{
755 ev_io *w; 989 ev_io *w;
756 990
757 while ((w = (ev_io *)anfds [fd].head)) 991 while ((w = (ev_io *)anfds [fd].head))
… …
759 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
760 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
761 } 995 }
762} 996}
763 997
764int inline_size 998/* check whether the given fd is actually valid, for error recovery */
999inline_size int
765fd_valid (int fd) 1000fd_valid (int fd)
766{ 1001{
767#ifdef _WIN32 1002#ifdef _WIN32
768 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
769#else 1004#else
770 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
771#endif 1006#endif
772} 1007}
773 1008
… …
791 1026
792 for (fd = anfdmax; fd--; ) 1027 for (fd = anfdmax; fd--; )
793 if (anfds [fd].events) 1028 if (anfds [fd].events)
794 { 1029 {
795 fd_kill (EV_A_ fd); 1030 fd_kill (EV_A_ fd);
796 return; 1031 break;
797 } 1032 }
798} 1033}
799 1034
800/* usually called after fork if backend needs to re-arm all fds from scratch */ 1035/* usually called after fork if backend needs to re-arm all fds from scratch */
801static void noinline 1036static void noinline
… …
805 1040
806 for (fd = 0; fd < anfdmax; ++fd) 1041 for (fd = 0; fd < anfdmax; ++fd)
807 if (anfds [fd].events) 1042 if (anfds [fd].events)
808 { 1043 {
809 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
1045 anfds [fd].emask = 0;
810 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
811 } 1047 }
1048}
1049
1050/* used to prepare libev internal fd's */
1051/* this is not fork-safe */
1052inline_speed void
1053fd_intern (int fd)
1054{
1055#ifdef _WIN32
1056 unsigned long arg = 1;
1057 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1058#else
1059 fcntl (fd, F_SETFD, FD_CLOEXEC);
1060 fcntl (fd, F_SETFL, O_NONBLOCK);
1061#endif
812} 1062}
813 1063
814/*****************************************************************************/ 1064/*****************************************************************************/
815 1065
816/* 1066/*
… …
831#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1081#define HEAP0 (DHEAP - 1) /* index of first element in heap */
832#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1082#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
833#define UPHEAP_DONE(p,k) ((p) == (k)) 1083#define UPHEAP_DONE(p,k) ((p) == (k))
834 1084
835/* away from the root */ 1085/* away from the root */
836void inline_speed 1086inline_speed void
837downheap (ANHE *heap, int N, int k) 1087downheap (ANHE *heap, int N, int k)
838{ 1088{
839 ANHE he = heap [k]; 1089 ANHE he = heap [k];
840 ANHE *E = heap + N + HEAP0; 1090 ANHE *E = heap + N + HEAP0;
841 1091
… …
881#define HEAP0 1 1131#define HEAP0 1
882#define HPARENT(k) ((k) >> 1) 1132#define HPARENT(k) ((k) >> 1)
883#define UPHEAP_DONE(p,k) (!(p)) 1133#define UPHEAP_DONE(p,k) (!(p))
884 1134
885/* away from the root */ 1135/* away from the root */
886void inline_speed 1136inline_speed void
887downheap (ANHE *heap, int N, int k) 1137downheap (ANHE *heap, int N, int k)
888{ 1138{
889 ANHE he = heap [k]; 1139 ANHE he = heap [k];
890 1140
891 for (;;) 1141 for (;;)
892 { 1142 {
893 int c = k << 1; 1143 int c = k << 1;
894 1144
895 if (c > N + HEAP0 - 1) 1145 if (c >= N + HEAP0)
896 break; 1146 break;
897 1147
898 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1148 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
899 ? 1 : 0; 1149 ? 1 : 0;
900 1150
… …
911 ev_active (ANHE_w (he)) = k; 1161 ev_active (ANHE_w (he)) = k;
912} 1162}
913#endif 1163#endif
914 1164
915/* towards the root */ 1165/* towards the root */
916void inline_speed 1166inline_speed void
917upheap (ANHE *heap, int k) 1167upheap (ANHE *heap, int k)
918{ 1168{
919 ANHE he = heap [k]; 1169 ANHE he = heap [k];
920 1170
921 for (;;) 1171 for (;;)
… …
932 1182
933 heap [k] = he; 1183 heap [k] = he;
934 ev_active (ANHE_w (he)) = k; 1184 ev_active (ANHE_w (he)) = k;
935} 1185}
936 1186
937void inline_size 1187/* move an element suitably so it is in a correct place */
1188inline_size void
938adjustheap (ANHE *heap, int N, int k) 1189adjustheap (ANHE *heap, int N, int k)
939{ 1190{
940 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1191 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
941 upheap (heap, k); 1192 upheap (heap, k);
942 else 1193 else
943 downheap (heap, N, k); 1194 downheap (heap, N, k);
944} 1195}
945 1196
946/* rebuild the heap: this function is used only once and executed rarely */ 1197/* rebuild the heap: this function is used only once and executed rarely */
947void inline_size 1198inline_size void
948reheap (ANHE *heap, int N) 1199reheap (ANHE *heap, int N)
949{ 1200{
950 int i; 1201 int i;
951 1202
952 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1203 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
955 upheap (heap, i + HEAP0); 1206 upheap (heap, i + HEAP0);
956} 1207}
957 1208
958/*****************************************************************************/ 1209/*****************************************************************************/
959 1210
1211/* associate signal watchers to a signal signal */
960typedef struct 1212typedef struct
961{ 1213{
1214 EV_ATOMIC_T pending;
1215#if EV_MULTIPLICITY
1216 EV_P;
1217#endif
962 WL head; 1218 WL head;
963 EV_ATOMIC_T gotsig;
964} ANSIG; 1219} ANSIG;
965 1220
966static ANSIG *signals; 1221static ANSIG signals [EV_NSIG - 1];
967static int signalmax;
968
969static EV_ATOMIC_T gotsig;
970
971void inline_size
972signals_init (ANSIG *base, int count)
973{
974 while (count--)
975 {
976 base->head = 0;
977 base->gotsig = 0;
978
979 ++base;
980 }
981}
982 1222
983/*****************************************************************************/ 1223/*****************************************************************************/
984 1224
985void inline_speed 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
986fd_intern (int fd)
987{
988#ifdef _WIN32
989 unsigned long arg = 1;
990 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
991#else
992 fcntl (fd, F_SETFD, FD_CLOEXEC);
993 fcntl (fd, F_SETFL, O_NONBLOCK);
994#endif
995}
996 1226
997static void noinline 1227static void noinline
998evpipe_init (EV_P) 1228evpipe_init (EV_P)
999{ 1229{
1000 if (!ev_is_active (&pipeev)) 1230 if (!ev_is_active (&pipe_w))
1001 { 1231 {
1002#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1234 if (evfd < 0 && errno == EINVAL)
1003 if ((evfd = eventfd (0, 0)) >= 0) 1235 evfd = eventfd (0, 0);
1236
1237 if (evfd >= 0)
1004 { 1238 {
1005 evpipe [0] = -1; 1239 evpipe [0] = -1;
1006 fd_intern (evfd); 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1007 ev_io_set (&pipeev, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1008 } 1242 }
1009 else 1243 else
1010#endif 1244# endif
1011 { 1245 {
1012 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1013 syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1014 1248
1015 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
1016 fd_intern (evpipe [1]); 1250 fd_intern (evpipe [1]);
1017 ev_io_set (&pipeev, evpipe [0], EV_READ); 1251 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1018 } 1252 }
1019 1253
1020 ev_io_start (EV_A_ &pipeev); 1254 ev_io_start (EV_A_ &pipe_w);
1021 ev_unref (EV_A); /* watcher should not keep loop alive */ 1255 ev_unref (EV_A); /* watcher should not keep loop alive */
1022 } 1256 }
1023} 1257}
1024 1258
1025void inline_size 1259inline_size void
1026evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1027{ 1261{
1028 if (!*flag) 1262 if (!*flag)
1029 { 1263 {
1030 int old_errno = errno; /* save errno because write might clobber it */ 1264 int old_errno = errno; /* save errno because write might clobber it */
1265 char dummy;
1031 1266
1032 *flag = 1; 1267 *flag = 1;
1033 1268
1034#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1035 if (evfd >= 0) 1270 if (evfd >= 0)
… …
1037 uint64_t counter = 1; 1272 uint64_t counter = 1;
1038 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1039 } 1274 }
1040 else 1275 else
1041#endif 1276#endif
1042 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1043 1278
1044 errno = old_errno; 1279 errno = old_errno;
1045 } 1280 }
1046} 1281}
1047 1282
1283/* called whenever the libev signal pipe */
1284/* got some events (signal, async) */
1048static void 1285static void
1049pipecb (EV_P_ ev_io *iow, int revents) 1286pipecb (EV_P_ ev_io *iow, int revents)
1050{ 1287{
1288 int i;
1289
1051#if EV_USE_EVENTFD 1290#if EV_USE_EVENTFD
1052 if (evfd >= 0) 1291 if (evfd >= 0)
1053 { 1292 {
1054 uint64_t counter; 1293 uint64_t counter;
1055 read (evfd, &counter, sizeof (uint64_t)); 1294 read (evfd, &counter, sizeof (uint64_t));
… …
1059 { 1298 {
1060 char dummy; 1299 char dummy;
1061 read (evpipe [0], &dummy, 1); 1300 read (evpipe [0], &dummy, 1);
1062 } 1301 }
1063 1302
1064 if (gotsig && ev_is_default_loop (EV_A)) 1303 if (sig_pending)
1065 { 1304 {
1066 int signum; 1305 sig_pending = 0;
1067 gotsig = 0;
1068 1306
1069 for (signum = signalmax; signum--; ) 1307 for (i = EV_NSIG - 1; i--; )
1070 if (signals [signum].gotsig) 1308 if (expect_false (signals [i].pending))
1071 ev_feed_signal_event (EV_A_ signum + 1); 1309 ev_feed_signal_event (EV_A_ i + 1);
1072 } 1310 }
1073 1311
1074#if EV_ASYNC_ENABLE 1312#if EV_ASYNC_ENABLE
1075 if (gotasync) 1313 if (async_pending)
1076 { 1314 {
1077 int i; 1315 async_pending = 0;
1078 gotasync = 0;
1079 1316
1080 for (i = asynccnt; i--; ) 1317 for (i = asynccnt; i--; )
1081 if (asyncs [i]->sent) 1318 if (asyncs [i]->sent)
1082 { 1319 {
1083 asyncs [i]->sent = 0; 1320 asyncs [i]->sent = 0;
… …
1091 1328
1092static void 1329static void
1093ev_sighandler (int signum) 1330ev_sighandler (int signum)
1094{ 1331{
1095#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1096 struct ev_loop *loop = &default_loop_struct; 1333 EV_P = signals [signum - 1].loop;
1097#endif 1334#endif
1098 1335
1099#if _WIN32 1336#ifdef _WIN32
1100 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1101#endif 1338#endif
1102 1339
1103 signals [signum - 1].gotsig = 1; 1340 signals [signum - 1].pending = 1;
1104 evpipe_write (EV_A_ &gotsig); 1341 evpipe_write (EV_A_ &sig_pending);
1105} 1342}
1106 1343
1107void noinline 1344void noinline
1108ev_feed_signal_event (EV_P_ int signum) 1345ev_feed_signal_event (EV_P_ int signum)
1109{ 1346{
1110 WL w; 1347 WL w;
1111 1348
1349 if (expect_false (signum <= 0 || signum > EV_NSIG))
1350 return;
1351
1352 --signum;
1353
1112#if EV_MULTIPLICITY 1354#if EV_MULTIPLICITY
1113 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1355 /* it is permissible to try to feed a signal to the wrong loop */
1114#endif 1356 /* or, likely more useful, feeding a signal nobody is waiting for */
1115 1357
1116 --signum; 1358 if (expect_false (signals [signum].loop != EV_A))
1117
1118 if (signum < 0 || signum >= signalmax)
1119 return; 1359 return;
1360#endif
1120 1361
1121 signals [signum].gotsig = 0; 1362 signals [signum].pending = 0;
1122 1363
1123 for (w = signals [signum].head; w; w = w->next) 1364 for (w = signals [signum].head; w; w = w->next)
1124 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1365 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1125} 1366}
1126 1367
1368#if EV_USE_SIGNALFD
1369static void
1370sigfdcb (EV_P_ ev_io *iow, int revents)
1371{
1372 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1373
1374 for (;;)
1375 {
1376 ssize_t res = read (sigfd, si, sizeof (si));
1377
1378 /* not ISO-C, as res might be -1, but works with SuS */
1379 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1380 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1381
1382 if (res < (ssize_t)sizeof (si))
1383 break;
1384 }
1385}
1386#endif
1387
1388#endif
1389
1127/*****************************************************************************/ 1390/*****************************************************************************/
1128 1391
1392#if EV_CHILD_ENABLE
1129static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1130
1131#ifndef _WIN32
1132 1394
1133static ev_signal childev; 1395static ev_signal childev;
1134 1396
1135#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1136# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
1137#endif 1399#endif
1138 1400
1139void inline_speed 1401/* handle a single child status event */
1402inline_speed void
1140child_reap (EV_P_ int chain, int pid, int status) 1403child_reap (EV_P_ int chain, int pid, int status)
1141{ 1404{
1142 ev_child *w; 1405 ev_child *w;
1143 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1406 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1144 1407
… …
1157 1420
1158#ifndef WCONTINUED 1421#ifndef WCONTINUED
1159# define WCONTINUED 0 1422# define WCONTINUED 0
1160#endif 1423#endif
1161 1424
1425/* called on sigchld etc., calls waitpid */
1162static void 1426static void
1163childcb (EV_P_ ev_signal *sw, int revents) 1427childcb (EV_P_ ev_signal *sw, int revents)
1164{ 1428{
1165 int pid, status; 1429 int pid, status;
1166 1430
… …
1247 /* kqueue is borked on everything but netbsd apparently */ 1511 /* kqueue is borked on everything but netbsd apparently */
1248 /* it usually doesn't work correctly on anything but sockets and pipes */ 1512 /* it usually doesn't work correctly on anything but sockets and pipes */
1249 flags &= ~EVBACKEND_KQUEUE; 1513 flags &= ~EVBACKEND_KQUEUE;
1250#endif 1514#endif
1251#ifdef __APPLE__ 1515#ifdef __APPLE__
1252 // flags &= ~EVBACKEND_KQUEUE; for documentation 1516 /* only select works correctly on that "unix-certified" platform */
1253 flags &= ~EVBACKEND_POLL; 1517 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1518 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1254#endif 1519#endif
1255 1520
1256 return flags; 1521 return flags;
1257} 1522}
1258 1523
… …
1272ev_backend (EV_P) 1537ev_backend (EV_P)
1273{ 1538{
1274 return backend; 1539 return backend;
1275} 1540}
1276 1541
1542#if EV_MINIMAL < 2
1277unsigned int 1543unsigned int
1278ev_loop_count (EV_P) 1544ev_loop_count (EV_P)
1279{ 1545{
1280 return loop_count; 1546 return loop_count;
1281} 1547}
1282 1548
1549unsigned int
1550ev_loop_depth (EV_P)
1551{
1552 return loop_depth;
1553}
1554
1283void 1555void
1284ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1556ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1557{
1286 io_blocktime = interval; 1558 io_blocktime = interval;
1287} 1559}
… …
1290ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1562ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1291{ 1563{
1292 timeout_blocktime = interval; 1564 timeout_blocktime = interval;
1293} 1565}
1294 1566
1567void
1568ev_set_userdata (EV_P_ void *data)
1569{
1570 userdata = data;
1571}
1572
1573void *
1574ev_userdata (EV_P)
1575{
1576 return userdata;
1577}
1578
1579void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1580{
1581 invoke_cb = invoke_pending_cb;
1582}
1583
1584void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1585{
1586 release_cb = release;
1587 acquire_cb = acquire;
1588}
1589#endif
1590
1591/* initialise a loop structure, must be zero-initialised */
1295static void noinline 1592static void noinline
1296loop_init (EV_P_ unsigned int flags) 1593loop_init (EV_P_ unsigned int flags)
1297{ 1594{
1298 if (!backend) 1595 if (!backend)
1299 { 1596 {
1597#if EV_USE_REALTIME
1598 if (!have_realtime)
1599 {
1600 struct timespec ts;
1601
1602 if (!clock_gettime (CLOCK_REALTIME, &ts))
1603 have_realtime = 1;
1604 }
1605#endif
1606
1300#if EV_USE_MONOTONIC 1607#if EV_USE_MONOTONIC
1608 if (!have_monotonic)
1301 { 1609 {
1302 struct timespec ts; 1610 struct timespec ts;
1611
1303 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1612 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1304 have_monotonic = 1; 1613 have_monotonic = 1;
1305 } 1614 }
1306#endif 1615#endif
1616
1617 /* pid check not overridable via env */
1618#ifndef _WIN32
1619 if (flags & EVFLAG_FORKCHECK)
1620 curpid = getpid ();
1621#endif
1622
1623 if (!(flags & EVFLAG_NOENV)
1624 && !enable_secure ()
1625 && getenv ("LIBEV_FLAGS"))
1626 flags = atoi (getenv ("LIBEV_FLAGS"));
1307 1627
1308 ev_rt_now = ev_time (); 1628 ev_rt_now = ev_time ();
1309 mn_now = get_clock (); 1629 mn_now = get_clock ();
1310 now_floor = mn_now; 1630 now_floor = mn_now;
1311 rtmn_diff = ev_rt_now - mn_now; 1631 rtmn_diff = ev_rt_now - mn_now;
1632#if EV_MINIMAL < 2
1633 invoke_cb = ev_invoke_pending;
1634#endif
1312 1635
1313 io_blocktime = 0.; 1636 io_blocktime = 0.;
1314 timeout_blocktime = 0.; 1637 timeout_blocktime = 0.;
1315 backend = 0; 1638 backend = 0;
1316 backend_fd = -1; 1639 backend_fd = -1;
1317 gotasync = 0; 1640 sig_pending = 0;
1641#if EV_ASYNC_ENABLE
1642 async_pending = 0;
1643#endif
1318#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1319 fs_fd = -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1320#endif 1646#endif
1321 1647#if EV_USE_SIGNALFD
1322 /* pid check not overridable via env */ 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1323#ifndef _WIN32
1324 if (flags & EVFLAG_FORKCHECK)
1325 curpid = getpid ();
1326#endif 1649#endif
1327
1328 if (!(flags & EVFLAG_NOENV)
1329 && !enable_secure ()
1330 && getenv ("LIBEV_FLAGS"))
1331 flags = atoi (getenv ("LIBEV_FLAGS"));
1332 1650
1333 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1334 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1335 1653
1336#if EV_USE_PORT 1654#if EV_USE_PORT
… …
1347#endif 1665#endif
1348#if EV_USE_SELECT 1666#if EV_USE_SELECT
1349 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1350#endif 1668#endif
1351 1669
1670 ev_prepare_init (&pending_w, pendingcb);
1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1352 ev_init (&pipeev, pipecb); 1673 ev_init (&pipe_w, pipecb);
1353 ev_set_priority (&pipeev, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1354 } 1676 }
1355} 1677}
1356 1678
1679/* free up a loop structure */
1357static void noinline 1680static void noinline
1358loop_destroy (EV_P) 1681loop_destroy (EV_P)
1359{ 1682{
1360 int i; 1683 int i;
1361 1684
1362 if (ev_is_active (&pipeev)) 1685 if (ev_is_active (&pipe_w))
1363 { 1686 {
1364 ev_ref (EV_A); /* signal watcher */ 1687 /*ev_ref (EV_A);*/
1365 ev_io_stop (EV_A_ &pipeev); 1688 /*ev_io_stop (EV_A_ &pipe_w);*/
1366 1689
1367#if EV_USE_EVENTFD 1690#if EV_USE_EVENTFD
1368 if (evfd >= 0) 1691 if (evfd >= 0)
1369 close (evfd); 1692 close (evfd);
1370#endif 1693#endif
1371 1694
1372 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1373 { 1696 {
1374 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1375 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1376 } 1699 }
1377 } 1700 }
1701
1702#if EV_USE_SIGNALFD
1703 if (ev_is_active (&sigfd_w))
1704 close (sigfd);
1705#endif
1378 1706
1379#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1380 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1381 close (fs_fd); 1709 close (fs_fd);
1382#endif 1710#endif
… …
1406#if EV_IDLE_ENABLE 1734#if EV_IDLE_ENABLE
1407 array_free (idle, [i]); 1735 array_free (idle, [i]);
1408#endif 1736#endif
1409 } 1737 }
1410 1738
1411 ev_free (anfds); anfdmax = 0; 1739 ev_free (anfds); anfds = 0; anfdmax = 0;
1412 1740
1413 /* have to use the microsoft-never-gets-it-right macro */ 1741 /* have to use the microsoft-never-gets-it-right macro */
1742 array_free (rfeed, EMPTY);
1414 array_free (fdchange, EMPTY); 1743 array_free (fdchange, EMPTY);
1415 array_free (timer, EMPTY); 1744 array_free (timer, EMPTY);
1416#if EV_PERIODIC_ENABLE 1745#if EV_PERIODIC_ENABLE
1417 array_free (periodic, EMPTY); 1746 array_free (periodic, EMPTY);
1418#endif 1747#endif
… …
1427 1756
1428 backend = 0; 1757 backend = 0;
1429} 1758}
1430 1759
1431#if EV_USE_INOTIFY 1760#if EV_USE_INOTIFY
1432void inline_size infy_fork (EV_P); 1761inline_size void infy_fork (EV_P);
1433#endif 1762#endif
1434 1763
1435void inline_size 1764inline_size void
1436loop_fork (EV_P) 1765loop_fork (EV_P)
1437{ 1766{
1438#if EV_USE_PORT 1767#if EV_USE_PORT
1439 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1768 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1440#endif 1769#endif
… …
1446#endif 1775#endif
1447#if EV_USE_INOTIFY 1776#if EV_USE_INOTIFY
1448 infy_fork (EV_A); 1777 infy_fork (EV_A);
1449#endif 1778#endif
1450 1779
1451 if (ev_is_active (&pipeev)) 1780 if (ev_is_active (&pipe_w))
1452 { 1781 {
1453 /* this "locks" the handlers against writing to the pipe */ 1782 /* this "locks" the handlers against writing to the pipe */
1454 /* while we modify the fd vars */ 1783 /* while we modify the fd vars */
1455 gotsig = 1; 1784 sig_pending = 1;
1456#if EV_ASYNC_ENABLE 1785#if EV_ASYNC_ENABLE
1457 gotasync = 1; 1786 async_pending = 1;
1458#endif 1787#endif
1459 1788
1460 ev_ref (EV_A); 1789 ev_ref (EV_A);
1461 ev_io_stop (EV_A_ &pipeev); 1790 ev_io_stop (EV_A_ &pipe_w);
1462 1791
1463#if EV_USE_EVENTFD 1792#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1793 if (evfd >= 0)
1465 close (evfd); 1794 close (evfd);
1466#endif 1795#endif
1467 1796
1468 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1469 { 1798 {
1470 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1471 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1472 } 1801 }
1473 1802
1803#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1474 evpipe_init (EV_A); 1804 evpipe_init (EV_A);
1475 /* now iterate over everything, in case we missed something */ 1805 /* now iterate over everything, in case we missed something */
1476 pipecb (EV_A_ &pipeev, EV_READ); 1806 pipecb (EV_A_ &pipe_w, EV_READ);
1807#endif
1477 } 1808 }
1478 1809
1479 postfork = 0; 1810 postfork = 0;
1480} 1811}
1481 1812
1482#if EV_MULTIPLICITY 1813#if EV_MULTIPLICITY
1483 1814
1484struct ev_loop * 1815struct ev_loop *
1485ev_loop_new (unsigned int flags) 1816ev_loop_new (unsigned int flags)
1486{ 1817{
1487 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1818 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1488 1819
1489 memset (loop, 0, sizeof (struct ev_loop)); 1820 memset (EV_A, 0, sizeof (struct ev_loop));
1490
1491 loop_init (EV_A_ flags); 1821 loop_init (EV_A_ flags);
1492 1822
1493 if (ev_backend (EV_A)) 1823 if (ev_backend (EV_A))
1494 return loop; 1824 return EV_A;
1495 1825
1496 return 0; 1826 return 0;
1497} 1827}
1498 1828
1499void 1829void
… …
1506void 1836void
1507ev_loop_fork (EV_P) 1837ev_loop_fork (EV_P)
1508{ 1838{
1509 postfork = 1; /* must be in line with ev_default_fork */ 1839 postfork = 1; /* must be in line with ev_default_fork */
1510} 1840}
1841#endif /* multiplicity */
1511 1842
1512#if EV_VERIFY 1843#if EV_VERIFY
1513void noinline 1844static void noinline
1514verify_watcher (EV_P_ W w) 1845verify_watcher (EV_P_ W w)
1515{ 1846{
1516 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1847 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1517 1848
1518 if (w->pending) 1849 if (w->pending)
1519 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1850 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1520} 1851}
1521 1852
1522static void noinline 1853static void noinline
1523verify_heap (EV_P_ ANHE *heap, int N) 1854verify_heap (EV_P_ ANHE *heap, int N)
1524{ 1855{
1525 int i; 1856 int i;
1526 1857
1527 for (i = HEAP0; i < N + HEAP0; ++i) 1858 for (i = HEAP0; i < N + HEAP0; ++i)
1528 { 1859 {
1529 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1860 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1530 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1861 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1531 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1862 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1532 1863
1533 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1864 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1534 } 1865 }
1535} 1866}
1536 1867
1537static void noinline 1868static void noinline
1538array_verify (EV_P_ W *ws, int cnt) 1869array_verify (EV_P_ W *ws, int cnt)
1539{ 1870{
1540 while (cnt--) 1871 while (cnt--)
1541 { 1872 {
1542 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1873 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1543 verify_watcher (EV_A_ ws [cnt]); 1874 verify_watcher (EV_A_ ws [cnt]);
1544 } 1875 }
1545} 1876}
1546#endif 1877#endif
1547 1878
1879#if EV_MINIMAL < 2
1548void 1880void
1549ev_loop_verify (EV_P) 1881ev_loop_verify (EV_P)
1550{ 1882{
1551#if EV_VERIFY 1883#if EV_VERIFY
1552 int i; 1884 int i;
… …
1554 1886
1555 assert (activecnt >= -1); 1887 assert (activecnt >= -1);
1556 1888
1557 assert (fdchangemax >= fdchangecnt); 1889 assert (fdchangemax >= fdchangecnt);
1558 for (i = 0; i < fdchangecnt; ++i) 1890 for (i = 0; i < fdchangecnt; ++i)
1559 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1891 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1560 1892
1561 assert (anfdmax >= 0); 1893 assert (anfdmax >= 0);
1562 for (i = 0; i < anfdmax; ++i) 1894 for (i = 0; i < anfdmax; ++i)
1563 for (w = anfds [i].head; w; w = w->next) 1895 for (w = anfds [i].head; w; w = w->next)
1564 { 1896 {
1565 verify_watcher (EV_A_ (W)w); 1897 verify_watcher (EV_A_ (W)w);
1566 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1898 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1567 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1899 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1568 } 1900 }
1569 1901
1570 assert (timermax >= timercnt); 1902 assert (timermax >= timercnt);
1571 verify_heap (EV_A_ timers, timercnt); 1903 verify_heap (EV_A_ timers, timercnt);
1572 1904
… …
1593#if EV_ASYNC_ENABLE 1925#if EV_ASYNC_ENABLE
1594 assert (asyncmax >= asynccnt); 1926 assert (asyncmax >= asynccnt);
1595 array_verify (EV_A_ (W *)asyncs, asynccnt); 1927 array_verify (EV_A_ (W *)asyncs, asynccnt);
1596#endif 1928#endif
1597 1929
1930#if EV_PREPARE_ENABLE
1598 assert (preparemax >= preparecnt); 1931 assert (preparemax >= preparecnt);
1599 array_verify (EV_A_ (W *)prepares, preparecnt); 1932 array_verify (EV_A_ (W *)prepares, preparecnt);
1933#endif
1600 1934
1935#if EV_CHECK_ENABLE
1601 assert (checkmax >= checkcnt); 1936 assert (checkmax >= checkcnt);
1602 array_verify (EV_A_ (W *)checks, checkcnt); 1937 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif
1603 1939
1604# if 0 1940# if 0
1941#if EV_CHILD_ENABLE
1605 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1942 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1606 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1607# endif 1944#endif
1608#endif 1945# endif
1946#endif
1609} 1947}
1610 1948#endif
1611#endif /* multiplicity */
1612 1949
1613#if EV_MULTIPLICITY 1950#if EV_MULTIPLICITY
1614struct ev_loop * 1951struct ev_loop *
1615ev_default_loop_init (unsigned int flags) 1952ev_default_loop_init (unsigned int flags)
1616#else 1953#else
… …
1619#endif 1956#endif
1620{ 1957{
1621 if (!ev_default_loop_ptr) 1958 if (!ev_default_loop_ptr)
1622 { 1959 {
1623#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1624 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1961 EV_P = ev_default_loop_ptr = &default_loop_struct;
1625#else 1962#else
1626 ev_default_loop_ptr = 1; 1963 ev_default_loop_ptr = 1;
1627#endif 1964#endif
1628 1965
1629 loop_init (EV_A_ flags); 1966 loop_init (EV_A_ flags);
1630 1967
1631 if (ev_backend (EV_A)) 1968 if (ev_backend (EV_A))
1632 { 1969 {
1633#ifndef _WIN32 1970#if EV_CHILD_ENABLE
1634 ev_signal_init (&childev, childcb, SIGCHLD); 1971 ev_signal_init (&childev, childcb, SIGCHLD);
1635 ev_set_priority (&childev, EV_MAXPRI); 1972 ev_set_priority (&childev, EV_MAXPRI);
1636 ev_signal_start (EV_A_ &childev); 1973 ev_signal_start (EV_A_ &childev);
1637 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1974 ev_unref (EV_A); /* child watcher should not keep loop alive */
1638#endif 1975#endif
… …
1646 1983
1647void 1984void
1648ev_default_destroy (void) 1985ev_default_destroy (void)
1649{ 1986{
1650#if EV_MULTIPLICITY 1987#if EV_MULTIPLICITY
1651 struct ev_loop *loop = ev_default_loop_ptr; 1988 EV_P = ev_default_loop_ptr;
1652#endif 1989#endif
1653 1990
1654#ifndef _WIN32 1991 ev_default_loop_ptr = 0;
1992
1993#if EV_CHILD_ENABLE
1655 ev_ref (EV_A); /* child watcher */ 1994 ev_ref (EV_A); /* child watcher */
1656 ev_signal_stop (EV_A_ &childev); 1995 ev_signal_stop (EV_A_ &childev);
1657#endif 1996#endif
1658 1997
1659 loop_destroy (EV_A); 1998 loop_destroy (EV_A);
… …
1661 2000
1662void 2001void
1663ev_default_fork (void) 2002ev_default_fork (void)
1664{ 2003{
1665#if EV_MULTIPLICITY 2004#if EV_MULTIPLICITY
1666 struct ev_loop *loop = ev_default_loop_ptr; 2005 EV_P = ev_default_loop_ptr;
1667#endif 2006#endif
1668 2007
1669 if (backend)
1670 postfork = 1; /* must be in line with ev_loop_fork */ 2008 postfork = 1; /* must be in line with ev_loop_fork */
1671} 2009}
1672 2010
1673/*****************************************************************************/ 2011/*****************************************************************************/
1674 2012
1675void 2013void
1676ev_invoke (EV_P_ void *w, int revents) 2014ev_invoke (EV_P_ void *w, int revents)
1677{ 2015{
1678 EV_CB_INVOKE ((W)w, revents); 2016 EV_CB_INVOKE ((W)w, revents);
1679} 2017}
1680 2018
1681void inline_speed 2019unsigned int
1682call_pending (EV_P) 2020ev_pending_count (EV_P)
2021{
2022 int pri;
2023 unsigned int count = 0;
2024
2025 for (pri = NUMPRI; pri--; )
2026 count += pendingcnt [pri];
2027
2028 return count;
2029}
2030
2031void noinline
2032ev_invoke_pending (EV_P)
1683{ 2033{
1684 int pri; 2034 int pri;
1685 2035
1686 for (pri = NUMPRI; pri--; ) 2036 for (pri = NUMPRI; pri--; )
1687 while (pendingcnt [pri]) 2037 while (pendingcnt [pri])
1688 { 2038 {
1689 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2039 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1690 2040
1691 if (expect_true (p->w))
1692 {
1693 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 2041 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2042 /* ^ this is no longer true, as pending_w could be here */
1694 2043
1695 p->w->pending = 0; 2044 p->w->pending = 0;
1696 EV_CB_INVOKE (p->w, p->events); 2045 EV_CB_INVOKE (p->w, p->events);
1697 EV_FREQUENT_CHECK; 2046 EV_FREQUENT_CHECK;
1698 }
1699 } 2047 }
1700} 2048}
1701 2049
1702#if EV_IDLE_ENABLE 2050#if EV_IDLE_ENABLE
1703void inline_size 2051/* make idle watchers pending. this handles the "call-idle */
2052/* only when higher priorities are idle" logic */
2053inline_size void
1704idle_reify (EV_P) 2054idle_reify (EV_P)
1705{ 2055{
1706 if (expect_false (idleall)) 2056 if (expect_false (idleall))
1707 { 2057 {
1708 int pri; 2058 int pri;
… …
1720 } 2070 }
1721 } 2071 }
1722} 2072}
1723#endif 2073#endif
1724 2074
1725void inline_size 2075/* make timers pending */
2076inline_size void
1726timers_reify (EV_P) 2077timers_reify (EV_P)
1727{ 2078{
1728 EV_FREQUENT_CHECK; 2079 EV_FREQUENT_CHECK;
1729 2080
1730 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2081 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1731 { 2082 {
1732 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2083 do
1733
1734 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1735
1736 /* first reschedule or stop timer */
1737 if (w->repeat)
1738 { 2084 {
2085 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2086
2087 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2088
2089 /* first reschedule or stop timer */
2090 if (w->repeat)
2091 {
1739 ev_at (w) += w->repeat; 2092 ev_at (w) += w->repeat;
1740 if (ev_at (w) < mn_now) 2093 if (ev_at (w) < mn_now)
1741 ev_at (w) = mn_now; 2094 ev_at (w) = mn_now;
1742 2095
1743 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2096 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1744 2097
1745 ANHE_at_cache (timers [HEAP0]); 2098 ANHE_at_cache (timers [HEAP0]);
1746 downheap (timers, timercnt, HEAP0); 2099 downheap (timers, timercnt, HEAP0);
2100 }
2101 else
2102 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2103
2104 EV_FREQUENT_CHECK;
2105 feed_reverse (EV_A_ (W)w);
1747 } 2106 }
1748 else 2107 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1749 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1750 2108
1751 EV_FREQUENT_CHECK;
1752 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2109 feed_reverse_done (EV_A_ EV_TIMEOUT);
1753 } 2110 }
1754} 2111}
1755 2112
1756#if EV_PERIODIC_ENABLE 2113#if EV_PERIODIC_ENABLE
1757void inline_size 2114/* make periodics pending */
2115inline_size void
1758periodics_reify (EV_P) 2116periodics_reify (EV_P)
1759{ 2117{
1760 EV_FREQUENT_CHECK; 2118 EV_FREQUENT_CHECK;
1761 2119
1762 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2120 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1763 { 2121 {
1764 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2122 int feed_count = 0;
1765 2123
1766 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2124 do
1767
1768 /* first reschedule or stop timer */
1769 if (w->reschedule_cb)
1770 { 2125 {
2126 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2127
2128 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2129
2130 /* first reschedule or stop timer */
2131 if (w->reschedule_cb)
2132 {
1771 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2133 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1772 2134
1773 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2135 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1774 2136
1775 ANHE_at_cache (periodics [HEAP0]); 2137 ANHE_at_cache (periodics [HEAP0]);
1776 downheap (periodics, periodiccnt, HEAP0); 2138 downheap (periodics, periodiccnt, HEAP0);
2139 }
2140 else if (w->interval)
2141 {
2142 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2143 /* if next trigger time is not sufficiently in the future, put it there */
2144 /* this might happen because of floating point inexactness */
2145 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2146 {
2147 ev_at (w) += w->interval;
2148
2149 /* if interval is unreasonably low we might still have a time in the past */
2150 /* so correct this. this will make the periodic very inexact, but the user */
2151 /* has effectively asked to get triggered more often than possible */
2152 if (ev_at (w) < ev_rt_now)
2153 ev_at (w) = ev_rt_now;
2154 }
2155
2156 ANHE_at_cache (periodics [HEAP0]);
2157 downheap (periodics, periodiccnt, HEAP0);
2158 }
2159 else
2160 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2161
2162 EV_FREQUENT_CHECK;
2163 feed_reverse (EV_A_ (W)w);
1777 } 2164 }
1778 else if (w->interval) 2165 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1779 {
1780 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1781 /* if next trigger time is not sufficiently in the future, put it there */
1782 /* this might happen because of floating point inexactness */
1783 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1784 {
1785 ev_at (w) += w->interval;
1786 2166
1787 /* if interval is unreasonably low we might still have a time in the past */
1788 /* so correct this. this will make the periodic very inexact, but the user */
1789 /* has effectively asked to get triggered more often than possible */
1790 if (ev_at (w) < ev_rt_now)
1791 ev_at (w) = ev_rt_now;
1792 }
1793
1794 ANHE_at_cache (periodics [HEAP0]);
1795 downheap (periodics, periodiccnt, HEAP0);
1796 }
1797 else
1798 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1799
1800 EV_FREQUENT_CHECK;
1801 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2167 feed_reverse_done (EV_A_ EV_PERIODIC);
1802 } 2168 }
1803} 2169}
1804 2170
2171/* simply recalculate all periodics */
2172/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1805static void noinline 2173static void noinline
1806periodics_reschedule (EV_P) 2174periodics_reschedule (EV_P)
1807{ 2175{
1808 int i; 2176 int i;
1809 2177
… …
1822 2190
1823 reheap (periodics, periodiccnt); 2191 reheap (periodics, periodiccnt);
1824} 2192}
1825#endif 2193#endif
1826 2194
1827void inline_speed 2195/* adjust all timers by a given offset */
2196static void noinline
2197timers_reschedule (EV_P_ ev_tstamp adjust)
2198{
2199 int i;
2200
2201 for (i = 0; i < timercnt; ++i)
2202 {
2203 ANHE *he = timers + i + HEAP0;
2204 ANHE_w (*he)->at += adjust;
2205 ANHE_at_cache (*he);
2206 }
2207}
2208
2209/* fetch new monotonic and realtime times from the kernel */
2210/* also detect if there was a timejump, and act accordingly */
2211inline_speed void
1828time_update (EV_P_ ev_tstamp max_block) 2212time_update (EV_P_ ev_tstamp max_block)
1829{ 2213{
1830 int i;
1831
1832#if EV_USE_MONOTONIC 2214#if EV_USE_MONOTONIC
1833 if (expect_true (have_monotonic)) 2215 if (expect_true (have_monotonic))
1834 { 2216 {
2217 int i;
1835 ev_tstamp odiff = rtmn_diff; 2218 ev_tstamp odiff = rtmn_diff;
1836 2219
1837 mn_now = get_clock (); 2220 mn_now = get_clock ();
1838 2221
1839 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2222 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1865 ev_rt_now = ev_time (); 2248 ev_rt_now = ev_time ();
1866 mn_now = get_clock (); 2249 mn_now = get_clock ();
1867 now_floor = mn_now; 2250 now_floor = mn_now;
1868 } 2251 }
1869 2252
2253 /* no timer adjustment, as the monotonic clock doesn't jump */
2254 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870# if EV_PERIODIC_ENABLE 2255# if EV_PERIODIC_ENABLE
1871 periodics_reschedule (EV_A); 2256 periodics_reschedule (EV_A);
1872# endif 2257# endif
1873 /* no timer adjustment, as the monotonic clock doesn't jump */
1874 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1875 } 2258 }
1876 else 2259 else
1877#endif 2260#endif
1878 { 2261 {
1879 ev_rt_now = ev_time (); 2262 ev_rt_now = ev_time ();
1880 2263
1881 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2264 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1882 { 2265 {
2266 /* adjust timers. this is easy, as the offset is the same for all of them */
2267 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1883#if EV_PERIODIC_ENABLE 2268#if EV_PERIODIC_ENABLE
1884 periodics_reschedule (EV_A); 2269 periodics_reschedule (EV_A);
1885#endif 2270#endif
1886 /* adjust timers. this is easy, as the offset is the same for all of them */
1887 for (i = 0; i < timercnt; ++i)
1888 {
1889 ANHE *he = timers + i + HEAP0;
1890 ANHE_w (*he)->at += ev_rt_now - mn_now;
1891 ANHE_at_cache (*he);
1892 }
1893 } 2271 }
1894 2272
1895 mn_now = ev_rt_now; 2273 mn_now = ev_rt_now;
1896 } 2274 }
1897} 2275}
1898 2276
1899void 2277void
1900ev_ref (EV_P)
1901{
1902 ++activecnt;
1903}
1904
1905void
1906ev_unref (EV_P)
1907{
1908 --activecnt;
1909}
1910
1911static int loop_done;
1912
1913void
1914ev_loop (EV_P_ int flags) 2278ev_loop (EV_P_ int flags)
1915{ 2279{
2280#if EV_MINIMAL < 2
2281 ++loop_depth;
2282#endif
2283
2284 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2285
1916 loop_done = EVUNLOOP_CANCEL; 2286 loop_done = EVUNLOOP_CANCEL;
1917 2287
1918 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2288 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1919 2289
1920 do 2290 do
1921 { 2291 {
1922#if EV_VERIFY >= 2 2292#if EV_VERIFY >= 2
1923 ev_loop_verify (EV_A); 2293 ev_loop_verify (EV_A);
… …
1936 /* we might have forked, so queue fork handlers */ 2306 /* we might have forked, so queue fork handlers */
1937 if (expect_false (postfork)) 2307 if (expect_false (postfork))
1938 if (forkcnt) 2308 if (forkcnt)
1939 { 2309 {
1940 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2310 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1941 call_pending (EV_A); 2311 EV_INVOKE_PENDING;
1942 } 2312 }
1943#endif 2313#endif
1944 2314
2315#if EV_PREPARE_ENABLE
1945 /* queue prepare watchers (and execute them) */ 2316 /* queue prepare watchers (and execute them) */
1946 if (expect_false (preparecnt)) 2317 if (expect_false (preparecnt))
1947 { 2318 {
1948 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2319 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1949 call_pending (EV_A); 2320 EV_INVOKE_PENDING;
1950 } 2321 }
2322#endif
1951 2323
1952 if (expect_false (!activecnt)) 2324 if (expect_false (loop_done))
1953 break; 2325 break;
1954 2326
1955 /* we might have forked, so reify kernel state if necessary */ 2327 /* we might have forked, so reify kernel state if necessary */
1956 if (expect_false (postfork)) 2328 if (expect_false (postfork))
1957 loop_fork (EV_A); 2329 loop_fork (EV_A);
… …
1964 ev_tstamp waittime = 0.; 2336 ev_tstamp waittime = 0.;
1965 ev_tstamp sleeptime = 0.; 2337 ev_tstamp sleeptime = 0.;
1966 2338
1967 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2339 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1968 { 2340 {
2341 /* remember old timestamp for io_blocktime calculation */
2342 ev_tstamp prev_mn_now = mn_now;
2343
1969 /* update time to cancel out callback processing overhead */ 2344 /* update time to cancel out callback processing overhead */
1970 time_update (EV_A_ 1e100); 2345 time_update (EV_A_ 1e100);
1971 2346
1972 waittime = MAX_BLOCKTIME; 2347 waittime = MAX_BLOCKTIME;
1973 2348
… …
1983 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2358 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1984 if (waittime > to) waittime = to; 2359 if (waittime > to) waittime = to;
1985 } 2360 }
1986#endif 2361#endif
1987 2362
2363 /* don't let timeouts decrease the waittime below timeout_blocktime */
1988 if (expect_false (waittime < timeout_blocktime)) 2364 if (expect_false (waittime < timeout_blocktime))
1989 waittime = timeout_blocktime; 2365 waittime = timeout_blocktime;
1990 2366
1991 sleeptime = waittime - backend_fudge; 2367 /* extra check because io_blocktime is commonly 0 */
1992
1993 if (expect_true (sleeptime > io_blocktime)) 2368 if (expect_false (io_blocktime))
1994 sleeptime = io_blocktime;
1995
1996 if (sleeptime)
1997 { 2369 {
2370 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2371
2372 if (sleeptime > waittime - backend_fudge)
2373 sleeptime = waittime - backend_fudge;
2374
2375 if (expect_true (sleeptime > 0.))
2376 {
1998 ev_sleep (sleeptime); 2377 ev_sleep (sleeptime);
1999 waittime -= sleeptime; 2378 waittime -= sleeptime;
2379 }
2000 } 2380 }
2001 } 2381 }
2002 2382
2383#if EV_MINIMAL < 2
2003 ++loop_count; 2384 ++loop_count;
2385#endif
2386 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2004 backend_poll (EV_A_ waittime); 2387 backend_poll (EV_A_ waittime);
2388 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2005 2389
2006 /* update ev_rt_now, do magic */ 2390 /* update ev_rt_now, do magic */
2007 time_update (EV_A_ waittime + sleeptime); 2391 time_update (EV_A_ waittime + sleeptime);
2008 } 2392 }
2009 2393
… …
2016#if EV_IDLE_ENABLE 2400#if EV_IDLE_ENABLE
2017 /* queue idle watchers unless other events are pending */ 2401 /* queue idle watchers unless other events are pending */
2018 idle_reify (EV_A); 2402 idle_reify (EV_A);
2019#endif 2403#endif
2020 2404
2405#if EV_CHECK_ENABLE
2021 /* queue check watchers, to be executed first */ 2406 /* queue check watchers, to be executed first */
2022 if (expect_false (checkcnt)) 2407 if (expect_false (checkcnt))
2023 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2408 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2409#endif
2024 2410
2025 call_pending (EV_A); 2411 EV_INVOKE_PENDING;
2026 } 2412 }
2027 while (expect_true ( 2413 while (expect_true (
2028 activecnt 2414 activecnt
2029 && !loop_done 2415 && !loop_done
2030 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2416 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2031 )); 2417 ));
2032 2418
2033 if (loop_done == EVUNLOOP_ONE) 2419 if (loop_done == EVUNLOOP_ONE)
2034 loop_done = EVUNLOOP_CANCEL; 2420 loop_done = EVUNLOOP_CANCEL;
2421
2422#if EV_MINIMAL < 2
2423 --loop_depth;
2424#endif
2035} 2425}
2036 2426
2037void 2427void
2038ev_unloop (EV_P_ int how) 2428ev_unloop (EV_P_ int how)
2039{ 2429{
2040 loop_done = how; 2430 loop_done = how;
2041} 2431}
2042 2432
2433void
2434ev_ref (EV_P)
2435{
2436 ++activecnt;
2437}
2438
2439void
2440ev_unref (EV_P)
2441{
2442 --activecnt;
2443}
2444
2445void
2446ev_now_update (EV_P)
2447{
2448 time_update (EV_A_ 1e100);
2449}
2450
2451void
2452ev_suspend (EV_P)
2453{
2454 ev_now_update (EV_A);
2455}
2456
2457void
2458ev_resume (EV_P)
2459{
2460 ev_tstamp mn_prev = mn_now;
2461
2462 ev_now_update (EV_A);
2463 timers_reschedule (EV_A_ mn_now - mn_prev);
2464#if EV_PERIODIC_ENABLE
2465 /* TODO: really do this? */
2466 periodics_reschedule (EV_A);
2467#endif
2468}
2469
2043/*****************************************************************************/ 2470/*****************************************************************************/
2471/* singly-linked list management, used when the expected list length is short */
2044 2472
2045void inline_size 2473inline_size void
2046wlist_add (WL *head, WL elem) 2474wlist_add (WL *head, WL elem)
2047{ 2475{
2048 elem->next = *head; 2476 elem->next = *head;
2049 *head = elem; 2477 *head = elem;
2050} 2478}
2051 2479
2052void inline_size 2480inline_size void
2053wlist_del (WL *head, WL elem) 2481wlist_del (WL *head, WL elem)
2054{ 2482{
2055 while (*head) 2483 while (*head)
2056 { 2484 {
2057 if (*head == elem) 2485 if (expect_true (*head == elem))
2058 { 2486 {
2059 *head = elem->next; 2487 *head = elem->next;
2060 return; 2488 break;
2061 } 2489 }
2062 2490
2063 head = &(*head)->next; 2491 head = &(*head)->next;
2064 } 2492 }
2065} 2493}
2066 2494
2067void inline_speed 2495/* internal, faster, version of ev_clear_pending */
2496inline_speed void
2068clear_pending (EV_P_ W w) 2497clear_pending (EV_P_ W w)
2069{ 2498{
2070 if (w->pending) 2499 if (w->pending)
2071 { 2500 {
2072 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2501 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2073 w->pending = 0; 2502 w->pending = 0;
2074 } 2503 }
2075} 2504}
2076 2505
2077int 2506int
… …
2081 int pending = w_->pending; 2510 int pending = w_->pending;
2082 2511
2083 if (expect_true (pending)) 2512 if (expect_true (pending))
2084 { 2513 {
2085 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2514 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2515 p->w = (W)&pending_w;
2086 w_->pending = 0; 2516 w_->pending = 0;
2087 p->w = 0;
2088 return p->events; 2517 return p->events;
2089 } 2518 }
2090 else 2519 else
2091 return 0; 2520 return 0;
2092} 2521}
2093 2522
2094void inline_size 2523inline_size void
2095pri_adjust (EV_P_ W w) 2524pri_adjust (EV_P_ W w)
2096{ 2525{
2097 int pri = w->priority; 2526 int pri = ev_priority (w);
2098 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2527 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2099 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2528 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2100 w->priority = pri; 2529 ev_set_priority (w, pri);
2101} 2530}
2102 2531
2103void inline_speed 2532inline_speed void
2104ev_start (EV_P_ W w, int active) 2533ev_start (EV_P_ W w, int active)
2105{ 2534{
2106 pri_adjust (EV_A_ w); 2535 pri_adjust (EV_A_ w);
2107 w->active = active; 2536 w->active = active;
2108 ev_ref (EV_A); 2537 ev_ref (EV_A);
2109} 2538}
2110 2539
2111void inline_size 2540inline_size void
2112ev_stop (EV_P_ W w) 2541ev_stop (EV_P_ W w)
2113{ 2542{
2114 ev_unref (EV_A); 2543 ev_unref (EV_A);
2115 w->active = 0; 2544 w->active = 0;
2116} 2545}
… …
2123 int fd = w->fd; 2552 int fd = w->fd;
2124 2553
2125 if (expect_false (ev_is_active (w))) 2554 if (expect_false (ev_is_active (w)))
2126 return; 2555 return;
2127 2556
2128 assert (("ev_io_start called with negative fd", fd >= 0)); 2557 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2558 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2129 2559
2130 EV_FREQUENT_CHECK; 2560 EV_FREQUENT_CHECK;
2131 2561
2132 ev_start (EV_A_ (W)w, 1); 2562 ev_start (EV_A_ (W)w, 1);
2133 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2563 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2134 wlist_add (&anfds[fd].head, (WL)w); 2564 wlist_add (&anfds[fd].head, (WL)w);
2135 2565
2136 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2566 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2137 w->events &= ~EV_IOFDSET; 2567 w->events &= ~EV__IOFDSET;
2138 2568
2139 EV_FREQUENT_CHECK; 2569 EV_FREQUENT_CHECK;
2140} 2570}
2141 2571
2142void noinline 2572void noinline
… …
2144{ 2574{
2145 clear_pending (EV_A_ (W)w); 2575 clear_pending (EV_A_ (W)w);
2146 if (expect_false (!ev_is_active (w))) 2576 if (expect_false (!ev_is_active (w)))
2147 return; 2577 return;
2148 2578
2149 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2579 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2150 2580
2151 EV_FREQUENT_CHECK; 2581 EV_FREQUENT_CHECK;
2152 2582
2153 wlist_del (&anfds[w->fd].head, (WL)w); 2583 wlist_del (&anfds[w->fd].head, (WL)w);
2154 ev_stop (EV_A_ (W)w); 2584 ev_stop (EV_A_ (W)w);
… …
2164 if (expect_false (ev_is_active (w))) 2594 if (expect_false (ev_is_active (w)))
2165 return; 2595 return;
2166 2596
2167 ev_at (w) += mn_now; 2597 ev_at (w) += mn_now;
2168 2598
2169 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2599 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2170 2600
2171 EV_FREQUENT_CHECK; 2601 EV_FREQUENT_CHECK;
2172 2602
2173 ++timercnt; 2603 ++timercnt;
2174 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2604 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2177 ANHE_at_cache (timers [ev_active (w)]); 2607 ANHE_at_cache (timers [ev_active (w)]);
2178 upheap (timers, ev_active (w)); 2608 upheap (timers, ev_active (w));
2179 2609
2180 EV_FREQUENT_CHECK; 2610 EV_FREQUENT_CHECK;
2181 2611
2182 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2612 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2183} 2613}
2184 2614
2185void noinline 2615void noinline
2186ev_timer_stop (EV_P_ ev_timer *w) 2616ev_timer_stop (EV_P_ ev_timer *w)
2187{ 2617{
… …
2192 EV_FREQUENT_CHECK; 2622 EV_FREQUENT_CHECK;
2193 2623
2194 { 2624 {
2195 int active = ev_active (w); 2625 int active = ev_active (w);
2196 2626
2197 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2627 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2198 2628
2199 --timercnt; 2629 --timercnt;
2200 2630
2201 if (expect_true (active < timercnt + HEAP0)) 2631 if (expect_true (active < timercnt + HEAP0))
2202 { 2632 {
2203 timers [active] = timers [timercnt + HEAP0]; 2633 timers [active] = timers [timercnt + HEAP0];
2204 adjustheap (timers, timercnt, active); 2634 adjustheap (timers, timercnt, active);
2205 } 2635 }
2206 } 2636 }
2207 2637
2208 EV_FREQUENT_CHECK;
2209
2210 ev_at (w) -= mn_now; 2638 ev_at (w) -= mn_now;
2211 2639
2212 ev_stop (EV_A_ (W)w); 2640 ev_stop (EV_A_ (W)w);
2641
2642 EV_FREQUENT_CHECK;
2213} 2643}
2214 2644
2215void noinline 2645void noinline
2216ev_timer_again (EV_P_ ev_timer *w) 2646ev_timer_again (EV_P_ ev_timer *w)
2217{ 2647{
… …
2235 } 2665 }
2236 2666
2237 EV_FREQUENT_CHECK; 2667 EV_FREQUENT_CHECK;
2238} 2668}
2239 2669
2670ev_tstamp
2671ev_timer_remaining (EV_P_ ev_timer *w)
2672{
2673 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2674}
2675
2240#if EV_PERIODIC_ENABLE 2676#if EV_PERIODIC_ENABLE
2241void noinline 2677void noinline
2242ev_periodic_start (EV_P_ ev_periodic *w) 2678ev_periodic_start (EV_P_ ev_periodic *w)
2243{ 2679{
2244 if (expect_false (ev_is_active (w))) 2680 if (expect_false (ev_is_active (w)))
… …
2246 2682
2247 if (w->reschedule_cb) 2683 if (w->reschedule_cb)
2248 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2684 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2249 else if (w->interval) 2685 else if (w->interval)
2250 { 2686 {
2251 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2687 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2252 /* this formula differs from the one in periodic_reify because we do not always round up */ 2688 /* this formula differs from the one in periodic_reify because we do not always round up */
2253 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2689 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2254 } 2690 }
2255 else 2691 else
2256 ev_at (w) = w->offset; 2692 ev_at (w) = w->offset;
… …
2264 ANHE_at_cache (periodics [ev_active (w)]); 2700 ANHE_at_cache (periodics [ev_active (w)]);
2265 upheap (periodics, ev_active (w)); 2701 upheap (periodics, ev_active (w));
2266 2702
2267 EV_FREQUENT_CHECK; 2703 EV_FREQUENT_CHECK;
2268 2704
2269 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2705 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2270} 2706}
2271 2707
2272void noinline 2708void noinline
2273ev_periodic_stop (EV_P_ ev_periodic *w) 2709ev_periodic_stop (EV_P_ ev_periodic *w)
2274{ 2710{
… …
2279 EV_FREQUENT_CHECK; 2715 EV_FREQUENT_CHECK;
2280 2716
2281 { 2717 {
2282 int active = ev_active (w); 2718 int active = ev_active (w);
2283 2719
2284 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2720 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2285 2721
2286 --periodiccnt; 2722 --periodiccnt;
2287 2723
2288 if (expect_true (active < periodiccnt + HEAP0)) 2724 if (expect_true (active < periodiccnt + HEAP0))
2289 { 2725 {
2290 periodics [active] = periodics [periodiccnt + HEAP0]; 2726 periodics [active] = periodics [periodiccnt + HEAP0];
2291 adjustheap (periodics, periodiccnt, active); 2727 adjustheap (periodics, periodiccnt, active);
2292 } 2728 }
2293 } 2729 }
2294 2730
2295 EV_FREQUENT_CHECK;
2296
2297 ev_stop (EV_A_ (W)w); 2731 ev_stop (EV_A_ (W)w);
2732
2733 EV_FREQUENT_CHECK;
2298} 2734}
2299 2735
2300void noinline 2736void noinline
2301ev_periodic_again (EV_P_ ev_periodic *w) 2737ev_periodic_again (EV_P_ ev_periodic *w)
2302{ 2738{
… …
2308 2744
2309#ifndef SA_RESTART 2745#ifndef SA_RESTART
2310# define SA_RESTART 0 2746# define SA_RESTART 0
2311#endif 2747#endif
2312 2748
2749#if EV_SIGNAL_ENABLE
2750
2313void noinline 2751void noinline
2314ev_signal_start (EV_P_ ev_signal *w) 2752ev_signal_start (EV_P_ ev_signal *w)
2315{ 2753{
2316#if EV_MULTIPLICITY
2317 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2318#endif
2319 if (expect_false (ev_is_active (w))) 2754 if (expect_false (ev_is_active (w)))
2320 return; 2755 return;
2321 2756
2322 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2757 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2323 2758
2324 evpipe_init (EV_A); 2759#if EV_MULTIPLICITY
2760 assert (("libev: a signal must not be attached to two different loops",
2761 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2325 2762
2326 EV_FREQUENT_CHECK; 2763 signals [w->signum - 1].loop = EV_A;
2764#endif
2327 2765
2766 EV_FREQUENT_CHECK;
2767
2768#if EV_USE_SIGNALFD
2769 if (sigfd == -2)
2328 { 2770 {
2329#ifndef _WIN32 2771 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2330 sigset_t full, prev; 2772 if (sigfd < 0 && errno == EINVAL)
2331 sigfillset (&full); 2773 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2332 sigprocmask (SIG_SETMASK, &full, &prev);
2333#endif
2334 2774
2335 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2775 if (sigfd >= 0)
2776 {
2777 fd_intern (sigfd); /* doing it twice will not hurt */
2336 2778
2337#ifndef _WIN32 2779 sigemptyset (&sigfd_set);
2338 sigprocmask (SIG_SETMASK, &prev, 0); 2780
2339#endif 2781 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2782 ev_set_priority (&sigfd_w, EV_MAXPRI);
2783 ev_io_start (EV_A_ &sigfd_w);
2784 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2785 }
2340 } 2786 }
2787
2788 if (sigfd >= 0)
2789 {
2790 /* TODO: check .head */
2791 sigaddset (&sigfd_set, w->signum);
2792 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2793
2794 signalfd (sigfd, &sigfd_set, 0);
2795 }
2796#endif
2341 2797
2342 ev_start (EV_A_ (W)w, 1); 2798 ev_start (EV_A_ (W)w, 1);
2343 wlist_add (&signals [w->signum - 1].head, (WL)w); 2799 wlist_add (&signals [w->signum - 1].head, (WL)w);
2344 2800
2345 if (!((WL)w)->next) 2801 if (!((WL)w)->next)
2802# if EV_USE_SIGNALFD
2803 if (sigfd < 0) /*TODO*/
2804# endif
2346 { 2805 {
2347#if _WIN32 2806# ifdef _WIN32
2807 evpipe_init (EV_A);
2808
2348 signal (w->signum, ev_sighandler); 2809 signal (w->signum, ev_sighandler);
2349#else 2810# else
2350 struct sigaction sa; 2811 struct sigaction sa;
2812
2813 evpipe_init (EV_A);
2814
2351 sa.sa_handler = ev_sighandler; 2815 sa.sa_handler = ev_sighandler;
2352 sigfillset (&sa.sa_mask); 2816 sigfillset (&sa.sa_mask);
2353 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2817 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2354 sigaction (w->signum, &sa, 0); 2818 sigaction (w->signum, &sa, 0);
2819
2820 sigemptyset (&sa.sa_mask);
2821 sigaddset (&sa.sa_mask, w->signum);
2822 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2355#endif 2823#endif
2356 } 2824 }
2357 2825
2358 EV_FREQUENT_CHECK; 2826 EV_FREQUENT_CHECK;
2359} 2827}
2360 2828
2361void noinline 2829void noinline
… …
2369 2837
2370 wlist_del (&signals [w->signum - 1].head, (WL)w); 2838 wlist_del (&signals [w->signum - 1].head, (WL)w);
2371 ev_stop (EV_A_ (W)w); 2839 ev_stop (EV_A_ (W)w);
2372 2840
2373 if (!signals [w->signum - 1].head) 2841 if (!signals [w->signum - 1].head)
2842 {
2843#if EV_MULTIPLICITY
2844 signals [w->signum - 1].loop = 0; /* unattach from signal */
2845#endif
2846#if EV_USE_SIGNALFD
2847 if (sigfd >= 0)
2848 {
2849 sigset_t ss;
2850
2851 sigemptyset (&ss);
2852 sigaddset (&ss, w->signum);
2853 sigdelset (&sigfd_set, w->signum);
2854
2855 signalfd (sigfd, &sigfd_set, 0);
2856 sigprocmask (SIG_UNBLOCK, &ss, 0);
2857 }
2858 else
2859#endif
2374 signal (w->signum, SIG_DFL); 2860 signal (w->signum, SIG_DFL);
2861 }
2375 2862
2376 EV_FREQUENT_CHECK; 2863 EV_FREQUENT_CHECK;
2377} 2864}
2865
2866#endif
2867
2868#if EV_CHILD_ENABLE
2378 2869
2379void 2870void
2380ev_child_start (EV_P_ ev_child *w) 2871ev_child_start (EV_P_ ev_child *w)
2381{ 2872{
2382#if EV_MULTIPLICITY 2873#if EV_MULTIPLICITY
2383 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2874 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2384#endif 2875#endif
2385 if (expect_false (ev_is_active (w))) 2876 if (expect_false (ev_is_active (w)))
2386 return; 2877 return;
2387 2878
2388 EV_FREQUENT_CHECK; 2879 EV_FREQUENT_CHECK;
… …
2406 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2407 2898
2408 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2409} 2900}
2410 2901
2902#endif
2903
2411#if EV_STAT_ENABLE 2904#if EV_STAT_ENABLE
2412 2905
2413# ifdef _WIN32 2906# ifdef _WIN32
2414# undef lstat 2907# undef lstat
2415# define lstat(a,b) _stati64 (a,b) 2908# define lstat(a,b) _stati64 (a,b)
2416# endif 2909# endif
2417 2910
2418#define DEF_STAT_INTERVAL 5.0074891 2911#define DEF_STAT_INTERVAL 5.0074891
2912#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2419#define MIN_STAT_INTERVAL 0.1074891 2913#define MIN_STAT_INTERVAL 0.1074891
2420 2914
2421static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2915static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2422 2916
2423#if EV_USE_INOTIFY 2917#if EV_USE_INOTIFY
2424# define EV_INOTIFY_BUFSIZE 8192 2918
2919/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2920# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2425 2921
2426static void noinline 2922static void noinline
2427infy_add (EV_P_ ev_stat *w) 2923infy_add (EV_P_ ev_stat *w)
2428{ 2924{
2429 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2925 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2430 2926
2431 if (w->wd < 0) 2927 if (w->wd >= 0)
2928 {
2929 struct statfs sfs;
2930
2931 /* now local changes will be tracked by inotify, but remote changes won't */
2932 /* unless the filesystem is known to be local, we therefore still poll */
2933 /* also do poll on <2.6.25, but with normal frequency */
2934
2935 if (!fs_2625)
2936 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2937 else if (!statfs (w->path, &sfs)
2938 && (sfs.f_type == 0x1373 /* devfs */
2939 || sfs.f_type == 0xEF53 /* ext2/3 */
2940 || sfs.f_type == 0x3153464a /* jfs */
2941 || sfs.f_type == 0x52654973 /* reiser3 */
2942 || sfs.f_type == 0x01021994 /* tempfs */
2943 || sfs.f_type == 0x58465342 /* xfs */))
2944 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2945 else
2946 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2432 { 2947 }
2433 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2948 else
2949 {
2950 /* can't use inotify, continue to stat */
2951 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2434 2952
2435 /* monitor some parent directory for speedup hints */ 2953 /* if path is not there, monitor some parent directory for speedup hints */
2436 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2954 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2437 /* but an efficiency issue only */ 2955 /* but an efficiency issue only */
2438 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2956 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2439 { 2957 {
2440 char path [4096]; 2958 char path [4096];
2441 strcpy (path, w->path); 2959 strcpy (path, w->path);
… …
2445 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2963 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2446 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2964 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2447 2965
2448 char *pend = strrchr (path, '/'); 2966 char *pend = strrchr (path, '/');
2449 2967
2450 if (!pend) 2968 if (!pend || pend == path)
2451 break; /* whoops, no '/', complain to your admin */ 2969 break;
2452 2970
2453 *pend = 0; 2971 *pend = 0;
2454 w->wd = inotify_add_watch (fs_fd, path, mask); 2972 w->wd = inotify_add_watch (fs_fd, path, mask);
2455 } 2973 }
2456 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2457 } 2975 }
2458 } 2976 }
2459 else
2460 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2461 2977
2462 if (w->wd >= 0) 2978 if (w->wd >= 0)
2463 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2979 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2980
2981 /* now re-arm timer, if required */
2982 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2983 ev_timer_again (EV_A_ &w->timer);
2984 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2464} 2985}
2465 2986
2466static void noinline 2987static void noinline
2467infy_del (EV_P_ ev_stat *w) 2988infy_del (EV_P_ ev_stat *w)
2468{ 2989{
… …
2482 3003
2483static void noinline 3004static void noinline
2484infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3005infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2485{ 3006{
2486 if (slot < 0) 3007 if (slot < 0)
2487 /* overflow, need to check for all hahs slots */ 3008 /* overflow, need to check for all hash slots */
2488 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3009 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2489 infy_wd (EV_A_ slot, wd, ev); 3010 infy_wd (EV_A_ slot, wd, ev);
2490 else 3011 else
2491 { 3012 {
2492 WL w_; 3013 WL w_;
… …
2498 3019
2499 if (w->wd == wd || wd == -1) 3020 if (w->wd == wd || wd == -1)
2500 { 3021 {
2501 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3022 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2502 { 3023 {
3024 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2503 w->wd = -1; 3025 w->wd = -1;
2504 infy_add (EV_A_ w); /* re-add, no matter what */ 3026 infy_add (EV_A_ w); /* re-add, no matter what */
2505 } 3027 }
2506 3028
2507 stat_timer_cb (EV_A_ &w->timer, 0); 3029 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2512 3034
2513static void 3035static void
2514infy_cb (EV_P_ ev_io *w, int revents) 3036infy_cb (EV_P_ ev_io *w, int revents)
2515{ 3037{
2516 char buf [EV_INOTIFY_BUFSIZE]; 3038 char buf [EV_INOTIFY_BUFSIZE];
2517 struct inotify_event *ev = (struct inotify_event *)buf;
2518 int ofs; 3039 int ofs;
2519 int len = read (fs_fd, buf, sizeof (buf)); 3040 int len = read (fs_fd, buf, sizeof (buf));
2520 3041
2521 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3042 for (ofs = 0; ofs < len; )
3043 {
3044 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2522 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3045 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3046 ofs += sizeof (struct inotify_event) + ev->len;
3047 }
2523} 3048}
2524 3049
2525void inline_size 3050inline_size unsigned int
3051ev_linux_version (void)
3052{
3053 struct utsname buf;
3054 unsigned int v;
3055 int i;
3056 char *p = buf.release;
3057
3058 if (uname (&buf))
3059 return 0;
3060
3061 for (i = 3+1; --i; )
3062 {
3063 unsigned int c = 0;
3064
3065 for (;;)
3066 {
3067 if (*p >= '0' && *p <= '9')
3068 c = c * 10 + *p++ - '0';
3069 else
3070 {
3071 p += *p == '.';
3072 break;
3073 }
3074 }
3075
3076 v = (v << 8) | c;
3077 }
3078
3079 return v;
3080}
3081
3082inline_size void
3083ev_check_2625 (EV_P)
3084{
3085 /* kernels < 2.6.25 are borked
3086 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3087 */
3088 if (ev_linux_version () < 0x020619)
3089 return;
3090
3091 fs_2625 = 1;
3092}
3093
3094inline_size int
3095infy_newfd (void)
3096{
3097#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3098 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3099 if (fd >= 0)
3100 return fd;
3101#endif
3102 return inotify_init ();
3103}
3104
3105inline_size void
2526infy_init (EV_P) 3106infy_init (EV_P)
2527{ 3107{
2528 if (fs_fd != -2) 3108 if (fs_fd != -2)
2529 return; 3109 return;
2530 3110
3111 fs_fd = -1;
3112
3113 ev_check_2625 (EV_A);
3114
2531 fs_fd = inotify_init (); 3115 fs_fd = infy_newfd ();
2532 3116
2533 if (fs_fd >= 0) 3117 if (fs_fd >= 0)
2534 { 3118 {
3119 fd_intern (fs_fd);
2535 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3120 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2536 ev_set_priority (&fs_w, EV_MAXPRI); 3121 ev_set_priority (&fs_w, EV_MAXPRI);
2537 ev_io_start (EV_A_ &fs_w); 3122 ev_io_start (EV_A_ &fs_w);
3123 ev_unref (EV_A);
2538 } 3124 }
2539} 3125}
2540 3126
2541void inline_size 3127inline_size void
2542infy_fork (EV_P) 3128infy_fork (EV_P)
2543{ 3129{
2544 int slot; 3130 int slot;
2545 3131
2546 if (fs_fd < 0) 3132 if (fs_fd < 0)
2547 return; 3133 return;
2548 3134
3135 ev_ref (EV_A);
3136 ev_io_stop (EV_A_ &fs_w);
2549 close (fs_fd); 3137 close (fs_fd);
2550 fs_fd = inotify_init (); 3138 fs_fd = infy_newfd ();
3139
3140 if (fs_fd >= 0)
3141 {
3142 fd_intern (fs_fd);
3143 ev_io_set (&fs_w, fs_fd, EV_READ);
3144 ev_io_start (EV_A_ &fs_w);
3145 ev_unref (EV_A);
3146 }
2551 3147
2552 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2553 { 3149 {
2554 WL w_ = fs_hash [slot].head; 3150 WL w_ = fs_hash [slot].head;
2555 fs_hash [slot].head = 0; 3151 fs_hash [slot].head = 0;
… …
2562 w->wd = -1; 3158 w->wd = -1;
2563 3159
2564 if (fs_fd >= 0) 3160 if (fs_fd >= 0)
2565 infy_add (EV_A_ w); /* re-add, no matter what */ 3161 infy_add (EV_A_ w); /* re-add, no matter what */
2566 else 3162 else
3163 {
3164 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3165 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2567 ev_timer_start (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3168 }
2568 } 3169 }
2569
2570 } 3170 }
2571} 3171}
2572 3172
2573#endif 3173#endif
2574 3174
… …
2590static void noinline 3190static void noinline
2591stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3191stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2592{ 3192{
2593 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3193 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2594 3194
2595 /* we copy this here each the time so that */ 3195 ev_statdata prev = w->attr;
2596 /* prev has the old value when the callback gets invoked */
2597 w->prev = w->attr;
2598 ev_stat_stat (EV_A_ w); 3196 ev_stat_stat (EV_A_ w);
2599 3197
2600 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3198 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2601 if ( 3199 if (
2602 w->prev.st_dev != w->attr.st_dev 3200 prev.st_dev != w->attr.st_dev
2603 || w->prev.st_ino != w->attr.st_ino 3201 || prev.st_ino != w->attr.st_ino
2604 || w->prev.st_mode != w->attr.st_mode 3202 || prev.st_mode != w->attr.st_mode
2605 || w->prev.st_nlink != w->attr.st_nlink 3203 || prev.st_nlink != w->attr.st_nlink
2606 || w->prev.st_uid != w->attr.st_uid 3204 || prev.st_uid != w->attr.st_uid
2607 || w->prev.st_gid != w->attr.st_gid 3205 || prev.st_gid != w->attr.st_gid
2608 || w->prev.st_rdev != w->attr.st_rdev 3206 || prev.st_rdev != w->attr.st_rdev
2609 || w->prev.st_size != w->attr.st_size 3207 || prev.st_size != w->attr.st_size
2610 || w->prev.st_atime != w->attr.st_atime 3208 || prev.st_atime != w->attr.st_atime
2611 || w->prev.st_mtime != w->attr.st_mtime 3209 || prev.st_mtime != w->attr.st_mtime
2612 || w->prev.st_ctime != w->attr.st_ctime 3210 || prev.st_ctime != w->attr.st_ctime
2613 ) { 3211 ) {
3212 /* we only update w->prev on actual differences */
3213 /* in case we test more often than invoke the callback, */
3214 /* to ensure that prev is always different to attr */
3215 w->prev = prev;
3216
2614 #if EV_USE_INOTIFY 3217 #if EV_USE_INOTIFY
3218 if (fs_fd >= 0)
3219 {
2615 infy_del (EV_A_ w); 3220 infy_del (EV_A_ w);
2616 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
2617 ev_stat_stat (EV_A_ w); /* avoid race... */ 3222 ev_stat_stat (EV_A_ w); /* avoid race... */
3223 }
2618 #endif 3224 #endif
2619 3225
2620 ev_feed_event (EV_A_ w, EV_STAT); 3226 ev_feed_event (EV_A_ w, EV_STAT);
2621 } 3227 }
2622} 3228}
… …
2625ev_stat_start (EV_P_ ev_stat *w) 3231ev_stat_start (EV_P_ ev_stat *w)
2626{ 3232{
2627 if (expect_false (ev_is_active (w))) 3233 if (expect_false (ev_is_active (w)))
2628 return; 3234 return;
2629 3235
2630 /* since we use memcmp, we need to clear any padding data etc. */
2631 memset (&w->prev, 0, sizeof (ev_statdata));
2632 memset (&w->attr, 0, sizeof (ev_statdata));
2633
2634 ev_stat_stat (EV_A_ w); 3236 ev_stat_stat (EV_A_ w);
2635 3237
3238 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2636 if (w->interval < MIN_STAT_INTERVAL) 3239 w->interval = MIN_STAT_INTERVAL;
2637 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2638 3240
2639 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3241 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2640 ev_set_priority (&w->timer, ev_priority (w)); 3242 ev_set_priority (&w->timer, ev_priority (w));
2641 3243
2642#if EV_USE_INOTIFY 3244#if EV_USE_INOTIFY
2643 infy_init (EV_A); 3245 infy_init (EV_A);
2644 3246
2645 if (fs_fd >= 0) 3247 if (fs_fd >= 0)
2646 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
2647 else 3249 else
2648#endif 3250#endif
3251 {
2649 ev_timer_start (EV_A_ &w->timer); 3252 ev_timer_again (EV_A_ &w->timer);
3253 ev_unref (EV_A);
3254 }
2650 3255
2651 ev_start (EV_A_ (W)w, 1); 3256 ev_start (EV_A_ (W)w, 1);
2652 3257
2653 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
2654} 3259}
… …
2663 EV_FREQUENT_CHECK; 3268 EV_FREQUENT_CHECK;
2664 3269
2665#if EV_USE_INOTIFY 3270#if EV_USE_INOTIFY
2666 infy_del (EV_A_ w); 3271 infy_del (EV_A_ w);
2667#endif 3272#endif
3273
3274 if (ev_is_active (&w->timer))
3275 {
3276 ev_ref (EV_A);
2668 ev_timer_stop (EV_A_ &w->timer); 3277 ev_timer_stop (EV_A_ &w->timer);
3278 }
2669 3279
2670 ev_stop (EV_A_ (W)w); 3280 ev_stop (EV_A_ (W)w);
2671 3281
2672 EV_FREQUENT_CHECK; 3282 EV_FREQUENT_CHECK;
2673} 3283}
… …
2718 3328
2719 EV_FREQUENT_CHECK; 3329 EV_FREQUENT_CHECK;
2720} 3330}
2721#endif 3331#endif
2722 3332
3333#if EV_PREPARE_ENABLE
2723void 3334void
2724ev_prepare_start (EV_P_ ev_prepare *w) 3335ev_prepare_start (EV_P_ ev_prepare *w)
2725{ 3336{
2726 if (expect_false (ev_is_active (w))) 3337 if (expect_false (ev_is_active (w)))
2727 return; 3338 return;
… …
2753 3364
2754 ev_stop (EV_A_ (W)w); 3365 ev_stop (EV_A_ (W)w);
2755 3366
2756 EV_FREQUENT_CHECK; 3367 EV_FREQUENT_CHECK;
2757} 3368}
3369#endif
2758 3370
3371#if EV_CHECK_ENABLE
2759void 3372void
2760ev_check_start (EV_P_ ev_check *w) 3373ev_check_start (EV_P_ ev_check *w)
2761{ 3374{
2762 if (expect_false (ev_is_active (w))) 3375 if (expect_false (ev_is_active (w)))
2763 return; 3376 return;
… …
2789 3402
2790 ev_stop (EV_A_ (W)w); 3403 ev_stop (EV_A_ (W)w);
2791 3404
2792 EV_FREQUENT_CHECK; 3405 EV_FREQUENT_CHECK;
2793} 3406}
3407#endif
2794 3408
2795#if EV_EMBED_ENABLE 3409#if EV_EMBED_ENABLE
2796void noinline 3410void noinline
2797ev_embed_sweep (EV_P_ ev_embed *w) 3411ev_embed_sweep (EV_P_ ev_embed *w)
2798{ 3412{
… …
2814embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3428embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2815{ 3429{
2816 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3430 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2817 3431
2818 { 3432 {
2819 struct ev_loop *loop = w->other; 3433 EV_P = w->other;
2820 3434
2821 while (fdchangecnt) 3435 while (fdchangecnt)
2822 { 3436 {
2823 fd_reify (EV_A); 3437 fd_reify (EV_A);
2824 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3438 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2825 } 3439 }
2826 } 3440 }
2827} 3441}
2828 3442
3443static void
3444embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3445{
3446 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3447
3448 ev_embed_stop (EV_A_ w);
3449
3450 {
3451 EV_P = w->other;
3452
3453 ev_loop_fork (EV_A);
3454 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3455 }
3456
3457 ev_embed_start (EV_A_ w);
3458}
3459
2829#if 0 3460#if 0
2830static void 3461static void
2831embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3462embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2832{ 3463{
2833 ev_idle_stop (EV_A_ idle); 3464 ev_idle_stop (EV_A_ idle);
… …
2839{ 3470{
2840 if (expect_false (ev_is_active (w))) 3471 if (expect_false (ev_is_active (w)))
2841 return; 3472 return;
2842 3473
2843 { 3474 {
2844 struct ev_loop *loop = w->other; 3475 EV_P = w->other;
2845 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3476 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2846 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3477 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2847 } 3478 }
2848 3479
2849 EV_FREQUENT_CHECK; 3480 EV_FREQUENT_CHECK;
2850 3481
… …
2853 3484
2854 ev_prepare_init (&w->prepare, embed_prepare_cb); 3485 ev_prepare_init (&w->prepare, embed_prepare_cb);
2855 ev_set_priority (&w->prepare, EV_MINPRI); 3486 ev_set_priority (&w->prepare, EV_MINPRI);
2856 ev_prepare_start (EV_A_ &w->prepare); 3487 ev_prepare_start (EV_A_ &w->prepare);
2857 3488
3489 ev_fork_init (&w->fork, embed_fork_cb);
3490 ev_fork_start (EV_A_ &w->fork);
3491
2858 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3492 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2859 3493
2860 ev_start (EV_A_ (W)w, 1); 3494 ev_start (EV_A_ (W)w, 1);
2861 3495
2862 EV_FREQUENT_CHECK; 3496 EV_FREQUENT_CHECK;
… …
2869 if (expect_false (!ev_is_active (w))) 3503 if (expect_false (!ev_is_active (w)))
2870 return; 3504 return;
2871 3505
2872 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
2873 3507
2874 ev_io_stop (EV_A_ &w->io); 3508 ev_io_stop (EV_A_ &w->io);
2875 ev_prepare_stop (EV_A_ &w->prepare); 3509 ev_prepare_stop (EV_A_ &w->prepare);
3510 ev_fork_stop (EV_A_ &w->fork);
2876 3511
2877 ev_stop (EV_A_ (W)w); 3512 ev_stop (EV_A_ (W)w);
2878 3513
2879 EV_FREQUENT_CHECK; 3514 EV_FREQUENT_CHECK;
2880} 3515}
… …
2959 3594
2960void 3595void
2961ev_async_send (EV_P_ ev_async *w) 3596ev_async_send (EV_P_ ev_async *w)
2962{ 3597{
2963 w->sent = 1; 3598 w->sent = 1;
2964 evpipe_write (EV_A_ &gotasync); 3599 evpipe_write (EV_A_ &async_pending);
2965} 3600}
2966#endif 3601#endif
2967 3602
2968/*****************************************************************************/ 3603/*****************************************************************************/
2969 3604
… …
2979once_cb (EV_P_ struct ev_once *once, int revents) 3614once_cb (EV_P_ struct ev_once *once, int revents)
2980{ 3615{
2981 void (*cb)(int revents, void *arg) = once->cb; 3616 void (*cb)(int revents, void *arg) = once->cb;
2982 void *arg = once->arg; 3617 void *arg = once->arg;
2983 3618
2984 ev_io_stop (EV_A_ &once->io); 3619 ev_io_stop (EV_A_ &once->io);
2985 ev_timer_stop (EV_A_ &once->to); 3620 ev_timer_stop (EV_A_ &once->to);
2986 ev_free (once); 3621 ev_free (once);
2987 3622
2988 cb (revents, arg); 3623 cb (revents, arg);
2989} 3624}
2990 3625
2991static void 3626static void
2992once_cb_io (EV_P_ ev_io *w, int revents) 3627once_cb_io (EV_P_ ev_io *w, int revents)
2993{ 3628{
2994 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3629 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3630
3631 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2995} 3632}
2996 3633
2997static void 3634static void
2998once_cb_to (EV_P_ ev_timer *w, int revents) 3635once_cb_to (EV_P_ ev_timer *w, int revents)
2999{ 3636{
3000 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3637 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3638
3639 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3001} 3640}
3002 3641
3003void 3642void
3004ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3643ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3005{ 3644{
… …
3027 ev_timer_set (&once->to, timeout, 0.); 3666 ev_timer_set (&once->to, timeout, 0.);
3028 ev_timer_start (EV_A_ &once->to); 3667 ev_timer_start (EV_A_ &once->to);
3029 } 3668 }
3030} 3669}
3031 3670
3671/*****************************************************************************/
3672
3673#if EV_WALK_ENABLE
3674void
3675ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3676{
3677 int i, j;
3678 ev_watcher_list *wl, *wn;
3679
3680 if (types & (EV_IO | EV_EMBED))
3681 for (i = 0; i < anfdmax; ++i)
3682 for (wl = anfds [i].head; wl; )
3683 {
3684 wn = wl->next;
3685
3686#if EV_EMBED_ENABLE
3687 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3688 {
3689 if (types & EV_EMBED)
3690 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3691 }
3692 else
3693#endif
3694#if EV_USE_INOTIFY
3695 if (ev_cb ((ev_io *)wl) == infy_cb)
3696 ;
3697 else
3698#endif
3699 if ((ev_io *)wl != &pipe_w)
3700 if (types & EV_IO)
3701 cb (EV_A_ EV_IO, wl);
3702
3703 wl = wn;
3704 }
3705
3706 if (types & (EV_TIMER | EV_STAT))
3707 for (i = timercnt + HEAP0; i-- > HEAP0; )
3708#if EV_STAT_ENABLE
3709 /*TODO: timer is not always active*/
3710 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3711 {
3712 if (types & EV_STAT)
3713 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3714 }
3715 else
3716#endif
3717 if (types & EV_TIMER)
3718 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3719
3720#if EV_PERIODIC_ENABLE
3721 if (types & EV_PERIODIC)
3722 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3723 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3724#endif
3725
3726#if EV_IDLE_ENABLE
3727 if (types & EV_IDLE)
3728 for (j = NUMPRI; i--; )
3729 for (i = idlecnt [j]; i--; )
3730 cb (EV_A_ EV_IDLE, idles [j][i]);
3731#endif
3732
3733#if EV_FORK_ENABLE
3734 if (types & EV_FORK)
3735 for (i = forkcnt; i--; )
3736 if (ev_cb (forks [i]) != embed_fork_cb)
3737 cb (EV_A_ EV_FORK, forks [i]);
3738#endif
3739
3740#if EV_ASYNC_ENABLE
3741 if (types & EV_ASYNC)
3742 for (i = asynccnt; i--; )
3743 cb (EV_A_ EV_ASYNC, asyncs [i]);
3744#endif
3745
3746#if EV_PREPARE_ENABLE
3747 if (types & EV_PREPARE)
3748 for (i = preparecnt; i--; )
3749# if EV_EMBED_ENABLE
3750 if (ev_cb (prepares [i]) != embed_prepare_cb)
3751# endif
3752 cb (EV_A_ EV_PREPARE, prepares [i]);
3753#endif
3754
3755#if EV_CHECK_ENABLE
3756 if (types & EV_CHECK)
3757 for (i = checkcnt; i--; )
3758 cb (EV_A_ EV_CHECK, checks [i]);
3759#endif
3760
3761#if EV_SIGNAL_ENABLE
3762 if (types & EV_SIGNAL)
3763 for (i = 0; i < EV_NSIG - 1; ++i)
3764 for (wl = signals [i].head; wl; )
3765 {
3766 wn = wl->next;
3767 cb (EV_A_ EV_SIGNAL, wl);
3768 wl = wn;
3769 }
3770#endif
3771
3772#if EV_CHILD_ENABLE
3773 if (types & EV_CHILD)
3774 for (i = EV_PID_HASHSIZE; i--; )
3775 for (wl = childs [i]; wl; )
3776 {
3777 wn = wl->next;
3778 cb (EV_A_ EV_CHILD, wl);
3779 wl = wn;
3780 }
3781#endif
3782/* EV_STAT 0x00001000 /* stat data changed */
3783/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3784}
3785#endif
3786
3032#if EV_MULTIPLICITY 3787#if EV_MULTIPLICITY
3033 #include "ev_wrap.h" 3788 #include "ev_wrap.h"
3034#endif 3789#endif
3035 3790
3036#ifdef __cplusplus 3791#ifdef __cplusplus

Diff Legend

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