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

Comparing libev/ev.c (file contents):
Revision 1.366 by root, Mon Jan 10 01:58:54 2011 UTC vs.
Revision 1.379 by root, Sun Jun 19 17:55:13 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
… …
842 } 951 }
843 952
844 return ncur; 953 return ncur;
845} 954}
846 955
847static noinline void * 956static void * noinline ecb_cold
848array_realloc (int elem, void *base, int *cur, int cnt) 957array_realloc (int elem, void *base, int *cur, int cnt)
849{ 958{
850 *cur = array_nextsize (elem, *cur, cnt); 959 *cur = array_nextsize (elem, *cur, cnt);
851 return ev_realloc (base, elem * *cur); 960 return ev_realloc (base, elem * *cur);
852} 961}
… …
965inline_size void 1074inline_size void
966fd_reify (EV_P) 1075fd_reify (EV_P)
967{ 1076{
968 int i; 1077 int i;
969 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
970 for (i = 0; i < fdchangecnt; ++i) 1104 for (i = 0; i < fdchangecnt; ++i)
971 { 1105 {
972 int fd = fdchanges [i]; 1106 int fd = fdchanges [i];
973 ANFD *anfd = anfds + fd; 1107 ANFD *anfd = anfds + fd;
974 ev_io *w; 1108 ev_io *w;
… …
976 unsigned char o_events = anfd->events; 1110 unsigned char o_events = anfd->events;
977 unsigned char o_reify = anfd->reify; 1111 unsigned char o_reify = anfd->reify;
978 1112
979 anfd->reify = 0; 1113 anfd->reify = 0;
980 1114
981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
982 if (o_reify & EV__IOFDSET)
983 {
984 unsigned long arg;
985 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
986 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
987 printf ("oi %d %x\n", fd, anfd->handle);//D
988 }
989#endif
990
991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1115 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
992 { 1116 {
993 anfd->events = 0; 1117 anfd->events = 0;
994 1118
995 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)
… …
1020 fdchanges [fdchangecnt - 1] = fd; 1144 fdchanges [fdchangecnt - 1] = fd;
1021 } 1145 }
1022} 1146}
1023 1147
1024/* 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 */
1025inline_speed void 1149inline_speed void ecb_cold
1026fd_kill (EV_P_ int fd) 1150fd_kill (EV_P_ int fd)
1027{ 1151{
1028 ev_io *w; 1152 ev_io *w;
1029 1153
1030 while ((w = (ev_io *)anfds [fd].head)) 1154 while ((w = (ev_io *)anfds [fd].head))
… …
1033 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);
1034 } 1158 }
1035} 1159}
1036 1160
1037/* check whether the given fd is actually valid, for error recovery */ 1161/* check whether the given fd is actually valid, for error recovery */
1038inline_size int 1162inline_size int ecb_cold
1039fd_valid (int fd) 1163fd_valid (int fd)
1040{ 1164{
1041#ifdef _WIN32 1165#ifdef _WIN32
1042 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1166 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1043#else 1167#else
1044 return fcntl (fd, F_GETFD) != -1; 1168 return fcntl (fd, F_GETFD) != -1;
1045#endif 1169#endif
1046} 1170}
1047 1171
1048/* called on EBADF to verify fds */ 1172/* called on EBADF to verify fds */
1049static void noinline 1173static void noinline ecb_cold
1050fd_ebadf (EV_P) 1174fd_ebadf (EV_P)
1051{ 1175{
1052 int fd; 1176 int fd;
1053 1177
1054 for (fd = 0; fd < anfdmax; ++fd) 1178 for (fd = 0; fd < anfdmax; ++fd)
… …
1056 if (!fd_valid (fd) && errno == EBADF) 1180 if (!fd_valid (fd) && errno == EBADF)
1057 fd_kill (EV_A_ fd); 1181 fd_kill (EV_A_ fd);
1058} 1182}
1059 1183
1060/* 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 */
1061static void noinline 1185static void noinline ecb_cold
1062fd_enomem (EV_P) 1186fd_enomem (EV_P)
1063{ 1187{
1064 int fd; 1188 int fd;
1065 1189
1066 for (fd = anfdmax; fd--; ) 1190 for (fd = anfdmax; fd--; )
… …
1261 1385
1262/*****************************************************************************/ 1386/*****************************************************************************/
1263 1387
1264#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1388#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1265 1389
1266static void noinline 1390static void noinline ecb_cold
1267evpipe_init (EV_P) 1391evpipe_init (EV_P)
1268{ 1392{
1269 if (!ev_is_active (&pipe_w)) 1393 if (!ev_is_active (&pipe_w))
1270 { 1394 {
1271# if EV_USE_EVENTFD 1395# if EV_USE_EVENTFD
… …
1298inline_size void 1422inline_size void
1299evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1423evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1300{ 1424{
1301 if (!*flag) 1425 if (!*flag)
1302 { 1426 {
1303 int old_errno = errno; /* save errno because write might clobber it */
1304 char dummy;
1305
1306 *flag = 1; 1427 *flag = 1;
1307 1428
1429 pipe_write_skipped = 1;
1430
1431 if (pipe_write_wanted)
1432 {
1433 int old_errno = errno; /* save errno because write will clobber it */
1434 char dummy;
1435
1436 pipe_write_skipped = 0;
1437
1308#if EV_USE_EVENTFD 1438#if EV_USE_EVENTFD
1309 if (evfd >= 0) 1439 if (evfd >= 0)
1310 { 1440 {
1311 uint64_t counter = 1; 1441 uint64_t counter = 1;
1312 write (evfd, &counter, sizeof (uint64_t)); 1442 write (evfd, &counter, sizeof (uint64_t));
1443 }
1444 else
1445#endif
1446 {
1447 /* win32 people keep sending patches that change this write() to send() */
1448 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1449 /* so when you think this write should be a send instead, please find out */
1450 /* where your send() is from - it's definitely not the microsoft send, and */
1451 /* tell me. thank you. */
1452 write (evpipe [1], &dummy, 1);
1453 }
1454
1455 errno = old_errno;
1313 } 1456 }
1314 else
1315#endif
1316 /* win32 people keep sending patches that change this write() to send() */
1317 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1318 /* so when you think this write should be a send instead, please find out */
1319 /* where your send() is from - it's definitely not the microsoft send, and */
1320 /* tell me. thank you. */
1321 write (evpipe [1], &dummy, 1);
1322
1323 errno = old_errno;
1324 } 1457 }
1325} 1458}
1326 1459
1327/* called whenever the libev signal pipe */ 1460/* called whenever the libev signal pipe */
1328/* got some events (signal, async) */ 1461/* got some events (signal, async) */
1329static void 1462static void
1330pipecb (EV_P_ ev_io *iow, int revents) 1463pipecb (EV_P_ ev_io *iow, int revents)
1331{ 1464{
1332 int i; 1465 int i;
1333 1466
1467 if (revents & EV_READ)
1468 {
1334#if EV_USE_EVENTFD 1469#if EV_USE_EVENTFD
1335 if (evfd >= 0) 1470 if (evfd >= 0)
1336 { 1471 {
1337 uint64_t counter; 1472 uint64_t counter;
1338 read (evfd, &counter, sizeof (uint64_t)); 1473 read (evfd, &counter, sizeof (uint64_t));
1339 } 1474 }
1340 else 1475 else
1341#endif 1476#endif
1342 { 1477 {
1343 char dummy; 1478 char dummy;
1344 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1479 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1345 read (evpipe [0], &dummy, 1); 1480 read (evpipe [0], &dummy, 1);
1481 }
1346 } 1482 }
1347 1483
1484 pipe_write_skipped = 0;
1485
1486#if EV_SIGNAL_ENABLE
1348 if (sig_pending) 1487 if (sig_pending)
1349 { 1488 {
1350 sig_pending = 0; 1489 sig_pending = 0;
1351 1490
1352 for (i = EV_NSIG - 1; i--; ) 1491 for (i = EV_NSIG - 1; i--; )
1353 if (expect_false (signals [i].pending)) 1492 if (expect_false (signals [i].pending))
1354 ev_feed_signal_event (EV_A_ i + 1); 1493 ev_feed_signal_event (EV_A_ i + 1);
1355 } 1494 }
1495#endif
1356 1496
1357#if EV_ASYNC_ENABLE 1497#if EV_ASYNC_ENABLE
1358 if (async_pending) 1498 if (async_pending)
1359 { 1499 {
1360 async_pending = 0; 1500 async_pending = 0;
… …
1378 EV_P = signals [signum - 1].loop; 1518 EV_P = signals [signum - 1].loop;
1379 1519
1380 if (!EV_A) 1520 if (!EV_A)
1381 return; 1521 return;
1382#endif 1522#endif
1523
1524 evpipe_init (EV_A);
1383 1525
1384 signals [signum - 1].pending = 1; 1526 signals [signum - 1].pending = 1;
1385 evpipe_write (EV_A_ &sig_pending); 1527 evpipe_write (EV_A_ &sig_pending);
1386} 1528}
1387 1529
… …
1519#endif 1661#endif
1520#if EV_USE_SELECT 1662#if EV_USE_SELECT
1521# include "ev_select.c" 1663# include "ev_select.c"
1522#endif 1664#endif
1523 1665
1524int 1666int ecb_cold
1525ev_version_major (void) 1667ev_version_major (void)
1526{ 1668{
1527 return EV_VERSION_MAJOR; 1669 return EV_VERSION_MAJOR;
1528} 1670}
1529 1671
1530int 1672int ecb_cold
1531ev_version_minor (void) 1673ev_version_minor (void)
1532{ 1674{
1533 return EV_VERSION_MINOR; 1675 return EV_VERSION_MINOR;
1534} 1676}
1535 1677
1536/* return true if we are running with elevated privileges and should ignore env variables */ 1678/* return true if we are running with elevated privileges and should ignore env variables */
1537int inline_size 1679int inline_size ecb_cold
1538enable_secure (void) 1680enable_secure (void)
1539{ 1681{
1540#ifdef _WIN32 1682#ifdef _WIN32
1541 return 0; 1683 return 0;
1542#else 1684#else
1543 return getuid () != geteuid () 1685 return getuid () != geteuid ()
1544 || getgid () != getegid (); 1686 || getgid () != getegid ();
1545#endif 1687#endif
1546} 1688}
1547 1689
1548unsigned int 1690unsigned int ecb_cold
1549ev_supported_backends (void) 1691ev_supported_backends (void)
1550{ 1692{
1551 unsigned int flags = 0; 1693 unsigned int flags = 0;
1552 1694
1553 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1695 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1557 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1699 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1558 1700
1559 return flags; 1701 return flags;
1560} 1702}
1561 1703
1562unsigned int 1704unsigned int ecb_cold
1563ev_recommended_backends (void) 1705ev_recommended_backends (void)
1564{ 1706{
1565 unsigned int flags = ev_supported_backends (); 1707 unsigned int flags = ev_supported_backends ();
1566 1708
1567#ifndef __NetBSD__ 1709#ifndef __NetBSD__
… …
1579#endif 1721#endif
1580 1722
1581 return flags; 1723 return flags;
1582} 1724}
1583 1725
1584unsigned int 1726unsigned int ecb_cold
1585ev_embeddable_backends (void) 1727ev_embeddable_backends (void)
1586{ 1728{
1587 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1729 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1588 1730
1589 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1731 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
… …
1634ev_userdata (EV_P) 1776ev_userdata (EV_P)
1635{ 1777{
1636 return userdata; 1778 return userdata;
1637} 1779}
1638 1780
1781void
1639void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1782ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1640{ 1783{
1641 invoke_cb = invoke_pending_cb; 1784 invoke_cb = invoke_pending_cb;
1642} 1785}
1643 1786
1787void
1644void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1788ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1645{ 1789{
1646 release_cb = release; 1790 release_cb = release;
1647 acquire_cb = acquire; 1791 acquire_cb = acquire;
1648} 1792}
1649#endif 1793#endif
1650 1794
1651/* initialise a loop structure, must be zero-initialised */ 1795/* initialise a loop structure, must be zero-initialised */
1652static void noinline 1796static void noinline ecb_cold
1653loop_init (EV_P_ unsigned int flags) 1797loop_init (EV_P_ unsigned int flags)
1654{ 1798{
1655 if (!backend) 1799 if (!backend)
1656 { 1800 {
1657 origflags = flags; 1801 origflags = flags;
… …
1685 if (!(flags & EVFLAG_NOENV) 1829 if (!(flags & EVFLAG_NOENV)
1686 && !enable_secure () 1830 && !enable_secure ()
1687 && getenv ("LIBEV_FLAGS")) 1831 && getenv ("LIBEV_FLAGS"))
1688 flags = atoi (getenv ("LIBEV_FLAGS")); 1832 flags = atoi (getenv ("LIBEV_FLAGS"));
1689 1833
1690 ev_rt_now = ev_time (); 1834 ev_rt_now = ev_time ();
1691 mn_now = get_clock (); 1835 mn_now = get_clock ();
1692 now_floor = mn_now; 1836 now_floor = mn_now;
1693 rtmn_diff = ev_rt_now - mn_now; 1837 rtmn_diff = ev_rt_now - mn_now;
1694#if EV_FEATURE_API 1838#if EV_FEATURE_API
1695 invoke_cb = ev_invoke_pending; 1839 invoke_cb = ev_invoke_pending;
1696#endif 1840#endif
1697 1841
1698 io_blocktime = 0.; 1842 io_blocktime = 0.;
1699 timeout_blocktime = 0.; 1843 timeout_blocktime = 0.;
1700 backend = 0; 1844 backend = 0;
1701 backend_fd = -1; 1845 backend_fd = -1;
1702 sig_pending = 0; 1846 sig_pending = 0;
1703#if EV_ASYNC_ENABLE 1847#if EV_ASYNC_ENABLE
1704 async_pending = 0; 1848 async_pending = 0;
1705#endif 1849#endif
1850 pipe_write_skipped = 0;
1851 pipe_write_wanted = 0;
1706#if EV_USE_INOTIFY 1852#if EV_USE_INOTIFY
1707 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1853 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1708#endif 1854#endif
1709#if EV_USE_SIGNALFD 1855#if EV_USE_SIGNALFD
1710 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1856 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1711#endif 1857#endif
1712 1858
1713 if (!(flags & EVBACKEND_MASK)) 1859 if (!(flags & EVBACKEND_MASK))
1714 flags |= ev_recommended_backends (); 1860 flags |= ev_recommended_backends ();
1715 1861
… …
1740#endif 1886#endif
1741 } 1887 }
1742} 1888}
1743 1889
1744/* free up a loop structure */ 1890/* free up a loop structure */
1745void 1891void ecb_cold
1746ev_loop_destroy (EV_P) 1892ev_loop_destroy (EV_P)
1747{ 1893{
1748 int i; 1894 int i;
1749 1895
1750#if EV_MULTIPLICITY 1896#if EV_MULTIPLICITY
… …
1880 infy_fork (EV_A); 2026 infy_fork (EV_A);
1881#endif 2027#endif
1882 2028
1883 if (ev_is_active (&pipe_w)) 2029 if (ev_is_active (&pipe_w))
1884 { 2030 {
1885 /* this "locks" the handlers against writing to the pipe */ 2031 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1886 /* while we modify the fd vars */
1887 sig_pending = 1;
1888#if EV_ASYNC_ENABLE
1889 async_pending = 1;
1890#endif
1891 2032
1892 ev_ref (EV_A); 2033 ev_ref (EV_A);
1893 ev_io_stop (EV_A_ &pipe_w); 2034 ev_io_stop (EV_A_ &pipe_w);
1894 2035
1895#if EV_USE_EVENTFD 2036#if EV_USE_EVENTFD
… …
1913 postfork = 0; 2054 postfork = 0;
1914} 2055}
1915 2056
1916#if EV_MULTIPLICITY 2057#if EV_MULTIPLICITY
1917 2058
1918struct ev_loop * 2059struct ev_loop * ecb_cold
1919ev_loop_new (unsigned int flags) 2060ev_loop_new (unsigned int flags)
1920{ 2061{
1921 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2062 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1922 2063
1923 memset (EV_A, 0, sizeof (struct ev_loop)); 2064 memset (EV_A, 0, sizeof (struct ev_loop));
… …
1931} 2072}
1932 2073
1933#endif /* multiplicity */ 2074#endif /* multiplicity */
1934 2075
1935#if EV_VERIFY 2076#if EV_VERIFY
1936static void noinline 2077static void noinline ecb_cold
1937verify_watcher (EV_P_ W w) 2078verify_watcher (EV_P_ W w)
1938{ 2079{
1939 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2080 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1940 2081
1941 if (w->pending) 2082 if (w->pending)
1942 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2083 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1943} 2084}
1944 2085
1945static void noinline 2086static void noinline ecb_cold
1946verify_heap (EV_P_ ANHE *heap, int N) 2087verify_heap (EV_P_ ANHE *heap, int N)
1947{ 2088{
1948 int i; 2089 int i;
1949 2090
1950 for (i = HEAP0; i < N + HEAP0; ++i) 2091 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1955 2096
1956 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2097 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1957 } 2098 }
1958} 2099}
1959 2100
1960static void noinline 2101static void noinline ecb_cold
1961array_verify (EV_P_ W *ws, int cnt) 2102array_verify (EV_P_ W *ws, int cnt)
1962{ 2103{
1963 while (cnt--) 2104 while (cnt--)
1964 { 2105 {
1965 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2106 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
… …
1967 } 2108 }
1968} 2109}
1969#endif 2110#endif
1970 2111
1971#if EV_FEATURE_API 2112#if EV_FEATURE_API
1972void 2113void ecb_cold
1973ev_verify (EV_P) 2114ev_verify (EV_P)
1974{ 2115{
1975#if EV_VERIFY 2116#if EV_VERIFY
1976 int i; 2117 int i;
1977 WL w; 2118 WL w;
… …
2043#endif 2184#endif
2044} 2185}
2045#endif 2186#endif
2046 2187
2047#if EV_MULTIPLICITY 2188#if EV_MULTIPLICITY
2048struct ev_loop * 2189struct ev_loop * ecb_cold
2049#else 2190#else
2050int 2191int
2051#endif 2192#endif
2052ev_default_loop (unsigned int flags) 2193ev_default_loop (unsigned int flags)
2053{ 2194{
… …
2111 for (pri = NUMPRI; pri--; ) 2252 for (pri = NUMPRI; pri--; )
2112 while (pendingcnt [pri]) 2253 while (pendingcnt [pri])
2113 { 2254 {
2114 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2255 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2115 2256
2116 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2117 /* ^ this is no longer true, as pending_w could be here */
2118
2119 p->w->pending = 0; 2257 p->w->pending = 0;
2120 EV_CB_INVOKE (p->w, p->events); 2258 EV_CB_INVOKE (p->w, p->events);
2121 EV_FREQUENT_CHECK; 2259 EV_FREQUENT_CHECK;
2122 } 2260 }
2123} 2261}
… …
2184 feed_reverse_done (EV_A_ EV_TIMER); 2322 feed_reverse_done (EV_A_ EV_TIMER);
2185 } 2323 }
2186} 2324}
2187 2325
2188#if EV_PERIODIC_ENABLE 2326#if EV_PERIODIC_ENABLE
2327
2328static void noinline
2329periodic_recalc (EV_P_ ev_periodic *w)
2330{
2331 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2332 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2333
2334 /* the above almost always errs on the low side */
2335 while (at <= ev_rt_now)
2336 {
2337 ev_tstamp nat = at + w->interval;
2338
2339 /* when resolution fails us, we use ev_rt_now */
2340 if (expect_false (nat == at))
2341 {
2342 at = ev_rt_now;
2343 break;
2344 }
2345
2346 at = nat;
2347 }
2348
2349 ev_at (w) = at;
2350}
2351
2189/* make periodics pending */ 2352/* make periodics pending */
2190inline_size void 2353inline_size void
2191periodics_reify (EV_P) 2354periodics_reify (EV_P)
2192{ 2355{
2193 EV_FREQUENT_CHECK; 2356 EV_FREQUENT_CHECK;
… …
2212 ANHE_at_cache (periodics [HEAP0]); 2375 ANHE_at_cache (periodics [HEAP0]);
2213 downheap (periodics, periodiccnt, HEAP0); 2376 downheap (periodics, periodiccnt, HEAP0);
2214 } 2377 }
2215 else if (w->interval) 2378 else if (w->interval)
2216 { 2379 {
2217 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2380 periodic_recalc (EV_A_ w);
2218 /* if next trigger time is not sufficiently in the future, put it there */
2219 /* this might happen because of floating point inexactness */
2220 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2221 {
2222 ev_at (w) += w->interval;
2223
2224 /* if interval is unreasonably low we might still have a time in the past */
2225 /* so correct this. this will make the periodic very inexact, but the user */
2226 /* has effectively asked to get triggered more often than possible */
2227 if (ev_at (w) < ev_rt_now)
2228 ev_at (w) = ev_rt_now;
2229 }
2230
2231 ANHE_at_cache (periodics [HEAP0]); 2381 ANHE_at_cache (periodics [HEAP0]);
2232 downheap (periodics, periodiccnt, HEAP0); 2382 downheap (periodics, periodiccnt, HEAP0);
2233 } 2383 }
2234 else 2384 else
2235 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2385 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2243 } 2393 }
2244} 2394}
2245 2395
2246/* simply recalculate all periodics */ 2396/* simply recalculate all periodics */
2247/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2397/* TODO: maybe ensure that at least one event happens when jumping forward? */
2248static void noinline 2398static void noinline ecb_cold
2249periodics_reschedule (EV_P) 2399periodics_reschedule (EV_P)
2250{ 2400{
2251 int i; 2401 int i;
2252 2402
2253 /* adjust periodics after time jump */ 2403 /* adjust periodics after time jump */
… …
2256 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2406 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2257 2407
2258 if (w->reschedule_cb) 2408 if (w->reschedule_cb)
2259 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2409 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2260 else if (w->interval) 2410 else if (w->interval)
2261 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2411 periodic_recalc (EV_A_ w);
2262 2412
2263 ANHE_at_cache (periodics [i]); 2413 ANHE_at_cache (periodics [i]);
2264 } 2414 }
2265 2415
2266 reheap (periodics, periodiccnt); 2416 reheap (periodics, periodiccnt);
2267} 2417}
2268#endif 2418#endif
2269 2419
2270/* adjust all timers by a given offset */ 2420/* adjust all timers by a given offset */
2271static void noinline 2421static void noinline ecb_cold
2272timers_reschedule (EV_P_ ev_tstamp adjust) 2422timers_reschedule (EV_P_ ev_tstamp adjust)
2273{ 2423{
2274 int i; 2424 int i;
2275 2425
2276 for (i = 0; i < timercnt; ++i) 2426 for (i = 0; i < timercnt; ++i)
… …
2313 * doesn't hurt either as we only do this on time-jumps or 2463 * doesn't hurt either as we only do this on time-jumps or
2314 * in the unlikely event of having been preempted here. 2464 * in the unlikely event of having been preempted here.
2315 */ 2465 */
2316 for (i = 4; --i; ) 2466 for (i = 4; --i; )
2317 { 2467 {
2468 ev_tstamp diff;
2318 rtmn_diff = ev_rt_now - mn_now; 2469 rtmn_diff = ev_rt_now - mn_now;
2319 2470
2471 diff = odiff - rtmn_diff;
2472
2320 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2473 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2321 return; /* all is well */ 2474 return; /* all is well */
2322 2475
2323 ev_rt_now = ev_time (); 2476 ev_rt_now = ev_time ();
2324 mn_now = get_clock (); 2477 mn_now = get_clock ();
2325 now_floor = mn_now; 2478 now_floor = mn_now;
… …
2415 ev_tstamp prev_mn_now = mn_now; 2568 ev_tstamp prev_mn_now = mn_now;
2416 2569
2417 /* update time to cancel out callback processing overhead */ 2570 /* update time to cancel out callback processing overhead */
2418 time_update (EV_A_ 1e100); 2571 time_update (EV_A_ 1e100);
2419 2572
2573 /* from now on, we want a pipe-wake-up */
2574 pipe_write_wanted = 1;
2575
2420 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2576 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2421 { 2577 {
2422 waittime = MAX_BLOCKTIME; 2578 waittime = MAX_BLOCKTIME;
2423 2579
2424 if (timercnt) 2580 if (timercnt)
2425 { 2581 {
2426 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2582 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2427 if (waittime > to) waittime = to; 2583 if (waittime > to) waittime = to;
2428 } 2584 }
2429 2585
2430#if EV_PERIODIC_ENABLE 2586#if EV_PERIODIC_ENABLE
2431 if (periodiccnt) 2587 if (periodiccnt)
2432 { 2588 {
2433 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2589 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2434 if (waittime > to) waittime = to; 2590 if (waittime > to) waittime = to;
2435 } 2591 }
2436#endif 2592#endif
2437 2593
2438 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2594 /* don't let timeouts decrease the waittime below timeout_blocktime */
2439 if (expect_false (waittime < timeout_blocktime)) 2595 if (expect_false (waittime < timeout_blocktime))
2440 waittime = timeout_blocktime; 2596 waittime = timeout_blocktime;
2597
2598 /* at this point, we NEED to wait, so we have to ensure */
2599 /* to pass a minimum nonzero value to the backend */
2600 if (expect_false (waittime < backend_mintime))
2601 waittime = backend_mintime;
2441 2602
2442 /* extra check because io_blocktime is commonly 0 */ 2603 /* extra check because io_blocktime is commonly 0 */
2443 if (expect_false (io_blocktime)) 2604 if (expect_false (io_blocktime))
2444 { 2605 {
2445 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2606 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2446 2607
2447 if (sleeptime > waittime - backend_fudge) 2608 if (sleeptime > waittime - backend_mintime)
2448 sleeptime = waittime - backend_fudge; 2609 sleeptime = waittime - backend_mintime;
2449 2610
2450 if (expect_true (sleeptime > 0.)) 2611 if (expect_true (sleeptime > 0.))
2451 { 2612 {
2452 ev_sleep (sleeptime); 2613 ev_sleep (sleeptime);
2453 waittime -= sleeptime; 2614 waittime -= sleeptime;
… …
2459 ++loop_count; 2620 ++loop_count;
2460#endif 2621#endif
2461 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2622 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2462 backend_poll (EV_A_ waittime); 2623 backend_poll (EV_A_ waittime);
2463 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2624 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2625
2626 pipe_write_wanted = 0;
2627
2628 if (pipe_write_skipped)
2629 {
2630 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2631 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2632 }
2633
2464 2634
2465 /* update ev_rt_now, do magic */ 2635 /* update ev_rt_now, do magic */
2466 time_update (EV_A_ waittime + sleeptime); 2636 time_update (EV_A_ waittime + sleeptime);
2467 } 2637 }
2468 2638
… …
2758 if (w->reschedule_cb) 2928 if (w->reschedule_cb)
2759 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2929 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2760 else if (w->interval) 2930 else if (w->interval)
2761 { 2931 {
2762 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2932 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2763 /* this formula differs from the one in periodic_reify because we do not always round up */ 2933 periodic_recalc (EV_A_ w);
2764 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2765 } 2934 }
2766 else 2935 else
2767 ev_at (w) = w->offset; 2936 ev_at (w) = w->offset;
2768 2937
2769 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
… …
3046 if (!pend || pend == path) 3215 if (!pend || pend == path)
3047 break; 3216 break;
3048 3217
3049 *pend = 0; 3218 *pend = 0;
3050 w->wd = inotify_add_watch (fs_fd, path, mask); 3219 w->wd = inotify_add_watch (fs_fd, path, mask);
3051 } 3220 }
3052 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3221 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3053 } 3222 }
3054 } 3223 }
3055 3224
3056 if (w->wd >= 0) 3225 if (w->wd >= 0)
… …
3123 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3292 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3124 ofs += sizeof (struct inotify_event) + ev->len; 3293 ofs += sizeof (struct inotify_event) + ev->len;
3125 } 3294 }
3126} 3295}
3127 3296
3128inline_size void 3297inline_size void ecb_cold
3129ev_check_2625 (EV_P) 3298ev_check_2625 (EV_P)
3130{ 3299{
3131 /* kernels < 2.6.25 are borked 3300 /* kernels < 2.6.25 are borked
3132 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3301 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3133 */ 3302 */
… …
3758} 3927}
3759 3928
3760/*****************************************************************************/ 3929/*****************************************************************************/
3761 3930
3762#if EV_WALK_ENABLE 3931#if EV_WALK_ENABLE
3763void 3932void ecb_cold
3764ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3933ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3765{ 3934{
3766 int i, j; 3935 int i, j;
3767 ev_watcher_list *wl, *wn; 3936 ev_watcher_list *wl, *wn;
3768 3937

Diff Legend

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