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

Comparing libev/ev.c (file contents):
Revision 1.368 by root, Mon Jan 17 12:11:11 2011 UTC vs.
Revision 1.388 by root, Fri Jul 29 12:17:26 2011 UTC

4 * Copyright (c) 2007,2008,2009,2010,2011 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,
42# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
43# include EV_CONFIG_H 43# include EV_CONFIG_H
44# else 44# else
45# include "config.h" 45# include "config.h"
46# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
47 53
48# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
49# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
50# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
51# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
156# define EV_USE_EVENTFD 0 162# define EV_USE_EVENTFD 0
157# endif 163# endif
158 164
159#endif 165#endif
160 166
161#include <math.h>
162#include <stdlib.h> 167#include <stdlib.h>
163#include <string.h> 168#include <string.h>
164#include <fcntl.h> 169#include <fcntl.h>
165#include <stddef.h> 170#include <stddef.h>
166 171
232/* to make it compile regardless, just remove the above line, */ 237/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */ 238/* but consider reporting it, too! :) */
234# define EV_NSIG 65 239# define EV_NSIG 65
235#endif 240#endif
236 241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
245
237#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
238# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
240# else 249# else
241# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
376# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
377# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
378#endif 387#endif
379 388
380#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
381# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
382# include <sys/select.h> 392# include <sys/select.h>
383# endif 393# endif
384#endif 394#endif
385 395
386#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
442#else 452#else
443# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
444#endif 454#endif
445 455
446/* 456/*
447 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
448 * It is added to ev_rt_now when scheduling periodics
449 * to ensure progress, time-wise, even when rounding
450 * errors are against us.
451 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
452 * Better solutions welcome.
453 */ 459 */
454#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 */
455 462
456#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) */
457#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) */
458 465
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } 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)
461 468
462#if __GNUC__ >= 4 469/* the following are taken from libecb */
463# define expect(expr,value) __builtin_expect ((expr),(value)) 470/* ecb.h start */
464# define noinline __attribute__ ((noinline)) 471
472/* many compilers define _GNUC_ to some versions but then only implement
473 * what their idiot authors think are the "more important" extensions,
474 * causing enourmous grief in return for some better fake benchmark numbers.
475 * or so.
476 * we try to detect these and simply assume they are not gcc - if they have
477 * an issue with that they should have done it right in the first place.
478 */
479#ifndef ECB_GCC_VERSION
480 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
481 #define ECB_GCC_VERSION(major,minor) 0
482 #else
483 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
484 #endif
485#endif
486
487#if __cplusplus
488 #define ecb_inline static inline
489#elif ECB_GCC_VERSION(2,5)
490 #define ecb_inline static __inline__
491#elif ECB_C99
492 #define ecb_inline static inline
465#else 493#else
466# define expect(expr,value) (expr) 494 #define ecb_inline static
467# define noinline
468# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
469# define inline
470# endif 495#endif
496
497#ifndef ECB_MEMORY_FENCE
498 #if ECB_GCC_VERSION(2,5)
499 #if __x86
500 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
501 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
502 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE /* better be safe than sorry */
503 #elif __amd64
504 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
505 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
506 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence")
507 #endif
471#endif 508 #endif
509#endif
472 510
511#ifndef ECB_MEMORY_FENCE
512 #if ECB_GCC_VERSION(4,4)
513 #define ECB_MEMORY_FENCE __sync_synchronize ()
514 #define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); })
515 #define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); })
516 #elif _MSC_VER >= 1400 && 0 /* TODO: only true when using volatiles */
517 #define ECB_MEMORY_FENCE do { } while (0)
518 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
519 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
520 #elif defined(_WIN32)
521 #include <WinNT.h>
522 #define ECB_MEMORY_FENCE MemoryBarrier ()
523 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
524 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
525 #endif
526#endif
527
528#ifndef ECB_MEMORY_FENCE
529 #include <pthread.h>
530
531 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
532 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
533 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
534 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
535#endif
536
537#if ECB_GCC_VERSION(3,1)
538 #define ecb_attribute(attrlist) __attribute__(attrlist)
539 #define ecb_is_constant(expr) __builtin_constant_p (expr)
540 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
541 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
542#else
543 #define ecb_attribute(attrlist)
544 #define ecb_is_constant(expr) 0
545 #define ecb_expect(expr,value) (expr)
546 #define ecb_prefetch(addr,rw,locality)
547#endif
548
549#define ecb_noinline ecb_attribute ((__noinline__))
550#define ecb_noreturn ecb_attribute ((__noreturn__))
551#define ecb_unused ecb_attribute ((__unused__))
552#define ecb_const ecb_attribute ((__const__))
553#define ecb_pure ecb_attribute ((__pure__))
554
555#if ECB_GCC_VERSION(4,3)
556 #define ecb_artificial ecb_attribute ((__artificial__))
557 #define ecb_hot ecb_attribute ((__hot__))
558 #define ecb_cold ecb_attribute ((__cold__))
559#else
560 #define ecb_artificial
561 #define ecb_hot
562 #define ecb_cold
563#endif
564
565/* put around conditional expressions if you are very sure that the */
566/* expression is mostly true or mostly false. note that these return */
567/* booleans, not the expression. */
473#define expect_false(expr) expect ((expr) != 0, 0) 568#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
474#define expect_true(expr) expect ((expr) != 0, 1) 569#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
570/* ecb.h end */
571
572#define expect_false(cond) ecb_expect_false (cond)
573#define expect_true(cond) ecb_expect_true (cond)
574#define noinline ecb_noinline
575
475#define inline_size static inline 576#define inline_size ecb_inline
476 577
477#if EV_FEATURE_CODE 578#if EV_FEATURE_CODE
478# define inline_speed static inline 579# define inline_speed ecb_inline
479#else 580#else
480# define inline_speed static noinline 581# define inline_speed static noinline
481#endif 582#endif
482 583
483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 584#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
522# include "ev_win32.c" 623# include "ev_win32.c"
523#endif 624#endif
524 625
525/*****************************************************************************/ 626/*****************************************************************************/
526 627
628/* define a suitable floor function (only used by periodics atm) */
629
630#if EV_USE_FLOOR
631# include <math.h>
632# define ev_floor(v) floor (v)
633#else
634
635#include <float.h>
636
637/* a floor() replacement function, should be independent of ev_tstamp type */
638static ev_tstamp noinline
639ev_floor (ev_tstamp v)
640{
641 /* the choice of shift factor is not terribly important */
642#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
643 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
644#else
645 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
646#endif
647
648 /* argument too large for an unsigned long? */
649 if (expect_false (v >= shift))
650 {
651 ev_tstamp f;
652
653 if (v == v - 1.)
654 return v; /* very large number */
655
656 f = shift * ev_floor (v * (1. / shift));
657 return f + ev_floor (v - f);
658 }
659
660 /* special treatment for negative args? */
661 if (expect_false (v < 0.))
662 {
663 ev_tstamp f = -ev_floor (-v);
664
665 return f - (f == v ? 0 : 1);
666 }
667
668 /* fits into an unsigned long */
669 return (unsigned long)v;
670}
671
672#endif
673
674/*****************************************************************************/
675
527#ifdef __linux 676#ifdef __linux
528# include <sys/utsname.h> 677# include <sys/utsname.h>
529#endif 678#endif
530 679
531static unsigned int noinline 680static unsigned int noinline ecb_cold
532ev_linux_version (void) 681ev_linux_version (void)
533{ 682{
534#ifdef __linux 683#ifdef __linux
535 unsigned int v = 0; 684 unsigned int v = 0;
536 struct utsname buf; 685 struct utsname buf;
565} 714}
566 715
567/*****************************************************************************/ 716/*****************************************************************************/
568 717
569#if EV_AVOID_STDIO 718#if EV_AVOID_STDIO
570static void noinline 719static void noinline ecb_cold
571ev_printerr (const char *msg) 720ev_printerr (const char *msg)
572{ 721{
573 write (STDERR_FILENO, msg, strlen (msg)); 722 write (STDERR_FILENO, msg, strlen (msg));
574} 723}
575#endif 724#endif
576 725
577static void (*syserr_cb)(const char *msg); 726static void (*syserr_cb)(const char *msg);
578 727
579void 728void ecb_cold
580ev_set_syserr_cb (void (*cb)(const char *msg)) 729ev_set_syserr_cb (void (*cb)(const char *msg))
581{ 730{
582 syserr_cb = cb; 731 syserr_cb = cb;
583} 732}
584 733
585static void noinline 734static void noinline ecb_cold
586ev_syserr (const char *msg) 735ev_syserr (const char *msg)
587{ 736{
588 if (!msg) 737 if (!msg)
589 msg = "(libev) system error"; 738 msg = "(libev) system error";
590 739
623#endif 772#endif
624} 773}
625 774
626static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 775static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
627 776
628void 777void ecb_cold
629ev_set_allocator (void *(*cb)(void *ptr, long size)) 778ev_set_allocator (void *(*cb)(void *ptr, long size))
630{ 779{
631 alloc = cb; 780 alloc = cb;
632} 781}
633 782
815 select (0, 0, 0, 0, &tv); 964 select (0, 0, 0, 0, &tv);
816#endif 965#endif
817 } 966 }
818} 967}
819 968
820inline_speed int
821ev_timeout_to_ms (ev_tstamp timeout)
822{
823 int ms = timeout * 1000. + .999999;
824
825 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
826}
827
828/*****************************************************************************/ 969/*****************************************************************************/
829 970
830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 971#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
831 972
832/* find a suitable new size for the given array, */ 973/* find a suitable new size for the given array, */
850 } 991 }
851 992
852 return ncur; 993 return ncur;
853} 994}
854 995
855static noinline void * 996static void * noinline ecb_cold
856array_realloc (int elem, void *base, int *cur, int cnt) 997array_realloc (int elem, void *base, int *cur, int cnt)
857{ 998{
858 *cur = array_nextsize (elem, *cur, cnt); 999 *cur = array_nextsize (elem, *cur, cnt);
859 return ev_realloc (base, elem * *cur); 1000 return ev_realloc (base, elem * *cur);
860} 1001}
863 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1004 memset ((void *)(base), 0, sizeof (*(base)) * (count))
864 1005
865#define array_needsize(type,base,cur,cnt,init) \ 1006#define array_needsize(type,base,cur,cnt,init) \
866 if (expect_false ((cnt) > (cur))) \ 1007 if (expect_false ((cnt) > (cur))) \
867 { \ 1008 { \
868 int ocur_ = (cur); \ 1009 int ecb_unused ocur_ = (cur); \
869 (base) = (type *)array_realloc \ 1010 (base) = (type *)array_realloc \
870 (sizeof (type), (base), &(cur), (cnt)); \ 1011 (sizeof (type), (base), &(cur), (cnt)); \
871 init ((base) + (ocur_), (cur) - ocur_); \ 1012 init ((base) + (ocur_), (cur) - ocur_); \
872 } 1013 }
873 1014
973inline_size void 1114inline_size void
974fd_reify (EV_P) 1115fd_reify (EV_P)
975{ 1116{
976 int i; 1117 int i;
977 1118
1119#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1120 for (i = 0; i < fdchangecnt; ++i)
1121 {
1122 int fd = fdchanges [i];
1123 ANFD *anfd = anfds + fd;
1124
1125 if (anfd->reify & EV__IOFDSET && anfd->head)
1126 {
1127 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1128
1129 if (handle != anfd->handle)
1130 {
1131 unsigned long arg;
1132
1133 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1134
1135 /* handle changed, but fd didn't - we need to do it in two steps */
1136 backend_modify (EV_A_ fd, anfd->events, 0);
1137 anfd->events = 0;
1138 anfd->handle = handle;
1139 }
1140 }
1141 }
1142#endif
1143
978 for (i = 0; i < fdchangecnt; ++i) 1144 for (i = 0; i < fdchangecnt; ++i)
979 { 1145 {
980 int fd = fdchanges [i]; 1146 int fd = fdchanges [i];
981 ANFD *anfd = anfds + fd; 1147 ANFD *anfd = anfds + fd;
982 ev_io *w; 1148 ev_io *w;
984 unsigned char o_events = anfd->events; 1150 unsigned char o_events = anfd->events;
985 unsigned char o_reify = anfd->reify; 1151 unsigned char o_reify = anfd->reify;
986 1152
987 anfd->reify = 0; 1153 anfd->reify = 0;
988 1154
989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
990 if (o_reify & EV__IOFDSET)
991 {
992 unsigned long arg;
993 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
996 }
997#endif
998
999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1155 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
1000 { 1156 {
1001 anfd->events = 0; 1157 anfd->events = 0;
1002 1158
1003 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1159 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1028 fdchanges [fdchangecnt - 1] = fd; 1184 fdchanges [fdchangecnt - 1] = fd;
1029 } 1185 }
1030} 1186}
1031 1187
1032/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1188/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1033inline_speed void 1189inline_speed void ecb_cold
1034fd_kill (EV_P_ int fd) 1190fd_kill (EV_P_ int fd)
1035{ 1191{
1036 ev_io *w; 1192 ev_io *w;
1037 1193
1038 while ((w = (ev_io *)anfds [fd].head)) 1194 while ((w = (ev_io *)anfds [fd].head))
1041 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1197 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1042 } 1198 }
1043} 1199}
1044 1200
1045/* check whether the given fd is actually valid, for error recovery */ 1201/* check whether the given fd is actually valid, for error recovery */
1046inline_size int 1202inline_size int ecb_cold
1047fd_valid (int fd) 1203fd_valid (int fd)
1048{ 1204{
1049#ifdef _WIN32 1205#ifdef _WIN32
1050 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1206 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1051#else 1207#else
1052 return fcntl (fd, F_GETFD) != -1; 1208 return fcntl (fd, F_GETFD) != -1;
1053#endif 1209#endif
1054} 1210}
1055 1211
1056/* called on EBADF to verify fds */ 1212/* called on EBADF to verify fds */
1057static void noinline 1213static void noinline ecb_cold
1058fd_ebadf (EV_P) 1214fd_ebadf (EV_P)
1059{ 1215{
1060 int fd; 1216 int fd;
1061 1217
1062 for (fd = 0; fd < anfdmax; ++fd) 1218 for (fd = 0; fd < anfdmax; ++fd)
1064 if (!fd_valid (fd) && errno == EBADF) 1220 if (!fd_valid (fd) && errno == EBADF)
1065 fd_kill (EV_A_ fd); 1221 fd_kill (EV_A_ fd);
1066} 1222}
1067 1223
1068/* called on ENOMEM in select/poll to kill some fds and retry */ 1224/* called on ENOMEM in select/poll to kill some fds and retry */
1069static void noinline 1225static void noinline ecb_cold
1070fd_enomem (EV_P) 1226fd_enomem (EV_P)
1071{ 1227{
1072 int fd; 1228 int fd;
1073 1229
1074 for (fd = anfdmax; fd--; ) 1230 for (fd = anfdmax; fd--; )
1269 1425
1270/*****************************************************************************/ 1426/*****************************************************************************/
1271 1427
1272#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1428#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1273 1429
1274static void noinline 1430static void noinline ecb_cold
1275evpipe_init (EV_P) 1431evpipe_init (EV_P)
1276{ 1432{
1277 if (!ev_is_active (&pipe_w)) 1433 if (!ev_is_active (&pipe_w))
1278 { 1434 {
1279# if EV_USE_EVENTFD 1435# if EV_USE_EVENTFD
1301 ev_io_start (EV_A_ &pipe_w); 1457 ev_io_start (EV_A_ &pipe_w);
1302 ev_unref (EV_A); /* watcher should not keep loop alive */ 1458 ev_unref (EV_A); /* watcher should not keep loop alive */
1303 } 1459 }
1304} 1460}
1305 1461
1306inline_size void 1462inline_speed void
1307evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1463evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1308{ 1464{
1309 if (!*flag) 1465 if (expect_true (*flag))
1466 return;
1467
1468 *flag = 1;
1469
1470 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1471
1472 pipe_write_skipped = 1;
1473
1474 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1475
1476 if (pipe_write_wanted)
1310 { 1477 {
1478 int old_errno;
1479
1480 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */
1481
1311 int old_errno = errno; /* save errno because write might clobber it */ 1482 old_errno = errno; /* save errno because write will clobber it */
1312 char dummy;
1313
1314 *flag = 1;
1315 1483
1316#if EV_USE_EVENTFD 1484#if EV_USE_EVENTFD
1317 if (evfd >= 0) 1485 if (evfd >= 0)
1318 { 1486 {
1319 uint64_t counter = 1; 1487 uint64_t counter = 1;
1320 write (evfd, &counter, sizeof (uint64_t)); 1488 write (evfd, &counter, sizeof (uint64_t));
1321 } 1489 }
1322 else 1490 else
1323#endif 1491#endif
1492 {
1324 /* win32 people keep sending patches that change this write() to send() */ 1493 /* win32 people keep sending patches that change this write() to send() */
1325 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1494 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1326 /* so when you think this write should be a send instead, please find out */ 1495 /* so when you think this write should be a send instead, please find out */
1327 /* where your send() is from - it's definitely not the microsoft send, and */ 1496 /* where your send() is from - it's definitely not the microsoft send, and */
1328 /* tell me. thank you. */ 1497 /* tell me. thank you. */
1329 write (evpipe [1], &dummy, 1); 1498 write (evpipe [1], &(evpipe [1]), 1);
1499 }
1330 1500
1331 errno = old_errno; 1501 errno = old_errno;
1332 } 1502 }
1333} 1503}
1334 1504
1337static void 1507static void
1338pipecb (EV_P_ ev_io *iow, int revents) 1508pipecb (EV_P_ ev_io *iow, int revents)
1339{ 1509{
1340 int i; 1510 int i;
1341 1511
1512 if (revents & EV_READ)
1513 {
1342#if EV_USE_EVENTFD 1514#if EV_USE_EVENTFD
1343 if (evfd >= 0) 1515 if (evfd >= 0)
1344 { 1516 {
1345 uint64_t counter; 1517 uint64_t counter;
1346 read (evfd, &counter, sizeof (uint64_t)); 1518 read (evfd, &counter, sizeof (uint64_t));
1347 } 1519 }
1348 else 1520 else
1349#endif 1521#endif
1350 { 1522 {
1351 char dummy; 1523 char dummy;
1352 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1524 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1353 read (evpipe [0], &dummy, 1); 1525 read (evpipe [0], &dummy, 1);
1526 }
1354 } 1527 }
1355 1528
1529 pipe_write_skipped = 0;
1530
1531#if EV_SIGNAL_ENABLE
1356 if (sig_pending) 1532 if (sig_pending)
1357 { 1533 {
1358 sig_pending = 0; 1534 sig_pending = 0;
1359 1535
1360 for (i = EV_NSIG - 1; i--; ) 1536 for (i = EV_NSIG - 1; i--; )
1361 if (expect_false (signals [i].pending)) 1537 if (expect_false (signals [i].pending))
1362 ev_feed_signal_event (EV_A_ i + 1); 1538 ev_feed_signal_event (EV_A_ i + 1);
1363 } 1539 }
1540#endif
1364 1541
1365#if EV_ASYNC_ENABLE 1542#if EV_ASYNC_ENABLE
1366 if (async_pending) 1543 if (async_pending)
1367 { 1544 {
1368 async_pending = 0; 1545 async_pending = 0;
1386 EV_P = signals [signum - 1].loop; 1563 EV_P = signals [signum - 1].loop;
1387 1564
1388 if (!EV_A) 1565 if (!EV_A)
1389 return; 1566 return;
1390#endif 1567#endif
1568
1569 if (!ev_active (&pipe_w))
1570 return;
1391 1571
1392 signals [signum - 1].pending = 1; 1572 signals [signum - 1].pending = 1;
1393 evpipe_write (EV_A_ &sig_pending); 1573 evpipe_write (EV_A_ &sig_pending);
1394} 1574}
1395 1575
1527#endif 1707#endif
1528#if EV_USE_SELECT 1708#if EV_USE_SELECT
1529# include "ev_select.c" 1709# include "ev_select.c"
1530#endif 1710#endif
1531 1711
1532int 1712int ecb_cold
1533ev_version_major (void) 1713ev_version_major (void)
1534{ 1714{
1535 return EV_VERSION_MAJOR; 1715 return EV_VERSION_MAJOR;
1536} 1716}
1537 1717
1538int 1718int ecb_cold
1539ev_version_minor (void) 1719ev_version_minor (void)
1540{ 1720{
1541 return EV_VERSION_MINOR; 1721 return EV_VERSION_MINOR;
1542} 1722}
1543 1723
1544/* return true if we are running with elevated privileges and should ignore env variables */ 1724/* return true if we are running with elevated privileges and should ignore env variables */
1545int inline_size 1725int inline_size ecb_cold
1546enable_secure (void) 1726enable_secure (void)
1547{ 1727{
1548#ifdef _WIN32 1728#ifdef _WIN32
1549 return 0; 1729 return 0;
1550#else 1730#else
1551 return getuid () != geteuid () 1731 return getuid () != geteuid ()
1552 || getgid () != getegid (); 1732 || getgid () != getegid ();
1553#endif 1733#endif
1554} 1734}
1555 1735
1556unsigned int 1736unsigned int ecb_cold
1557ev_supported_backends (void) 1737ev_supported_backends (void)
1558{ 1738{
1559 unsigned int flags = 0; 1739 unsigned int flags = 0;
1560 1740
1561 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1741 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
1565 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1745 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1566 1746
1567 return flags; 1747 return flags;
1568} 1748}
1569 1749
1570unsigned int 1750unsigned int ecb_cold
1571ev_recommended_backends (void) 1751ev_recommended_backends (void)
1572{ 1752{
1573 unsigned int flags = ev_supported_backends (); 1753 unsigned int flags = ev_supported_backends ();
1574 1754
1575#ifndef __NetBSD__ 1755#ifndef __NetBSD__
1587#endif 1767#endif
1588 1768
1589 return flags; 1769 return flags;
1590} 1770}
1591 1771
1592unsigned int 1772unsigned int ecb_cold
1593ev_embeddable_backends (void) 1773ev_embeddable_backends (void)
1594{ 1774{
1595 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1775 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1596 1776
1597 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1777 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1642ev_userdata (EV_P) 1822ev_userdata (EV_P)
1643{ 1823{
1644 return userdata; 1824 return userdata;
1645} 1825}
1646 1826
1827void
1647void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1828ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1648{ 1829{
1649 invoke_cb = invoke_pending_cb; 1830 invoke_cb = invoke_pending_cb;
1650} 1831}
1651 1832
1833void
1652void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1834ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1653{ 1835{
1654 release_cb = release; 1836 release_cb = release;
1655 acquire_cb = acquire; 1837 acquire_cb = acquire;
1656} 1838}
1657#endif 1839#endif
1658 1840
1659/* initialise a loop structure, must be zero-initialised */ 1841/* initialise a loop structure, must be zero-initialised */
1660static void noinline 1842static void noinline ecb_cold
1661loop_init (EV_P_ unsigned int flags) 1843loop_init (EV_P_ unsigned int flags)
1662{ 1844{
1663 if (!backend) 1845 if (!backend)
1664 { 1846 {
1665 origflags = flags; 1847 origflags = flags;
1693 if (!(flags & EVFLAG_NOENV) 1875 if (!(flags & EVFLAG_NOENV)
1694 && !enable_secure () 1876 && !enable_secure ()
1695 && getenv ("LIBEV_FLAGS")) 1877 && getenv ("LIBEV_FLAGS"))
1696 flags = atoi (getenv ("LIBEV_FLAGS")); 1878 flags = atoi (getenv ("LIBEV_FLAGS"));
1697 1879
1698 ev_rt_now = ev_time (); 1880 ev_rt_now = ev_time ();
1699 mn_now = get_clock (); 1881 mn_now = get_clock ();
1700 now_floor = mn_now; 1882 now_floor = mn_now;
1701 rtmn_diff = ev_rt_now - mn_now; 1883 rtmn_diff = ev_rt_now - mn_now;
1702#if EV_FEATURE_API 1884#if EV_FEATURE_API
1703 invoke_cb = ev_invoke_pending; 1885 invoke_cb = ev_invoke_pending;
1704#endif 1886#endif
1705 1887
1706 io_blocktime = 0.; 1888 io_blocktime = 0.;
1707 timeout_blocktime = 0.; 1889 timeout_blocktime = 0.;
1708 backend = 0; 1890 backend = 0;
1709 backend_fd = -1; 1891 backend_fd = -1;
1710 sig_pending = 0; 1892 sig_pending = 0;
1711#if EV_ASYNC_ENABLE 1893#if EV_ASYNC_ENABLE
1712 async_pending = 0; 1894 async_pending = 0;
1713#endif 1895#endif
1896 pipe_write_skipped = 0;
1897 pipe_write_wanted = 0;
1714#if EV_USE_INOTIFY 1898#if EV_USE_INOTIFY
1715 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1899 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1716#endif 1900#endif
1717#if EV_USE_SIGNALFD 1901#if EV_USE_SIGNALFD
1718 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1902 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1719#endif 1903#endif
1720 1904
1721 if (!(flags & EVBACKEND_MASK)) 1905 if (!(flags & EVBACKEND_MASK))
1722 flags |= ev_recommended_backends (); 1906 flags |= ev_recommended_backends ();
1723 1907
1748#endif 1932#endif
1749 } 1933 }
1750} 1934}
1751 1935
1752/* free up a loop structure */ 1936/* free up a loop structure */
1753void 1937void ecb_cold
1754ev_loop_destroy (EV_P) 1938ev_loop_destroy (EV_P)
1755{ 1939{
1756 int i; 1940 int i;
1757 1941
1758#if EV_MULTIPLICITY 1942#if EV_MULTIPLICITY
1888 infy_fork (EV_A); 2072 infy_fork (EV_A);
1889#endif 2073#endif
1890 2074
1891 if (ev_is_active (&pipe_w)) 2075 if (ev_is_active (&pipe_w))
1892 { 2076 {
1893 /* this "locks" the handlers against writing to the pipe */ 2077 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1894 /* while we modify the fd vars */
1895 sig_pending = 1;
1896#if EV_ASYNC_ENABLE
1897 async_pending = 1;
1898#endif
1899 2078
1900 ev_ref (EV_A); 2079 ev_ref (EV_A);
1901 ev_io_stop (EV_A_ &pipe_w); 2080 ev_io_stop (EV_A_ &pipe_w);
1902 2081
1903#if EV_USE_EVENTFD 2082#if EV_USE_EVENTFD
1921 postfork = 0; 2100 postfork = 0;
1922} 2101}
1923 2102
1924#if EV_MULTIPLICITY 2103#if EV_MULTIPLICITY
1925 2104
1926struct ev_loop * 2105struct ev_loop * ecb_cold
1927ev_loop_new (unsigned int flags) 2106ev_loop_new (unsigned int flags)
1928{ 2107{
1929 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2108 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1930 2109
1931 memset (EV_A, 0, sizeof (struct ev_loop)); 2110 memset (EV_A, 0, sizeof (struct ev_loop));
1939} 2118}
1940 2119
1941#endif /* multiplicity */ 2120#endif /* multiplicity */
1942 2121
1943#if EV_VERIFY 2122#if EV_VERIFY
1944static void noinline 2123static void noinline ecb_cold
1945verify_watcher (EV_P_ W w) 2124verify_watcher (EV_P_ W w)
1946{ 2125{
1947 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2126 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1948 2127
1949 if (w->pending) 2128 if (w->pending)
1950 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2129 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1951} 2130}
1952 2131
1953static void noinline 2132static void noinline ecb_cold
1954verify_heap (EV_P_ ANHE *heap, int N) 2133verify_heap (EV_P_ ANHE *heap, int N)
1955{ 2134{
1956 int i; 2135 int i;
1957 2136
1958 for (i = HEAP0; i < N + HEAP0; ++i) 2137 for (i = HEAP0; i < N + HEAP0; ++i)
1963 2142
1964 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2143 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1965 } 2144 }
1966} 2145}
1967 2146
1968static void noinline 2147static void noinline ecb_cold
1969array_verify (EV_P_ W *ws, int cnt) 2148array_verify (EV_P_ W *ws, int cnt)
1970{ 2149{
1971 while (cnt--) 2150 while (cnt--)
1972 { 2151 {
1973 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2152 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1975 } 2154 }
1976} 2155}
1977#endif 2156#endif
1978 2157
1979#if EV_FEATURE_API 2158#if EV_FEATURE_API
1980void 2159void ecb_cold
1981ev_verify (EV_P) 2160ev_verify (EV_P)
1982{ 2161{
1983#if EV_VERIFY 2162#if EV_VERIFY
1984 int i; 2163 int i;
1985 WL w; 2164 WL w;
2051#endif 2230#endif
2052} 2231}
2053#endif 2232#endif
2054 2233
2055#if EV_MULTIPLICITY 2234#if EV_MULTIPLICITY
2056struct ev_loop * 2235struct ev_loop * ecb_cold
2057#else 2236#else
2058int 2237int
2059#endif 2238#endif
2060ev_default_loop (unsigned int flags) 2239ev_default_loop (unsigned int flags)
2061{ 2240{
2189 feed_reverse_done (EV_A_ EV_TIMER); 2368 feed_reverse_done (EV_A_ EV_TIMER);
2190 } 2369 }
2191} 2370}
2192 2371
2193#if EV_PERIODIC_ENABLE 2372#if EV_PERIODIC_ENABLE
2373
2374static void noinline
2375periodic_recalc (EV_P_ ev_periodic *w)
2376{
2377 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2378 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2379
2380 /* the above almost always errs on the low side */
2381 while (at <= ev_rt_now)
2382 {
2383 ev_tstamp nat = at + w->interval;
2384
2385 /* when resolution fails us, we use ev_rt_now */
2386 if (expect_false (nat == at))
2387 {
2388 at = ev_rt_now;
2389 break;
2390 }
2391
2392 at = nat;
2393 }
2394
2395 ev_at (w) = at;
2396}
2397
2194/* make periodics pending */ 2398/* make periodics pending */
2195inline_size void 2399inline_size void
2196periodics_reify (EV_P) 2400periodics_reify (EV_P)
2197{ 2401{
2198 EV_FREQUENT_CHECK; 2402 EV_FREQUENT_CHECK;
2217 ANHE_at_cache (periodics [HEAP0]); 2421 ANHE_at_cache (periodics [HEAP0]);
2218 downheap (periodics, periodiccnt, HEAP0); 2422 downheap (periodics, periodiccnt, HEAP0);
2219 } 2423 }
2220 else if (w->interval) 2424 else if (w->interval)
2221 { 2425 {
2222 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2426 periodic_recalc (EV_A_ w);
2223 /* if next trigger time is not sufficiently in the future, put it there */
2224 /* this might happen because of floating point inexactness */
2225 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2226 {
2227 ev_at (w) += w->interval;
2228
2229 /* if interval is unreasonably low we might still have a time in the past */
2230 /* so correct this. this will make the periodic very inexact, but the user */
2231 /* has effectively asked to get triggered more often than possible */
2232 if (ev_at (w) < ev_rt_now)
2233 ev_at (w) = ev_rt_now;
2234 }
2235
2236 ANHE_at_cache (periodics [HEAP0]); 2427 ANHE_at_cache (periodics [HEAP0]);
2237 downheap (periodics, periodiccnt, HEAP0); 2428 downheap (periodics, periodiccnt, HEAP0);
2238 } 2429 }
2239 else 2430 else
2240 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2431 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2248 } 2439 }
2249} 2440}
2250 2441
2251/* simply recalculate all periodics */ 2442/* simply recalculate all periodics */
2252/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2443/* TODO: maybe ensure that at least one event happens when jumping forward? */
2253static void noinline 2444static void noinline ecb_cold
2254periodics_reschedule (EV_P) 2445periodics_reschedule (EV_P)
2255{ 2446{
2256 int i; 2447 int i;
2257 2448
2258 /* adjust periodics after time jump */ 2449 /* adjust periodics after time jump */
2261 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2452 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2262 2453
2263 if (w->reschedule_cb) 2454 if (w->reschedule_cb)
2264 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2455 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2265 else if (w->interval) 2456 else if (w->interval)
2266 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2457 periodic_recalc (EV_A_ w);
2267 2458
2268 ANHE_at_cache (periodics [i]); 2459 ANHE_at_cache (periodics [i]);
2269 } 2460 }
2270 2461
2271 reheap (periodics, periodiccnt); 2462 reheap (periodics, periodiccnt);
2272} 2463}
2273#endif 2464#endif
2274 2465
2275/* adjust all timers by a given offset */ 2466/* adjust all timers by a given offset */
2276static void noinline 2467static void noinline ecb_cold
2277timers_reschedule (EV_P_ ev_tstamp adjust) 2468timers_reschedule (EV_P_ ev_tstamp adjust)
2278{ 2469{
2279 int i; 2470 int i;
2280 2471
2281 for (i = 0; i < timercnt; ++i) 2472 for (i = 0; i < timercnt; ++i)
2318 * doesn't hurt either as we only do this on time-jumps or 2509 * doesn't hurt either as we only do this on time-jumps or
2319 * in the unlikely event of having been preempted here. 2510 * in the unlikely event of having been preempted here.
2320 */ 2511 */
2321 for (i = 4; --i; ) 2512 for (i = 4; --i; )
2322 { 2513 {
2514 ev_tstamp diff;
2323 rtmn_diff = ev_rt_now - mn_now; 2515 rtmn_diff = ev_rt_now - mn_now;
2324 2516
2517 diff = odiff - rtmn_diff;
2518
2325 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2519 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2326 return; /* all is well */ 2520 return; /* all is well */
2327 2521
2328 ev_rt_now = ev_time (); 2522 ev_rt_now = ev_time ();
2329 mn_now = get_clock (); 2523 mn_now = get_clock ();
2330 now_floor = mn_now; 2524 now_floor = mn_now;
2420 ev_tstamp prev_mn_now = mn_now; 2614 ev_tstamp prev_mn_now = mn_now;
2421 2615
2422 /* update time to cancel out callback processing overhead */ 2616 /* update time to cancel out callback processing overhead */
2423 time_update (EV_A_ 1e100); 2617 time_update (EV_A_ 1e100);
2424 2618
2619 /* from now on, we want a pipe-wake-up */
2620 pipe_write_wanted = 1;
2621
2622 ECB_MEMORY_FENCE; /* amke sure pipe_write_wanted is visible before we check for potential skips */
2623
2425 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2624 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2426 { 2625 {
2427 waittime = MAX_BLOCKTIME; 2626 waittime = MAX_BLOCKTIME;
2428 2627
2429 if (timercnt) 2628 if (timercnt)
2430 { 2629 {
2431 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2630 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2432 if (waittime > to) waittime = to; 2631 if (waittime > to) waittime = to;
2433 } 2632 }
2434 2633
2435#if EV_PERIODIC_ENABLE 2634#if EV_PERIODIC_ENABLE
2436 if (periodiccnt) 2635 if (periodiccnt)
2437 { 2636 {
2438 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2637 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2439 if (waittime > to) waittime = to; 2638 if (waittime > to) waittime = to;
2440 } 2639 }
2441#endif 2640#endif
2442 2641
2443 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2642 /* don't let timeouts decrease the waittime below timeout_blocktime */
2444 if (expect_false (waittime < timeout_blocktime)) 2643 if (expect_false (waittime < timeout_blocktime))
2445 waittime = timeout_blocktime; 2644 waittime = timeout_blocktime;
2645
2646 /* at this point, we NEED to wait, so we have to ensure */
2647 /* to pass a minimum nonzero value to the backend */
2648 if (expect_false (waittime < backend_mintime))
2649 waittime = backend_mintime;
2446 2650
2447 /* extra check because io_blocktime is commonly 0 */ 2651 /* extra check because io_blocktime is commonly 0 */
2448 if (expect_false (io_blocktime)) 2652 if (expect_false (io_blocktime))
2449 { 2653 {
2450 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2654 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2451 2655
2452 if (sleeptime > waittime - backend_fudge) 2656 if (sleeptime > waittime - backend_mintime)
2453 sleeptime = waittime - backend_fudge; 2657 sleeptime = waittime - backend_mintime;
2454 2658
2455 if (expect_true (sleeptime > 0.)) 2659 if (expect_true (sleeptime > 0.))
2456 { 2660 {
2457 ev_sleep (sleeptime); 2661 ev_sleep (sleeptime);
2458 waittime -= sleeptime; 2662 waittime -= sleeptime;
2464 ++loop_count; 2668 ++loop_count;
2465#endif 2669#endif
2466 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2670 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2467 backend_poll (EV_A_ waittime); 2671 backend_poll (EV_A_ waittime);
2468 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2672 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2673
2674 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2675
2676 if (pipe_write_skipped)
2677 {
2678 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2679 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2680 }
2681
2469 2682
2470 /* update ev_rt_now, do magic */ 2683 /* update ev_rt_now, do magic */
2471 time_update (EV_A_ waittime + sleeptime); 2684 time_update (EV_A_ waittime + sleeptime);
2472 } 2685 }
2473 2686
2763 if (w->reschedule_cb) 2976 if (w->reschedule_cb)
2764 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2977 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2765 else if (w->interval) 2978 else if (w->interval)
2766 { 2979 {
2767 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2980 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2768 /* this formula differs from the one in periodic_reify because we do not always round up */ 2981 periodic_recalc (EV_A_ w);
2769 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2770 } 2982 }
2771 else 2983 else
2772 ev_at (w) = w->offset; 2984 ev_at (w) = w->offset;
2773 2985
2774 EV_FREQUENT_CHECK; 2986 EV_FREQUENT_CHECK;
3051 if (!pend || pend == path) 3263 if (!pend || pend == path)
3052 break; 3264 break;
3053 3265
3054 *pend = 0; 3266 *pend = 0;
3055 w->wd = inotify_add_watch (fs_fd, path, mask); 3267 w->wd = inotify_add_watch (fs_fd, path, mask);
3056 } 3268 }
3057 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3269 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3058 } 3270 }
3059 } 3271 }
3060 3272
3061 if (w->wd >= 0) 3273 if (w->wd >= 0)
3128 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3340 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3129 ofs += sizeof (struct inotify_event) + ev->len; 3341 ofs += sizeof (struct inotify_event) + ev->len;
3130 } 3342 }
3131} 3343}
3132 3344
3133inline_size void 3345inline_size void ecb_cold
3134ev_check_2625 (EV_P) 3346ev_check_2625 (EV_P)
3135{ 3347{
3136 /* kernels < 2.6.25 are borked 3348 /* kernels < 2.6.25 are borked
3137 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3349 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3138 */ 3350 */
3763} 3975}
3764 3976
3765/*****************************************************************************/ 3977/*****************************************************************************/
3766 3978
3767#if EV_WALK_ENABLE 3979#if EV_WALK_ENABLE
3768void 3980void ecb_cold
3769ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3981ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3770{ 3982{
3771 int i, j; 3983 int i, j;
3772 ev_watcher_list *wl, *wn; 3984 ev_watcher_list *wl, *wn;
3773 3985

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines