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.381 by root, Mon Jun 27 21:29:35 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
… …
1293 ev_io_start (EV_A_ &pipe_w); 1417 ev_io_start (EV_A_ &pipe_w);
1294 ev_unref (EV_A); /* watcher should not keep loop alive */ 1418 ev_unref (EV_A); /* watcher should not keep loop alive */
1295 } 1419 }
1296} 1420}
1297 1421
1298inline_size void 1422inline_speed 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;
1434
1435 pipe_write_skipped = 0;
1436
1437 old_errno = errno; /* save errno because write will clobber it */
1438
1308#if EV_USE_EVENTFD 1439#if EV_USE_EVENTFD
1309 if (evfd >= 0) 1440 if (evfd >= 0)
1310 { 1441 {
1311 uint64_t counter = 1; 1442 uint64_t counter = 1;
1312 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;
1313 } 1457 }
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 } 1458 }
1325} 1459}
1326 1460
1327/* called whenever the libev signal pipe */ 1461/* called whenever the libev signal pipe */
1328/* got some events (signal, async) */ 1462/* got some events (signal, async) */
1329static void 1463static void
1330pipecb (EV_P_ ev_io *iow, int revents) 1464pipecb (EV_P_ ev_io *iow, int revents)
1331{ 1465{
1332 int i; 1466 int i;
1333 1467
1468 if (revents & EV_READ)
1469 {
1334#if EV_USE_EVENTFD 1470#if EV_USE_EVENTFD
1335 if (evfd >= 0) 1471 if (evfd >= 0)
1336 { 1472 {
1337 uint64_t counter; 1473 uint64_t counter;
1338 read (evfd, &counter, sizeof (uint64_t)); 1474 read (evfd, &counter, sizeof (uint64_t));
1339 } 1475 }
1340 else 1476 else
1341#endif 1477#endif
1342 { 1478 {
1343 char dummy; 1479 char dummy;
1344 /* 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 */
1345 read (evpipe [0], &dummy, 1); 1481 read (evpipe [0], &dummy, 1);
1482 }
1346 } 1483 }
1347 1484
1485 pipe_write_skipped = 0;
1486
1487#if EV_SIGNAL_ENABLE
1348 if (sig_pending) 1488 if (sig_pending)
1349 { 1489 {
1350 sig_pending = 0; 1490 sig_pending = 0;
1351 1491
1352 for (i = EV_NSIG - 1; i--; ) 1492 for (i = EV_NSIG - 1; i--; )
1353 if (expect_false (signals [i].pending)) 1493 if (expect_false (signals [i].pending))
1354 ev_feed_signal_event (EV_A_ i + 1); 1494 ev_feed_signal_event (EV_A_ i + 1);
1355 } 1495 }
1496#endif
1356 1497
1357#if EV_ASYNC_ENABLE 1498#if EV_ASYNC_ENABLE
1358 if (async_pending) 1499 if (async_pending)
1359 { 1500 {
1360 async_pending = 0; 1501 async_pending = 0;
… …
1378 EV_P = signals [signum - 1].loop; 1519 EV_P = signals [signum - 1].loop;
1379 1520
1380 if (!EV_A) 1521 if (!EV_A)
1381 return; 1522 return;
1382#endif 1523#endif
1524
1525 if (!ev_active (&pipe_w))
1526 return;
1383 1527
1384 signals [signum - 1].pending = 1; 1528 signals [signum - 1].pending = 1;
1385 evpipe_write (EV_A_ &sig_pending); 1529 evpipe_write (EV_A_ &sig_pending);
1386} 1530}
1387 1531
… …
1519#endif 1663#endif
1520#if EV_USE_SELECT 1664#if EV_USE_SELECT
1521# include "ev_select.c" 1665# include "ev_select.c"
1522#endif 1666#endif
1523 1667
1524int 1668int ecb_cold
1525ev_version_major (void) 1669ev_version_major (void)
1526{ 1670{
1527 return EV_VERSION_MAJOR; 1671 return EV_VERSION_MAJOR;
1528} 1672}
1529 1673
1530int 1674int ecb_cold
1531ev_version_minor (void) 1675ev_version_minor (void)
1532{ 1676{
1533 return EV_VERSION_MINOR; 1677 return EV_VERSION_MINOR;
1534} 1678}
1535 1679
1536/* return true if we are running with elevated privileges and should ignore env variables */ 1680/* return true if we are running with elevated privileges and should ignore env variables */
1537int inline_size 1681int inline_size ecb_cold
1538enable_secure (void) 1682enable_secure (void)
1539{ 1683{
1540#ifdef _WIN32 1684#ifdef _WIN32
1541 return 0; 1685 return 0;
1542#else 1686#else
1543 return getuid () != geteuid () 1687 return getuid () != geteuid ()
1544 || getgid () != getegid (); 1688 || getgid () != getegid ();
1545#endif 1689#endif
1546} 1690}
1547 1691
1548unsigned int 1692unsigned int ecb_cold
1549ev_supported_backends (void) 1693ev_supported_backends (void)
1550{ 1694{
1551 unsigned int flags = 0; 1695 unsigned int flags = 0;
1552 1696
1553 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1697 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1557 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1701 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1558 1702
1559 return flags; 1703 return flags;
1560} 1704}
1561 1705
1562unsigned int 1706unsigned int ecb_cold
1563ev_recommended_backends (void) 1707ev_recommended_backends (void)
1564{ 1708{
1565 unsigned int flags = ev_supported_backends (); 1709 unsigned int flags = ev_supported_backends ();
1566 1710
1567#ifndef __NetBSD__ 1711#ifndef __NetBSD__
… …
1579#endif 1723#endif
1580 1724
1581 return flags; 1725 return flags;
1582} 1726}
1583 1727
1584unsigned int 1728unsigned int ecb_cold
1585ev_embeddable_backends (void) 1729ev_embeddable_backends (void)
1586{ 1730{
1587 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1731 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1588 1732
1589 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1733 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
… …
1634ev_userdata (EV_P) 1778ev_userdata (EV_P)
1635{ 1779{
1636 return userdata; 1780 return userdata;
1637} 1781}
1638 1782
1783void
1639void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1784ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1640{ 1785{
1641 invoke_cb = invoke_pending_cb; 1786 invoke_cb = invoke_pending_cb;
1642} 1787}
1643 1788
1789void
1644void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1790ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1645{ 1791{
1646 release_cb = release; 1792 release_cb = release;
1647 acquire_cb = acquire; 1793 acquire_cb = acquire;
1648} 1794}
1649#endif 1795#endif
1650 1796
1651/* initialise a loop structure, must be zero-initialised */ 1797/* initialise a loop structure, must be zero-initialised */
1652static void noinline 1798static void noinline ecb_cold
1653loop_init (EV_P_ unsigned int flags) 1799loop_init (EV_P_ unsigned int flags)
1654{ 1800{
1655 if (!backend) 1801 if (!backend)
1656 { 1802 {
1657 origflags = flags; 1803 origflags = flags;
… …
1685 if (!(flags & EVFLAG_NOENV) 1831 if (!(flags & EVFLAG_NOENV)
1686 && !enable_secure () 1832 && !enable_secure ()
1687 && getenv ("LIBEV_FLAGS")) 1833 && getenv ("LIBEV_FLAGS"))
1688 flags = atoi (getenv ("LIBEV_FLAGS")); 1834 flags = atoi (getenv ("LIBEV_FLAGS"));
1689 1835
1690 ev_rt_now = ev_time (); 1836 ev_rt_now = ev_time ();
1691 mn_now = get_clock (); 1837 mn_now = get_clock ();
1692 now_floor = mn_now; 1838 now_floor = mn_now;
1693 rtmn_diff = ev_rt_now - mn_now; 1839 rtmn_diff = ev_rt_now - mn_now;
1694#if EV_FEATURE_API 1840#if EV_FEATURE_API
1695 invoke_cb = ev_invoke_pending; 1841 invoke_cb = ev_invoke_pending;
1696#endif 1842#endif
1697 1843
1698 io_blocktime = 0.; 1844 io_blocktime = 0.;
1699 timeout_blocktime = 0.; 1845 timeout_blocktime = 0.;
1700 backend = 0; 1846 backend = 0;
1701 backend_fd = -1; 1847 backend_fd = -1;
1702 sig_pending = 0; 1848 sig_pending = 0;
1703#if EV_ASYNC_ENABLE 1849#if EV_ASYNC_ENABLE
1704 async_pending = 0; 1850 async_pending = 0;
1705#endif 1851#endif
1852 pipe_write_skipped = 0;
1853 pipe_write_wanted = 0;
1706#if EV_USE_INOTIFY 1854#if EV_USE_INOTIFY
1707 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1855 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1708#endif 1856#endif
1709#if EV_USE_SIGNALFD 1857#if EV_USE_SIGNALFD
1710 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1858 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1711#endif 1859#endif
1712 1860
1713 if (!(flags & EVBACKEND_MASK)) 1861 if (!(flags & EVBACKEND_MASK))
1714 flags |= ev_recommended_backends (); 1862 flags |= ev_recommended_backends ();
1715 1863
… …
1740#endif 1888#endif
1741 } 1889 }
1742} 1890}
1743 1891
1744/* free up a loop structure */ 1892/* free up a loop structure */
1745void 1893void ecb_cold
1746ev_loop_destroy (EV_P) 1894ev_loop_destroy (EV_P)
1747{ 1895{
1748 int i; 1896 int i;
1749 1897
1750#if EV_MULTIPLICITY 1898#if EV_MULTIPLICITY
… …
1880 infy_fork (EV_A); 2028 infy_fork (EV_A);
1881#endif 2029#endif
1882 2030
1883 if (ev_is_active (&pipe_w)) 2031 if (ev_is_active (&pipe_w))
1884 { 2032 {
1885 /* this "locks" the handlers against writing to the pipe */ 2033 /* 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 2034
1892 ev_ref (EV_A); 2035 ev_ref (EV_A);
1893 ev_io_stop (EV_A_ &pipe_w); 2036 ev_io_stop (EV_A_ &pipe_w);
1894 2037
1895#if EV_USE_EVENTFD 2038#if EV_USE_EVENTFD
… …
1913 postfork = 0; 2056 postfork = 0;
1914} 2057}
1915 2058
1916#if EV_MULTIPLICITY 2059#if EV_MULTIPLICITY
1917 2060
1918struct ev_loop * 2061struct ev_loop * ecb_cold
1919ev_loop_new (unsigned int flags) 2062ev_loop_new (unsigned int flags)
1920{ 2063{
1921 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2064 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1922 2065
1923 memset (EV_A, 0, sizeof (struct ev_loop)); 2066 memset (EV_A, 0, sizeof (struct ev_loop));
… …
1931} 2074}
1932 2075
1933#endif /* multiplicity */ 2076#endif /* multiplicity */
1934 2077
1935#if EV_VERIFY 2078#if EV_VERIFY
1936static void noinline 2079static void noinline ecb_cold
1937verify_watcher (EV_P_ W w) 2080verify_watcher (EV_P_ W w)
1938{ 2081{
1939 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2082 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1940 2083
1941 if (w->pending) 2084 if (w->pending)
1942 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2085 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1943} 2086}
1944 2087
1945static void noinline 2088static void noinline ecb_cold
1946verify_heap (EV_P_ ANHE *heap, int N) 2089verify_heap (EV_P_ ANHE *heap, int N)
1947{ 2090{
1948 int i; 2091 int i;
1949 2092
1950 for (i = HEAP0; i < N + HEAP0; ++i) 2093 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1955 2098
1956 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2099 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1957 } 2100 }
1958} 2101}
1959 2102
1960static void noinline 2103static void noinline ecb_cold
1961array_verify (EV_P_ W *ws, int cnt) 2104array_verify (EV_P_ W *ws, int cnt)
1962{ 2105{
1963 while (cnt--) 2106 while (cnt--)
1964 { 2107 {
1965 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2108 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
… …
1967 } 2110 }
1968} 2111}
1969#endif 2112#endif
1970 2113
1971#if EV_FEATURE_API 2114#if EV_FEATURE_API
1972void 2115void ecb_cold
1973ev_verify (EV_P) 2116ev_verify (EV_P)
1974{ 2117{
1975#if EV_VERIFY 2118#if EV_VERIFY
1976 int i; 2119 int i;
1977 WL w; 2120 WL w;
… …
2043#endif 2186#endif
2044} 2187}
2045#endif 2188#endif
2046 2189
2047#if EV_MULTIPLICITY 2190#if EV_MULTIPLICITY
2048struct ev_loop * 2191struct ev_loop * ecb_cold
2049#else 2192#else
2050int 2193int
2051#endif 2194#endif
2052ev_default_loop (unsigned int flags) 2195ev_default_loop (unsigned int flags)
2053{ 2196{
… …
2111 for (pri = NUMPRI; pri--; ) 2254 for (pri = NUMPRI; pri--; )
2112 while (pendingcnt [pri]) 2255 while (pendingcnt [pri])
2113 { 2256 {
2114 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2257 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2115 2258
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; 2259 p->w->pending = 0;
2120 EV_CB_INVOKE (p->w, p->events); 2260 EV_CB_INVOKE (p->w, p->events);
2121 EV_FREQUENT_CHECK; 2261 EV_FREQUENT_CHECK;
2122 } 2262 }
2123} 2263}
… …
2184 feed_reverse_done (EV_A_ EV_TIMER); 2324 feed_reverse_done (EV_A_ EV_TIMER);
2185 } 2325 }
2186} 2326}
2187 2327
2188#if EV_PERIODIC_ENABLE 2328#if EV_PERIODIC_ENABLE
2329
2330static void noinline
2331periodic_recalc (EV_P_ ev_periodic *w)
2332{
2333 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2334 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2335
2336 /* the above almost always errs on the low side */
2337 while (at <= ev_rt_now)
2338 {
2339 ev_tstamp nat = at + w->interval;
2340
2341 /* when resolution fails us, we use ev_rt_now */
2342 if (expect_false (nat == at))
2343 {
2344 at = ev_rt_now;
2345 break;
2346 }
2347
2348 at = nat;
2349 }
2350
2351 ev_at (w) = at;
2352}
2353
2189/* make periodics pending */ 2354/* make periodics pending */
2190inline_size void 2355inline_size void
2191periodics_reify (EV_P) 2356periodics_reify (EV_P)
2192{ 2357{
2193 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
… …
2212 ANHE_at_cache (periodics [HEAP0]); 2377 ANHE_at_cache (periodics [HEAP0]);
2213 downheap (periodics, periodiccnt, HEAP0); 2378 downheap (periodics, periodiccnt, HEAP0);
2214 } 2379 }
2215 else if (w->interval) 2380 else if (w->interval)
2216 { 2381 {
2217 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2382 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]); 2383 ANHE_at_cache (periodics [HEAP0]);
2232 downheap (periodics, periodiccnt, HEAP0); 2384 downheap (periodics, periodiccnt, HEAP0);
2233 } 2385 }
2234 else 2386 else
2235 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2387 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2243 } 2395 }
2244} 2396}
2245 2397
2246/* simply recalculate all periodics */ 2398/* simply recalculate all periodics */
2247/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2399/* TODO: maybe ensure that at least one event happens when jumping forward? */
2248static void noinline 2400static void noinline ecb_cold
2249periodics_reschedule (EV_P) 2401periodics_reschedule (EV_P)
2250{ 2402{
2251 int i; 2403 int i;
2252 2404
2253 /* adjust periodics after time jump */ 2405 /* adjust periodics after time jump */
… …
2256 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2408 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2257 2409
2258 if (w->reschedule_cb) 2410 if (w->reschedule_cb)
2259 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2411 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2260 else if (w->interval) 2412 else if (w->interval)
2261 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2413 periodic_recalc (EV_A_ w);
2262 2414
2263 ANHE_at_cache (periodics [i]); 2415 ANHE_at_cache (periodics [i]);
2264 } 2416 }
2265 2417
2266 reheap (periodics, periodiccnt); 2418 reheap (periodics, periodiccnt);
2267} 2419}
2268#endif 2420#endif
2269 2421
2270/* adjust all timers by a given offset */ 2422/* adjust all timers by a given offset */
2271static void noinline 2423static void noinline ecb_cold
2272timers_reschedule (EV_P_ ev_tstamp adjust) 2424timers_reschedule (EV_P_ ev_tstamp adjust)
2273{ 2425{
2274 int i; 2426 int i;
2275 2427
2276 for (i = 0; i < timercnt; ++i) 2428 for (i = 0; i < timercnt; ++i)
… …
2313 * doesn't hurt either as we only do this on time-jumps or 2465 * doesn't hurt either as we only do this on time-jumps or
2314 * in the unlikely event of having been preempted here. 2466 * in the unlikely event of having been preempted here.
2315 */ 2467 */
2316 for (i = 4; --i; ) 2468 for (i = 4; --i; )
2317 { 2469 {
2470 ev_tstamp diff;
2318 rtmn_diff = ev_rt_now - mn_now; 2471 rtmn_diff = ev_rt_now - mn_now;
2319 2472
2473 diff = odiff - rtmn_diff;
2474
2320 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2475 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2321 return; /* all is well */ 2476 return; /* all is well */
2322 2477
2323 ev_rt_now = ev_time (); 2478 ev_rt_now = ev_time ();
2324 mn_now = get_clock (); 2479 mn_now = get_clock ();
2325 now_floor = mn_now; 2480 now_floor = mn_now;
… …
2415 ev_tstamp prev_mn_now = mn_now; 2570 ev_tstamp prev_mn_now = mn_now;
2416 2571
2417 /* update time to cancel out callback processing overhead */ 2572 /* update time to cancel out callback processing overhead */
2418 time_update (EV_A_ 1e100); 2573 time_update (EV_A_ 1e100);
2419 2574
2575 /* from now on, we want a pipe-wake-up */
2576 pipe_write_wanted = 1;
2577
2420 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2578 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2421 { 2579 {
2422 waittime = MAX_BLOCKTIME; 2580 waittime = MAX_BLOCKTIME;
2423 2581
2424 if (timercnt) 2582 if (timercnt)
2425 { 2583 {
2426 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2584 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2427 if (waittime > to) waittime = to; 2585 if (waittime > to) waittime = to;
2428 } 2586 }
2429 2587
2430#if EV_PERIODIC_ENABLE 2588#if EV_PERIODIC_ENABLE
2431 if (periodiccnt) 2589 if (periodiccnt)
2432 { 2590 {
2433 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2591 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2434 if (waittime > to) waittime = to; 2592 if (waittime > to) waittime = to;
2435 } 2593 }
2436#endif 2594#endif
2437 2595
2438 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2596 /* don't let timeouts decrease the waittime below timeout_blocktime */
2439 if (expect_false (waittime < timeout_blocktime)) 2597 if (expect_false (waittime < timeout_blocktime))
2440 waittime = timeout_blocktime; 2598 waittime = timeout_blocktime;
2599
2600 /* at this point, we NEED to wait, so we have to ensure */
2601 /* to pass a minimum nonzero value to the backend */
2602 if (expect_false (waittime < backend_mintime))
2603 waittime = backend_mintime;
2441 2604
2442 /* extra check because io_blocktime is commonly 0 */ 2605 /* extra check because io_blocktime is commonly 0 */
2443 if (expect_false (io_blocktime)) 2606 if (expect_false (io_blocktime))
2444 { 2607 {
2445 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2608 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2446 2609
2447 if (sleeptime > waittime - backend_fudge) 2610 if (sleeptime > waittime - backend_mintime)
2448 sleeptime = waittime - backend_fudge; 2611 sleeptime = waittime - backend_mintime;
2449 2612
2450 if (expect_true (sleeptime > 0.)) 2613 if (expect_true (sleeptime > 0.))
2451 { 2614 {
2452 ev_sleep (sleeptime); 2615 ev_sleep (sleeptime);
2453 waittime -= sleeptime; 2616 waittime -= sleeptime;
… …
2459 ++loop_count; 2622 ++loop_count;
2460#endif 2623#endif
2461 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2624 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2462 backend_poll (EV_A_ waittime); 2625 backend_poll (EV_A_ waittime);
2463 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2626 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2627
2628 pipe_write_wanted = 0;
2629
2630 if (pipe_write_skipped)
2631 {
2632 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2633 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2634 }
2635
2464 2636
2465 /* update ev_rt_now, do magic */ 2637 /* update ev_rt_now, do magic */
2466 time_update (EV_A_ waittime + sleeptime); 2638 time_update (EV_A_ waittime + sleeptime);
2467 } 2639 }
2468 2640
… …
2758 if (w->reschedule_cb) 2930 if (w->reschedule_cb)
2759 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2931 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2760 else if (w->interval) 2932 else if (w->interval)
2761 { 2933 {
2762 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2934 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 */ 2935 periodic_recalc (EV_A_ w);
2764 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2765 } 2936 }
2766 else 2937 else
2767 ev_at (w) = w->offset; 2938 ev_at (w) = w->offset;
2768 2939
2769 EV_FREQUENT_CHECK; 2940 EV_FREQUENT_CHECK;
… …
3046 if (!pend || pend == path) 3217 if (!pend || pend == path)
3047 break; 3218 break;
3048 3219
3049 *pend = 0; 3220 *pend = 0;
3050 w->wd = inotify_add_watch (fs_fd, path, mask); 3221 w->wd = inotify_add_watch (fs_fd, path, mask);
3051 } 3222 }
3052 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3223 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3053 } 3224 }
3054 } 3225 }
3055 3226
3056 if (w->wd >= 0) 3227 if (w->wd >= 0)
… …
3123 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3294 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3124 ofs += sizeof (struct inotify_event) + ev->len; 3295 ofs += sizeof (struct inotify_event) + ev->len;
3125 } 3296 }
3126} 3297}
3127 3298
3128inline_size void 3299inline_size void ecb_cold
3129ev_check_2625 (EV_P) 3300ev_check_2625 (EV_P)
3130{ 3301{
3131 /* kernels < 2.6.25 are borked 3302 /* kernels < 2.6.25 are borked
3132 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3303 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3133 */ 3304 */
… …
3758} 3929}
3759 3930
3760/*****************************************************************************/ 3931/*****************************************************************************/
3761 3932
3762#if EV_WALK_ENABLE 3933#if EV_WALK_ENABLE
3763void 3934void ecb_cold
3764ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3935ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3765{ 3936{
3766 int i, j; 3937 int i, j;
3767 ev_watcher_list *wl, *wn; 3938 ev_watcher_list *wl, *wn;
3768 3939

Diff Legend

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