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

Comparing libev/ev.c (file contents):
Revision 1.371 by root, Mon Feb 7 21:45:32 2011 UTC vs.
Revision 1.389 by root, Wed Aug 3 15:31:23 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 /* 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
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 _MSC_VER >= 1400 /* VC++ 2005 */
517 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
518 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
519 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
520 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
521 #elif defined(_WIN32)
522 #include <WinNT.h>
523 #define ECB_MEMORY_FENCE MemoryBarrier ()
524 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
525 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
526 #endif
527#endif
528
529#ifndef ECB_MEMORY_FENCE
530 #include <pthread.h>
531
532 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
533 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
534 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
535 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
536#endif
537
538#if ECB_GCC_VERSION(3,1)
539 #define ecb_attribute(attrlist) __attribute__(attrlist)
540 #define ecb_is_constant(expr) __builtin_constant_p (expr)
541 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
542 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
543#else
544 #define ecb_attribute(attrlist)
545 #define ecb_is_constant(expr) 0
546 #define ecb_expect(expr,value) (expr)
547 #define ecb_prefetch(addr,rw,locality)
548#endif
549
550#define ecb_noinline ecb_attribute ((__noinline__))
551#define ecb_noreturn ecb_attribute ((__noreturn__))
552#define ecb_unused ecb_attribute ((__unused__))
553#define ecb_const ecb_attribute ((__const__))
554#define ecb_pure ecb_attribute ((__pure__))
555
556#if ECB_GCC_VERSION(4,3)
557 #define ecb_artificial ecb_attribute ((__artificial__))
558 #define ecb_hot ecb_attribute ((__hot__))
559 #define ecb_cold ecb_attribute ((__cold__))
560#else
561 #define ecb_artificial
562 #define ecb_hot
563 #define ecb_cold
564#endif
565
566/* put around conditional expressions if you are very sure that the */
567/* expression is mostly true or mostly false. note that these return */
568/* booleans, not the expression. */
474#define expect_false(expr) expect ((expr) != 0, 0) 569#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
475#define expect_true(expr) expect ((expr) != 0, 1) 570#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
571/* ecb.h end */
572
573#define expect_false(cond) ecb_expect_false (cond)
574#define expect_true(cond) ecb_expect_true (cond)
575#define noinline ecb_noinline
576
476#define inline_size static inline 577#define inline_size ecb_inline
477 578
478#if EV_FEATURE_CODE 579#if EV_FEATURE_CODE
479# define inline_speed static inline 580# define inline_speed ecb_inline
480#else 581#else
481# define inline_speed static noinline 582# define inline_speed static noinline
482#endif 583#endif
483 584
484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 585#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
523# include "ev_win32.c" 624# include "ev_win32.c"
524#endif 625#endif
525 626
526/*****************************************************************************/ 627/*****************************************************************************/
527 628
629/* define a suitable floor function (only used by periodics atm) */
630
631#if EV_USE_FLOOR
632# include <math.h>
633# define ev_floor(v) floor (v)
634#else
635
636#include <float.h>
637
638/* a floor() replacement function, should be independent of ev_tstamp type */
639static ev_tstamp noinline
640ev_floor (ev_tstamp v)
641{
642 /* the choice of shift factor is not terribly important */
643#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
644 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
645#else
646 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
647#endif
648
649 /* argument too large for an unsigned long? */
650 if (expect_false (v >= shift))
651 {
652 ev_tstamp f;
653
654 if (v == v - 1.)
655 return v; /* very large number */
656
657 f = shift * ev_floor (v * (1. / shift));
658 return f + ev_floor (v - f);
659 }
660
661 /* special treatment for negative args? */
662 if (expect_false (v < 0.))
663 {
664 ev_tstamp f = -ev_floor (-v);
665
666 return f - (f == v ? 0 : 1);
667 }
668
669 /* fits into an unsigned long */
670 return (unsigned long)v;
671}
672
673#endif
674
675/*****************************************************************************/
676
528#ifdef __linux 677#ifdef __linux
529# include <sys/utsname.h> 678# include <sys/utsname.h>
530#endif 679#endif
531 680
532static unsigned int noinline 681static unsigned int noinline ecb_cold
533ev_linux_version (void) 682ev_linux_version (void)
534{ 683{
535#ifdef __linux 684#ifdef __linux
536 unsigned int v = 0; 685 unsigned int v = 0;
537 struct utsname buf; 686 struct utsname buf;
566} 715}
567 716
568/*****************************************************************************/ 717/*****************************************************************************/
569 718
570#if EV_AVOID_STDIO 719#if EV_AVOID_STDIO
571static void noinline 720static void noinline ecb_cold
572ev_printerr (const char *msg) 721ev_printerr (const char *msg)
573{ 722{
574 write (STDERR_FILENO, msg, strlen (msg)); 723 write (STDERR_FILENO, msg, strlen (msg));
575} 724}
576#endif 725#endif
577 726
578static void (*syserr_cb)(const char *msg); 727static void (*syserr_cb)(const char *msg);
579 728
580void 729void ecb_cold
581ev_set_syserr_cb (void (*cb)(const char *msg)) 730ev_set_syserr_cb (void (*cb)(const char *msg))
582{ 731{
583 syserr_cb = cb; 732 syserr_cb = cb;
584} 733}
585 734
586static void noinline 735static void noinline ecb_cold
587ev_syserr (const char *msg) 736ev_syserr (const char *msg)
588{ 737{
589 if (!msg) 738 if (!msg)
590 msg = "(libev) system error"; 739 msg = "(libev) system error";
591 740
624#endif 773#endif
625} 774}
626 775
627static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 776static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
628 777
629void 778void ecb_cold
630ev_set_allocator (void *(*cb)(void *ptr, long size)) 779ev_set_allocator (void *(*cb)(void *ptr, long size))
631{ 780{
632 alloc = cb; 781 alloc = cb;
633} 782}
634 783
816 select (0, 0, 0, 0, &tv); 965 select (0, 0, 0, 0, &tv);
817#endif 966#endif
818 } 967 }
819} 968}
820 969
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/*****************************************************************************/ 970/*****************************************************************************/
830 971
831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 972#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
832 973
833/* find a suitable new size for the given array, */ 974/* find a suitable new size for the given array, */
851 } 992 }
852 993
853 return ncur; 994 return ncur;
854} 995}
855 996
856static noinline void * 997static void * noinline ecb_cold
857array_realloc (int elem, void *base, int *cur, int cnt) 998array_realloc (int elem, void *base, int *cur, int cnt)
858{ 999{
859 *cur = array_nextsize (elem, *cur, cnt); 1000 *cur = array_nextsize (elem, *cur, cnt);
860 return ev_realloc (base, elem * *cur); 1001 return ev_realloc (base, elem * *cur);
861} 1002}
864 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1005 memset ((void *)(base), 0, sizeof (*(base)) * (count))
865 1006
866#define array_needsize(type,base,cur,cnt,init) \ 1007#define array_needsize(type,base,cur,cnt,init) \
867 if (expect_false ((cnt) > (cur))) \ 1008 if (expect_false ((cnt) > (cur))) \
868 { \ 1009 { \
869 int ocur_ = (cur); \ 1010 int ecb_unused ocur_ = (cur); \
870 (base) = (type *)array_realloc \ 1011 (base) = (type *)array_realloc \
871 (sizeof (type), (base), &(cur), (cnt)); \ 1012 (sizeof (type), (base), &(cur), (cnt)); \
872 init ((base) + (ocur_), (cur) - ocur_); \ 1013 init ((base) + (ocur_), (cur) - ocur_); \
873 } 1014 }
874 1015
980 for (i = 0; i < fdchangecnt; ++i) 1121 for (i = 0; i < fdchangecnt; ++i)
981 { 1122 {
982 int fd = fdchanges [i]; 1123 int fd = fdchanges [i];
983 ANFD *anfd = anfds + fd; 1124 ANFD *anfd = anfds + fd;
984 1125
985 if (anfd->reify & EV__IOFDSET) 1126 if (anfd->reify & EV__IOFDSET && anfd->head)
986 { 1127 {
987 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd); 1128 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
988 1129
989 if (handle != anfd->handle) 1130 if (handle != anfd->handle)
990 { 1131 {
1044 fdchanges [fdchangecnt - 1] = fd; 1185 fdchanges [fdchangecnt - 1] = fd;
1045 } 1186 }
1046} 1187}
1047 1188
1048/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1189/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1049inline_speed void 1190inline_speed void ecb_cold
1050fd_kill (EV_P_ int fd) 1191fd_kill (EV_P_ int fd)
1051{ 1192{
1052 ev_io *w; 1193 ev_io *w;
1053 1194
1054 while ((w = (ev_io *)anfds [fd].head)) 1195 while ((w = (ev_io *)anfds [fd].head))
1057 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1198 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1058 } 1199 }
1059} 1200}
1060 1201
1061/* check whether the given fd is actually valid, for error recovery */ 1202/* check whether the given fd is actually valid, for error recovery */
1062inline_size int 1203inline_size int ecb_cold
1063fd_valid (int fd) 1204fd_valid (int fd)
1064{ 1205{
1065#ifdef _WIN32 1206#ifdef _WIN32
1066 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1207 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1067#else 1208#else
1068 return fcntl (fd, F_GETFD) != -1; 1209 return fcntl (fd, F_GETFD) != -1;
1069#endif 1210#endif
1070} 1211}
1071 1212
1072/* called on EBADF to verify fds */ 1213/* called on EBADF to verify fds */
1073static void noinline 1214static void noinline ecb_cold
1074fd_ebadf (EV_P) 1215fd_ebadf (EV_P)
1075{ 1216{
1076 int fd; 1217 int fd;
1077 1218
1078 for (fd = 0; fd < anfdmax; ++fd) 1219 for (fd = 0; fd < anfdmax; ++fd)
1080 if (!fd_valid (fd) && errno == EBADF) 1221 if (!fd_valid (fd) && errno == EBADF)
1081 fd_kill (EV_A_ fd); 1222 fd_kill (EV_A_ fd);
1082} 1223}
1083 1224
1084/* called on ENOMEM in select/poll to kill some fds and retry */ 1225/* called on ENOMEM in select/poll to kill some fds and retry */
1085static void noinline 1226static void noinline ecb_cold
1086fd_enomem (EV_P) 1227fd_enomem (EV_P)
1087{ 1228{
1088 int fd; 1229 int fd;
1089 1230
1090 for (fd = anfdmax; fd--; ) 1231 for (fd = anfdmax; fd--; )
1285 1426
1286/*****************************************************************************/ 1427/*****************************************************************************/
1287 1428
1288#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1429#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1289 1430
1290static void noinline 1431static void noinline ecb_cold
1291evpipe_init (EV_P) 1432evpipe_init (EV_P)
1292{ 1433{
1293 if (!ev_is_active (&pipe_w)) 1434 if (!ev_is_active (&pipe_w))
1294 { 1435 {
1295# if EV_USE_EVENTFD 1436# if EV_USE_EVENTFD
1317 ev_io_start (EV_A_ &pipe_w); 1458 ev_io_start (EV_A_ &pipe_w);
1318 ev_unref (EV_A); /* watcher should not keep loop alive */ 1459 ev_unref (EV_A); /* watcher should not keep loop alive */
1319 } 1460 }
1320} 1461}
1321 1462
1322inline_size void 1463inline_speed void
1323evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1464evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1324{ 1465{
1325 if (!*flag) 1466 if (expect_true (*flag))
1467 return;
1468
1469 *flag = 1;
1470
1471 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1472
1473 pipe_write_skipped = 1;
1474
1475 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1476
1477 if (pipe_write_wanted)
1326 { 1478 {
1479 int old_errno;
1480
1481 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */
1482
1327 int old_errno = errno; /* save errno because write might clobber it */ 1483 old_errno = errno; /* save errno because write will clobber it */
1328 char dummy;
1329
1330 *flag = 1;
1331 1484
1332#if EV_USE_EVENTFD 1485#if EV_USE_EVENTFD
1333 if (evfd >= 0) 1486 if (evfd >= 0)
1334 { 1487 {
1335 uint64_t counter = 1; 1488 uint64_t counter = 1;
1336 write (evfd, &counter, sizeof (uint64_t)); 1489 write (evfd, &counter, sizeof (uint64_t));
1337 } 1490 }
1338 else 1491 else
1339#endif 1492#endif
1493 {
1340 /* win32 people keep sending patches that change this write() to send() */ 1494 /* win32 people keep sending patches that change this write() to send() */
1341 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1495 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1342 /* so when you think this write should be a send instead, please find out */ 1496 /* so when you think this write should be a send instead, please find out */
1343 /* where your send() is from - it's definitely not the microsoft send, and */ 1497 /* where your send() is from - it's definitely not the microsoft send, and */
1344 /* tell me. thank you. */ 1498 /* tell me. thank you. */
1345 write (evpipe [1], &dummy, 1); 1499 write (evpipe [1], &(evpipe [1]), 1);
1500 }
1346 1501
1347 errno = old_errno; 1502 errno = old_errno;
1348 } 1503 }
1349} 1504}
1350 1505
1353static void 1508static void
1354pipecb (EV_P_ ev_io *iow, int revents) 1509pipecb (EV_P_ ev_io *iow, int revents)
1355{ 1510{
1356 int i; 1511 int i;
1357 1512
1513 if (revents & EV_READ)
1514 {
1358#if EV_USE_EVENTFD 1515#if EV_USE_EVENTFD
1359 if (evfd >= 0) 1516 if (evfd >= 0)
1360 { 1517 {
1361 uint64_t counter; 1518 uint64_t counter;
1362 read (evfd, &counter, sizeof (uint64_t)); 1519 read (evfd, &counter, sizeof (uint64_t));
1363 } 1520 }
1364 else 1521 else
1365#endif 1522#endif
1366 { 1523 {
1367 char dummy; 1524 char dummy;
1368 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1525 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1369 read (evpipe [0], &dummy, 1); 1526 read (evpipe [0], &dummy, 1);
1527 }
1370 } 1528 }
1529
1530 pipe_write_skipped = 0;
1371 1531
1372#if EV_SIGNAL_ENABLE 1532#if EV_SIGNAL_ENABLE
1373 if (sig_pending) 1533 if (sig_pending)
1374 { 1534 {
1375 sig_pending = 0; 1535 sig_pending = 0;
1376 1536
1377 for (i = EV_NSIG - 1; i--; ) 1537 for (i = EV_NSIG - 1; i--; )
1378 if (expect_false (signals [i].pending)) 1538 if (expect_false (signals [i].pending))
1379 ev_feed_signal_event (EV_A_ i + 1); 1539 ev_feed_signal_event (EV_A_ i + 1);
1404 EV_P = signals [signum - 1].loop; 1564 EV_P = signals [signum - 1].loop;
1405 1565
1406 if (!EV_A) 1566 if (!EV_A)
1407 return; 1567 return;
1408#endif 1568#endif
1569
1570 if (!ev_active (&pipe_w))
1571 return;
1409 1572
1410 signals [signum - 1].pending = 1; 1573 signals [signum - 1].pending = 1;
1411 evpipe_write (EV_A_ &sig_pending); 1574 evpipe_write (EV_A_ &sig_pending);
1412} 1575}
1413 1576
1545#endif 1708#endif
1546#if EV_USE_SELECT 1709#if EV_USE_SELECT
1547# include "ev_select.c" 1710# include "ev_select.c"
1548#endif 1711#endif
1549 1712
1550int 1713int ecb_cold
1551ev_version_major (void) 1714ev_version_major (void)
1552{ 1715{
1553 return EV_VERSION_MAJOR; 1716 return EV_VERSION_MAJOR;
1554} 1717}
1555 1718
1556int 1719int ecb_cold
1557ev_version_minor (void) 1720ev_version_minor (void)
1558{ 1721{
1559 return EV_VERSION_MINOR; 1722 return EV_VERSION_MINOR;
1560} 1723}
1561 1724
1562/* return true if we are running with elevated privileges and should ignore env variables */ 1725/* return true if we are running with elevated privileges and should ignore env variables */
1563int inline_size 1726int inline_size ecb_cold
1564enable_secure (void) 1727enable_secure (void)
1565{ 1728{
1566#ifdef _WIN32 1729#ifdef _WIN32
1567 return 0; 1730 return 0;
1568#else 1731#else
1569 return getuid () != geteuid () 1732 return getuid () != geteuid ()
1570 || getgid () != getegid (); 1733 || getgid () != getegid ();
1571#endif 1734#endif
1572} 1735}
1573 1736
1574unsigned int 1737unsigned int ecb_cold
1575ev_supported_backends (void) 1738ev_supported_backends (void)
1576{ 1739{
1577 unsigned int flags = 0; 1740 unsigned int flags = 0;
1578 1741
1579 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1742 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
1583 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1746 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1584 1747
1585 return flags; 1748 return flags;
1586} 1749}
1587 1750
1588unsigned int 1751unsigned int ecb_cold
1589ev_recommended_backends (void) 1752ev_recommended_backends (void)
1590{ 1753{
1591 unsigned int flags = ev_supported_backends (); 1754 unsigned int flags = ev_supported_backends ();
1592 1755
1593#ifndef __NetBSD__ 1756#ifndef __NetBSD__
1605#endif 1768#endif
1606 1769
1607 return flags; 1770 return flags;
1608} 1771}
1609 1772
1610unsigned int 1773unsigned int ecb_cold
1611ev_embeddable_backends (void) 1774ev_embeddable_backends (void)
1612{ 1775{
1613 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1776 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1614 1777
1615 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1778 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1660ev_userdata (EV_P) 1823ev_userdata (EV_P)
1661{ 1824{
1662 return userdata; 1825 return userdata;
1663} 1826}
1664 1827
1828void
1665void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1829ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1666{ 1830{
1667 invoke_cb = invoke_pending_cb; 1831 invoke_cb = invoke_pending_cb;
1668} 1832}
1669 1833
1834void
1670void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1835ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1671{ 1836{
1672 release_cb = release; 1837 release_cb = release;
1673 acquire_cb = acquire; 1838 acquire_cb = acquire;
1674} 1839}
1675#endif 1840#endif
1676 1841
1677/* initialise a loop structure, must be zero-initialised */ 1842/* initialise a loop structure, must be zero-initialised */
1678static void noinline 1843static void noinline ecb_cold
1679loop_init (EV_P_ unsigned int flags) 1844loop_init (EV_P_ unsigned int flags)
1680{ 1845{
1681 if (!backend) 1846 if (!backend)
1682 { 1847 {
1683 origflags = flags; 1848 origflags = flags;
1711 if (!(flags & EVFLAG_NOENV) 1876 if (!(flags & EVFLAG_NOENV)
1712 && !enable_secure () 1877 && !enable_secure ()
1713 && getenv ("LIBEV_FLAGS")) 1878 && getenv ("LIBEV_FLAGS"))
1714 flags = atoi (getenv ("LIBEV_FLAGS")); 1879 flags = atoi (getenv ("LIBEV_FLAGS"));
1715 1880
1716 ev_rt_now = ev_time (); 1881 ev_rt_now = ev_time ();
1717 mn_now = get_clock (); 1882 mn_now = get_clock ();
1718 now_floor = mn_now; 1883 now_floor = mn_now;
1719 rtmn_diff = ev_rt_now - mn_now; 1884 rtmn_diff = ev_rt_now - mn_now;
1720#if EV_FEATURE_API 1885#if EV_FEATURE_API
1721 invoke_cb = ev_invoke_pending; 1886 invoke_cb = ev_invoke_pending;
1722#endif 1887#endif
1723 1888
1724 io_blocktime = 0.; 1889 io_blocktime = 0.;
1725 timeout_blocktime = 0.; 1890 timeout_blocktime = 0.;
1726 backend = 0; 1891 backend = 0;
1727 backend_fd = -1; 1892 backend_fd = -1;
1728 sig_pending = 0; 1893 sig_pending = 0;
1729#if EV_ASYNC_ENABLE 1894#if EV_ASYNC_ENABLE
1730 async_pending = 0; 1895 async_pending = 0;
1731#endif 1896#endif
1897 pipe_write_skipped = 0;
1898 pipe_write_wanted = 0;
1732#if EV_USE_INOTIFY 1899#if EV_USE_INOTIFY
1733 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1900 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1734#endif 1901#endif
1735#if EV_USE_SIGNALFD 1902#if EV_USE_SIGNALFD
1736 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1903 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1737#endif 1904#endif
1738 1905
1739 if (!(flags & EVBACKEND_MASK)) 1906 if (!(flags & EVBACKEND_MASK))
1740 flags |= ev_recommended_backends (); 1907 flags |= ev_recommended_backends ();
1741 1908
1766#endif 1933#endif
1767 } 1934 }
1768} 1935}
1769 1936
1770/* free up a loop structure */ 1937/* free up a loop structure */
1771void 1938void ecb_cold
1772ev_loop_destroy (EV_P) 1939ev_loop_destroy (EV_P)
1773{ 1940{
1774 int i; 1941 int i;
1775 1942
1776#if EV_MULTIPLICITY 1943#if EV_MULTIPLICITY
1906 infy_fork (EV_A); 2073 infy_fork (EV_A);
1907#endif 2074#endif
1908 2075
1909 if (ev_is_active (&pipe_w)) 2076 if (ev_is_active (&pipe_w))
1910 { 2077 {
1911 /* this "locks" the handlers against writing to the pipe */ 2078 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1912 /* while we modify the fd vars */
1913 sig_pending = 1;
1914#if EV_ASYNC_ENABLE
1915 async_pending = 1;
1916#endif
1917 2079
1918 ev_ref (EV_A); 2080 ev_ref (EV_A);
1919 ev_io_stop (EV_A_ &pipe_w); 2081 ev_io_stop (EV_A_ &pipe_w);
1920 2082
1921#if EV_USE_EVENTFD 2083#if EV_USE_EVENTFD
1939 postfork = 0; 2101 postfork = 0;
1940} 2102}
1941 2103
1942#if EV_MULTIPLICITY 2104#if EV_MULTIPLICITY
1943 2105
1944struct ev_loop * 2106struct ev_loop * ecb_cold
1945ev_loop_new (unsigned int flags) 2107ev_loop_new (unsigned int flags)
1946{ 2108{
1947 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2109 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1948 2110
1949 memset (EV_A, 0, sizeof (struct ev_loop)); 2111 memset (EV_A, 0, sizeof (struct ev_loop));
1957} 2119}
1958 2120
1959#endif /* multiplicity */ 2121#endif /* multiplicity */
1960 2122
1961#if EV_VERIFY 2123#if EV_VERIFY
1962static void noinline 2124static void noinline ecb_cold
1963verify_watcher (EV_P_ W w) 2125verify_watcher (EV_P_ W w)
1964{ 2126{
1965 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2127 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1966 2128
1967 if (w->pending) 2129 if (w->pending)
1968 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2130 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1969} 2131}
1970 2132
1971static void noinline 2133static void noinline ecb_cold
1972verify_heap (EV_P_ ANHE *heap, int N) 2134verify_heap (EV_P_ ANHE *heap, int N)
1973{ 2135{
1974 int i; 2136 int i;
1975 2137
1976 for (i = HEAP0; i < N + HEAP0; ++i) 2138 for (i = HEAP0; i < N + HEAP0; ++i)
1981 2143
1982 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2144 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1983 } 2145 }
1984} 2146}
1985 2147
1986static void noinline 2148static void noinline ecb_cold
1987array_verify (EV_P_ W *ws, int cnt) 2149array_verify (EV_P_ W *ws, int cnt)
1988{ 2150{
1989 while (cnt--) 2151 while (cnt--)
1990 { 2152 {
1991 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2153 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1993 } 2155 }
1994} 2156}
1995#endif 2157#endif
1996 2158
1997#if EV_FEATURE_API 2159#if EV_FEATURE_API
1998void 2160void ecb_cold
1999ev_verify (EV_P) 2161ev_verify (EV_P)
2000{ 2162{
2001#if EV_VERIFY 2163#if EV_VERIFY
2002 int i; 2164 int i;
2003 WL w; 2165 WL w;
2069#endif 2231#endif
2070} 2232}
2071#endif 2233#endif
2072 2234
2073#if EV_MULTIPLICITY 2235#if EV_MULTIPLICITY
2074struct ev_loop * 2236struct ev_loop * ecb_cold
2075#else 2237#else
2076int 2238int
2077#endif 2239#endif
2078ev_default_loop (unsigned int flags) 2240ev_default_loop (unsigned int flags)
2079{ 2241{
2208 } 2370 }
2209} 2371}
2210 2372
2211#if EV_PERIODIC_ENABLE 2373#if EV_PERIODIC_ENABLE
2212 2374
2213inline_speed void 2375static void noinline
2214periodic_recalc (EV_P_ ev_periodic *w) 2376periodic_recalc (EV_P_ ev_periodic *w)
2215{ 2377{
2216 /* TODO: use slow but potentially more correct incremental algo, */ 2378 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2217 /* also do not rely on ceil */ 2379 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2218 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2380
2381 /* the above almost always errs on the low side */
2382 while (at <= ev_rt_now)
2383 {
2384 ev_tstamp nat = at + w->interval;
2385
2386 /* when resolution fails us, we use ev_rt_now */
2387 if (expect_false (nat == at))
2388 {
2389 at = ev_rt_now;
2390 break;
2391 }
2392
2393 at = nat;
2394 }
2395
2396 ev_at (w) = at;
2219} 2397}
2220 2398
2221/* make periodics pending */ 2399/* make periodics pending */
2222inline_size void 2400inline_size void
2223periodics_reify (EV_P) 2401periodics_reify (EV_P)
2245 downheap (periodics, periodiccnt, HEAP0); 2423 downheap (periodics, periodiccnt, HEAP0);
2246 } 2424 }
2247 else if (w->interval) 2425 else if (w->interval)
2248 { 2426 {
2249 periodic_recalc (EV_A_ w); 2427 periodic_recalc (EV_A_ w);
2250
2251 /* if next trigger time is not sufficiently in the future, put it there */
2252 /* this might happen because of floating point inexactness */
2253 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2254 {
2255 ev_at (w) += w->interval;
2256
2257 /* if interval is unreasonably low we might still have a time in the past */
2258 /* so correct this. this will make the periodic very inexact, but the user */
2259 /* has effectively asked to get triggered more often than possible */
2260 if (ev_at (w) < ev_rt_now)
2261 ev_at (w) = ev_rt_now;
2262 }
2263
2264 ANHE_at_cache (periodics [HEAP0]); 2428 ANHE_at_cache (periodics [HEAP0]);
2265 downheap (periodics, periodiccnt, HEAP0); 2429 downheap (periodics, periodiccnt, HEAP0);
2266 } 2430 }
2267 else 2431 else
2268 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2432 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2276 } 2440 }
2277} 2441}
2278 2442
2279/* simply recalculate all periodics */ 2443/* simply recalculate all periodics */
2280/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2444/* TODO: maybe ensure that at least one event happens when jumping forward? */
2281static void noinline 2445static void noinline ecb_cold
2282periodics_reschedule (EV_P) 2446periodics_reschedule (EV_P)
2283{ 2447{
2284 int i; 2448 int i;
2285 2449
2286 /* adjust periodics after time jump */ 2450 /* adjust periodics after time jump */
2299 reheap (periodics, periodiccnt); 2463 reheap (periodics, periodiccnt);
2300} 2464}
2301#endif 2465#endif
2302 2466
2303/* adjust all timers by a given offset */ 2467/* adjust all timers by a given offset */
2304static void noinline 2468static void noinline ecb_cold
2305timers_reschedule (EV_P_ ev_tstamp adjust) 2469timers_reschedule (EV_P_ ev_tstamp adjust)
2306{ 2470{
2307 int i; 2471 int i;
2308 2472
2309 for (i = 0; i < timercnt; ++i) 2473 for (i = 0; i < timercnt; ++i)
2346 * doesn't hurt either as we only do this on time-jumps or 2510 * doesn't hurt either as we only do this on time-jumps or
2347 * in the unlikely event of having been preempted here. 2511 * in the unlikely event of having been preempted here.
2348 */ 2512 */
2349 for (i = 4; --i; ) 2513 for (i = 4; --i; )
2350 { 2514 {
2515 ev_tstamp diff;
2351 rtmn_diff = ev_rt_now - mn_now; 2516 rtmn_diff = ev_rt_now - mn_now;
2352 2517
2518 diff = odiff - rtmn_diff;
2519
2353 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2520 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2354 return; /* all is well */ 2521 return; /* all is well */
2355 2522
2356 ev_rt_now = ev_time (); 2523 ev_rt_now = ev_time ();
2357 mn_now = get_clock (); 2524 mn_now = get_clock ();
2358 now_floor = mn_now; 2525 now_floor = mn_now;
2448 ev_tstamp prev_mn_now = mn_now; 2615 ev_tstamp prev_mn_now = mn_now;
2449 2616
2450 /* update time to cancel out callback processing overhead */ 2617 /* update time to cancel out callback processing overhead */
2451 time_update (EV_A_ 1e100); 2618 time_update (EV_A_ 1e100);
2452 2619
2620 /* from now on, we want a pipe-wake-up */
2621 pipe_write_wanted = 1;
2622
2623 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
2624
2453 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2625 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2454 { 2626 {
2455 waittime = MAX_BLOCKTIME; 2627 waittime = MAX_BLOCKTIME;
2456 2628
2457 if (timercnt) 2629 if (timercnt)
2458 { 2630 {
2459 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2631 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2460 if (waittime > to) waittime = to; 2632 if (waittime > to) waittime = to;
2461 } 2633 }
2462 2634
2463#if EV_PERIODIC_ENABLE 2635#if EV_PERIODIC_ENABLE
2464 if (periodiccnt) 2636 if (periodiccnt)
2465 { 2637 {
2466 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2638 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2467 if (waittime > to) waittime = to; 2639 if (waittime > to) waittime = to;
2468 } 2640 }
2469#endif 2641#endif
2470 2642
2471 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2643 /* don't let timeouts decrease the waittime below timeout_blocktime */
2472 if (expect_false (waittime < timeout_blocktime)) 2644 if (expect_false (waittime < timeout_blocktime))
2473 waittime = timeout_blocktime; 2645 waittime = timeout_blocktime;
2646
2647 /* at this point, we NEED to wait, so we have to ensure */
2648 /* to pass a minimum nonzero value to the backend */
2649 if (expect_false (waittime < backend_mintime))
2650 waittime = backend_mintime;
2474 2651
2475 /* extra check because io_blocktime is commonly 0 */ 2652 /* extra check because io_blocktime is commonly 0 */
2476 if (expect_false (io_blocktime)) 2653 if (expect_false (io_blocktime))
2477 { 2654 {
2478 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2655 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2479 2656
2480 if (sleeptime > waittime - backend_fudge) 2657 if (sleeptime > waittime - backend_mintime)
2481 sleeptime = waittime - backend_fudge; 2658 sleeptime = waittime - backend_mintime;
2482 2659
2483 if (expect_true (sleeptime > 0.)) 2660 if (expect_true (sleeptime > 0.))
2484 { 2661 {
2485 ev_sleep (sleeptime); 2662 ev_sleep (sleeptime);
2486 waittime -= sleeptime; 2663 waittime -= sleeptime;
2492 ++loop_count; 2669 ++loop_count;
2493#endif 2670#endif
2494 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2671 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2495 backend_poll (EV_A_ waittime); 2672 backend_poll (EV_A_ waittime);
2496 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2673 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2674
2675 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2676
2677 if (pipe_write_skipped)
2678 {
2679 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2680 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2681 }
2682
2497 2683
2498 /* update ev_rt_now, do magic */ 2684 /* update ev_rt_now, do magic */
2499 time_update (EV_A_ waittime + sleeptime); 2685 time_update (EV_A_ waittime + sleeptime);
2500 } 2686 }
2501 2687
3078 if (!pend || pend == path) 3264 if (!pend || pend == path)
3079 break; 3265 break;
3080 3266
3081 *pend = 0; 3267 *pend = 0;
3082 w->wd = inotify_add_watch (fs_fd, path, mask); 3268 w->wd = inotify_add_watch (fs_fd, path, mask);
3083 } 3269 }
3084 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3270 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3085 } 3271 }
3086 } 3272 }
3087 3273
3088 if (w->wd >= 0) 3274 if (w->wd >= 0)
3155 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3341 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3156 ofs += sizeof (struct inotify_event) + ev->len; 3342 ofs += sizeof (struct inotify_event) + ev->len;
3157 } 3343 }
3158} 3344}
3159 3345
3160inline_size void 3346inline_size void ecb_cold
3161ev_check_2625 (EV_P) 3347ev_check_2625 (EV_P)
3162{ 3348{
3163 /* kernels < 2.6.25 are borked 3349 /* kernels < 2.6.25 are borked
3164 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3350 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3165 */ 3351 */
3790} 3976}
3791 3977
3792/*****************************************************************************/ 3978/*****************************************************************************/
3793 3979
3794#if EV_WALK_ENABLE 3980#if EV_WALK_ENABLE
3795void 3981void ecb_cold
3796ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3982ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3797{ 3983{
3798 int i, j; 3984 int i, j;
3799 ev_watcher_list *wl, *wn; 3985 ev_watcher_list *wl, *wn;
3800 3986

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines