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

Comparing libev/ev.c (file contents):
Revision 1.340 by root, Tue Mar 16 20:39:29 2010 UTC vs.
Revision 1.377 by root, Wed Jun 8 13:11:55 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 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 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
49# include "config.h" 45# include "config.h"
50# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
51 53
52# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
77# ifndef EV_USE_REALTIME 79# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 80# define EV_USE_REALTIME 0
79# endif 81# endif
80# endif 82# endif
81 83
84# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 85# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP EV_FEATURE_OS 86# define EV_USE_NANOSLEEP EV_FEATURE_OS
87# endif
85# else 88# else
89# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 90# define EV_USE_NANOSLEEP 0
91# endif
92
93# if HAVE_SELECT && HAVE_SYS_SELECT_H
94# ifndef EV_USE_SELECT
95# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 96# endif
97# else
98# undef EV_USE_SELECT
99# define EV_USE_SELECT 0
88# endif 100# endif
89 101
102# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 103# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT EV_FEATURE_BACKENDS 104# define EV_USE_POLL EV_FEATURE_BACKENDS
93# else
94# define EV_USE_SELECT 0
95# endif 105# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL EV_FEATURE_BACKENDS
101# else 106# else
107# undef EV_USE_POLL
102# define EV_USE_POLL 0 108# define EV_USE_POLL 0
103# endif
104# endif 109# endif
105 110
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 111# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
112# ifndef EV_USE_EPOLL
108# define EV_USE_EPOLL EV_FEATURE_BACKENDS 113# define EV_USE_EPOLL EV_FEATURE_BACKENDS
109# else
110# define EV_USE_EPOLL 0
111# endif 114# endif
115# else
116# undef EV_USE_EPOLL
117# define EV_USE_EPOLL 0
112# endif 118# endif
113 119
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 120# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
121# ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS 122# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 123# endif
124# else
125# undef EV_USE_KQUEUE
126# define EV_USE_KQUEUE 0
120# endif 127# endif
121 128
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 129# if HAVE_PORT_H && HAVE_PORT_CREATE
130# ifndef EV_USE_PORT
124# define EV_USE_PORT EV_FEATURE_BACKENDS 131# define EV_USE_PORT EV_FEATURE_BACKENDS
125# else
126# define EV_USE_PORT 0
127# endif 132# endif
133# else
134# undef EV_USE_PORT
135# define EV_USE_PORT 0
128# endif 136# endif
129 137
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 138# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
139# ifndef EV_USE_INOTIFY
132# define EV_USE_INOTIFY EV_FEATURE_OS 140# define EV_USE_INOTIFY EV_FEATURE_OS
133# else
134# define EV_USE_INOTIFY 0
135# endif 141# endif
142# else
143# undef EV_USE_INOTIFY
144# define EV_USE_INOTIFY 0
136# endif 145# endif
137 146
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 147# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
148# ifndef EV_USE_SIGNALFD
140# define EV_USE_SIGNALFD EV_FEATURE_OS 149# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else
142# define EV_USE_SIGNALFD 0
143# endif 150# endif
151# else
152# undef EV_USE_SIGNALFD
153# define EV_USE_SIGNALFD 0
144# endif 154# endif
145 155
156# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 157# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD EV_FEATURE_OS 158# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 159# endif
160# else
161# undef EV_USE_EVENTFD
162# define EV_USE_EVENTFD 0
152# endif 163# endif
153 164
154#endif 165#endif
155 166
156#include <math.h>
157#include <stdlib.h> 167#include <stdlib.h>
158#include <string.h> 168#include <string.h>
159#include <fcntl.h> 169#include <fcntl.h>
160#include <stddef.h> 170#include <stddef.h>
161 171
… …
172#ifdef EV_H 182#ifdef EV_H
173# include EV_H 183# include EV_H
174#else 184#else
175# include "ev.h" 185# include "ev.h"
176#endif 186#endif
187
188EV_CPP(extern "C" {)
177 189
178#ifndef _WIN32 190#ifndef _WIN32
179# include <sys/time.h> 191# include <sys/time.h>
180# include <sys/wait.h> 192# include <sys/wait.h>
181# include <unistd.h> 193# include <unistd.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 198# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 199# define EV_SELECT_IS_WINSOCKET 1
188# endif 200# endif
189# undef EV_AVOID_STDIO 201# undef EV_AVOID_STDIO
190#endif 202#endif
203
204/* OS X, in its infinite idiocy, actually HARDCODES
205 * a limit of 1024 into their select. Where people have brains,
206 * OS X engineers apparently have a vacuum. Or maybe they were
207 * ordered to have a vacuum, or they do anything for money.
208 * This might help. Or not.
209 */
210#define _DARWIN_UNLIMITED_SELECT 1
191 211
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 212/* this block tries to deduce configuration from header-defined symbols and defaults */
193 213
194/* try to deduce the maximum number of signals on this platform */ 214/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 215#if defined (EV_NSIG)
… …
217/* to make it compile regardless, just remove the above line, */ 237/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */ 238/* but consider reporting it, too! :) */
219# define EV_NSIG 65 239# define EV_NSIG 65
220#endif 240#endif
221 241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
245
222#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
223# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
225# else 249# else
226# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
… …
361# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
362# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
363#endif 387#endif
364 388
365#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
366# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
367# include <sys/select.h> 392# include <sys/select.h>
368# endif 393# endif
369#endif 394#endif
370 395
371#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
372# include <sys/utsname.h>
373# include <sys/statfs.h> 397# include <sys/statfs.h>
374# include <sys/inotify.h> 398# include <sys/inotify.h>
375/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 399/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
376# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
377# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
394# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
395# else 419# else
396# define EFD_CLOEXEC 02000000 420# define EFD_CLOEXEC 02000000
397# endif 421# endif
398# endif 422# endif
399# ifdef __cplusplus
400extern "C" {
401# endif
402int (eventfd) (unsigned int initval, int flags); 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
403# ifdef __cplusplus
404}
405# endif
406#endif 424#endif
407 425
408#if EV_USE_SIGNALFD 426#if EV_USE_SIGNALFD
409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 427/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h> 428# include <stdint.h>
… …
416# define SFD_CLOEXEC O_CLOEXEC 434# define SFD_CLOEXEC O_CLOEXEC
417# else 435# else
418# define SFD_CLOEXEC 02000000 436# define SFD_CLOEXEC 02000000
419# endif 437# endif
420# endif 438# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags); 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
425 440
426struct signalfd_siginfo 441struct signalfd_siginfo
427{ 442{
428 uint32_t ssi_signo; 443 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)]; 444 char pad[128 - sizeof (uint32_t)];
430}; 445};
431# ifdef __cplusplus
432}
433# endif 446#endif
434#endif
435
436 447
437/**/ 448/**/
438 449
439#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
440# define EV_FREQUENT_CHECK ev_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
441#else 452#else
442# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
443#endif 454#endif
444 455
445/* 456/*
446 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
447 * It is added to ev_rt_now when scheduling periodics
448 * to ensure progress, time-wise, even when rounding
449 * errors are against us.
450 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
451 * Better solutions welcome.
452 */ 459 */
453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
461/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
454 462
455#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) */
456#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) */
465
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
457 468
458#if __GNUC__ >= 4 469#if __GNUC__ >= 4
459# define expect(expr,value) __builtin_expect ((expr),(value)) 470# define expect(expr,value) __builtin_expect ((expr),(value))
460# define noinline __attribute__ ((noinline)) 471# define noinline __attribute__ ((noinline))
461#else 472#else
… …
494#define ev_active(w) ((W)(w))->active 505#define ev_active(w) ((W)(w))->active
495#define ev_at(w) ((WT)(w))->at 506#define ev_at(w) ((WT)(w))->at
496 507
497#if EV_USE_REALTIME 508#if EV_USE_REALTIME
498/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 509/* sig_atomic_t is used to avoid per-thread variables or locking but still */
499/* giving it a reasonably high chance of working on typical architetcures */ 510/* giving it a reasonably high chance of working on typical architectures */
500static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 511static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
501#endif 512#endif
502 513
503#if EV_USE_MONOTONIC 514#if EV_USE_MONOTONIC
504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 515static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
515#endif 526#endif
516 527
517#ifdef _WIN32 528#ifdef _WIN32
518# include "ev_win32.c" 529# include "ev_win32.c"
519#endif 530#endif
531
532/*****************************************************************************/
533
534/* define a suitable floor function (only used by periodics atm) */
535
536#if EV_USE_FLOOR
537# include <math.h>
538# define ev_floor(v) floor (v)
539#else
540
541#include <float.h>
542
543/* a floor() replacement function, should be independent of ev_tstamp type */
544static ev_tstamp noinline
545ev_floor (ev_tstamp v)
546{
547 /* the choice of shift factor is not terribly important */
548#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
549 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
550#else
551 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
552#endif
553
554 /* argument too large for an unsigned long? */
555 if (expect_false (v >= shift))
556 {
557 ev_tstamp f;
558
559 if (v == v - 1.)
560 return v; /* very large number */
561
562 f = shift * ev_floor (v * (1. / shift));
563 return f + ev_floor (v - f);
564 }
565
566 /* special treatment for negative args? */
567 if (expect_false (v < 0.))
568 {
569 ev_tstamp f = -ev_floor (-v);
570
571 return f - (f == v ? 0 : 1);
572 }
573
574 /* fits into an unsigned long */
575 return (unsigned long)v;
576}
577
578#endif
579
580/*****************************************************************************/
581
582#ifdef __linux
583# include <sys/utsname.h>
584#endif
585
586static unsigned int noinline
587ev_linux_version (void)
588{
589#ifdef __linux
590 unsigned int v = 0;
591 struct utsname buf;
592 int i;
593 char *p = buf.release;
594
595 if (uname (&buf))
596 return 0;
597
598 for (i = 3+1; --i; )
599 {
600 unsigned int c = 0;
601
602 for (;;)
603 {
604 if (*p >= '0' && *p <= '9')
605 c = c * 10 + *p++ - '0';
606 else
607 {
608 p += *p == '.';
609 break;
610 }
611 }
612
613 v = (v << 8) | c;
614 }
615
616 return v;
617#else
618 return 0;
619#endif
620}
520 621
521/*****************************************************************************/ 622/*****************************************************************************/
522 623
523#if EV_AVOID_STDIO 624#if EV_AVOID_STDIO
524static void noinline 625static void noinline
… …
545 if (syserr_cb) 646 if (syserr_cb)
546 syserr_cb (msg); 647 syserr_cb (msg);
547 else 648 else
548 { 649 {
549#if EV_AVOID_STDIO 650#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg); 651 ev_printerr (msg);
553 ev_printerr (": "); 652 ev_printerr (": ");
554 ev_printerr (err); 653 ev_printerr (strerror (errno));
555 ev_printerr ("\n"); 654 ev_printerr ("\n");
556#else 655#else
557 perror (msg); 656 perror (msg);
558#endif 657#endif
559 abort (); 658 abort ();
… …
593 ptr = alloc (ptr, size); 692 ptr = alloc (ptr, size);
594 693
595 if (!ptr && size) 694 if (!ptr && size)
596 { 695 {
597#if EV_AVOID_STDIO 696#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n"); 697 ev_printerr ("(libev) memory allocation failed, aborting.\n");
599#else 698#else
600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 699 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
601#endif 700#endif
602 abort (); 701 abort ();
603 } 702 }
604 703
605 return ptr; 704 return ptr;
… …
622 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 721 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
623 unsigned char unused; 722 unsigned char unused;
624#if EV_USE_EPOLL 723#if EV_USE_EPOLL
625 unsigned int egen; /* generation counter to counter epoll bugs */ 724 unsigned int egen; /* generation counter to counter epoll bugs */
626#endif 725#endif
627#if EV_SELECT_IS_WINSOCKET 726#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
628 SOCKET handle; 727 SOCKET handle;
728#endif
729#if EV_USE_IOCP
730 OVERLAPPED or, ow;
629#endif 731#endif
630} ANFD; 732} ANFD;
631 733
632/* stores the pending event set for a given watcher */ 734/* stores the pending event set for a given watcher */
633typedef struct 735typedef struct
… …
698# define EV_RELEASE_CB (void)0 800# define EV_RELEASE_CB (void)0
699# define EV_ACQUIRE_CB (void)0 801# define EV_ACQUIRE_CB (void)0
700# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 802# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
701#endif 803#endif
702 804
703#define EVUNLOOP_RECURSE 0x80 805#define EVBREAK_RECURSE 0x80
704 806
705/*****************************************************************************/ 807/*****************************************************************************/
706 808
707#ifndef EV_HAVE_EV_TIME 809#ifndef EV_HAVE_EV_TIME
708ev_tstamp 810ev_tstamp
… …
752 if (delay > 0.) 854 if (delay > 0.)
753 { 855 {
754#if EV_USE_NANOSLEEP 856#if EV_USE_NANOSLEEP
755 struct timespec ts; 857 struct timespec ts;
756 858
757 ts.tv_sec = (time_t)delay; 859 EV_TS_SET (ts, delay);
758 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
759
760 nanosleep (&ts, 0); 860 nanosleep (&ts, 0);
761#elif defined(_WIN32) 861#elif defined(_WIN32)
762 Sleep ((unsigned long)(delay * 1e3)); 862 Sleep ((unsigned long)(delay * 1e3));
763#else 863#else
764 struct timeval tv; 864 struct timeval tv;
765 865
766 tv.tv_sec = (time_t)delay;
767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
768
769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 866 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
770 /* something not guaranteed by newer posix versions, but guaranteed */ 867 /* something not guaranteed by newer posix versions, but guaranteed */
771 /* by older ones */ 868 /* by older ones */
869 EV_TV_SET (tv, delay);
772 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
773#endif 871#endif
774 } 872 }
775} 873}
776 874
777/*****************************************************************************/ 875/*****************************************************************************/
778 876
779#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 877#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
780 878
781/* find a suitable new size for the given array, */ 879/* find a suitable new size for the given array, */
782/* hopefully by rounding to a ncie-to-malloc size */ 880/* hopefully by rounding to a nice-to-malloc size */
783inline_size int 881inline_size int
784array_nextsize (int elem, int cur, int cnt) 882array_nextsize (int elem, int cur, int cnt)
785{ 883{
786 int ncur = cur + 1; 884 int ncur = cur + 1;
787 885
… …
922inline_size void 1020inline_size void
923fd_reify (EV_P) 1021fd_reify (EV_P)
924{ 1022{
925 int i; 1023 int i;
926 1024
1025#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1026 for (i = 0; i < fdchangecnt; ++i)
1027 {
1028 int fd = fdchanges [i];
1029 ANFD *anfd = anfds + fd;
1030
1031 if (anfd->reify & EV__IOFDSET && anfd->head)
1032 {
1033 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1034
1035 if (handle != anfd->handle)
1036 {
1037 unsigned long arg;
1038
1039 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1040
1041 /* handle changed, but fd didn't - we need to do it in two steps */
1042 backend_modify (EV_A_ fd, anfd->events, 0);
1043 anfd->events = 0;
1044 anfd->handle = handle;
1045 }
1046 }
1047 }
1048#endif
1049
927 for (i = 0; i < fdchangecnt; ++i) 1050 for (i = 0; i < fdchangecnt; ++i)
928 { 1051 {
929 int fd = fdchanges [i]; 1052 int fd = fdchanges [i];
930 ANFD *anfd = anfds + fd; 1053 ANFD *anfd = anfds + fd;
931 ev_io *w; 1054 ev_io *w;
932 1055
933 unsigned char events = 0; 1056 unsigned char o_events = anfd->events;
1057 unsigned char o_reify = anfd->reify;
934 1058
935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1059 anfd->reify = 0;
936 events |= (unsigned char)w->events;
937 1060
938#if EV_SELECT_IS_WINSOCKET 1061 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
939 if (events)
940 { 1062 {
941 unsigned long arg; 1063 anfd->events = 0;
942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1064
943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1065 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1066 anfd->events |= (unsigned char)w->events;
1067
1068 if (o_events != anfd->events)
1069 o_reify = EV__IOFDSET; /* actually |= */
944 } 1070 }
945#endif
946 1071
947 { 1072 if (o_reify & EV__IOFDSET)
948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
950
951 anfd->reify = 0;
952 anfd->events = events;
953
954 if (o_events != events || o_reify & EV__IOFDSET)
955 backend_modify (EV_A_ fd, o_events, events); 1073 backend_modify (EV_A_ fd, o_events, anfd->events);
956 }
957 } 1074 }
958 1075
959 fdchangecnt = 0; 1076 fdchangecnt = 0;
960} 1077}
961 1078
… …
1054} 1171}
1055 1172
1056/*****************************************************************************/ 1173/*****************************************************************************/
1057 1174
1058/* 1175/*
1059 * the heap functions want a real array index. array index 0 uis guaranteed to not 1176 * the heap functions want a real array index. array index 0 is guaranteed to not
1060 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1177 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1061 * the branching factor of the d-tree. 1178 * the branching factor of the d-tree.
1062 */ 1179 */
1063 1180
1064/* 1181/*
… …
1264 uint64_t counter = 1; 1381 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t)); 1382 write (evfd, &counter, sizeof (uint64_t));
1266 } 1383 }
1267 else 1384 else
1268#endif 1385#endif
1386 /* win32 people keep sending patches that change this write() to send() */
1387 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1388 /* so when you think this write should be a send instead, please find out */
1389 /* where your send() is from - it's definitely not the microsoft send, and */
1390 /* tell me. thank you. */
1269 write (evpipe [1], &dummy, 1); 1391 write (evpipe [1], &dummy, 1);
1270 1392
1271 errno = old_errno; 1393 errno = old_errno;
1272 } 1394 }
1273} 1395}
… …
1287 } 1409 }
1288 else 1410 else
1289#endif 1411#endif
1290 { 1412 {
1291 char dummy; 1413 char dummy;
1414 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1292 read (evpipe [0], &dummy, 1); 1415 read (evpipe [0], &dummy, 1);
1293 } 1416 }
1294 1417
1418#if EV_SIGNAL_ENABLE
1295 if (sig_pending) 1419 if (sig_pending)
1296 { 1420 {
1297 sig_pending = 0; 1421 sig_pending = 0;
1298 1422
1299 for (i = EV_NSIG - 1; i--; ) 1423 for (i = EV_NSIG - 1; i--; )
1300 if (expect_false (signals [i].pending)) 1424 if (expect_false (signals [i].pending))
1301 ev_feed_signal_event (EV_A_ i + 1); 1425 ev_feed_signal_event (EV_A_ i + 1);
1302 } 1426 }
1427#endif
1303 1428
1304#if EV_ASYNC_ENABLE 1429#if EV_ASYNC_ENABLE
1305 if (async_pending) 1430 if (async_pending)
1306 { 1431 {
1307 async_pending = 0; 1432 async_pending = 0;
… …
1316#endif 1441#endif
1317} 1442}
1318 1443
1319/*****************************************************************************/ 1444/*****************************************************************************/
1320 1445
1446void
1447ev_feed_signal (int signum)
1448{
1449#if EV_MULTIPLICITY
1450 EV_P = signals [signum - 1].loop;
1451
1452 if (!EV_A)
1453 return;
1454#endif
1455
1456 signals [signum - 1].pending = 1;
1457 evpipe_write (EV_A_ &sig_pending);
1458}
1459
1321static void 1460static void
1322ev_sighandler (int signum) 1461ev_sighandler (int signum)
1323{ 1462{
1324#if EV_MULTIPLICITY
1325 EV_P = signals [signum - 1].loop;
1326#endif
1327
1328#ifdef _WIN32 1463#ifdef _WIN32
1329 signal (signum, ev_sighandler); 1464 signal (signum, ev_sighandler);
1330#endif 1465#endif
1331 1466
1332 signals [signum - 1].pending = 1; 1467 ev_feed_signal (signum);
1333 evpipe_write (EV_A_ &sig_pending);
1334} 1468}
1335 1469
1336void noinline 1470void noinline
1337ev_feed_signal_event (EV_P_ int signum) 1471ev_feed_signal_event (EV_P_ int signum)
1338{ 1472{
… …
1438 1572
1439#endif 1573#endif
1440 1574
1441/*****************************************************************************/ 1575/*****************************************************************************/
1442 1576
1577#if EV_USE_IOCP
1578# include "ev_iocp.c"
1579#endif
1443#if EV_USE_PORT 1580#if EV_USE_PORT
1444# include "ev_port.c" 1581# include "ev_port.c"
1445#endif 1582#endif
1446#if EV_USE_KQUEUE 1583#if EV_USE_KQUEUE
1447# include "ev_kqueue.c" 1584# include "ev_kqueue.c"
… …
1507#ifdef __APPLE__ 1644#ifdef __APPLE__
1508 /* only select works correctly on that "unix-certified" platform */ 1645 /* only select works correctly on that "unix-certified" platform */
1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1646 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1510 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1647 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1511#endif 1648#endif
1649#ifdef __FreeBSD__
1650 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1651#endif
1512 1652
1513 return flags; 1653 return flags;
1514} 1654}
1515 1655
1516unsigned int 1656unsigned int
1517ev_embeddable_backends (void) 1657ev_embeddable_backends (void)
1518{ 1658{
1519 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1659 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1520 1660
1521 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1661 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1522 /* please fix it and tell me how to detect the fix */ 1662 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1523 flags &= ~EVBACKEND_EPOLL; 1663 flags &= ~EVBACKEND_EPOLL;
1524 1664
1525 return flags; 1665 return flags;
1526} 1666}
1527 1667
1528unsigned int 1668unsigned int
… …
1584static void noinline 1724static void noinline
1585loop_init (EV_P_ unsigned int flags) 1725loop_init (EV_P_ unsigned int flags)
1586{ 1726{
1587 if (!backend) 1727 if (!backend)
1588 { 1728 {
1729 origflags = flags;
1730
1589#if EV_USE_REALTIME 1731#if EV_USE_REALTIME
1590 if (!have_realtime) 1732 if (!have_realtime)
1591 { 1733 {
1592 struct timespec ts; 1734 struct timespec ts;
1593 1735
… …
1638#endif 1780#endif
1639#if EV_USE_SIGNALFD 1781#if EV_USE_SIGNALFD
1640 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1782 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1641#endif 1783#endif
1642 1784
1643 if (!(flags & 0x0000ffffU)) 1785 if (!(flags & EVBACKEND_MASK))
1644 flags |= ev_recommended_backends (); 1786 flags |= ev_recommended_backends ();
1645 1787
1788#if EV_USE_IOCP
1789 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1790#endif
1646#if EV_USE_PORT 1791#if EV_USE_PORT
1647 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1792 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1648#endif 1793#endif
1649#if EV_USE_KQUEUE 1794#if EV_USE_KQUEUE
1650 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1795 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1667#endif 1812#endif
1668 } 1813 }
1669} 1814}
1670 1815
1671/* free up a loop structure */ 1816/* free up a loop structure */
1672static void noinline 1817void
1673loop_destroy (EV_P) 1818ev_loop_destroy (EV_P)
1674{ 1819{
1675 int i; 1820 int i;
1821
1822#if EV_MULTIPLICITY
1823 /* mimic free (0) */
1824 if (!EV_A)
1825 return;
1826#endif
1827
1828#if EV_CLEANUP_ENABLE
1829 /* queue cleanup watchers (and execute them) */
1830 if (expect_false (cleanupcnt))
1831 {
1832 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1833 EV_INVOKE_PENDING;
1834 }
1835#endif
1836
1837#if EV_CHILD_ENABLE
1838 if (ev_is_active (&childev))
1839 {
1840 ev_ref (EV_A); /* child watcher */
1841 ev_signal_stop (EV_A_ &childev);
1842 }
1843#endif
1676 1844
1677 if (ev_is_active (&pipe_w)) 1845 if (ev_is_active (&pipe_w))
1678 { 1846 {
1679 /*ev_ref (EV_A);*/ 1847 /*ev_ref (EV_A);*/
1680 /*ev_io_stop (EV_A_ &pipe_w);*/ 1848 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1702#endif 1870#endif
1703 1871
1704 if (backend_fd >= 0) 1872 if (backend_fd >= 0)
1705 close (backend_fd); 1873 close (backend_fd);
1706 1874
1875#if EV_USE_IOCP
1876 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1877#endif
1707#if EV_USE_PORT 1878#if EV_USE_PORT
1708 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1879 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1709#endif 1880#endif
1710#if EV_USE_KQUEUE 1881#if EV_USE_KQUEUE
1711 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1882 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1738 array_free (periodic, EMPTY); 1909 array_free (periodic, EMPTY);
1739#endif 1910#endif
1740#if EV_FORK_ENABLE 1911#if EV_FORK_ENABLE
1741 array_free (fork, EMPTY); 1912 array_free (fork, EMPTY);
1742#endif 1913#endif
1914#if EV_CLEANUP_ENABLE
1915 array_free (cleanup, EMPTY);
1916#endif
1743 array_free (prepare, EMPTY); 1917 array_free (prepare, EMPTY);
1744 array_free (check, EMPTY); 1918 array_free (check, EMPTY);
1745#if EV_ASYNC_ENABLE 1919#if EV_ASYNC_ENABLE
1746 array_free (async, EMPTY); 1920 array_free (async, EMPTY);
1747#endif 1921#endif
1748 1922
1749 backend = 0; 1923 backend = 0;
1924
1925#if EV_MULTIPLICITY
1926 if (ev_is_default_loop (EV_A))
1927#endif
1928 ev_default_loop_ptr = 0;
1929#if EV_MULTIPLICITY
1930 else
1931 ev_free (EV_A);
1932#endif
1750} 1933}
1751 1934
1752#if EV_USE_INOTIFY 1935#if EV_USE_INOTIFY
1753inline_size void infy_fork (EV_P); 1936inline_size void infy_fork (EV_P);
1754#endif 1937#endif
… …
1813 loop_init (EV_A_ flags); 1996 loop_init (EV_A_ flags);
1814 1997
1815 if (ev_backend (EV_A)) 1998 if (ev_backend (EV_A))
1816 return EV_A; 1999 return EV_A;
1817 2000
2001 ev_free (EV_A);
1818 return 0; 2002 return 0;
1819} 2003}
1820 2004
1821void
1822ev_loop_destroy (EV_P)
1823{
1824 loop_destroy (EV_A);
1825 ev_free (loop);
1826}
1827
1828void
1829ev_loop_fork (EV_P)
1830{
1831 postfork = 1; /* must be in line with ev_default_fork */
1832}
1833#endif /* multiplicity */ 2005#endif /* multiplicity */
1834 2006
1835#if EV_VERIFY 2007#if EV_VERIFY
1836static void noinline 2008static void noinline
1837verify_watcher (EV_P_ W w) 2009verify_watcher (EV_P_ W w)
… …
1912#if EV_FORK_ENABLE 2084#if EV_FORK_ENABLE
1913 assert (forkmax >= forkcnt); 2085 assert (forkmax >= forkcnt);
1914 array_verify (EV_A_ (W *)forks, forkcnt); 2086 array_verify (EV_A_ (W *)forks, forkcnt);
1915#endif 2087#endif
1916 2088
2089#if EV_CLEANUP_ENABLE
2090 assert (cleanupmax >= cleanupcnt);
2091 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2092#endif
2093
1917#if EV_ASYNC_ENABLE 2094#if EV_ASYNC_ENABLE
1918 assert (asyncmax >= asynccnt); 2095 assert (asyncmax >= asynccnt);
1919 array_verify (EV_A_ (W *)asyncs, asynccnt); 2096 array_verify (EV_A_ (W *)asyncs, asynccnt);
1920#endif 2097#endif
1921 2098
… …
1939} 2116}
1940#endif 2117#endif
1941 2118
1942#if EV_MULTIPLICITY 2119#if EV_MULTIPLICITY
1943struct ev_loop * 2120struct ev_loop *
1944ev_default_loop_init (unsigned int flags)
1945#else 2121#else
1946int 2122int
2123#endif
1947ev_default_loop (unsigned int flags) 2124ev_default_loop (unsigned int flags)
1948#endif
1949{ 2125{
1950 if (!ev_default_loop_ptr) 2126 if (!ev_default_loop_ptr)
1951 { 2127 {
1952#if EV_MULTIPLICITY 2128#if EV_MULTIPLICITY
1953 EV_P = ev_default_loop_ptr = &default_loop_struct; 2129 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1972 2148
1973 return ev_default_loop_ptr; 2149 return ev_default_loop_ptr;
1974} 2150}
1975 2151
1976void 2152void
1977ev_default_destroy (void) 2153ev_loop_fork (EV_P)
1978{ 2154{
1979#if EV_MULTIPLICITY
1980 EV_P = ev_default_loop_ptr;
1981#endif
1982
1983 ev_default_loop_ptr = 0;
1984
1985#if EV_CHILD_ENABLE
1986 ev_ref (EV_A); /* child watcher */
1987 ev_signal_stop (EV_A_ &childev);
1988#endif
1989
1990 loop_destroy (EV_A);
1991}
1992
1993void
1994ev_default_fork (void)
1995{
1996#if EV_MULTIPLICITY
1997 EV_P = ev_default_loop_ptr;
1998#endif
1999
2000 postfork = 1; /* must be in line with ev_loop_fork */ 2155 postfork = 1; /* must be in line with ev_default_fork */
2001} 2156}
2002 2157
2003/*****************************************************************************/ 2158/*****************************************************************************/
2004 2159
2005void 2160void
… …
2027 2182
2028 for (pri = NUMPRI; pri--; ) 2183 for (pri = NUMPRI; pri--; )
2029 while (pendingcnt [pri]) 2184 while (pendingcnt [pri])
2030 { 2185 {
2031 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2186 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2032
2033 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2034 /* ^ this is no longer true, as pending_w could be here */
2035 2187
2036 p->w->pending = 0; 2188 p->w->pending = 0;
2037 EV_CB_INVOKE (p->w, p->events); 2189 EV_CB_INVOKE (p->w, p->events);
2038 EV_FREQUENT_CHECK; 2190 EV_FREQUENT_CHECK;
2039 } 2191 }
… …
2096 EV_FREQUENT_CHECK; 2248 EV_FREQUENT_CHECK;
2097 feed_reverse (EV_A_ (W)w); 2249 feed_reverse (EV_A_ (W)w);
2098 } 2250 }
2099 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2251 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2100 2252
2101 feed_reverse_done (EV_A_ EV_TIMEOUT); 2253 feed_reverse_done (EV_A_ EV_TIMER);
2102 } 2254 }
2103} 2255}
2104 2256
2105#if EV_PERIODIC_ENABLE 2257#if EV_PERIODIC_ENABLE
2258
2259static void noinline
2260periodic_recalc (EV_P_ ev_periodic *w)
2261{
2262 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2263 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2264
2265 /* the above almost always errs on the low side */
2266 while (at <= ev_rt_now)
2267 {
2268 ev_tstamp nat = at + w->interval;
2269
2270 /* when resolution fails us, we use ev_rt_now */
2271 if (expect_false (nat == at))
2272 {
2273 at = ev_rt_now;
2274 break;
2275 }
2276
2277 at = nat;
2278 }
2279
2280 ev_at (w) = at;
2281}
2282
2106/* make periodics pending */ 2283/* make periodics pending */
2107inline_size void 2284inline_size void
2108periodics_reify (EV_P) 2285periodics_reify (EV_P)
2109{ 2286{
2110 EV_FREQUENT_CHECK; 2287 EV_FREQUENT_CHECK;
… …
2129 ANHE_at_cache (periodics [HEAP0]); 2306 ANHE_at_cache (periodics [HEAP0]);
2130 downheap (periodics, periodiccnt, HEAP0); 2307 downheap (periodics, periodiccnt, HEAP0);
2131 } 2308 }
2132 else if (w->interval) 2309 else if (w->interval)
2133 { 2310 {
2134 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2311 periodic_recalc (EV_A_ w);
2135 /* if next trigger time is not sufficiently in the future, put it there */
2136 /* this might happen because of floating point inexactness */
2137 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2138 {
2139 ev_at (w) += w->interval;
2140
2141 /* if interval is unreasonably low we might still have a time in the past */
2142 /* so correct this. this will make the periodic very inexact, but the user */
2143 /* has effectively asked to get triggered more often than possible */
2144 if (ev_at (w) < ev_rt_now)
2145 ev_at (w) = ev_rt_now;
2146 }
2147
2148 ANHE_at_cache (periodics [HEAP0]); 2312 ANHE_at_cache (periodics [HEAP0]);
2149 downheap (periodics, periodiccnt, HEAP0); 2313 downheap (periodics, periodiccnt, HEAP0);
2150 } 2314 }
2151 else 2315 else
2152 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2316 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2159 feed_reverse_done (EV_A_ EV_PERIODIC); 2323 feed_reverse_done (EV_A_ EV_PERIODIC);
2160 } 2324 }
2161} 2325}
2162 2326
2163/* simply recalculate all periodics */ 2327/* simply recalculate all periodics */
2164/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2328/* TODO: maybe ensure that at least one event happens when jumping forward? */
2165static void noinline 2329static void noinline
2166periodics_reschedule (EV_P) 2330periodics_reschedule (EV_P)
2167{ 2331{
2168 int i; 2332 int i;
2169 2333
… …
2173 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2337 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2174 2338
2175 if (w->reschedule_cb) 2339 if (w->reschedule_cb)
2176 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2340 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2177 else if (w->interval) 2341 else if (w->interval)
2178 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2342 periodic_recalc (EV_A_ w);
2179 2343
2180 ANHE_at_cache (periodics [i]); 2344 ANHE_at_cache (periodics [i]);
2181 } 2345 }
2182 2346
2183 reheap (periodics, periodiccnt); 2347 reheap (periodics, periodiccnt);
… …
2230 * doesn't hurt either as we only do this on time-jumps or 2394 * doesn't hurt either as we only do this on time-jumps or
2231 * in the unlikely event of having been preempted here. 2395 * in the unlikely event of having been preempted here.
2232 */ 2396 */
2233 for (i = 4; --i; ) 2397 for (i = 4; --i; )
2234 { 2398 {
2399 ev_tstamp diff;
2235 rtmn_diff = ev_rt_now - mn_now; 2400 rtmn_diff = ev_rt_now - mn_now;
2236 2401
2402 diff = odiff - rtmn_diff;
2403
2237 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2404 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2238 return; /* all is well */ 2405 return; /* all is well */
2239 2406
2240 ev_rt_now = ev_time (); 2407 ev_rt_now = ev_time ();
2241 mn_now = get_clock (); 2408 mn_now = get_clock ();
2242 now_floor = mn_now; 2409 now_floor = mn_now;
… …
2265 mn_now = ev_rt_now; 2432 mn_now = ev_rt_now;
2266 } 2433 }
2267} 2434}
2268 2435
2269void 2436void
2270ev_loop (EV_P_ int flags) 2437ev_run (EV_P_ int flags)
2271{ 2438{
2272#if EV_FEATURE_API 2439#if EV_FEATURE_API
2273 ++loop_depth; 2440 ++loop_depth;
2274#endif 2441#endif
2275 2442
2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2443 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2277 2444
2278 loop_done = EVUNLOOP_CANCEL; 2445 loop_done = EVBREAK_CANCEL;
2279 2446
2280 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2447 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2281 2448
2282 do 2449 do
2283 { 2450 {
… …
2326 /* calculate blocking time */ 2493 /* calculate blocking time */
2327 { 2494 {
2328 ev_tstamp waittime = 0.; 2495 ev_tstamp waittime = 0.;
2329 ev_tstamp sleeptime = 0.; 2496 ev_tstamp sleeptime = 0.;
2330 2497
2498 /* remember old timestamp for io_blocktime calculation */
2499 ev_tstamp prev_mn_now = mn_now;
2500
2501 /* update time to cancel out callback processing overhead */
2502 time_update (EV_A_ 1e100);
2503
2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2504 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2332 { 2505 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
2336 /* update time to cancel out callback processing overhead */
2337 time_update (EV_A_ 1e100);
2338
2339 waittime = MAX_BLOCKTIME; 2506 waittime = MAX_BLOCKTIME;
2340 2507
2341 if (timercnt) 2508 if (timercnt)
2342 { 2509 {
2343 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2510 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2344 if (waittime > to) waittime = to; 2511 if (waittime > to) waittime = to;
2345 } 2512 }
2346 2513
2347#if EV_PERIODIC_ENABLE 2514#if EV_PERIODIC_ENABLE
2348 if (periodiccnt) 2515 if (periodiccnt)
2349 { 2516 {
2350 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2517 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2351 if (waittime > to) waittime = to; 2518 if (waittime > to) waittime = to;
2352 } 2519 }
2353#endif 2520#endif
2354 2521
2355 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2522 /* don't let timeouts decrease the waittime below timeout_blocktime */
2356 if (expect_false (waittime < timeout_blocktime)) 2523 if (expect_false (waittime < timeout_blocktime))
2357 waittime = timeout_blocktime; 2524 waittime = timeout_blocktime;
2525
2526 /* at this point, we NEED to wait, so we have to ensure */
2527 /* to pass a minimum nonzero value to the backend */
2528 if (expect_false (waittime < backend_mintime))
2529 waittime = backend_mintime;
2358 2530
2359 /* extra check because io_blocktime is commonly 0 */ 2531 /* extra check because io_blocktime is commonly 0 */
2360 if (expect_false (io_blocktime)) 2532 if (expect_false (io_blocktime))
2361 { 2533 {
2362 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2534 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2363 2535
2364 if (sleeptime > waittime - backend_fudge) 2536 if (sleeptime > waittime - backend_mintime)
2365 sleeptime = waittime - backend_fudge; 2537 sleeptime = waittime - backend_mintime;
2366 2538
2367 if (expect_true (sleeptime > 0.)) 2539 if (expect_true (sleeptime > 0.))
2368 { 2540 {
2369 ev_sleep (sleeptime); 2541 ev_sleep (sleeptime);
2370 waittime -= sleeptime; 2542 waittime -= sleeptime;
… …
2373 } 2545 }
2374 2546
2375#if EV_FEATURE_API 2547#if EV_FEATURE_API
2376 ++loop_count; 2548 ++loop_count;
2377#endif 2549#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2550 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2379 backend_poll (EV_A_ waittime); 2551 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2552 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2381 2553
2382 /* update ev_rt_now, do magic */ 2554 /* update ev_rt_now, do magic */
2383 time_update (EV_A_ waittime + sleeptime); 2555 time_update (EV_A_ waittime + sleeptime);
2384 } 2556 }
2385 2557
… …
2403 EV_INVOKE_PENDING; 2575 EV_INVOKE_PENDING;
2404 } 2576 }
2405 while (expect_true ( 2577 while (expect_true (
2406 activecnt 2578 activecnt
2407 && !loop_done 2579 && !loop_done
2408 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2580 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2409 )); 2581 ));
2410 2582
2411 if (loop_done == EVUNLOOP_ONE) 2583 if (loop_done == EVBREAK_ONE)
2412 loop_done = EVUNLOOP_CANCEL; 2584 loop_done = EVBREAK_CANCEL;
2413 2585
2414#if EV_FEATURE_API 2586#if EV_FEATURE_API
2415 --loop_depth; 2587 --loop_depth;
2416#endif 2588#endif
2417} 2589}
2418 2590
2419void 2591void
2420ev_unloop (EV_P_ int how) 2592ev_break (EV_P_ int how)
2421{ 2593{
2422 loop_done = how; 2594 loop_done = how;
2423} 2595}
2424 2596
2425void 2597void
… …
2573 EV_FREQUENT_CHECK; 2745 EV_FREQUENT_CHECK;
2574 2746
2575 wlist_del (&anfds[w->fd].head, (WL)w); 2747 wlist_del (&anfds[w->fd].head, (WL)w);
2576 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2577 2749
2578 fd_change (EV_A_ w->fd, 1); 2750 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2579 2751
2580 EV_FREQUENT_CHECK; 2752 EV_FREQUENT_CHECK;
2581} 2753}
2582 2754
2583void noinline 2755void noinline
… …
2675 if (w->reschedule_cb) 2847 if (w->reschedule_cb)
2676 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2848 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2677 else if (w->interval) 2849 else if (w->interval)
2678 { 2850 {
2679 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2851 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2680 /* this formula differs from the one in periodic_reify because we do not always round up */ 2852 periodic_recalc (EV_A_ w);
2681 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2682 } 2853 }
2683 else 2854 else
2684 ev_at (w) = w->offset; 2855 ev_at (w) = w->offset;
2685 2856
2686 EV_FREQUENT_CHECK; 2857 EV_FREQUENT_CHECK;
… …
2807 sa.sa_handler = ev_sighandler; 2978 sa.sa_handler = ev_sighandler;
2808 sigfillset (&sa.sa_mask); 2979 sigfillset (&sa.sa_mask);
2809 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2980 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2810 sigaction (w->signum, &sa, 0); 2981 sigaction (w->signum, &sa, 0);
2811 2982
2983 if (origflags & EVFLAG_NOSIGMASK)
2984 {
2812 sigemptyset (&sa.sa_mask); 2985 sigemptyset (&sa.sa_mask);
2813 sigaddset (&sa.sa_mask, w->signum); 2986 sigaddset (&sa.sa_mask, w->signum);
2814 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2987 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2988 }
2815#endif 2989#endif
2816 } 2990 }
2817 2991
2818 EV_FREQUENT_CHECK; 2992 EV_FREQUENT_CHECK;
2819} 2993}
… …
2960 if (!pend || pend == path) 3134 if (!pend || pend == path)
2961 break; 3135 break;
2962 3136
2963 *pend = 0; 3137 *pend = 0;
2964 w->wd = inotify_add_watch (fs_fd, path, mask); 3138 w->wd = inotify_add_watch (fs_fd, path, mask);
2965 } 3139 }
2966 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3140 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2967 } 3141 }
2968 } 3142 }
2969 3143
2970 if (w->wd >= 0) 3144 if (w->wd >= 0)
… …
3035 { 3209 {
3036 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3210 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3037 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3211 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3038 ofs += sizeof (struct inotify_event) + ev->len; 3212 ofs += sizeof (struct inotify_event) + ev->len;
3039 } 3213 }
3040}
3041
3042inline_size unsigned int
3043ev_linux_version (void)
3044{
3045 struct utsname buf;
3046 unsigned int v;
3047 int i;
3048 char *p = buf.release;
3049
3050 if (uname (&buf))
3051 return 0;
3052
3053 for (i = 3+1; --i; )
3054 {
3055 unsigned int c = 0;
3056
3057 for (;;)
3058 {
3059 if (*p >= '0' && *p <= '9')
3060 c = c * 10 + *p++ - '0';
3061 else
3062 {
3063 p += *p == '.';
3064 break;
3065 }
3066 }
3067
3068 v = (v << 8) | c;
3069 }
3070
3071 return v;
3072} 3214}
3073 3215
3074inline_size void 3216inline_size void
3075ev_check_2625 (EV_P) 3217ev_check_2625 (EV_P)
3076{ 3218{
… …
3400 3542
3401#if EV_EMBED_ENABLE 3543#if EV_EMBED_ENABLE
3402void noinline 3544void noinline
3403ev_embed_sweep (EV_P_ ev_embed *w) 3545ev_embed_sweep (EV_P_ ev_embed *w)
3404{ 3546{
3405 ev_loop (w->other, EVLOOP_NONBLOCK); 3547 ev_run (w->other, EVRUN_NOWAIT);
3406} 3548}
3407 3549
3408static void 3550static void
3409embed_io_cb (EV_P_ ev_io *io, int revents) 3551embed_io_cb (EV_P_ ev_io *io, int revents)
3410{ 3552{
3411 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3553 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3412 3554
3413 if (ev_cb (w)) 3555 if (ev_cb (w))
3414 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3556 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3415 else 3557 else
3416 ev_loop (w->other, EVLOOP_NONBLOCK); 3558 ev_run (w->other, EVRUN_NOWAIT);
3417} 3559}
3418 3560
3419static void 3561static void
3420embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3562embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3421{ 3563{
… …
3425 EV_P = w->other; 3567 EV_P = w->other;
3426 3568
3427 while (fdchangecnt) 3569 while (fdchangecnt)
3428 { 3570 {
3429 fd_reify (EV_A); 3571 fd_reify (EV_A);
3430 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3572 ev_run (EV_A_ EVRUN_NOWAIT);
3431 } 3573 }
3432 } 3574 }
3433} 3575}
3434 3576
3435static void 3577static void
… …
3441 3583
3442 { 3584 {
3443 EV_P = w->other; 3585 EV_P = w->other;
3444 3586
3445 ev_loop_fork (EV_A); 3587 ev_loop_fork (EV_A);
3446 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3588 ev_run (EV_A_ EVRUN_NOWAIT);
3447 } 3589 }
3448 3590
3449 ev_embed_start (EV_A_ w); 3591 ev_embed_start (EV_A_ w);
3450} 3592}
3451 3593
… …
3543 3685
3544 EV_FREQUENT_CHECK; 3686 EV_FREQUENT_CHECK;
3545} 3687}
3546#endif 3688#endif
3547 3689
3548#if EV_ASYNC_ENABLE 3690#if EV_CLEANUP_ENABLE
3549void 3691void
3550ev_async_start (EV_P_ ev_async *w) 3692ev_cleanup_start (EV_P_ ev_cleanup *w)
3551{ 3693{
3552 if (expect_false (ev_is_active (w))) 3694 if (expect_false (ev_is_active (w)))
3553 return; 3695 return;
3696
3697 EV_FREQUENT_CHECK;
3698
3699 ev_start (EV_A_ (W)w, ++cleanupcnt);
3700 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3701 cleanups [cleanupcnt - 1] = w;
3702
3703 /* cleanup watchers should never keep a refcount on the loop */
3704 ev_unref (EV_A);
3705 EV_FREQUENT_CHECK;
3706}
3707
3708void
3709ev_cleanup_stop (EV_P_ ev_cleanup *w)
3710{
3711 clear_pending (EV_A_ (W)w);
3712 if (expect_false (!ev_is_active (w)))
3713 return;
3714
3715 EV_FREQUENT_CHECK;
3716 ev_ref (EV_A);
3717
3718 {
3719 int active = ev_active (w);
3720
3721 cleanups [active - 1] = cleanups [--cleanupcnt];
3722 ev_active (cleanups [active - 1]) = active;
3723 }
3724
3725 ev_stop (EV_A_ (W)w);
3726
3727 EV_FREQUENT_CHECK;
3728}
3729#endif
3730
3731#if EV_ASYNC_ENABLE
3732void
3733ev_async_start (EV_P_ ev_async *w)
3734{
3735 if (expect_false (ev_is_active (w)))
3736 return;
3737
3738 w->sent = 0;
3554 3739
3555 evpipe_init (EV_A); 3740 evpipe_init (EV_A);
3556 3741
3557 EV_FREQUENT_CHECK; 3742 EV_FREQUENT_CHECK;
3558 3743
… …
3636{ 3821{
3637 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3822 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3638 3823
3639 if (expect_false (!once)) 3824 if (expect_false (!once))
3640 { 3825 {
3641 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3826 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3642 return; 3827 return;
3643 } 3828 }
3644 3829
3645 once->cb = cb; 3830 once->cb = cb;
3646 once->arg = arg; 3831 once->arg = arg;
… …
3778 3963
3779#if EV_MULTIPLICITY 3964#if EV_MULTIPLICITY
3780 #include "ev_wrap.h" 3965 #include "ev_wrap.h"
3781#endif 3966#endif
3782 3967
3783#ifdef __cplusplus 3968EV_CPP(})
3784}
3785#endif
3786 3969

Diff Legend

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