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

Comparing libev/ev.c (file contents):
Revision 1.369 by root, Sun Jan 23 18:53:06 2011 UTC vs.
Revision 1.380 by root, Mon Jun 27 19:20:01 2011 UTC

… …
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
42# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
43# include EV_CONFIG_H 43# include EV_CONFIG_H
44# else 44# else
45# include "config.h" 45# include "config.h"
46# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
47 53
48# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
49# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
50# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
51# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
156# define EV_USE_EVENTFD 0 162# define EV_USE_EVENTFD 0
157# endif 163# endif
158 164
159#endif 165#endif
160 166
161#include <math.h>
162#include <stdlib.h> 167#include <stdlib.h>
163#include <string.h> 168#include <string.h>
164#include <fcntl.h> 169#include <fcntl.h>
165#include <stddef.h> 170#include <stddef.h>
166 171
… …
232/* to make it compile regardless, just remove the above line, */ 237/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */ 238/* but consider reporting it, too! :) */
234# define EV_NSIG 65 239# define EV_NSIG 65
235#endif 240#endif
236 241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
245
237#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
238# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
240# else 249# else
241# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
… …
376# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
377# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
378#endif 387#endif
379 388
380#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
381# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
382# include <sys/select.h> 392# include <sys/select.h>
383# endif 393# endif
384#endif 394#endif
385 395
386#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
… …
442#else 452#else
443# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
444#endif 454#endif
445 455
446/* 456/*
447 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
448 * It is added to ev_rt_now when scheduling periodics
449 * to ensure progress, time-wise, even when rounding
450 * errors are against us.
451 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
452 * Better solutions welcome.
453 */ 459 */
454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
461/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
455 462
456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
458 465
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0) 467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461 468
462#if __GNUC__ >= 4 469/* the following are taken from libecb */
463# define expect(expr,value) __builtin_expect ((expr),(value)) 470/* ecb.h start */
464# define noinline __attribute__ ((noinline)) 471
472/* many compilers define _GNUC_ to some versions but then only implement
473 * what their idiot authors think are the "more important" extensions,
474 * causing enourmous grief in return for some better fake benchmark numbers.
475 * or so.
476 * we try to detect these and simply assume they are not gcc - if they have
477 * an issue with that they should have done it right in the first place.
478 */
479#ifndef ECB_GCC_VERSION
480 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
481 #define ECB_GCC_VERSION(major,minor) 0
482 #else
483 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
484 #endif
485#endif
486
487#if __cplusplus
488 #define ecb_inline static inline
489#elif ECB_GCC_VERSION(2,5)
490 #define ecb_inline static __inline__
491#elif ECB_C99
492 #define ecb_inline static inline
465#else 493#else
466# define expect(expr,value) (expr) 494 #define ecb_inline static
467# define noinline
468# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
469# define inline
470# endif 495#endif
471#endif
472 496
497#if ECB_GCC_VERSION(3,1)
498 #define ecb_attribute(attrlist) __attribute__(attrlist)
499 #define ecb_is_constant(expr) __builtin_constant_p (expr)
500 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
501 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
502#else
503 #define ecb_attribute(attrlist)
504 #define ecb_is_constant(expr) 0
505 #define ecb_expect(expr,value) (expr)
506 #define ecb_prefetch(addr,rw,locality)
507#endif
508
509#define ecb_noinline ecb_attribute ((__noinline__))
510#define ecb_noreturn ecb_attribute ((__noreturn__))
511#define ecb_unused ecb_attribute ((__unused__))
512#define ecb_const ecb_attribute ((__const__))
513#define ecb_pure ecb_attribute ((__pure__))
514
515#if ECB_GCC_VERSION(4,3)
516 #define ecb_artificial ecb_attribute ((__artificial__))
517 #define ecb_hot ecb_attribute ((__hot__))
518 #define ecb_cold ecb_attribute ((__cold__))
519#else
520 #define ecb_artificial
521 #define ecb_hot
522 #define ecb_cold
523#endif
524
525/* put around conditional expressions if you are very sure that the */
526/* expression is mostly true or mostly false. note that these return */
527/* booleans, not the expression. */
473#define expect_false(expr) expect ((expr) != 0, 0) 528#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
474#define expect_true(expr) expect ((expr) != 0, 1) 529#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
530/* ecb.h end */
531
532#define expect_false(cond) ecb_expect_false (cond)
533#define expect_true(cond) ecb_expect_true (cond)
534#define noinline ecb_noinline
535
475#define inline_size static inline 536#define inline_size ecb_inline
476 537
477#if EV_FEATURE_CODE 538#if EV_FEATURE_CODE
478# define inline_speed static inline 539# define inline_speed ecb_inline
479#else 540#else
480# define inline_speed static noinline 541# define inline_speed static noinline
481#endif 542#endif
482 543
483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 544#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
… …
522# include "ev_win32.c" 583# include "ev_win32.c"
523#endif 584#endif
524 585
525/*****************************************************************************/ 586/*****************************************************************************/
526 587
588/* define a suitable floor function (only used by periodics atm) */
589
590#if EV_USE_FLOOR
591# include <math.h>
592# define ev_floor(v) floor (v)
593#else
594
595#include <float.h>
596
597/* a floor() replacement function, should be independent of ev_tstamp type */
598static ev_tstamp noinline
599ev_floor (ev_tstamp v)
600{
601 /* the choice of shift factor is not terribly important */
602#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
603 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
604#else
605 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
606#endif
607
608 /* argument too large for an unsigned long? */
609 if (expect_false (v >= shift))
610 {
611 ev_tstamp f;
612
613 if (v == v - 1.)
614 return v; /* very large number */
615
616 f = shift * ev_floor (v * (1. / shift));
617 return f + ev_floor (v - f);
618 }
619
620 /* special treatment for negative args? */
621 if (expect_false (v < 0.))
622 {
623 ev_tstamp f = -ev_floor (-v);
624
625 return f - (f == v ? 0 : 1);
626 }
627
628 /* fits into an unsigned long */
629 return (unsigned long)v;
630}
631
632#endif
633
634/*****************************************************************************/
635
527#ifdef __linux 636#ifdef __linux
528# include <sys/utsname.h> 637# include <sys/utsname.h>
529#endif 638#endif
530 639
531static unsigned int noinline 640static unsigned int noinline ecb_cold
532ev_linux_version (void) 641ev_linux_version (void)
533{ 642{
534#ifdef __linux 643#ifdef __linux
535 unsigned int v = 0; 644 unsigned int v = 0;
536 struct utsname buf; 645 struct utsname buf;
… …
565} 674}
566 675
567/*****************************************************************************/ 676/*****************************************************************************/
568 677
569#if EV_AVOID_STDIO 678#if EV_AVOID_STDIO
570static void noinline 679static void noinline ecb_cold
571ev_printerr (const char *msg) 680ev_printerr (const char *msg)
572{ 681{
573 write (STDERR_FILENO, msg, strlen (msg)); 682 write (STDERR_FILENO, msg, strlen (msg));
574} 683}
575#endif 684#endif
576 685
577static void (*syserr_cb)(const char *msg); 686static void (*syserr_cb)(const char *msg);
578 687
579void 688void ecb_cold
580ev_set_syserr_cb (void (*cb)(const char *msg)) 689ev_set_syserr_cb (void (*cb)(const char *msg))
581{ 690{
582 syserr_cb = cb; 691 syserr_cb = cb;
583} 692}
584 693
585static void noinline 694static void noinline ecb_cold
586ev_syserr (const char *msg) 695ev_syserr (const char *msg)
587{ 696{
588 if (!msg) 697 if (!msg)
589 msg = "(libev) system error"; 698 msg = "(libev) system error";
590 699
… …
623#endif 732#endif
624} 733}
625 734
626static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 735static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
627 736
628void 737void ecb_cold
629ev_set_allocator (void *(*cb)(void *ptr, long size)) 738ev_set_allocator (void *(*cb)(void *ptr, long size))
630{ 739{
631 alloc = cb; 740 alloc = cb;
632} 741}
633 742
… …
815 select (0, 0, 0, 0, &tv); 924 select (0, 0, 0, 0, &tv);
816#endif 925#endif
817 } 926 }
818} 927}
819 928
820inline_speed int
821ev_timeout_to_ms (ev_tstamp timeout)
822{
823 int ms = timeout * 1000. + .999999;
824
825 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
826}
827
828/*****************************************************************************/ 929/*****************************************************************************/
829 930
830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 931#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
831 932
832/* find a suitable new size for the given array, */ 933/* find a suitable new size for the given array, */
… …
850 } 951 }
851 952
852 return ncur; 953 return ncur;
853} 954}
854 955
855static noinline void * 956static void * noinline ecb_cold
856array_realloc (int elem, void *base, int *cur, int cnt) 957array_realloc (int elem, void *base, int *cur, int cnt)
857{ 958{
858 *cur = array_nextsize (elem, *cur, cnt); 959 *cur = array_nextsize (elem, *cur, cnt);
859 return ev_realloc (base, elem * *cur); 960 return ev_realloc (base, elem * *cur);
860} 961}
… …
973inline_size void 1074inline_size void
974fd_reify (EV_P) 1075fd_reify (EV_P)
975{ 1076{
976 int i; 1077 int i;
977 1078
1079#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1080 for (i = 0; i < fdchangecnt; ++i)
1081 {
1082 int fd = fdchanges [i];
1083 ANFD *anfd = anfds + fd;
1084
1085 if (anfd->reify & EV__IOFDSET && anfd->head)
1086 {
1087 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1088
1089 if (handle != anfd->handle)
1090 {
1091 unsigned long arg;
1092
1093 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1094
1095 /* handle changed, but fd didn't - we need to do it in two steps */
1096 backend_modify (EV_A_ fd, anfd->events, 0);
1097 anfd->events = 0;
1098 anfd->handle = handle;
1099 }
1100 }
1101 }
1102#endif
1103
978 for (i = 0; i < fdchangecnt; ++i) 1104 for (i = 0; i < fdchangecnt; ++i)
979 { 1105 {
980 int fd = fdchanges [i]; 1106 int fd = fdchanges [i];
981 ANFD *anfd = anfds + fd; 1107 ANFD *anfd = anfds + fd;
982 ev_io *w; 1108 ev_io *w;
… …
984 unsigned char o_events = anfd->events; 1110 unsigned char o_events = anfd->events;
985 unsigned char o_reify = anfd->reify; 1111 unsigned char o_reify = anfd->reify;
986 1112
987 anfd->reify = 0; 1113 anfd->reify = 0;
988 1114
989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
990 if (o_reify & EV__IOFDSET)
991 {
992 unsigned long arg;
993 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
996 }
997#endif
998
999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1115 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
1000 { 1116 {
1001 anfd->events = 0; 1117 anfd->events = 0;
1002 1118
1003 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1119 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
1028 fdchanges [fdchangecnt - 1] = fd; 1144 fdchanges [fdchangecnt - 1] = fd;
1029 } 1145 }
1030} 1146}
1031 1147
1032/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1148/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1033inline_speed void 1149inline_speed void ecb_cold
1034fd_kill (EV_P_ int fd) 1150fd_kill (EV_P_ int fd)
1035{ 1151{
1036 ev_io *w; 1152 ev_io *w;
1037 1153
1038 while ((w = (ev_io *)anfds [fd].head)) 1154 while ((w = (ev_io *)anfds [fd].head))
… …
1041 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1157 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1042 } 1158 }
1043} 1159}
1044 1160
1045/* check whether the given fd is actually valid, for error recovery */ 1161/* check whether the given fd is actually valid, for error recovery */
1046inline_size int 1162inline_size int ecb_cold
1047fd_valid (int fd) 1163fd_valid (int fd)
1048{ 1164{
1049#ifdef _WIN32 1165#ifdef _WIN32
1050 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1166 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1051#else 1167#else
1052 return fcntl (fd, F_GETFD) != -1; 1168 return fcntl (fd, F_GETFD) != -1;
1053#endif 1169#endif
1054} 1170}
1055 1171
1056/* called on EBADF to verify fds */ 1172/* called on EBADF to verify fds */
1057static void noinline 1173static void noinline ecb_cold
1058fd_ebadf (EV_P) 1174fd_ebadf (EV_P)
1059{ 1175{
1060 int fd; 1176 int fd;
1061 1177
1062 for (fd = 0; fd < anfdmax; ++fd) 1178 for (fd = 0; fd < anfdmax; ++fd)
… …
1064 if (!fd_valid (fd) && errno == EBADF) 1180 if (!fd_valid (fd) && errno == EBADF)
1065 fd_kill (EV_A_ fd); 1181 fd_kill (EV_A_ fd);
1066} 1182}
1067 1183
1068/* called on ENOMEM in select/poll to kill some fds and retry */ 1184/* called on ENOMEM in select/poll to kill some fds and retry */
1069static void noinline 1185static void noinline ecb_cold
1070fd_enomem (EV_P) 1186fd_enomem (EV_P)
1071{ 1187{
1072 int fd; 1188 int fd;
1073 1189
1074 for (fd = anfdmax; fd--; ) 1190 for (fd = anfdmax; fd--; )
… …
1269 1385
1270/*****************************************************************************/ 1386/*****************************************************************************/
1271 1387
1272#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1388#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1273 1389
1274static void noinline 1390static void noinline ecb_cold
1275evpipe_init (EV_P) 1391evpipe_init (EV_P)
1276{ 1392{
1277 if (!ev_is_active (&pipe_w)) 1393 if (!ev_is_active (&pipe_w))
1278 { 1394 {
1279# if EV_USE_EVENTFD 1395# if EV_USE_EVENTFD
… …
1301 ev_io_start (EV_A_ &pipe_w); 1417 ev_io_start (EV_A_ &pipe_w);
1302 ev_unref (EV_A); /* watcher should not keep loop alive */ 1418 ev_unref (EV_A); /* watcher should not keep loop alive */
1303 } 1419 }
1304} 1420}
1305 1421
1306inline_size void 1422inline_speed void
1307evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1423evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1308{ 1424{
1309 if (!*flag) 1425 if (!*flag)
1310 { 1426 {
1311 int old_errno = errno; /* save errno because write might clobber it */
1312 char dummy;
1313
1314 *flag = 1; 1427 *flag = 1;
1315 1428
1429 pipe_write_skipped = 1;
1430
1431 if (pipe_write_wanted)
1432 {
1433 int old_errno;
1434
1435 pipe_write_skipped = 0;
1436
1437 old_errno = errno; /* save errno because write will clobber it */
1438
1316#if EV_USE_EVENTFD 1439#if EV_USE_EVENTFD
1317 if (evfd >= 0) 1440 if (evfd >= 0)
1318 { 1441 {
1319 uint64_t counter = 1; 1442 uint64_t counter = 1;
1320 write (evfd, &counter, sizeof (uint64_t)); 1443 write (evfd, &counter, sizeof (uint64_t));
1444 }
1445 else
1446#endif
1447 {
1448 /* win32 people keep sending patches that change this write() to send() */
1449 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1450 /* so when you think this write should be a send instead, please find out */
1451 /* where your send() is from - it's definitely not the microsoft send, and */
1452 /* tell me. thank you. */
1453 write (evpipe [1], &(evpipe [1]), 1);
1454 }
1455
1456 errno = old_errno;
1321 } 1457 }
1322 else
1323#endif
1324 /* win32 people keep sending patches that change this write() to send() */
1325 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1326 /* so when you think this write should be a send instead, please find out */
1327 /* where your send() is from - it's definitely not the microsoft send, and */
1328 /* tell me. thank you. */
1329 write (evpipe [1], &dummy, 1);
1330
1331 errno = old_errno;
1332 } 1458 }
1333} 1459}
1334 1460
1335/* called whenever the libev signal pipe */ 1461/* called whenever the libev signal pipe */
1336/* got some events (signal, async) */ 1462/* got some events (signal, async) */
1337static void 1463static void
1338pipecb (EV_P_ ev_io *iow, int revents) 1464pipecb (EV_P_ ev_io *iow, int revents)
1339{ 1465{
1340 int i; 1466 int i;
1341 1467
1468 if (revents & EV_READ)
1469 {
1342#if EV_USE_EVENTFD 1470#if EV_USE_EVENTFD
1343 if (evfd >= 0) 1471 if (evfd >= 0)
1344 { 1472 {
1345 uint64_t counter; 1473 uint64_t counter;
1346 read (evfd, &counter, sizeof (uint64_t)); 1474 read (evfd, &counter, sizeof (uint64_t));
1347 } 1475 }
1348 else 1476 else
1349#endif 1477#endif
1350 { 1478 {
1351 char dummy; 1479 char dummy;
1352 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1480 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1353 read (evpipe [0], &dummy, 1); 1481 read (evpipe [0], &dummy, 1);
1482 }
1354 } 1483 }
1484
1485 pipe_write_skipped = 0;
1355 1486
1356#if EV_SIGNAL_ENABLE 1487#if EV_SIGNAL_ENABLE
1357 if (sig_pending) 1488 if (sig_pending)
1358 { 1489 {
1359 sig_pending = 0; 1490 sig_pending = 0;
1360 1491
1361 for (i = EV_NSIG - 1; i--; ) 1492 for (i = EV_NSIG - 1; i--; )
1362 if (expect_false (signals [i].pending)) 1493 if (expect_false (signals [i].pending))
1363 ev_feed_signal_event (EV_A_ i + 1); 1494 ev_feed_signal_event (EV_A_ i + 1);
… …
1388 EV_P = signals [signum - 1].loop; 1519 EV_P = signals [signum - 1].loop;
1389 1520
1390 if (!EV_A) 1521 if (!EV_A)
1391 return; 1522 return;
1392#endif 1523#endif
1524
1525 evpipe_init (EV_A);
1393 1526
1394 signals [signum - 1].pending = 1; 1527 signals [signum - 1].pending = 1;
1395 evpipe_write (EV_A_ &sig_pending); 1528 evpipe_write (EV_A_ &sig_pending);
1396} 1529}
1397 1530
… …
1529#endif 1662#endif
1530#if EV_USE_SELECT 1663#if EV_USE_SELECT
1531# include "ev_select.c" 1664# include "ev_select.c"
1532#endif 1665#endif
1533 1666
1534int 1667int ecb_cold
1535ev_version_major (void) 1668ev_version_major (void)
1536{ 1669{
1537 return EV_VERSION_MAJOR; 1670 return EV_VERSION_MAJOR;
1538} 1671}
1539 1672
1540int 1673int ecb_cold
1541ev_version_minor (void) 1674ev_version_minor (void)
1542{ 1675{
1543 return EV_VERSION_MINOR; 1676 return EV_VERSION_MINOR;
1544} 1677}
1545 1678
1546/* return true if we are running with elevated privileges and should ignore env variables */ 1679/* return true if we are running with elevated privileges and should ignore env variables */
1547int inline_size 1680int inline_size ecb_cold
1548enable_secure (void) 1681enable_secure (void)
1549{ 1682{
1550#ifdef _WIN32 1683#ifdef _WIN32
1551 return 0; 1684 return 0;
1552#else 1685#else
1553 return getuid () != geteuid () 1686 return getuid () != geteuid ()
1554 || getgid () != getegid (); 1687 || getgid () != getegid ();
1555#endif 1688#endif
1556} 1689}
1557 1690
1558unsigned int 1691unsigned int ecb_cold
1559ev_supported_backends (void) 1692ev_supported_backends (void)
1560{ 1693{
1561 unsigned int flags = 0; 1694 unsigned int flags = 0;
1562 1695
1563 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1696 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1567 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1700 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1568 1701
1569 return flags; 1702 return flags;
1570} 1703}
1571 1704
1572unsigned int 1705unsigned int ecb_cold
1573ev_recommended_backends (void) 1706ev_recommended_backends (void)
1574{ 1707{
1575 unsigned int flags = ev_supported_backends (); 1708 unsigned int flags = ev_supported_backends ();
1576 1709
1577#ifndef __NetBSD__ 1710#ifndef __NetBSD__
… …
1589#endif 1722#endif
1590 1723
1591 return flags; 1724 return flags;
1592} 1725}
1593 1726
1594unsigned int 1727unsigned int ecb_cold
1595ev_embeddable_backends (void) 1728ev_embeddable_backends (void)
1596{ 1729{
1597 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1730 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1598 1731
1599 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1732 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
… …
1644ev_userdata (EV_P) 1777ev_userdata (EV_P)
1645{ 1778{
1646 return userdata; 1779 return userdata;
1647} 1780}
1648 1781
1782void
1649void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1783ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1650{ 1784{
1651 invoke_cb = invoke_pending_cb; 1785 invoke_cb = invoke_pending_cb;
1652} 1786}
1653 1787
1788void
1654void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1789ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1655{ 1790{
1656 release_cb = release; 1791 release_cb = release;
1657 acquire_cb = acquire; 1792 acquire_cb = acquire;
1658} 1793}
1659#endif 1794#endif
1660 1795
1661/* initialise a loop structure, must be zero-initialised */ 1796/* initialise a loop structure, must be zero-initialised */
1662static void noinline 1797static void noinline ecb_cold
1663loop_init (EV_P_ unsigned int flags) 1798loop_init (EV_P_ unsigned int flags)
1664{ 1799{
1665 if (!backend) 1800 if (!backend)
1666 { 1801 {
1667 origflags = flags; 1802 origflags = flags;
… …
1695 if (!(flags & EVFLAG_NOENV) 1830 if (!(flags & EVFLAG_NOENV)
1696 && !enable_secure () 1831 && !enable_secure ()
1697 && getenv ("LIBEV_FLAGS")) 1832 && getenv ("LIBEV_FLAGS"))
1698 flags = atoi (getenv ("LIBEV_FLAGS")); 1833 flags = atoi (getenv ("LIBEV_FLAGS"));
1699 1834
1700 ev_rt_now = ev_time (); 1835 ev_rt_now = ev_time ();
1701 mn_now = get_clock (); 1836 mn_now = get_clock ();
1702 now_floor = mn_now; 1837 now_floor = mn_now;
1703 rtmn_diff = ev_rt_now - mn_now; 1838 rtmn_diff = ev_rt_now - mn_now;
1704#if EV_FEATURE_API 1839#if EV_FEATURE_API
1705 invoke_cb = ev_invoke_pending; 1840 invoke_cb = ev_invoke_pending;
1706#endif 1841#endif
1707 1842
1708 io_blocktime = 0.; 1843 io_blocktime = 0.;
1709 timeout_blocktime = 0.; 1844 timeout_blocktime = 0.;
1710 backend = 0; 1845 backend = 0;
1711 backend_fd = -1; 1846 backend_fd = -1;
1712 sig_pending = 0; 1847 sig_pending = 0;
1713#if EV_ASYNC_ENABLE 1848#if EV_ASYNC_ENABLE
1714 async_pending = 0; 1849 async_pending = 0;
1715#endif 1850#endif
1851 pipe_write_skipped = 0;
1852 pipe_write_wanted = 0;
1716#if EV_USE_INOTIFY 1853#if EV_USE_INOTIFY
1717 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1854 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1718#endif 1855#endif
1719#if EV_USE_SIGNALFD 1856#if EV_USE_SIGNALFD
1720 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1857 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1721#endif 1858#endif
1722 1859
1723 if (!(flags & EVBACKEND_MASK)) 1860 if (!(flags & EVBACKEND_MASK))
1724 flags |= ev_recommended_backends (); 1861 flags |= ev_recommended_backends ();
1725 1862
… …
1750#endif 1887#endif
1751 } 1888 }
1752} 1889}
1753 1890
1754/* free up a loop structure */ 1891/* free up a loop structure */
1755void 1892void ecb_cold
1756ev_loop_destroy (EV_P) 1893ev_loop_destroy (EV_P)
1757{ 1894{
1758 int i; 1895 int i;
1759 1896
1760#if EV_MULTIPLICITY 1897#if EV_MULTIPLICITY
… …
1890 infy_fork (EV_A); 2027 infy_fork (EV_A);
1891#endif 2028#endif
1892 2029
1893 if (ev_is_active (&pipe_w)) 2030 if (ev_is_active (&pipe_w))
1894 { 2031 {
1895 /* this "locks" the handlers against writing to the pipe */ 2032 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1896 /* while we modify the fd vars */
1897 sig_pending = 1;
1898#if EV_ASYNC_ENABLE
1899 async_pending = 1;
1900#endif
1901 2033
1902 ev_ref (EV_A); 2034 ev_ref (EV_A);
1903 ev_io_stop (EV_A_ &pipe_w); 2035 ev_io_stop (EV_A_ &pipe_w);
1904 2036
1905#if EV_USE_EVENTFD 2037#if EV_USE_EVENTFD
… …
1923 postfork = 0; 2055 postfork = 0;
1924} 2056}
1925 2057
1926#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1927 2059
1928struct ev_loop * 2060struct ev_loop * ecb_cold
1929ev_loop_new (unsigned int flags) 2061ev_loop_new (unsigned int flags)
1930{ 2062{
1931 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2063 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1932 2064
1933 memset (EV_A, 0, sizeof (struct ev_loop)); 2065 memset (EV_A, 0, sizeof (struct ev_loop));
… …
1941} 2073}
1942 2074
1943#endif /* multiplicity */ 2075#endif /* multiplicity */
1944 2076
1945#if EV_VERIFY 2077#if EV_VERIFY
1946static void noinline 2078static void noinline ecb_cold
1947verify_watcher (EV_P_ W w) 2079verify_watcher (EV_P_ W w)
1948{ 2080{
1949 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2081 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1950 2082
1951 if (w->pending) 2083 if (w->pending)
1952 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2084 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1953} 2085}
1954 2086
1955static void noinline 2087static void noinline ecb_cold
1956verify_heap (EV_P_ ANHE *heap, int N) 2088verify_heap (EV_P_ ANHE *heap, int N)
1957{ 2089{
1958 int i; 2090 int i;
1959 2091
1960 for (i = HEAP0; i < N + HEAP0; ++i) 2092 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1965 2097
1966 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2098 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1967 } 2099 }
1968} 2100}
1969 2101
1970static void noinline 2102static void noinline ecb_cold
1971array_verify (EV_P_ W *ws, int cnt) 2103array_verify (EV_P_ W *ws, int cnt)
1972{ 2104{
1973 while (cnt--) 2105 while (cnt--)
1974 { 2106 {
1975 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2107 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
… …
1977 } 2109 }
1978} 2110}
1979#endif 2111#endif
1980 2112
1981#if EV_FEATURE_API 2113#if EV_FEATURE_API
1982void 2114void ecb_cold
1983ev_verify (EV_P) 2115ev_verify (EV_P)
1984{ 2116{
1985#if EV_VERIFY 2117#if EV_VERIFY
1986 int i; 2118 int i;
1987 WL w; 2119 WL w;
… …
2053#endif 2185#endif
2054} 2186}
2055#endif 2187#endif
2056 2188
2057#if EV_MULTIPLICITY 2189#if EV_MULTIPLICITY
2058struct ev_loop * 2190struct ev_loop * ecb_cold
2059#else 2191#else
2060int 2192int
2061#endif 2193#endif
2062ev_default_loop (unsigned int flags) 2194ev_default_loop (unsigned int flags)
2063{ 2195{
… …
2191 feed_reverse_done (EV_A_ EV_TIMER); 2323 feed_reverse_done (EV_A_ EV_TIMER);
2192 } 2324 }
2193} 2325}
2194 2326
2195#if EV_PERIODIC_ENABLE 2327#if EV_PERIODIC_ENABLE
2328
2329static void noinline
2330periodic_recalc (EV_P_ ev_periodic *w)
2331{
2332 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2333 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2334
2335 /* the above almost always errs on the low side */
2336 while (at <= ev_rt_now)
2337 {
2338 ev_tstamp nat = at + w->interval;
2339
2340 /* when resolution fails us, we use ev_rt_now */
2341 if (expect_false (nat == at))
2342 {
2343 at = ev_rt_now;
2344 break;
2345 }
2346
2347 at = nat;
2348 }
2349
2350 ev_at (w) = at;
2351}
2352
2196/* make periodics pending */ 2353/* make periodics pending */
2197inline_size void 2354inline_size void
2198periodics_reify (EV_P) 2355periodics_reify (EV_P)
2199{ 2356{
2200 EV_FREQUENT_CHECK; 2357 EV_FREQUENT_CHECK;
… …
2219 ANHE_at_cache (periodics [HEAP0]); 2376 ANHE_at_cache (periodics [HEAP0]);
2220 downheap (periodics, periodiccnt, HEAP0); 2377 downheap (periodics, periodiccnt, HEAP0);
2221 } 2378 }
2222 else if (w->interval) 2379 else if (w->interval)
2223 { 2380 {
2224 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2381 periodic_recalc (EV_A_ w);
2225 /* if next trigger time is not sufficiently in the future, put it there */
2226 /* this might happen because of floating point inexactness */
2227 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2228 {
2229 ev_at (w) += w->interval;
2230
2231 /* if interval is unreasonably low we might still have a time in the past */
2232 /* so correct this. this will make the periodic very inexact, but the user */
2233 /* has effectively asked to get triggered more often than possible */
2234 if (ev_at (w) < ev_rt_now)
2235 ev_at (w) = ev_rt_now;
2236 }
2237
2238 ANHE_at_cache (periodics [HEAP0]); 2382 ANHE_at_cache (periodics [HEAP0]);
2239 downheap (periodics, periodiccnt, HEAP0); 2383 downheap (periodics, periodiccnt, HEAP0);
2240 } 2384 }
2241 else 2385 else
2242 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2386 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2250 } 2394 }
2251} 2395}
2252 2396
2253/* simply recalculate all periodics */ 2397/* simply recalculate all periodics */
2254/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2398/* TODO: maybe ensure that at least one event happens when jumping forward? */
2255static void noinline 2399static void noinline ecb_cold
2256periodics_reschedule (EV_P) 2400periodics_reschedule (EV_P)
2257{ 2401{
2258 int i; 2402 int i;
2259 2403
2260 /* adjust periodics after time jump */ 2404 /* adjust periodics after time jump */
… …
2263 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2407 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2264 2408
2265 if (w->reschedule_cb) 2409 if (w->reschedule_cb)
2266 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2410 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2267 else if (w->interval) 2411 else if (w->interval)
2268 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2412 periodic_recalc (EV_A_ w);
2269 2413
2270 ANHE_at_cache (periodics [i]); 2414 ANHE_at_cache (periodics [i]);
2271 } 2415 }
2272 2416
2273 reheap (periodics, periodiccnt); 2417 reheap (periodics, periodiccnt);
2274} 2418}
2275#endif 2419#endif
2276 2420
2277/* adjust all timers by a given offset */ 2421/* adjust all timers by a given offset */
2278static void noinline 2422static void noinline ecb_cold
2279timers_reschedule (EV_P_ ev_tstamp adjust) 2423timers_reschedule (EV_P_ ev_tstamp adjust)
2280{ 2424{
2281 int i; 2425 int i;
2282 2426
2283 for (i = 0; i < timercnt; ++i) 2427 for (i = 0; i < timercnt; ++i)
… …
2320 * doesn't hurt either as we only do this on time-jumps or 2464 * doesn't hurt either as we only do this on time-jumps or
2321 * in the unlikely event of having been preempted here. 2465 * in the unlikely event of having been preempted here.
2322 */ 2466 */
2323 for (i = 4; --i; ) 2467 for (i = 4; --i; )
2324 { 2468 {
2469 ev_tstamp diff;
2325 rtmn_diff = ev_rt_now - mn_now; 2470 rtmn_diff = ev_rt_now - mn_now;
2326 2471
2472 diff = odiff - rtmn_diff;
2473
2327 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2474 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2328 return; /* all is well */ 2475 return; /* all is well */
2329 2476
2330 ev_rt_now = ev_time (); 2477 ev_rt_now = ev_time ();
2331 mn_now = get_clock (); 2478 mn_now = get_clock ();
2332 now_floor = mn_now; 2479 now_floor = mn_now;
… …
2422 ev_tstamp prev_mn_now = mn_now; 2569 ev_tstamp prev_mn_now = mn_now;
2423 2570
2424 /* update time to cancel out callback processing overhead */ 2571 /* update time to cancel out callback processing overhead */
2425 time_update (EV_A_ 1e100); 2572 time_update (EV_A_ 1e100);
2426 2573
2574 /* from now on, we want a pipe-wake-up */
2575 pipe_write_wanted = 1;
2576
2427 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2577 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2428 { 2578 {
2429 waittime = MAX_BLOCKTIME; 2579 waittime = MAX_BLOCKTIME;
2430 2580
2431 if (timercnt) 2581 if (timercnt)
2432 { 2582 {
2433 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2583 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2434 if (waittime > to) waittime = to; 2584 if (waittime > to) waittime = to;
2435 } 2585 }
2436 2586
2437#if EV_PERIODIC_ENABLE 2587#if EV_PERIODIC_ENABLE
2438 if (periodiccnt) 2588 if (periodiccnt)
2439 { 2589 {
2440 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2590 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2441 if (waittime > to) waittime = to; 2591 if (waittime > to) waittime = to;
2442 } 2592 }
2443#endif 2593#endif
2444 2594
2445 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2595 /* don't let timeouts decrease the waittime below timeout_blocktime */
2446 if (expect_false (waittime < timeout_blocktime)) 2596 if (expect_false (waittime < timeout_blocktime))
2447 waittime = timeout_blocktime; 2597 waittime = timeout_blocktime;
2598
2599 /* at this point, we NEED to wait, so we have to ensure */
2600 /* to pass a minimum nonzero value to the backend */
2601 if (expect_false (waittime < backend_mintime))
2602 waittime = backend_mintime;
2448 2603
2449 /* extra check because io_blocktime is commonly 0 */ 2604 /* extra check because io_blocktime is commonly 0 */
2450 if (expect_false (io_blocktime)) 2605 if (expect_false (io_blocktime))
2451 { 2606 {
2452 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2607 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2453 2608
2454 if (sleeptime > waittime - backend_fudge) 2609 if (sleeptime > waittime - backend_mintime)
2455 sleeptime = waittime - backend_fudge; 2610 sleeptime = waittime - backend_mintime;
2456 2611
2457 if (expect_true (sleeptime > 0.)) 2612 if (expect_true (sleeptime > 0.))
2458 { 2613 {
2459 ev_sleep (sleeptime); 2614 ev_sleep (sleeptime);
2460 waittime -= sleeptime; 2615 waittime -= sleeptime;
… …
2466 ++loop_count; 2621 ++loop_count;
2467#endif 2622#endif
2468 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2623 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2469 backend_poll (EV_A_ waittime); 2624 backend_poll (EV_A_ waittime);
2470 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2625 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2626
2627 pipe_write_wanted = 0;
2628
2629 if (pipe_write_skipped)
2630 {
2631 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2632 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2633 }
2634
2471 2635
2472 /* update ev_rt_now, do magic */ 2636 /* update ev_rt_now, do magic */
2473 time_update (EV_A_ waittime + sleeptime); 2637 time_update (EV_A_ waittime + sleeptime);
2474 } 2638 }
2475 2639
… …
2765 if (w->reschedule_cb) 2929 if (w->reschedule_cb)
2766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2930 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2767 else if (w->interval) 2931 else if (w->interval)
2768 { 2932 {
2769 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2933 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2770 /* this formula differs from the one in periodic_reify because we do not always round up */ 2934 periodic_recalc (EV_A_ w);
2771 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2772 } 2935 }
2773 else 2936 else
2774 ev_at (w) = w->offset; 2937 ev_at (w) = w->offset;
2775 2938
2776 EV_FREQUENT_CHECK; 2939 EV_FREQUENT_CHECK;
… …
3053 if (!pend || pend == path) 3216 if (!pend || pend == path)
3054 break; 3217 break;
3055 3218
3056 *pend = 0; 3219 *pend = 0;
3057 w->wd = inotify_add_watch (fs_fd, path, mask); 3220 w->wd = inotify_add_watch (fs_fd, path, mask);
3058 } 3221 }
3059 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3222 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3060 } 3223 }
3061 } 3224 }
3062 3225
3063 if (w->wd >= 0) 3226 if (w->wd >= 0)
… …
3130 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3293 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3131 ofs += sizeof (struct inotify_event) + ev->len; 3294 ofs += sizeof (struct inotify_event) + ev->len;
3132 } 3295 }
3133} 3296}
3134 3297
3135inline_size void 3298inline_size void ecb_cold
3136ev_check_2625 (EV_P) 3299ev_check_2625 (EV_P)
3137{ 3300{
3138 /* kernels < 2.6.25 are borked 3301 /* kernels < 2.6.25 are borked
3139 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3302 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3140 */ 3303 */
… …
3765} 3928}
3766 3929
3767/*****************************************************************************/ 3930/*****************************************************************************/
3768 3931
3769#if EV_WALK_ENABLE 3932#if EV_WALK_ENABLE
3770void 3933void ecb_cold
3771ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3934ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3772{ 3935{
3773 int i, j; 3936 int i, j;
3774 ev_watcher_list *wl, *wn; 3937 ev_watcher_list *wl, *wn;
3775 3938

Diff Legend

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