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

Comparing libev/ev.c (file contents):
Revision 1.370 by root, Sun Jan 30 19:05:41 2011 UTC vs.
Revision 1.387 by root, Wed Jul 20 01:04:43 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
443#else 452#else
444# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
445#endif 454#endif
446 455
447/* 456/*
448 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
449 * It is added to ev_rt_now when scheduling periodics
450 * to ensure progress, time-wise, even when rounding
451 * errors are against us.
452 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
453 * Better solutions welcome.
454 */ 459 */
455#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 */
456 462
457#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) */
458#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) */
459 465
460#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)
461#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)
462 468
463#if __GNUC__ >= 4 469/* the following are taken from libecb */
464# define expect(expr,value) __builtin_expect ((expr),(value)) 470/* ecb.h start */
465# 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
466#else 493#else
467# define expect(expr,value) (expr) 494 #define ecb_inline static
468# define noinline
469# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
470# define inline
471# 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
472#endif 508 #endif
509#endif
473 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. */
474#define expect_false(expr) expect ((expr) != 0, 0) 563#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
475#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
476#define inline_size static inline 571#define inline_size ecb_inline
477 572
478#if EV_FEATURE_CODE 573#if EV_FEATURE_CODE
479# define inline_speed static inline 574# define inline_speed ecb_inline
480#else 575#else
481# define inline_speed static noinline 576# define inline_speed static noinline
482#endif 577#endif
483 578
484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 579#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
523# include "ev_win32.c" 618# include "ev_win32.c"
524#endif 619#endif
525 620
526/*****************************************************************************/ 621/*****************************************************************************/
527 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
528#ifdef __linux 671#ifdef __linux
529# include <sys/utsname.h> 672# include <sys/utsname.h>
530#endif 673#endif
531 674
532static unsigned int noinline 675static unsigned int noinline ecb_cold
533ev_linux_version (void) 676ev_linux_version (void)
534{ 677{
535#ifdef __linux 678#ifdef __linux
536 unsigned int v = 0; 679 unsigned int v = 0;
537 struct utsname buf; 680 struct utsname buf;
566} 709}
567 710
568/*****************************************************************************/ 711/*****************************************************************************/
569 712
570#if EV_AVOID_STDIO 713#if EV_AVOID_STDIO
571static void noinline 714static void noinline ecb_cold
572ev_printerr (const char *msg) 715ev_printerr (const char *msg)
573{ 716{
574 write (STDERR_FILENO, msg, strlen (msg)); 717 write (STDERR_FILENO, msg, strlen (msg));
575} 718}
576#endif 719#endif
577 720
578static void (*syserr_cb)(const char *msg); 721static void (*syserr_cb)(const char *msg);
579 722
580void 723void ecb_cold
581ev_set_syserr_cb (void (*cb)(const char *msg)) 724ev_set_syserr_cb (void (*cb)(const char *msg))
582{ 725{
583 syserr_cb = cb; 726 syserr_cb = cb;
584} 727}
585 728
586static void noinline 729static void noinline ecb_cold
587ev_syserr (const char *msg) 730ev_syserr (const char *msg)
588{ 731{
589 if (!msg) 732 if (!msg)
590 msg = "(libev) system error"; 733 msg = "(libev) system error";
591 734
624#endif 767#endif
625} 768}
626 769
627static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 770static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
628 771
629void 772void ecb_cold
630ev_set_allocator (void *(*cb)(void *ptr, long size)) 773ev_set_allocator (void *(*cb)(void *ptr, long size))
631{ 774{
632 alloc = cb; 775 alloc = cb;
633} 776}
634 777
816 select (0, 0, 0, 0, &tv); 959 select (0, 0, 0, 0, &tv);
817#endif 960#endif
818 } 961 }
819} 962}
820 963
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
829/*****************************************************************************/ 964/*****************************************************************************/
830 965
831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 966#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
832 967
833/* find a suitable new size for the given array, */ 968/* find a suitable new size for the given array, */
851 } 986 }
852 987
853 return ncur; 988 return ncur;
854} 989}
855 990
856static noinline void * 991static void * noinline ecb_cold
857array_realloc (int elem, void *base, int *cur, int cnt) 992array_realloc (int elem, void *base, int *cur, int cnt)
858{ 993{
859 *cur = array_nextsize (elem, *cur, cnt); 994 *cur = array_nextsize (elem, *cur, cnt);
860 return ev_realloc (base, elem * *cur); 995 return ev_realloc (base, elem * *cur);
861} 996}
864 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 999 memset ((void *)(base), 0, sizeof (*(base)) * (count))
865 1000
866#define array_needsize(type,base,cur,cnt,init) \ 1001#define array_needsize(type,base,cur,cnt,init) \
867 if (expect_false ((cnt) > (cur))) \ 1002 if (expect_false ((cnt) > (cur))) \
868 { \ 1003 { \
869 int ocur_ = (cur); \ 1004 int ecb_unused ocur_ = (cur); \
870 (base) = (type *)array_realloc \ 1005 (base) = (type *)array_realloc \
871 (sizeof (type), (base), &(cur), (cnt)); \ 1006 (sizeof (type), (base), &(cur), (cnt)); \
872 init ((base) + (ocur_), (cur) - ocur_); \ 1007 init ((base) + (ocur_), (cur) - ocur_); \
873 } 1008 }
874 1009
974inline_size void 1109inline_size void
975fd_reify (EV_P) 1110fd_reify (EV_P)
976{ 1111{
977 int i; 1112 int i;
978 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
979 for (i = 0; i < fdchangecnt; ++i) 1139 for (i = 0; i < fdchangecnt; ++i)
980 { 1140 {
981 int fd = fdchanges [i]; 1141 int fd = fdchanges [i];
982 ANFD *anfd = anfds + fd; 1142 ANFD *anfd = anfds + fd;
983 ev_io *w; 1143 ev_io *w;
985 unsigned char o_events = anfd->events; 1145 unsigned char o_events = anfd->events;
986 unsigned char o_reify = anfd->reify; 1146 unsigned char o_reify = anfd->reify;
987 1147
988 anfd->reify = 0; 1148 anfd->reify = 0;
989 1149
990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
991 if (o_reify & EV__IOFDSET)
992 {
993 unsigned long arg;
994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
997 }
998#endif
999
1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1150 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
1001 { 1151 {
1002 anfd->events = 0; 1152 anfd->events = 0;
1003 1153
1004 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)
1029 fdchanges [fdchangecnt - 1] = fd; 1179 fdchanges [fdchangecnt - 1] = fd;
1030 } 1180 }
1031} 1181}
1032 1182
1033/* 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 */
1034inline_speed void 1184inline_speed void ecb_cold
1035fd_kill (EV_P_ int fd) 1185fd_kill (EV_P_ int fd)
1036{ 1186{
1037 ev_io *w; 1187 ev_io *w;
1038 1188
1039 while ((w = (ev_io *)anfds [fd].head)) 1189 while ((w = (ev_io *)anfds [fd].head))
1042 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);
1043 } 1193 }
1044} 1194}
1045 1195
1046/* check whether the given fd is actually valid, for error recovery */ 1196/* check whether the given fd is actually valid, for error recovery */
1047inline_size int 1197inline_size int ecb_cold
1048fd_valid (int fd) 1198fd_valid (int fd)
1049{ 1199{
1050#ifdef _WIN32 1200#ifdef _WIN32
1051 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1201 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1052#else 1202#else
1053 return fcntl (fd, F_GETFD) != -1; 1203 return fcntl (fd, F_GETFD) != -1;
1054#endif 1204#endif
1055} 1205}
1056 1206
1057/* called on EBADF to verify fds */ 1207/* called on EBADF to verify fds */
1058static void noinline 1208static void noinline ecb_cold
1059fd_ebadf (EV_P) 1209fd_ebadf (EV_P)
1060{ 1210{
1061 int fd; 1211 int fd;
1062 1212
1063 for (fd = 0; fd < anfdmax; ++fd) 1213 for (fd = 0; fd < anfdmax; ++fd)
1065 if (!fd_valid (fd) && errno == EBADF) 1215 if (!fd_valid (fd) && errno == EBADF)
1066 fd_kill (EV_A_ fd); 1216 fd_kill (EV_A_ fd);
1067} 1217}
1068 1218
1069/* 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 */
1070static void noinline 1220static void noinline ecb_cold
1071fd_enomem (EV_P) 1221fd_enomem (EV_P)
1072{ 1222{
1073 int fd; 1223 int fd;
1074 1224
1075 for (fd = anfdmax; fd--; ) 1225 for (fd = anfdmax; fd--; )
1270 1420
1271/*****************************************************************************/ 1421/*****************************************************************************/
1272 1422
1273#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1423#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1274 1424
1275static void noinline 1425static void noinline ecb_cold
1276evpipe_init (EV_P) 1426evpipe_init (EV_P)
1277{ 1427{
1278 if (!ev_is_active (&pipe_w)) 1428 if (!ev_is_active (&pipe_w))
1279 { 1429 {
1280# if EV_USE_EVENTFD 1430# if EV_USE_EVENTFD
1302 ev_io_start (EV_A_ &pipe_w); 1452 ev_io_start (EV_A_ &pipe_w);
1303 ev_unref (EV_A); /* watcher should not keep loop alive */ 1453 ev_unref (EV_A); /* watcher should not keep loop alive */
1304 } 1454 }
1305} 1455}
1306 1456
1307inline_size void 1457inline_speed void
1308evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1458evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1309{ 1459{
1310 if (!*flag) 1460 if (expect_true (*flag))
1461 return;
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)
1311 { 1472 {
1473 int old_errno;
1474
1475 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */
1476
1312 int old_errno = errno; /* save errno because write might clobber it */ 1477 old_errno = errno; /* save errno because write will clobber it */
1313 char dummy;
1314
1315 *flag = 1;
1316 1478
1317#if EV_USE_EVENTFD 1479#if EV_USE_EVENTFD
1318 if (evfd >= 0) 1480 if (evfd >= 0)
1319 { 1481 {
1320 uint64_t counter = 1; 1482 uint64_t counter = 1;
1321 write (evfd, &counter, sizeof (uint64_t)); 1483 write (evfd, &counter, sizeof (uint64_t));
1322 } 1484 }
1323 else 1485 else
1324#endif 1486#endif
1487 {
1325 /* win32 people keep sending patches that change this write() to send() */ 1488 /* win32 people keep sending patches that change this write() to send() */
1326 /* 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 */
1327 /* 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 */
1328 /* 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 */
1329 /* tell me. thank you. */ 1492 /* tell me. thank you. */
1330 write (evpipe [1], &dummy, 1); 1493 write (evpipe [1], &(evpipe [1]), 1);
1494 }
1331 1495
1332 errno = old_errno; 1496 errno = old_errno;
1333 } 1497 }
1334} 1498}
1335 1499
1338static void 1502static void
1339pipecb (EV_P_ ev_io *iow, int revents) 1503pipecb (EV_P_ ev_io *iow, int revents)
1340{ 1504{
1341 int i; 1505 int i;
1342 1506
1507 if (revents & EV_READ)
1508 {
1343#if EV_USE_EVENTFD 1509#if EV_USE_EVENTFD
1344 if (evfd >= 0) 1510 if (evfd >= 0)
1345 { 1511 {
1346 uint64_t counter; 1512 uint64_t counter;
1347 read (evfd, &counter, sizeof (uint64_t)); 1513 read (evfd, &counter, sizeof (uint64_t));
1348 } 1514 }
1349 else 1515 else
1350#endif 1516#endif
1351 { 1517 {
1352 char dummy; 1518 char dummy;
1353 /* 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 */
1354 read (evpipe [0], &dummy, 1); 1520 read (evpipe [0], &dummy, 1);
1521 }
1355 } 1522 }
1523
1524 pipe_write_skipped = 0;
1356 1525
1357#if EV_SIGNAL_ENABLE 1526#if EV_SIGNAL_ENABLE
1358 if (sig_pending) 1527 if (sig_pending)
1359 { 1528 {
1360 sig_pending = 0; 1529 sig_pending = 0;
1361 1530
1362 for (i = EV_NSIG - 1; i--; ) 1531 for (i = EV_NSIG - 1; i--; )
1363 if (expect_false (signals [i].pending)) 1532 if (expect_false (signals [i].pending))
1364 ev_feed_signal_event (EV_A_ i + 1); 1533 ev_feed_signal_event (EV_A_ i + 1);
1389 EV_P = signals [signum - 1].loop; 1558 EV_P = signals [signum - 1].loop;
1390 1559
1391 if (!EV_A) 1560 if (!EV_A)
1392 return; 1561 return;
1393#endif 1562#endif
1563
1564 if (!ev_active (&pipe_w))
1565 return;
1394 1566
1395 signals [signum - 1].pending = 1; 1567 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending); 1568 evpipe_write (EV_A_ &sig_pending);
1397} 1569}
1398 1570
1530#endif 1702#endif
1531#if EV_USE_SELECT 1703#if EV_USE_SELECT
1532# include "ev_select.c" 1704# include "ev_select.c"
1533#endif 1705#endif
1534 1706
1535int 1707int ecb_cold
1536ev_version_major (void) 1708ev_version_major (void)
1537{ 1709{
1538 return EV_VERSION_MAJOR; 1710 return EV_VERSION_MAJOR;
1539} 1711}
1540 1712
1541int 1713int ecb_cold
1542ev_version_minor (void) 1714ev_version_minor (void)
1543{ 1715{
1544 return EV_VERSION_MINOR; 1716 return EV_VERSION_MINOR;
1545} 1717}
1546 1718
1547/* 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 */
1548int inline_size 1720int inline_size ecb_cold
1549enable_secure (void) 1721enable_secure (void)
1550{ 1722{
1551#ifdef _WIN32 1723#ifdef _WIN32
1552 return 0; 1724 return 0;
1553#else 1725#else
1554 return getuid () != geteuid () 1726 return getuid () != geteuid ()
1555 || getgid () != getegid (); 1727 || getgid () != getegid ();
1556#endif 1728#endif
1557} 1729}
1558 1730
1559unsigned int 1731unsigned int ecb_cold
1560ev_supported_backends (void) 1732ev_supported_backends (void)
1561{ 1733{
1562 unsigned int flags = 0; 1734 unsigned int flags = 0;
1563 1735
1564 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1736 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
1568 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1740 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1569 1741
1570 return flags; 1742 return flags;
1571} 1743}
1572 1744
1573unsigned int 1745unsigned int ecb_cold
1574ev_recommended_backends (void) 1746ev_recommended_backends (void)
1575{ 1747{
1576 unsigned int flags = ev_supported_backends (); 1748 unsigned int flags = ev_supported_backends ();
1577 1749
1578#ifndef __NetBSD__ 1750#ifndef __NetBSD__
1590#endif 1762#endif
1591 1763
1592 return flags; 1764 return flags;
1593} 1765}
1594 1766
1595unsigned int 1767unsigned int ecb_cold
1596ev_embeddable_backends (void) 1768ev_embeddable_backends (void)
1597{ 1769{
1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1770 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1599 1771
1600 /* 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 */
1645ev_userdata (EV_P) 1817ev_userdata (EV_P)
1646{ 1818{
1647 return userdata; 1819 return userdata;
1648} 1820}
1649 1821
1822void
1650void 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))
1651{ 1824{
1652 invoke_cb = invoke_pending_cb; 1825 invoke_cb = invoke_pending_cb;
1653} 1826}
1654 1827
1828void
1655void 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))
1656{ 1830{
1657 release_cb = release; 1831 release_cb = release;
1658 acquire_cb = acquire; 1832 acquire_cb = acquire;
1659} 1833}
1660#endif 1834#endif
1661 1835
1662/* initialise a loop structure, must be zero-initialised */ 1836/* initialise a loop structure, must be zero-initialised */
1663static void noinline 1837static void noinline ecb_cold
1664loop_init (EV_P_ unsigned int flags) 1838loop_init (EV_P_ unsigned int flags)
1665{ 1839{
1666 if (!backend) 1840 if (!backend)
1667 { 1841 {
1668 origflags = flags; 1842 origflags = flags;
1696 if (!(flags & EVFLAG_NOENV) 1870 if (!(flags & EVFLAG_NOENV)
1697 && !enable_secure () 1871 && !enable_secure ()
1698 && getenv ("LIBEV_FLAGS")) 1872 && getenv ("LIBEV_FLAGS"))
1699 flags = atoi (getenv ("LIBEV_FLAGS")); 1873 flags = atoi (getenv ("LIBEV_FLAGS"));
1700 1874
1701 ev_rt_now = ev_time (); 1875 ev_rt_now = ev_time ();
1702 mn_now = get_clock (); 1876 mn_now = get_clock ();
1703 now_floor = mn_now; 1877 now_floor = mn_now;
1704 rtmn_diff = ev_rt_now - mn_now; 1878 rtmn_diff = ev_rt_now - mn_now;
1705#if EV_FEATURE_API 1879#if EV_FEATURE_API
1706 invoke_cb = ev_invoke_pending; 1880 invoke_cb = ev_invoke_pending;
1707#endif 1881#endif
1708 1882
1709 io_blocktime = 0.; 1883 io_blocktime = 0.;
1710 timeout_blocktime = 0.; 1884 timeout_blocktime = 0.;
1711 backend = 0; 1885 backend = 0;
1712 backend_fd = -1; 1886 backend_fd = -1;
1713 sig_pending = 0; 1887 sig_pending = 0;
1714#if EV_ASYNC_ENABLE 1888#if EV_ASYNC_ENABLE
1715 async_pending = 0; 1889 async_pending = 0;
1716#endif 1890#endif
1891 pipe_write_skipped = 0;
1892 pipe_write_wanted = 0;
1717#if EV_USE_INOTIFY 1893#if EV_USE_INOTIFY
1718 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1894 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1719#endif 1895#endif
1720#if EV_USE_SIGNALFD 1896#if EV_USE_SIGNALFD
1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1897 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1722#endif 1898#endif
1723 1899
1724 if (!(flags & EVBACKEND_MASK)) 1900 if (!(flags & EVBACKEND_MASK))
1725 flags |= ev_recommended_backends (); 1901 flags |= ev_recommended_backends ();
1726 1902
1751#endif 1927#endif
1752 } 1928 }
1753} 1929}
1754 1930
1755/* free up a loop structure */ 1931/* free up a loop structure */
1756void 1932void ecb_cold
1757ev_loop_destroy (EV_P) 1933ev_loop_destroy (EV_P)
1758{ 1934{
1759 int i; 1935 int i;
1760 1936
1761#if EV_MULTIPLICITY 1937#if EV_MULTIPLICITY
1891 infy_fork (EV_A); 2067 infy_fork (EV_A);
1892#endif 2068#endif
1893 2069
1894 if (ev_is_active (&pipe_w)) 2070 if (ev_is_active (&pipe_w))
1895 { 2071 {
1896 /* this "locks" the handlers against writing to the pipe */ 2072 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1897 /* while we modify the fd vars */
1898 sig_pending = 1;
1899#if EV_ASYNC_ENABLE
1900 async_pending = 1;
1901#endif
1902 2073
1903 ev_ref (EV_A); 2074 ev_ref (EV_A);
1904 ev_io_stop (EV_A_ &pipe_w); 2075 ev_io_stop (EV_A_ &pipe_w);
1905 2076
1906#if EV_USE_EVENTFD 2077#if EV_USE_EVENTFD
1924 postfork = 0; 2095 postfork = 0;
1925} 2096}
1926 2097
1927#if EV_MULTIPLICITY 2098#if EV_MULTIPLICITY
1928 2099
1929struct ev_loop * 2100struct ev_loop * ecb_cold
1930ev_loop_new (unsigned int flags) 2101ev_loop_new (unsigned int flags)
1931{ 2102{
1932 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2103 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1933 2104
1934 memset (EV_A, 0, sizeof (struct ev_loop)); 2105 memset (EV_A, 0, sizeof (struct ev_loop));
1942} 2113}
1943 2114
1944#endif /* multiplicity */ 2115#endif /* multiplicity */
1945 2116
1946#if EV_VERIFY 2117#if EV_VERIFY
1947static void noinline 2118static void noinline ecb_cold
1948verify_watcher (EV_P_ W w) 2119verify_watcher (EV_P_ W w)
1949{ 2120{
1950 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));
1951 2122
1952 if (w->pending) 2123 if (w->pending)
1953 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));
1954} 2125}
1955 2126
1956static void noinline 2127static void noinline ecb_cold
1957verify_heap (EV_P_ ANHE *heap, int N) 2128verify_heap (EV_P_ ANHE *heap, int N)
1958{ 2129{
1959 int i; 2130 int i;
1960 2131
1961 for (i = HEAP0; i < N + HEAP0; ++i) 2132 for (i = HEAP0; i < N + HEAP0; ++i)
1966 2137
1967 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2138 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1968 } 2139 }
1969} 2140}
1970 2141
1971static void noinline 2142static void noinline ecb_cold
1972array_verify (EV_P_ W *ws, int cnt) 2143array_verify (EV_P_ W *ws, int cnt)
1973{ 2144{
1974 while (cnt--) 2145 while (cnt--)
1975 { 2146 {
1976 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2147 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1978 } 2149 }
1979} 2150}
1980#endif 2151#endif
1981 2152
1982#if EV_FEATURE_API 2153#if EV_FEATURE_API
1983void 2154void ecb_cold
1984ev_verify (EV_P) 2155ev_verify (EV_P)
1985{ 2156{
1986#if EV_VERIFY 2157#if EV_VERIFY
1987 int i; 2158 int i;
1988 WL w; 2159 WL w;
2054#endif 2225#endif
2055} 2226}
2056#endif 2227#endif
2057 2228
2058#if EV_MULTIPLICITY 2229#if EV_MULTIPLICITY
2059struct ev_loop * 2230struct ev_loop * ecb_cold
2060#else 2231#else
2061int 2232int
2062#endif 2233#endif
2063ev_default_loop (unsigned int flags) 2234ev_default_loop (unsigned int flags)
2064{ 2235{
2193 } 2364 }
2194} 2365}
2195 2366
2196#if EV_PERIODIC_ENABLE 2367#if EV_PERIODIC_ENABLE
2197 2368
2198inline_speed 2369static void noinline
2199periodic_recalc (EV_P_ ev_periodic *w) 2370periodic_recalc (EV_P_ ev_periodic *w)
2200{ 2371{
2201 /* TODO: use slow but potentially more correct incremental algo, */ 2372 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2202 /* also do not rely on ceil */ 2373 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->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;
2204} 2391}
2205 2392
2206/* make periodics pending */ 2393/* make periodics pending */
2207inline_size void 2394inline_size void
2208periodics_reify (EV_P) 2395periodics_reify (EV_P)
2230 downheap (periodics, periodiccnt, HEAP0); 2417 downheap (periodics, periodiccnt, HEAP0);
2231 } 2418 }
2232 else if (w->interval) 2419 else if (w->interval)
2233 { 2420 {
2234 periodic_recalc (EV_A_ w); 2421 periodic_recalc (EV_A_ w);
2235
2236 /* if next trigger time is not sufficiently in the future, put it there */
2237 /* this might happen because of floating point inexactness */
2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2239 {
2240 ev_at (w) += w->interval;
2241
2242 /* if interval is unreasonably low we might still have a time in the past */
2243 /* so correct this. this will make the periodic very inexact, but the user */
2244 /* has effectively asked to get triggered more often than possible */
2245 if (ev_at (w) < ev_rt_now)
2246 ev_at (w) = ev_rt_now;
2247 }
2248
2249 ANHE_at_cache (periodics [HEAP0]); 2422 ANHE_at_cache (periodics [HEAP0]);
2250 downheap (periodics, periodiccnt, HEAP0); 2423 downheap (periodics, periodiccnt, HEAP0);
2251 } 2424 }
2252 else 2425 else
2253 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2426 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2261 } 2434 }
2262} 2435}
2263 2436
2264/* simply recalculate all periodics */ 2437/* simply recalculate all periodics */
2265/* 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? */
2266static void noinline 2439static void noinline ecb_cold
2267periodics_reschedule (EV_P) 2440periodics_reschedule (EV_P)
2268{ 2441{
2269 int i; 2442 int i;
2270 2443
2271 /* adjust periodics after time jump */ 2444 /* adjust periodics after time jump */
2284 reheap (periodics, periodiccnt); 2457 reheap (periodics, periodiccnt);
2285} 2458}
2286#endif 2459#endif
2287 2460
2288/* adjust all timers by a given offset */ 2461/* adjust all timers by a given offset */
2289static void noinline 2462static void noinline ecb_cold
2290timers_reschedule (EV_P_ ev_tstamp adjust) 2463timers_reschedule (EV_P_ ev_tstamp adjust)
2291{ 2464{
2292 int i; 2465 int i;
2293 2466
2294 for (i = 0; i < timercnt; ++i) 2467 for (i = 0; i < timercnt; ++i)
2331 * 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
2332 * in the unlikely event of having been preempted here. 2505 * in the unlikely event of having been preempted here.
2333 */ 2506 */
2334 for (i = 4; --i; ) 2507 for (i = 4; --i; )
2335 { 2508 {
2509 ev_tstamp diff;
2336 rtmn_diff = ev_rt_now - mn_now; 2510 rtmn_diff = ev_rt_now - mn_now;
2337 2511
2512 diff = odiff - rtmn_diff;
2513
2338 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2514 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2339 return; /* all is well */ 2515 return; /* all is well */
2340 2516
2341 ev_rt_now = ev_time (); 2517 ev_rt_now = ev_time ();
2342 mn_now = get_clock (); 2518 mn_now = get_clock ();
2343 now_floor = mn_now; 2519 now_floor = mn_now;
2433 ev_tstamp prev_mn_now = mn_now; 2609 ev_tstamp prev_mn_now = mn_now;
2434 2610
2435 /* update time to cancel out callback processing overhead */ 2611 /* update time to cancel out callback processing overhead */
2436 time_update (EV_A_ 1e100); 2612 time_update (EV_A_ 1e100);
2437 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
2438 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2619 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2439 { 2620 {
2440 waittime = MAX_BLOCKTIME; 2621 waittime = MAX_BLOCKTIME;
2441 2622
2442 if (timercnt) 2623 if (timercnt)
2443 { 2624 {
2444 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2625 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2445 if (waittime > to) waittime = to; 2626 if (waittime > to) waittime = to;
2446 } 2627 }
2447 2628
2448#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2449 if (periodiccnt) 2630 if (periodiccnt)
2450 { 2631 {
2451 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2632 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2452 if (waittime > to) waittime = to; 2633 if (waittime > to) waittime = to;
2453 } 2634 }
2454#endif 2635#endif
2455 2636
2456 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2637 /* don't let timeouts decrease the waittime below timeout_blocktime */
2457 if (expect_false (waittime < timeout_blocktime)) 2638 if (expect_false (waittime < timeout_blocktime))
2458 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;
2459 2645
2460 /* extra check because io_blocktime is commonly 0 */ 2646 /* extra check because io_blocktime is commonly 0 */
2461 if (expect_false (io_blocktime)) 2647 if (expect_false (io_blocktime))
2462 { 2648 {
2463 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2649 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2464 2650
2465 if (sleeptime > waittime - backend_fudge) 2651 if (sleeptime > waittime - backend_mintime)
2466 sleeptime = waittime - backend_fudge; 2652 sleeptime = waittime - backend_mintime;
2467 2653
2468 if (expect_true (sleeptime > 0.)) 2654 if (expect_true (sleeptime > 0.))
2469 { 2655 {
2470 ev_sleep (sleeptime); 2656 ev_sleep (sleeptime);
2471 waittime -= sleeptime; 2657 waittime -= sleeptime;
2477 ++loop_count; 2663 ++loop_count;
2478#endif 2664#endif
2479 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2665 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2480 backend_poll (EV_A_ waittime); 2666 backend_poll (EV_A_ waittime);
2481 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
2482 2677
2483 /* update ev_rt_now, do magic */ 2678 /* update ev_rt_now, do magic */
2484 time_update (EV_A_ waittime + sleeptime); 2679 time_update (EV_A_ waittime + sleeptime);
2485 } 2680 }
2486 2681
3063 if (!pend || pend == path) 3258 if (!pend || pend == path)
3064 break; 3259 break;
3065 3260
3066 *pend = 0; 3261 *pend = 0;
3067 w->wd = inotify_add_watch (fs_fd, path, mask); 3262 w->wd = inotify_add_watch (fs_fd, path, mask);
3068 } 3263 }
3069 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3264 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3070 } 3265 }
3071 } 3266 }
3072 3267
3073 if (w->wd >= 0) 3268 if (w->wd >= 0)
3140 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3335 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3141 ofs += sizeof (struct inotify_event) + ev->len; 3336 ofs += sizeof (struct inotify_event) + ev->len;
3142 } 3337 }
3143} 3338}
3144 3339
3145inline_size void 3340inline_size void ecb_cold
3146ev_check_2625 (EV_P) 3341ev_check_2625 (EV_P)
3147{ 3342{
3148 /* kernels < 2.6.25 are borked 3343 /* kernels < 2.6.25 are borked
3149 * 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
3150 */ 3345 */
3775} 3970}
3776 3971
3777/*****************************************************************************/ 3972/*****************************************************************************/
3778 3973
3779#if EV_WALK_ENABLE 3974#if EV_WALK_ENABLE
3780void 3975void ecb_cold
3781ev_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))
3782{ 3977{
3783 int i, j; 3978 int i, j;
3784 ev_watcher_list *wl, *wn; 3979 ev_watcher_list *wl, *wn;
3785 3980

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines