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

Comparing libev/ev.c (file contents):
Revision 1.361 by root, Sun Oct 24 19:01:01 2010 UTC vs.
Revision 1.386 by root, Wed Jul 20 01:04:20 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,
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
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 defined(_WIN32) && defined(MemoryBarrier)
517 #define ECB_MEMORY_FENCE MemoryBarrier ()
518 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
519 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
520 #endif
521#endif
522
523#ifndef ECB_MEMORY_FENCE
524 #include <pthread.h>
525
526 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
527 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
528 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
529 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
530#endif
531
532#if ECB_GCC_VERSION(3,1)
533 #define ecb_attribute(attrlist) __attribute__(attrlist)
534 #define ecb_is_constant(expr) __builtin_constant_p (expr)
535 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
536 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
537#else
538 #define ecb_attribute(attrlist)
539 #define ecb_is_constant(expr) 0
540 #define ecb_expect(expr,value) (expr)
541 #define ecb_prefetch(addr,rw,locality)
542#endif
543
544#define ecb_noinline ecb_attribute ((__noinline__))
545#define ecb_noreturn ecb_attribute ((__noreturn__))
546#define ecb_unused ecb_attribute ((__unused__))
547#define ecb_const ecb_attribute ((__const__))
548#define ecb_pure ecb_attribute ((__pure__))
549
550#if ECB_GCC_VERSION(4,3)
551 #define ecb_artificial ecb_attribute ((__artificial__))
552 #define ecb_hot ecb_attribute ((__hot__))
553 #define ecb_cold ecb_attribute ((__cold__))
554#else
555 #define ecb_artificial
556 #define ecb_hot
557 #define ecb_cold
558#endif
559
560/* put around conditional expressions if you are very sure that the */
561/* expression is mostly true or mostly false. note that these return */
562/* booleans, not the expression. */
473#define expect_false(expr) expect ((expr) != 0, 0) 563#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
474#define expect_true(expr) expect ((expr) != 0, 1) 564#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
565/* ecb.h end */
566
567#define expect_false(cond) ecb_expect_false (cond)
568#define expect_true(cond) ecb_expect_true (cond)
569#define noinline ecb_noinline
570
475#define inline_size static inline 571#define inline_size ecb_inline
476 572
477#if EV_FEATURE_CODE 573#if EV_FEATURE_CODE
478# define inline_speed static inline 574# define inline_speed ecb_inline
479#else 575#else
480# define inline_speed static noinline 576# define inline_speed static noinline
481#endif 577#endif
482 578
483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 579#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
522# include "ev_win32.c" 618# include "ev_win32.c"
523#endif 619#endif
524 620
525/*****************************************************************************/ 621/*****************************************************************************/
526 622
623/* define a suitable floor function (only used by periodics atm) */
624
625#if EV_USE_FLOOR
626# include <math.h>
627# define ev_floor(v) floor (v)
628#else
629
630#include <float.h>
631
632/* a floor() replacement function, should be independent of ev_tstamp type */
633static ev_tstamp noinline
634ev_floor (ev_tstamp v)
635{
636 /* the choice of shift factor is not terribly important */
637#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
638 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
639#else
640 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
641#endif
642
643 /* argument too large for an unsigned long? */
644 if (expect_false (v >= shift))
645 {
646 ev_tstamp f;
647
648 if (v == v - 1.)
649 return v; /* very large number */
650
651 f = shift * ev_floor (v * (1. / shift));
652 return f + ev_floor (v - f);
653 }
654
655 /* special treatment for negative args? */
656 if (expect_false (v < 0.))
657 {
658 ev_tstamp f = -ev_floor (-v);
659
660 return f - (f == v ? 0 : 1);
661 }
662
663 /* fits into an unsigned long */
664 return (unsigned long)v;
665}
666
667#endif
668
669/*****************************************************************************/
670
527#ifdef __linux 671#ifdef __linux
528# include <sys/utsname.h> 672# include <sys/utsname.h>
529#endif 673#endif
530 674
531static unsigned int noinline 675static unsigned int noinline ecb_cold
532ev_linux_version (void) 676ev_linux_version (void)
533{ 677{
534#ifdef __linux 678#ifdef __linux
535 unsigned int v = 0; 679 unsigned int v = 0;
536 struct utsname buf; 680 struct utsname buf;
565} 709}
566 710
567/*****************************************************************************/ 711/*****************************************************************************/
568 712
569#if EV_AVOID_STDIO 713#if EV_AVOID_STDIO
570static void noinline 714static void noinline ecb_cold
571ev_printerr (const char *msg) 715ev_printerr (const char *msg)
572{ 716{
573 write (STDERR_FILENO, msg, strlen (msg)); 717 write (STDERR_FILENO, msg, strlen (msg));
574} 718}
575#endif 719#endif
576 720
577static void (*syserr_cb)(const char *msg); 721static void (*syserr_cb)(const char *msg);
578 722
579void 723void ecb_cold
580ev_set_syserr_cb (void (*cb)(const char *msg)) 724ev_set_syserr_cb (void (*cb)(const char *msg))
581{ 725{
582 syserr_cb = cb; 726 syserr_cb = cb;
583} 727}
584 728
585static void noinline 729static void noinline ecb_cold
586ev_syserr (const char *msg) 730ev_syserr (const char *msg)
587{ 731{
588 if (!msg) 732 if (!msg)
589 msg = "(libev) system error"; 733 msg = "(libev) system error";
590 734
591 if (syserr_cb) 735 if (syserr_cb)
592 syserr_cb (msg); 736 syserr_cb (msg);
593 else 737 else
594 { 738 {
595#if EV_AVOID_STDIO 739#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg); 740 ev_printerr (msg);
599 ev_printerr (": "); 741 ev_printerr (": ");
600 ev_printerr (err); 742 ev_printerr (strerror (errno));
601 ev_printerr ("\n"); 743 ev_printerr ("\n");
602#else 744#else
603 perror (msg); 745 perror (msg);
604#endif 746#endif
605 abort (); 747 abort ();
625#endif 767#endif
626} 768}
627 769
628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 770static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
629 771
630void 772void ecb_cold
631ev_set_allocator (void *(*cb)(void *ptr, long size)) 773ev_set_allocator (void *(*cb)(void *ptr, long size))
632{ 774{
633 alloc = cb; 775 alloc = cb;
634} 776}
635 777
639 ptr = alloc (ptr, size); 781 ptr = alloc (ptr, size);
640 782
641 if (!ptr && size) 783 if (!ptr && size)
642 { 784 {
643#if EV_AVOID_STDIO 785#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n"); 786 ev_printerr ("(libev) memory allocation failed, aborting.\n");
645#else 787#else
646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 788 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
647#endif 789#endif
648 abort (); 790 abort ();
649 } 791 }
650 792
651 return ptr; 793 return ptr;
844 } 986 }
845 987
846 return ncur; 988 return ncur;
847} 989}
848 990
849static noinline void * 991static void * noinline ecb_cold
850array_realloc (int elem, void *base, int *cur, int cnt) 992array_realloc (int elem, void *base, int *cur, int cnt)
851{ 993{
852 *cur = array_nextsize (elem, *cur, cnt); 994 *cur = array_nextsize (elem, *cur, cnt);
853 return ev_realloc (base, elem * *cur); 995 return ev_realloc (base, elem * *cur);
854} 996}
857 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 999 memset ((void *)(base), 0, sizeof (*(base)) * (count))
858 1000
859#define array_needsize(type,base,cur,cnt,init) \ 1001#define array_needsize(type,base,cur,cnt,init) \
860 if (expect_false ((cnt) > (cur))) \ 1002 if (expect_false ((cnt) > (cur))) \
861 { \ 1003 { \
862 int ocur_ = (cur); \ 1004 int ecb_unused ocur_ = (cur); \
863 (base) = (type *)array_realloc \ 1005 (base) = (type *)array_realloc \
864 (sizeof (type), (base), &(cur), (cnt)); \ 1006 (sizeof (type), (base), &(cur), (cnt)); \
865 init ((base) + (ocur_), (cur) - ocur_); \ 1007 init ((base) + (ocur_), (cur) - ocur_); \
866 } 1008 }
867 1009
967inline_size void 1109inline_size void
968fd_reify (EV_P) 1110fd_reify (EV_P)
969{ 1111{
970 int i; 1112 int i;
971 1113
1114#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1115 for (i = 0; i < fdchangecnt; ++i)
1116 {
1117 int fd = fdchanges [i];
1118 ANFD *anfd = anfds + fd;
1119
1120 if (anfd->reify & EV__IOFDSET && anfd->head)
1121 {
1122 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1123
1124 if (handle != anfd->handle)
1125 {
1126 unsigned long arg;
1127
1128 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1129
1130 /* handle changed, but fd didn't - we need to do it in two steps */
1131 backend_modify (EV_A_ fd, anfd->events, 0);
1132 anfd->events = 0;
1133 anfd->handle = handle;
1134 }
1135 }
1136 }
1137#endif
1138
972 for (i = 0; i < fdchangecnt; ++i) 1139 for (i = 0; i < fdchangecnt; ++i)
973 { 1140 {
974 int fd = fdchanges [i]; 1141 int fd = fdchanges [i];
975 ANFD *anfd = anfds + fd; 1142 ANFD *anfd = anfds + fd;
976 ev_io *w; 1143 ev_io *w;
978 unsigned char o_events = anfd->events; 1145 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify; 1146 unsigned char o_reify = anfd->reify;
980 1147
981 anfd->reify = 0; 1148 anfd->reify = 0;
982 1149
983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
984 if (o_reify & EV__IOFDSET)
985 {
986 unsigned long arg;
987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
990 }
991#endif
992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1150 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
994 { 1151 {
995 anfd->events = 0; 1152 anfd->events = 0;
996 1153
997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1154 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1022 fdchanges [fdchangecnt - 1] = fd; 1179 fdchanges [fdchangecnt - 1] = fd;
1023 } 1180 }
1024} 1181}
1025 1182
1026/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1183/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1027inline_speed void 1184inline_speed void ecb_cold
1028fd_kill (EV_P_ int fd) 1185fd_kill (EV_P_ int fd)
1029{ 1186{
1030 ev_io *w; 1187 ev_io *w;
1031 1188
1032 while ((w = (ev_io *)anfds [fd].head)) 1189 while ((w = (ev_io *)anfds [fd].head))
1035 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1192 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1036 } 1193 }
1037} 1194}
1038 1195
1039/* check whether the given fd is actually valid, for error recovery */ 1196/* check whether the given fd is actually valid, for error recovery */
1040inline_size int 1197inline_size int ecb_cold
1041fd_valid (int fd) 1198fd_valid (int fd)
1042{ 1199{
1043#ifdef _WIN32 1200#ifdef _WIN32
1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1201 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1045#else 1202#else
1046 return fcntl (fd, F_GETFD) != -1; 1203 return fcntl (fd, F_GETFD) != -1;
1047#endif 1204#endif
1048} 1205}
1049 1206
1050/* called on EBADF to verify fds */ 1207/* called on EBADF to verify fds */
1051static void noinline 1208static void noinline ecb_cold
1052fd_ebadf (EV_P) 1209fd_ebadf (EV_P)
1053{ 1210{
1054 int fd; 1211 int fd;
1055 1212
1056 for (fd = 0; fd < anfdmax; ++fd) 1213 for (fd = 0; fd < anfdmax; ++fd)
1058 if (!fd_valid (fd) && errno == EBADF) 1215 if (!fd_valid (fd) && errno == EBADF)
1059 fd_kill (EV_A_ fd); 1216 fd_kill (EV_A_ fd);
1060} 1217}
1061 1218
1062/* called on ENOMEM in select/poll to kill some fds and retry */ 1219/* called on ENOMEM in select/poll to kill some fds and retry */
1063static void noinline 1220static void noinline ecb_cold
1064fd_enomem (EV_P) 1221fd_enomem (EV_P)
1065{ 1222{
1066 int fd; 1223 int fd;
1067 1224
1068 for (fd = anfdmax; fd--; ) 1225 for (fd = anfdmax; fd--; )
1263 1420
1264/*****************************************************************************/ 1421/*****************************************************************************/
1265 1422
1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1423#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1267 1424
1268static void noinline 1425static void noinline ecb_cold
1269evpipe_init (EV_P) 1426evpipe_init (EV_P)
1270{ 1427{
1271 if (!ev_is_active (&pipe_w)) 1428 if (!ev_is_active (&pipe_w))
1272 { 1429 {
1273# if EV_USE_EVENTFD 1430# if EV_USE_EVENTFD
1295 ev_io_start (EV_A_ &pipe_w); 1452 ev_io_start (EV_A_ &pipe_w);
1296 ev_unref (EV_A); /* watcher should not keep loop alive */ 1453 ev_unref (EV_A); /* watcher should not keep loop alive */
1297 } 1454 }
1298} 1455}
1299 1456
1300inline_size void 1457inline_speed void
1301evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1458evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1302{ 1459{
1303 if (!*flag) 1460 if (expect_true (*flag))
1461 /*return*//*D*/;
1462
1463 *flag = 1;
1464
1465 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1466
1467 pipe_write_skipped = 1;
1468
1469 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1470
1471 if (pipe_write_wanted)
1304 { 1472 {
1473 int old_errno;
1474
1475 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */
1476
1305 int old_errno = errno; /* save errno because write might clobber it */ 1477 old_errno = errno; /* save errno because write will clobber it */
1306 char dummy;
1307
1308 *flag = 1;
1309 1478
1310#if EV_USE_EVENTFD 1479#if EV_USE_EVENTFD
1311 if (evfd >= 0) 1480 if (evfd >= 0)
1312 { 1481 {
1313 uint64_t counter = 1; 1482 uint64_t counter = 1;
1314 write (evfd, &counter, sizeof (uint64_t)); 1483 write (evfd, &counter, sizeof (uint64_t));
1315 } 1484 }
1316 else 1485 else
1317#endif 1486#endif
1487 {
1318 /* win32 people keep sending patches that change this write() to send() */ 1488 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1489 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */ 1490 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */ 1491 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */ 1492 /* tell me. thank you. */
1323 write (evpipe [1], &dummy, 1); 1493 write (evpipe [1], &(evpipe [1]), 1);
1494 }
1324 1495
1325 errno = old_errno; 1496 errno = old_errno;
1326 } 1497 }
1327} 1498}
1328 1499
1331static void 1502static void
1332pipecb (EV_P_ ev_io *iow, int revents) 1503pipecb (EV_P_ ev_io *iow, int revents)
1333{ 1504{
1334 int i; 1505 int i;
1335 1506
1507 if (revents & EV_READ)
1508 {
1336#if EV_USE_EVENTFD 1509#if EV_USE_EVENTFD
1337 if (evfd >= 0) 1510 if (evfd >= 0)
1338 { 1511 {
1339 uint64_t counter; 1512 uint64_t counter;
1340 read (evfd, &counter, sizeof (uint64_t)); 1513 read (evfd, &counter, sizeof (uint64_t));
1341 } 1514 }
1342 else 1515 else
1343#endif 1516#endif
1344 { 1517 {
1345 char dummy; 1518 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1519 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1347 read (evpipe [0], &dummy, 1); 1520 read (evpipe [0], &dummy, 1);
1521 }
1348 } 1522 }
1349 1523
1524 pipe_write_skipped = 0;
1525
1526#if EV_SIGNAL_ENABLE
1350 if (sig_pending) 1527 if (sig_pending)
1351 { 1528 {
1352 sig_pending = 0; 1529 sig_pending = 0;
1353 1530
1354 for (i = EV_NSIG - 1; i--; ) 1531 for (i = EV_NSIG - 1; i--; )
1355 if (expect_false (signals [i].pending)) 1532 if (expect_false (signals [i].pending))
1356 ev_feed_signal_event (EV_A_ i + 1); 1533 ev_feed_signal_event (EV_A_ i + 1);
1357 } 1534 }
1535#endif
1358 1536
1359#if EV_ASYNC_ENABLE 1537#if EV_ASYNC_ENABLE
1360 if (async_pending) 1538 if (async_pending)
1361 { 1539 {
1362 async_pending = 0; 1540 async_pending = 0;
1371#endif 1549#endif
1372} 1550}
1373 1551
1374/*****************************************************************************/ 1552/*****************************************************************************/
1375 1553
1554void
1555ev_feed_signal (int signum)
1556{
1557#if EV_MULTIPLICITY
1558 EV_P = signals [signum - 1].loop;
1559
1560 if (!EV_A)
1561 return;
1562#endif
1563
1564 if (!ev_active (&pipe_w))
1565 return;
1566
1567 signals [signum - 1].pending = 1;
1568 evpipe_write (EV_A_ &sig_pending);
1569}
1570
1376static void 1571static void
1377ev_sighandler (int signum) 1572ev_sighandler (int signum)
1378{ 1573{
1379#if EV_MULTIPLICITY
1380 EV_P = signals [signum - 1].loop;
1381#endif
1382
1383#ifdef _WIN32 1574#ifdef _WIN32
1384 signal (signum, ev_sighandler); 1575 signal (signum, ev_sighandler);
1385#endif 1576#endif
1386 1577
1387 signals [signum - 1].pending = 1; 1578 ev_feed_signal (signum);
1388 evpipe_write (EV_A_ &sig_pending);
1389} 1579}
1390 1580
1391void noinline 1581void noinline
1392ev_feed_signal_event (EV_P_ int signum) 1582ev_feed_signal_event (EV_P_ int signum)
1393{ 1583{
1512#endif 1702#endif
1513#if EV_USE_SELECT 1703#if EV_USE_SELECT
1514# include "ev_select.c" 1704# include "ev_select.c"
1515#endif 1705#endif
1516 1706
1517int 1707int ecb_cold
1518ev_version_major (void) 1708ev_version_major (void)
1519{ 1709{
1520 return EV_VERSION_MAJOR; 1710 return EV_VERSION_MAJOR;
1521} 1711}
1522 1712
1523int 1713int ecb_cold
1524ev_version_minor (void) 1714ev_version_minor (void)
1525{ 1715{
1526 return EV_VERSION_MINOR; 1716 return EV_VERSION_MINOR;
1527} 1717}
1528 1718
1529/* return true if we are running with elevated privileges and should ignore env variables */ 1719/* return true if we are running with elevated privileges and should ignore env variables */
1530int inline_size 1720int inline_size ecb_cold
1531enable_secure (void) 1721enable_secure (void)
1532{ 1722{
1533#ifdef _WIN32 1723#ifdef _WIN32
1534 return 0; 1724 return 0;
1535#else 1725#else
1536 return getuid () != geteuid () 1726 return getuid () != geteuid ()
1537 || getgid () != getegid (); 1727 || getgid () != getegid ();
1538#endif 1728#endif
1539} 1729}
1540 1730
1541unsigned int 1731unsigned int ecb_cold
1542ev_supported_backends (void) 1732ev_supported_backends (void)
1543{ 1733{
1544 unsigned int flags = 0; 1734 unsigned int flags = 0;
1545 1735
1546 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1736 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
1550 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1740 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1551 1741
1552 return flags; 1742 return flags;
1553} 1743}
1554 1744
1555unsigned int 1745unsigned int ecb_cold
1556ev_recommended_backends (void) 1746ev_recommended_backends (void)
1557{ 1747{
1558 unsigned int flags = ev_supported_backends (); 1748 unsigned int flags = ev_supported_backends ();
1559 1749
1560#ifndef __NetBSD__ 1750#ifndef __NetBSD__
1572#endif 1762#endif
1573 1763
1574 return flags; 1764 return flags;
1575} 1765}
1576 1766
1577unsigned int 1767unsigned int ecb_cold
1578ev_embeddable_backends (void) 1768ev_embeddable_backends (void)
1579{ 1769{
1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1770 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1581 1771
1582 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1772 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1627ev_userdata (EV_P) 1817ev_userdata (EV_P)
1628{ 1818{
1629 return userdata; 1819 return userdata;
1630} 1820}
1631 1821
1822void
1632void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1823ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1633{ 1824{
1634 invoke_cb = invoke_pending_cb; 1825 invoke_cb = invoke_pending_cb;
1635} 1826}
1636 1827
1828void
1637void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1829ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1638{ 1830{
1639 release_cb = release; 1831 release_cb = release;
1640 acquire_cb = acquire; 1832 acquire_cb = acquire;
1641} 1833}
1642#endif 1834#endif
1643 1835
1644/* initialise a loop structure, must be zero-initialised */ 1836/* initialise a loop structure, must be zero-initialised */
1645static void noinline 1837static void noinline ecb_cold
1646loop_init (EV_P_ unsigned int flags) 1838loop_init (EV_P_ unsigned int flags)
1647{ 1839{
1648 if (!backend) 1840 if (!backend)
1649 { 1841 {
1842 origflags = flags;
1843
1650#if EV_USE_REALTIME 1844#if EV_USE_REALTIME
1651 if (!have_realtime) 1845 if (!have_realtime)
1652 { 1846 {
1653 struct timespec ts; 1847 struct timespec ts;
1654 1848
1676 if (!(flags & EVFLAG_NOENV) 1870 if (!(flags & EVFLAG_NOENV)
1677 && !enable_secure () 1871 && !enable_secure ()
1678 && getenv ("LIBEV_FLAGS")) 1872 && getenv ("LIBEV_FLAGS"))
1679 flags = atoi (getenv ("LIBEV_FLAGS")); 1873 flags = atoi (getenv ("LIBEV_FLAGS"));
1680 1874
1681 ev_rt_now = ev_time (); 1875 ev_rt_now = ev_time ();
1682 mn_now = get_clock (); 1876 mn_now = get_clock ();
1683 now_floor = mn_now; 1877 now_floor = mn_now;
1684 rtmn_diff = ev_rt_now - mn_now; 1878 rtmn_diff = ev_rt_now - mn_now;
1685#if EV_FEATURE_API 1879#if EV_FEATURE_API
1686 invoke_cb = ev_invoke_pending; 1880 invoke_cb = ev_invoke_pending;
1687#endif 1881#endif
1688 1882
1689 io_blocktime = 0.; 1883 io_blocktime = 0.;
1690 timeout_blocktime = 0.; 1884 timeout_blocktime = 0.;
1691 backend = 0; 1885 backend = 0;
1692 backend_fd = -1; 1886 backend_fd = -1;
1693 sig_pending = 0; 1887 sig_pending = 0;
1694#if EV_ASYNC_ENABLE 1888#if EV_ASYNC_ENABLE
1695 async_pending = 0; 1889 async_pending = 0;
1696#endif 1890#endif
1891 pipe_write_skipped = 0;
1892 pipe_write_wanted = 0;
1697#if EV_USE_INOTIFY 1893#if EV_USE_INOTIFY
1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1894 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1699#endif 1895#endif
1700#if EV_USE_SIGNALFD 1896#if EV_USE_SIGNALFD
1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1897 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1702#endif 1898#endif
1703 1899
1704 if (!(flags & 0x0000ffffU)) 1900 if (!(flags & EVBACKEND_MASK))
1705 flags |= ev_recommended_backends (); 1901 flags |= ev_recommended_backends ();
1706 1902
1707#if EV_USE_IOCP 1903#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags); 1904 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif 1905#endif
1731#endif 1927#endif
1732 } 1928 }
1733} 1929}
1734 1930
1735/* free up a loop structure */ 1931/* free up a loop structure */
1736void 1932void ecb_cold
1737ev_loop_destroy (EV_P) 1933ev_loop_destroy (EV_P)
1738{ 1934{
1739 int i; 1935 int i;
1936
1937#if EV_MULTIPLICITY
1938 /* mimic free (0) */
1939 if (!EV_A)
1940 return;
1941#endif
1740 1942
1741#if EV_CLEANUP_ENABLE 1943#if EV_CLEANUP_ENABLE
1742 /* queue cleanup watchers (and execute them) */ 1944 /* queue cleanup watchers (and execute them) */
1743 if (expect_false (cleanupcnt)) 1945 if (expect_false (cleanupcnt))
1744 { 1946 {
1865 infy_fork (EV_A); 2067 infy_fork (EV_A);
1866#endif 2068#endif
1867 2069
1868 if (ev_is_active (&pipe_w)) 2070 if (ev_is_active (&pipe_w))
1869 { 2071 {
1870 /* this "locks" the handlers against writing to the pipe */ 2072 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1871 /* while we modify the fd vars */
1872 sig_pending = 1;
1873#if EV_ASYNC_ENABLE
1874 async_pending = 1;
1875#endif
1876 2073
1877 ev_ref (EV_A); 2074 ev_ref (EV_A);
1878 ev_io_stop (EV_A_ &pipe_w); 2075 ev_io_stop (EV_A_ &pipe_w);
1879 2076
1880#if EV_USE_EVENTFD 2077#if EV_USE_EVENTFD
1898 postfork = 0; 2095 postfork = 0;
1899} 2096}
1900 2097
1901#if EV_MULTIPLICITY 2098#if EV_MULTIPLICITY
1902 2099
1903struct ev_loop * 2100struct ev_loop * ecb_cold
1904ev_loop_new (unsigned int flags) 2101ev_loop_new (unsigned int flags)
1905{ 2102{
1906 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2103 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1907 2104
1908 memset (EV_A, 0, sizeof (struct ev_loop)); 2105 memset (EV_A, 0, sizeof (struct ev_loop));
1916} 2113}
1917 2114
1918#endif /* multiplicity */ 2115#endif /* multiplicity */
1919 2116
1920#if EV_VERIFY 2117#if EV_VERIFY
1921static void noinline 2118static void noinline ecb_cold
1922verify_watcher (EV_P_ W w) 2119verify_watcher (EV_P_ W w)
1923{ 2120{
1924 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2121 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1925 2122
1926 if (w->pending) 2123 if (w->pending)
1927 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2124 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1928} 2125}
1929 2126
1930static void noinline 2127static void noinline ecb_cold
1931verify_heap (EV_P_ ANHE *heap, int N) 2128verify_heap (EV_P_ ANHE *heap, int N)
1932{ 2129{
1933 int i; 2130 int i;
1934 2131
1935 for (i = HEAP0; i < N + HEAP0; ++i) 2132 for (i = HEAP0; i < N + HEAP0; ++i)
1940 2137
1941 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2138 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1942 } 2139 }
1943} 2140}
1944 2141
1945static void noinline 2142static void noinline ecb_cold
1946array_verify (EV_P_ W *ws, int cnt) 2143array_verify (EV_P_ W *ws, int cnt)
1947{ 2144{
1948 while (cnt--) 2145 while (cnt--)
1949 { 2146 {
1950 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2147 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1952 } 2149 }
1953} 2150}
1954#endif 2151#endif
1955 2152
1956#if EV_FEATURE_API 2153#if EV_FEATURE_API
1957void 2154void ecb_cold
1958ev_verify (EV_P) 2155ev_verify (EV_P)
1959{ 2156{
1960#if EV_VERIFY 2157#if EV_VERIFY
1961 int i; 2158 int i;
1962 WL w; 2159 WL w;
2028#endif 2225#endif
2029} 2226}
2030#endif 2227#endif
2031 2228
2032#if EV_MULTIPLICITY 2229#if EV_MULTIPLICITY
2033struct ev_loop * 2230struct ev_loop * ecb_cold
2034#else 2231#else
2035int 2232int
2036#endif 2233#endif
2037ev_default_loop (unsigned int flags) 2234ev_default_loop (unsigned int flags)
2038{ 2235{
2096 for (pri = NUMPRI; pri--; ) 2293 for (pri = NUMPRI; pri--; )
2097 while (pendingcnt [pri]) 2294 while (pendingcnt [pri])
2098 { 2295 {
2099 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2296 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2100 2297
2101 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2102 /* ^ this is no longer true, as pending_w could be here */
2103
2104 p->w->pending = 0; 2298 p->w->pending = 0;
2105 EV_CB_INVOKE (p->w, p->events); 2299 EV_CB_INVOKE (p->w, p->events);
2106 EV_FREQUENT_CHECK; 2300 EV_FREQUENT_CHECK;
2107 } 2301 }
2108} 2302}
2169 feed_reverse_done (EV_A_ EV_TIMER); 2363 feed_reverse_done (EV_A_ EV_TIMER);
2170 } 2364 }
2171} 2365}
2172 2366
2173#if EV_PERIODIC_ENABLE 2367#if EV_PERIODIC_ENABLE
2368
2369static void noinline
2370periodic_recalc (EV_P_ ev_periodic *w)
2371{
2372 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2373 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2374
2375 /* the above almost always errs on the low side */
2376 while (at <= ev_rt_now)
2377 {
2378 ev_tstamp nat = at + w->interval;
2379
2380 /* when resolution fails us, we use ev_rt_now */
2381 if (expect_false (nat == at))
2382 {
2383 at = ev_rt_now;
2384 break;
2385 }
2386
2387 at = nat;
2388 }
2389
2390 ev_at (w) = at;
2391}
2392
2174/* make periodics pending */ 2393/* make periodics pending */
2175inline_size void 2394inline_size void
2176periodics_reify (EV_P) 2395periodics_reify (EV_P)
2177{ 2396{
2178 EV_FREQUENT_CHECK; 2397 EV_FREQUENT_CHECK;
2197 ANHE_at_cache (periodics [HEAP0]); 2416 ANHE_at_cache (periodics [HEAP0]);
2198 downheap (periodics, periodiccnt, HEAP0); 2417 downheap (periodics, periodiccnt, HEAP0);
2199 } 2418 }
2200 else if (w->interval) 2419 else if (w->interval)
2201 { 2420 {
2202 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2421 periodic_recalc (EV_A_ w);
2203 /* if next trigger time is not sufficiently in the future, put it there */
2204 /* this might happen because of floating point inexactness */
2205 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2206 {
2207 ev_at (w) += w->interval;
2208
2209 /* if interval is unreasonably low we might still have a time in the past */
2210 /* so correct this. this will make the periodic very inexact, but the user */
2211 /* has effectively asked to get triggered more often than possible */
2212 if (ev_at (w) < ev_rt_now)
2213 ev_at (w) = ev_rt_now;
2214 }
2215
2216 ANHE_at_cache (periodics [HEAP0]); 2422 ANHE_at_cache (periodics [HEAP0]);
2217 downheap (periodics, periodiccnt, HEAP0); 2423 downheap (periodics, periodiccnt, HEAP0);
2218 } 2424 }
2219 else 2425 else
2220 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2426 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2228 } 2434 }
2229} 2435}
2230 2436
2231/* simply recalculate all periodics */ 2437/* simply recalculate all periodics */
2232/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2438/* TODO: maybe ensure that at least one event happens when jumping forward? */
2233static void noinline 2439static void noinline ecb_cold
2234periodics_reschedule (EV_P) 2440periodics_reschedule (EV_P)
2235{ 2441{
2236 int i; 2442 int i;
2237 2443
2238 /* adjust periodics after time jump */ 2444 /* adjust periodics after time jump */
2241 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2447 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2242 2448
2243 if (w->reschedule_cb) 2449 if (w->reschedule_cb)
2244 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2450 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2245 else if (w->interval) 2451 else if (w->interval)
2246 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2452 periodic_recalc (EV_A_ w);
2247 2453
2248 ANHE_at_cache (periodics [i]); 2454 ANHE_at_cache (periodics [i]);
2249 } 2455 }
2250 2456
2251 reheap (periodics, periodiccnt); 2457 reheap (periodics, periodiccnt);
2252} 2458}
2253#endif 2459#endif
2254 2460
2255/* adjust all timers by a given offset */ 2461/* adjust all timers by a given offset */
2256static void noinline 2462static void noinline ecb_cold
2257timers_reschedule (EV_P_ ev_tstamp adjust) 2463timers_reschedule (EV_P_ ev_tstamp adjust)
2258{ 2464{
2259 int i; 2465 int i;
2260 2466
2261 for (i = 0; i < timercnt; ++i) 2467 for (i = 0; i < timercnt; ++i)
2298 * doesn't hurt either as we only do this on time-jumps or 2504 * doesn't hurt either as we only do this on time-jumps or
2299 * in the unlikely event of having been preempted here. 2505 * in the unlikely event of having been preempted here.
2300 */ 2506 */
2301 for (i = 4; --i; ) 2507 for (i = 4; --i; )
2302 { 2508 {
2509 ev_tstamp diff;
2303 rtmn_diff = ev_rt_now - mn_now; 2510 rtmn_diff = ev_rt_now - mn_now;
2304 2511
2512 diff = odiff - rtmn_diff;
2513
2305 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2514 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2306 return; /* all is well */ 2515 return; /* all is well */
2307 2516
2308 ev_rt_now = ev_time (); 2517 ev_rt_now = ev_time ();
2309 mn_now = get_clock (); 2518 mn_now = get_clock ();
2310 now_floor = mn_now; 2519 now_floor = mn_now;
2400 ev_tstamp prev_mn_now = mn_now; 2609 ev_tstamp prev_mn_now = mn_now;
2401 2610
2402 /* update time to cancel out callback processing overhead */ 2611 /* update time to cancel out callback processing overhead */
2403 time_update (EV_A_ 1e100); 2612 time_update (EV_A_ 1e100);
2404 2613
2614 /* from now on, we want a pipe-wake-up */
2615 pipe_write_wanted = 1;
2616
2617 ECB_MEMORY_FENCE; /* amke sure pipe_write_wanted is visible before we check for potential skips */
2618
2405 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2619 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2406 { 2620 {
2407 waittime = MAX_BLOCKTIME; 2621 waittime = MAX_BLOCKTIME;
2408 2622
2409 if (timercnt) 2623 if (timercnt)
2410 { 2624 {
2411 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2625 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2412 if (waittime > to) waittime = to; 2626 if (waittime > to) waittime = to;
2413 } 2627 }
2414 2628
2415#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2416 if (periodiccnt) 2630 if (periodiccnt)
2417 { 2631 {
2418 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2632 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2419 if (waittime > to) waittime = to; 2633 if (waittime > to) waittime = to;
2420 } 2634 }
2421#endif 2635#endif
2422 2636
2423 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2637 /* don't let timeouts decrease the waittime below timeout_blocktime */
2424 if (expect_false (waittime < timeout_blocktime)) 2638 if (expect_false (waittime < timeout_blocktime))
2425 waittime = timeout_blocktime; 2639 waittime = timeout_blocktime;
2640
2641 /* at this point, we NEED to wait, so we have to ensure */
2642 /* to pass a minimum nonzero value to the backend */
2643 if (expect_false (waittime < backend_mintime))
2644 waittime = backend_mintime;
2426 2645
2427 /* extra check because io_blocktime is commonly 0 */ 2646 /* extra check because io_blocktime is commonly 0 */
2428 if (expect_false (io_blocktime)) 2647 if (expect_false (io_blocktime))
2429 { 2648 {
2430 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2649 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2431 2650
2432 if (sleeptime > waittime - backend_fudge) 2651 if (sleeptime > waittime - backend_mintime)
2433 sleeptime = waittime - backend_fudge; 2652 sleeptime = waittime - backend_mintime;
2434 2653
2435 if (expect_true (sleeptime > 0.)) 2654 if (expect_true (sleeptime > 0.))
2436 { 2655 {
2437 ev_sleep (sleeptime); 2656 ev_sleep (sleeptime);
2438 waittime -= sleeptime; 2657 waittime -= sleeptime;
2444 ++loop_count; 2663 ++loop_count;
2445#endif 2664#endif
2446 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2665 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2447 backend_poll (EV_A_ waittime); 2666 backend_poll (EV_A_ waittime);
2448 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2667 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2668
2669 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2670
2671 if (pipe_write_skipped)
2672 {
2673 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2674 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2675 }
2676
2449 2677
2450 /* update ev_rt_now, do magic */ 2678 /* update ev_rt_now, do magic */
2451 time_update (EV_A_ waittime + sleeptime); 2679 time_update (EV_A_ waittime + sleeptime);
2452 } 2680 }
2453 2681
2743 if (w->reschedule_cb) 2971 if (w->reschedule_cb)
2744 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2972 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2745 else if (w->interval) 2973 else if (w->interval)
2746 { 2974 {
2747 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2975 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2748 /* this formula differs from the one in periodic_reify because we do not always round up */ 2976 periodic_recalc (EV_A_ w);
2749 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2750 } 2977 }
2751 else 2978 else
2752 ev_at (w) = w->offset; 2979 ev_at (w) = w->offset;
2753 2980
2754 EV_FREQUENT_CHECK; 2981 EV_FREQUENT_CHECK;
2875 sa.sa_handler = ev_sighandler; 3102 sa.sa_handler = ev_sighandler;
2876 sigfillset (&sa.sa_mask); 3103 sigfillset (&sa.sa_mask);
2877 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 3104 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2878 sigaction (w->signum, &sa, 0); 3105 sigaction (w->signum, &sa, 0);
2879 3106
3107 if (origflags & EVFLAG_NOSIGMASK)
3108 {
2880 sigemptyset (&sa.sa_mask); 3109 sigemptyset (&sa.sa_mask);
2881 sigaddset (&sa.sa_mask, w->signum); 3110 sigaddset (&sa.sa_mask, w->signum);
2882 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 3111 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
3112 }
2883#endif 3113#endif
2884 } 3114 }
2885 3115
2886 EV_FREQUENT_CHECK; 3116 EV_FREQUENT_CHECK;
2887} 3117}
3028 if (!pend || pend == path) 3258 if (!pend || pend == path)
3029 break; 3259 break;
3030 3260
3031 *pend = 0; 3261 *pend = 0;
3032 w->wd = inotify_add_watch (fs_fd, path, mask); 3262 w->wd = inotify_add_watch (fs_fd, path, mask);
3033 } 3263 }
3034 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3264 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3035 } 3265 }
3036 } 3266 }
3037 3267
3038 if (w->wd >= 0) 3268 if (w->wd >= 0)
3105 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3335 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3106 ofs += sizeof (struct inotify_event) + ev->len; 3336 ofs += sizeof (struct inotify_event) + ev->len;
3107 } 3337 }
3108} 3338}
3109 3339
3110inline_size void 3340inline_size void ecb_cold
3111ev_check_2625 (EV_P) 3341ev_check_2625 (EV_P)
3112{ 3342{
3113 /* kernels < 2.6.25 are borked 3343 /* kernels < 2.6.25 are borked
3114 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3344 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3115 */ 3345 */
3592 3822
3593 ev_start (EV_A_ (W)w, ++cleanupcnt); 3823 ev_start (EV_A_ (W)w, ++cleanupcnt);
3594 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2); 3824 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3595 cleanups [cleanupcnt - 1] = w; 3825 cleanups [cleanupcnt - 1] = w;
3596 3826
3827 /* cleanup watchers should never keep a refcount on the loop */
3828 ev_unref (EV_A);
3597 EV_FREQUENT_CHECK; 3829 EV_FREQUENT_CHECK;
3598} 3830}
3599 3831
3600void 3832void
3601ev_cleanup_stop (EV_P_ ev_cleanup *w) 3833ev_cleanup_stop (EV_P_ ev_cleanup *w)
3603 clear_pending (EV_A_ (W)w); 3835 clear_pending (EV_A_ (W)w);
3604 if (expect_false (!ev_is_active (w))) 3836 if (expect_false (!ev_is_active (w)))
3605 return; 3837 return;
3606 3838
3607 EV_FREQUENT_CHECK; 3839 EV_FREQUENT_CHECK;
3840 ev_ref (EV_A);
3608 3841
3609 { 3842 {
3610 int active = ev_active (w); 3843 int active = ev_active (w);
3611 3844
3612 cleanups [active - 1] = cleanups [--cleanupcnt]; 3845 cleanups [active - 1] = cleanups [--cleanupcnt];
3737} 3970}
3738 3971
3739/*****************************************************************************/ 3972/*****************************************************************************/
3740 3973
3741#if EV_WALK_ENABLE 3974#if EV_WALK_ENABLE
3742void 3975void ecb_cold
3743ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3976ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3744{ 3977{
3745 int i, j; 3978 int i, j;
3746 ev_watcher_list *wl, *wn; 3979 ev_watcher_list *wl, *wn;
3747 3980

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines