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

Comparing libev/ev.c (file contents):
Revision 1.351 by root, Sat Oct 16 06:46:55 2010 UTC vs.
Revision 1.378 by root, Mon Jun 13 09:52:36 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 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,
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
49# include "config.h" 45# include "config.h"
50# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
51 53
52# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
160# define EV_USE_EVENTFD 0 162# define EV_USE_EVENTFD 0
161# endif 163# endif
162 164
163#endif 165#endif
164 166
165#include <math.h>
166#include <stdlib.h> 167#include <stdlib.h>
167#include <string.h> 168#include <string.h>
168#include <fcntl.h> 169#include <fcntl.h>
169#include <stddef.h> 170#include <stddef.h>
170 171
… …
181#ifdef EV_H 182#ifdef EV_H
182# include EV_H 183# include EV_H
183#else 184#else
184# include "ev.h" 185# include "ev.h"
185#endif 186#endif
187
188EV_CPP(extern "C" {)
186 189
187#ifndef _WIN32 190#ifndef _WIN32
188# include <sys/time.h> 191# include <sys/time.h>
189# include <sys/wait.h> 192# include <sys/wait.h>
190# include <unistd.h> 193# include <unistd.h>
… …
234/* to make it compile regardless, just remove the above line, */ 237/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */ 238/* but consider reporting it, too! :) */
236# define EV_NSIG 65 239# define EV_NSIG 65
237#endif 240#endif
238 241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
245
239#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
240# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
242# else 249# else
243# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
… …
378# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
379# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
380#endif 387#endif
381 388
382#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
383# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
384# include <sys/select.h> 392# include <sys/select.h>
385# endif 393# endif
386#endif 394#endif
387 395
388#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
389# include <sys/utsname.h>
390# include <sys/statfs.h> 397# include <sys/statfs.h>
391# include <sys/inotify.h> 398# include <sys/inotify.h>
392/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 399/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
393# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
394# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
411# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
412# else 419# else
413# define EFD_CLOEXEC 02000000 420# define EFD_CLOEXEC 02000000
414# endif 421# endif
415# endif 422# endif
416# ifdef __cplusplus
417extern "C" {
418# endif
419int (eventfd) (unsigned int initval, int flags); 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
420# ifdef __cplusplus
421}
422# endif
423#endif 424#endif
424 425
425#if EV_USE_SIGNALFD 426#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 427/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h> 428# include <stdint.h>
… …
433# define SFD_CLOEXEC O_CLOEXEC 434# define SFD_CLOEXEC O_CLOEXEC
434# else 435# else
435# define SFD_CLOEXEC 02000000 436# define SFD_CLOEXEC 02000000
436# endif 437# endif
437# endif 438# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags); 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
442 440
443struct signalfd_siginfo 441struct signalfd_siginfo
444{ 442{
445 uint32_t ssi_signo; 443 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)]; 444 char pad[128 - sizeof (uint32_t)];
447}; 445};
448# ifdef __cplusplus
449}
450# endif
451#endif 446#endif
452 447
453/**/ 448/**/
454 449
455#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
… …
457#else 452#else
458# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
459#endif 454#endif
460 455
461/* 456/*
462 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
463 * It is added to ev_rt_now when scheduling periodics
464 * to ensure progress, time-wise, even when rounding
465 * errors are against us.
466 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
467 * Better solutions welcome.
468 */ 459 */
469#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 */
470 462
471#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) */
472#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) */
473 465
474#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)
… …
537# include "ev_win32.c" 529# include "ev_win32.c"
538#endif 530#endif
539 531
540/*****************************************************************************/ 532/*****************************************************************************/
541 533
534/* define a suitable floor function (only used by periodics atm) */
535
536#if EV_USE_FLOOR
537# include <math.h>
538# define ev_floor(v) floor (v)
539#else
540
541#include <float.h>
542
543/* a floor() replacement function, should be independent of ev_tstamp type */
544static ev_tstamp noinline
545ev_floor (ev_tstamp v)
546{
547 /* the choice of shift factor is not terribly important */
548#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
549 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
550#else
551 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
552#endif
553
554 /* argument too large for an unsigned long? */
555 if (expect_false (v >= shift))
556 {
557 ev_tstamp f;
558
559 if (v == v - 1.)
560 return v; /* very large number */
561
562 f = shift * ev_floor (v * (1. / shift));
563 return f + ev_floor (v - f);
564 }
565
566 /* special treatment for negative args? */
567 if (expect_false (v < 0.))
568 {
569 ev_tstamp f = -ev_floor (-v);
570
571 return f - (f == v ? 0 : 1);
572 }
573
574 /* fits into an unsigned long */
575 return (unsigned long)v;
576}
577
578#endif
579
580/*****************************************************************************/
581
582#ifdef __linux
583# include <sys/utsname.h>
584#endif
585
586static unsigned int noinline
587ev_linux_version (void)
588{
589#ifdef __linux
590 unsigned int v = 0;
591 struct utsname buf;
592 int i;
593 char *p = buf.release;
594
595 if (uname (&buf))
596 return 0;
597
598 for (i = 3+1; --i; )
599 {
600 unsigned int c = 0;
601
602 for (;;)
603 {
604 if (*p >= '0' && *p <= '9')
605 c = c * 10 + *p++ - '0';
606 else
607 {
608 p += *p == '.';
609 break;
610 }
611 }
612
613 v = (v << 8) | c;
614 }
615
616 return v;
617#else
618 return 0;
619#endif
620}
621
622/*****************************************************************************/
623
542#if EV_AVOID_STDIO 624#if EV_AVOID_STDIO
543static void noinline 625static void noinline
544ev_printerr (const char *msg) 626ev_printerr (const char *msg)
545{ 627{
546 write (STDERR_FILENO, msg, strlen (msg)); 628 write (STDERR_FILENO, msg, strlen (msg));
… …
564 if (syserr_cb) 646 if (syserr_cb)
565 syserr_cb (msg); 647 syserr_cb (msg);
566 else 648 else
567 { 649 {
568#if EV_AVOID_STDIO 650#if EV_AVOID_STDIO
569 const char *err = strerror (errno);
570
571 ev_printerr (msg); 651 ev_printerr (msg);
572 ev_printerr (": "); 652 ev_printerr (": ");
573 ev_printerr (err); 653 ev_printerr (strerror (errno));
574 ev_printerr ("\n"); 654 ev_printerr ("\n");
575#else 655#else
576 perror (msg); 656 perror (msg);
577#endif 657#endif
578 abort (); 658 abort ();
… …
612 ptr = alloc (ptr, size); 692 ptr = alloc (ptr, size);
613 693
614 if (!ptr && size) 694 if (!ptr && size)
615 { 695 {
616#if EV_AVOID_STDIO 696#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n"); 697 ev_printerr ("(libev) memory allocation failed, aborting.\n");
618#else 698#else
619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 699 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
620#endif 700#endif
621 abort (); 701 abort ();
622 } 702 }
623 703
624 return ptr; 704 return ptr;
… …
641 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 721 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
642 unsigned char unused; 722 unsigned char unused;
643#if EV_USE_EPOLL 723#if EV_USE_EPOLL
644 unsigned int egen; /* generation counter to counter epoll bugs */ 724 unsigned int egen; /* generation counter to counter epoll bugs */
645#endif 725#endif
646#if EV_SELECT_IS_WINSOCKET 726#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
647 SOCKET handle; 727 SOCKET handle;
728#endif
729#if EV_USE_IOCP
730 OVERLAPPED or, ow;
648#endif 731#endif
649} ANFD; 732} ANFD;
650 733
651/* stores the pending event set for a given watcher */ 734/* stores the pending event set for a given watcher */
652typedef struct 735typedef struct
… …
717# define EV_RELEASE_CB (void)0 800# define EV_RELEASE_CB (void)0
718# define EV_ACQUIRE_CB (void)0 801# define EV_ACQUIRE_CB (void)0
719# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 802# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
720#endif 803#endif
721 804
722#define EVUNLOOP_RECURSE 0x80 805#define EVBREAK_RECURSE 0x80
723 806
724/*****************************************************************************/ 807/*****************************************************************************/
725 808
726#ifndef EV_HAVE_EV_TIME 809#ifndef EV_HAVE_EV_TIME
727ev_tstamp 810ev_tstamp
… …
937inline_size void 1020inline_size void
938fd_reify (EV_P) 1021fd_reify (EV_P)
939{ 1022{
940 int i; 1023 int i;
941 1024
1025#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1026 for (i = 0; i < fdchangecnt; ++i)
1027 {
1028 int fd = fdchanges [i];
1029 ANFD *anfd = anfds + fd;
1030
1031 if (anfd->reify & EV__IOFDSET && anfd->head)
1032 {
1033 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1034
1035 if (handle != anfd->handle)
1036 {
1037 unsigned long arg;
1038
1039 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1040
1041 /* handle changed, but fd didn't - we need to do it in two steps */
1042 backend_modify (EV_A_ fd, anfd->events, 0);
1043 anfd->events = 0;
1044 anfd->handle = handle;
1045 }
1046 }
1047 }
1048#endif
1049
942 for (i = 0; i < fdchangecnt; ++i) 1050 for (i = 0; i < fdchangecnt; ++i)
943 { 1051 {
944 int fd = fdchanges [i]; 1052 int fd = fdchanges [i];
945 ANFD *anfd = anfds + fd; 1053 ANFD *anfd = anfds + fd;
946 ev_io *w; 1054 ev_io *w;
947 1055
948 unsigned char o_events = anfd->events; 1056 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify; 1057 unsigned char o_reify = anfd->reify;
950 1058
951 anfd->reify = 0; 1059 anfd->reify = 0;
952
953#if EV_SELECT_IS_WINSOCKET
954 if (o_reify & EV__IOFDSET)
955 {
956 unsigned long arg;
957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
959 }
960#endif
961 1060
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1061 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
963 { 1062 {
964 anfd->events = 0; 1063 anfd->events = 0;
965 1064
… …
1269inline_size void 1368inline_size void
1270evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1369evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1271{ 1370{
1272 if (!*flag) 1371 if (!*flag)
1273 { 1372 {
1274 int old_errno = errno; /* save errno because write might clobber it */
1275 char dummy;
1276
1277 *flag = 1; 1373 *flag = 1;
1278 1374
1375 pipe_write_skipped = 1;
1376
1377 if (pipe_write_wanted)
1378 {
1379 int old_errno = errno; /* save errno because write will clobber it */
1380 char dummy;
1381
1382 pipe_write_skipped = 0;
1383
1279#if EV_USE_EVENTFD 1384#if EV_USE_EVENTFD
1280 if (evfd >= 0) 1385 if (evfd >= 0)
1281 { 1386 {
1282 uint64_t counter = 1; 1387 uint64_t counter = 1;
1283 write (evfd, &counter, sizeof (uint64_t)); 1388 write (evfd, &counter, sizeof (uint64_t));
1389 }
1390 else
1391#endif
1392 {
1393 /* win32 people keep sending patches that change this write() to send() */
1394 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1395 /* so when you think this write should be a send instead, please find out */
1396 /* where your send() is from - it's definitely not the microsoft send, and */
1397 /* tell me. thank you. */
1398 write (evpipe [1], &dummy, 1);
1399 }
1400
1401 errno = old_errno;
1284 } 1402 }
1285 else
1286#endif
1287 /* win32 people keep sending patches that change this write() to send() */
1288 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1289 /* so when you think this write should be a send instead, please find out */
1290 /* where your send() is from - it's definitely not the microsoft send, and */
1291 /* tell me. thank you. */
1292 write (evpipe [1], &dummy, 1);
1293
1294 errno = old_errno;
1295 } 1403 }
1296} 1404}
1297 1405
1298/* called whenever the libev signal pipe */ 1406/* called whenever the libev signal pipe */
1299/* got some events (signal, async) */ 1407/* got some events (signal, async) */
1300static void 1408static void
1301pipecb (EV_P_ ev_io *iow, int revents) 1409pipecb (EV_P_ ev_io *iow, int revents)
1302{ 1410{
1303 int i; 1411 int i;
1304 1412
1413 if (revents & EV_READ)
1414 {
1305#if EV_USE_EVENTFD 1415#if EV_USE_EVENTFD
1306 if (evfd >= 0) 1416 if (evfd >= 0)
1307 { 1417 {
1308 uint64_t counter; 1418 uint64_t counter;
1309 read (evfd, &counter, sizeof (uint64_t)); 1419 read (evfd, &counter, sizeof (uint64_t));
1310 } 1420 }
1311 else 1421 else
1312#endif 1422#endif
1313 { 1423 {
1314 char dummy; 1424 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1425 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1316 read (evpipe [0], &dummy, 1); 1426 read (evpipe [0], &dummy, 1);
1427 }
1317 } 1428 }
1318 1429
1430 pipe_write_skipped = 0;
1431
1432#if EV_SIGNAL_ENABLE
1319 if (sig_pending) 1433 if (sig_pending)
1320 { 1434 {
1321 sig_pending = 0; 1435 sig_pending = 0;
1322 1436
1323 for (i = EV_NSIG - 1; i--; ) 1437 for (i = EV_NSIG - 1; i--; )
1324 if (expect_false (signals [i].pending)) 1438 if (expect_false (signals [i].pending))
1325 ev_feed_signal_event (EV_A_ i + 1); 1439 ev_feed_signal_event (EV_A_ i + 1);
1326 } 1440 }
1441#endif
1327 1442
1328#if EV_ASYNC_ENABLE 1443#if EV_ASYNC_ENABLE
1329 if (async_pending) 1444 if (async_pending)
1330 { 1445 {
1331 async_pending = 0; 1446 async_pending = 0;
… …
1340#endif 1455#endif
1341} 1456}
1342 1457
1343/*****************************************************************************/ 1458/*****************************************************************************/
1344 1459
1460void
1461ev_feed_signal (int signum)
1462{
1463#if EV_MULTIPLICITY
1464 EV_P = signals [signum - 1].loop;
1465
1466 if (!EV_A)
1467 return;
1468#endif
1469
1470 evpipe_init (EV_A);
1471
1472 signals [signum - 1].pending = 1;
1473 evpipe_write (EV_A_ &sig_pending);
1474}
1475
1345static void 1476static void
1346ev_sighandler (int signum) 1477ev_sighandler (int signum)
1347{ 1478{
1348#if EV_MULTIPLICITY
1349 EV_P = signals [signum - 1].loop;
1350#endif
1351
1352#ifdef _WIN32 1479#ifdef _WIN32
1353 signal (signum, ev_sighandler); 1480 signal (signum, ev_sighandler);
1354#endif 1481#endif
1355 1482
1356 signals [signum - 1].pending = 1; 1483 ev_feed_signal (signum);
1357 evpipe_write (EV_A_ &sig_pending);
1358} 1484}
1359 1485
1360void noinline 1486void noinline
1361ev_feed_signal_event (EV_P_ int signum) 1487ev_feed_signal_event (EV_P_ int signum)
1362{ 1488{
… …
1462 1588
1463#endif 1589#endif
1464 1590
1465/*****************************************************************************/ 1591/*****************************************************************************/
1466 1592
1593#if EV_USE_IOCP
1594# include "ev_iocp.c"
1595#endif
1467#if EV_USE_PORT 1596#if EV_USE_PORT
1468# include "ev_port.c" 1597# include "ev_port.c"
1469#endif 1598#endif
1470#if EV_USE_KQUEUE 1599#if EV_USE_KQUEUE
1471# include "ev_kqueue.c" 1600# include "ev_kqueue.c"
… …
1544ev_embeddable_backends (void) 1673ev_embeddable_backends (void)
1545{ 1674{
1546 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1675 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1547 1676
1548 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1677 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1549 /* please fix it and tell me how to detect the fix */ 1678 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1550 flags &= ~EVBACKEND_EPOLL; 1679 flags &= ~EVBACKEND_EPOLL;
1551 1680
1552 return flags; 1681 return flags;
1553} 1682}
1554 1683
1555unsigned int 1684unsigned int
… …
1611static void noinline 1740static void noinline
1612loop_init (EV_P_ unsigned int flags) 1741loop_init (EV_P_ unsigned int flags)
1613{ 1742{
1614 if (!backend) 1743 if (!backend)
1615 { 1744 {
1745 origflags = flags;
1746
1616#if EV_USE_REALTIME 1747#if EV_USE_REALTIME
1617 if (!have_realtime) 1748 if (!have_realtime)
1618 { 1749 {
1619 struct timespec ts; 1750 struct timespec ts;
1620 1751
… …
1642 if (!(flags & EVFLAG_NOENV) 1773 if (!(flags & EVFLAG_NOENV)
1643 && !enable_secure () 1774 && !enable_secure ()
1644 && getenv ("LIBEV_FLAGS")) 1775 && getenv ("LIBEV_FLAGS"))
1645 flags = atoi (getenv ("LIBEV_FLAGS")); 1776 flags = atoi (getenv ("LIBEV_FLAGS"));
1646 1777
1647 ev_rt_now = ev_time (); 1778 ev_rt_now = ev_time ();
1648 mn_now = get_clock (); 1779 mn_now = get_clock ();
1649 now_floor = mn_now; 1780 now_floor = mn_now;
1650 rtmn_diff = ev_rt_now - mn_now; 1781 rtmn_diff = ev_rt_now - mn_now;
1651#if EV_FEATURE_API 1782#if EV_FEATURE_API
1652 invoke_cb = ev_invoke_pending; 1783 invoke_cb = ev_invoke_pending;
1653#endif 1784#endif
1654 1785
1655 io_blocktime = 0.; 1786 io_blocktime = 0.;
1656 timeout_blocktime = 0.; 1787 timeout_blocktime = 0.;
1657 backend = 0; 1788 backend = 0;
1658 backend_fd = -1; 1789 backend_fd = -1;
1659 sig_pending = 0; 1790 sig_pending = 0;
1660#if EV_ASYNC_ENABLE 1791#if EV_ASYNC_ENABLE
1661 async_pending = 0; 1792 async_pending = 0;
1662#endif 1793#endif
1794 pipe_write_skipped = 0;
1795 pipe_write_wanted = 0;
1663#if EV_USE_INOTIFY 1796#if EV_USE_INOTIFY
1664 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1797 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1665#endif 1798#endif
1666#if EV_USE_SIGNALFD 1799#if EV_USE_SIGNALFD
1667 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1800 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1668#endif 1801#endif
1669 1802
1670 if (!(flags & 0x0000ffffU)) 1803 if (!(flags & EVBACKEND_MASK))
1671 flags |= ev_recommended_backends (); 1804 flags |= ev_recommended_backends ();
1672 1805
1806#if EV_USE_IOCP
1807 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1808#endif
1673#if EV_USE_PORT 1809#if EV_USE_PORT
1674 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1810 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1675#endif 1811#endif
1676#if EV_USE_KQUEUE 1812#if EV_USE_KQUEUE
1677 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1813 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1694#endif 1830#endif
1695 } 1831 }
1696} 1832}
1697 1833
1698/* free up a loop structure */ 1834/* free up a loop structure */
1699static void noinline 1835void
1700loop_destroy (EV_P) 1836ev_loop_destroy (EV_P)
1701{ 1837{
1702 int i; 1838 int i;
1839
1840#if EV_MULTIPLICITY
1841 /* mimic free (0) */
1842 if (!EV_A)
1843 return;
1844#endif
1845
1846#if EV_CLEANUP_ENABLE
1847 /* queue cleanup watchers (and execute them) */
1848 if (expect_false (cleanupcnt))
1849 {
1850 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1851 EV_INVOKE_PENDING;
1852 }
1853#endif
1854
1855#if EV_CHILD_ENABLE
1856 if (ev_is_active (&childev))
1857 {
1858 ev_ref (EV_A); /* child watcher */
1859 ev_signal_stop (EV_A_ &childev);
1860 }
1861#endif
1703 1862
1704 if (ev_is_active (&pipe_w)) 1863 if (ev_is_active (&pipe_w))
1705 { 1864 {
1706 /*ev_ref (EV_A);*/ 1865 /*ev_ref (EV_A);*/
1707 /*ev_io_stop (EV_A_ &pipe_w);*/ 1866 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1729#endif 1888#endif
1730 1889
1731 if (backend_fd >= 0) 1890 if (backend_fd >= 0)
1732 close (backend_fd); 1891 close (backend_fd);
1733 1892
1893#if EV_USE_IOCP
1894 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1895#endif
1734#if EV_USE_PORT 1896#if EV_USE_PORT
1735 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1897 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1736#endif 1898#endif
1737#if EV_USE_KQUEUE 1899#if EV_USE_KQUEUE
1738 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1900 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1765 array_free (periodic, EMPTY); 1927 array_free (periodic, EMPTY);
1766#endif 1928#endif
1767#if EV_FORK_ENABLE 1929#if EV_FORK_ENABLE
1768 array_free (fork, EMPTY); 1930 array_free (fork, EMPTY);
1769#endif 1931#endif
1932#if EV_CLEANUP_ENABLE
1933 array_free (cleanup, EMPTY);
1934#endif
1770 array_free (prepare, EMPTY); 1935 array_free (prepare, EMPTY);
1771 array_free (check, EMPTY); 1936 array_free (check, EMPTY);
1772#if EV_ASYNC_ENABLE 1937#if EV_ASYNC_ENABLE
1773 array_free (async, EMPTY); 1938 array_free (async, EMPTY);
1774#endif 1939#endif
1775 1940
1776 backend = 0; 1941 backend = 0;
1942
1943#if EV_MULTIPLICITY
1944 if (ev_is_default_loop (EV_A))
1945#endif
1946 ev_default_loop_ptr = 0;
1947#if EV_MULTIPLICITY
1948 else
1949 ev_free (EV_A);
1950#endif
1777} 1951}
1778 1952
1779#if EV_USE_INOTIFY 1953#if EV_USE_INOTIFY
1780inline_size void infy_fork (EV_P); 1954inline_size void infy_fork (EV_P);
1781#endif 1955#endif
… …
1796 infy_fork (EV_A); 1970 infy_fork (EV_A);
1797#endif 1971#endif
1798 1972
1799 if (ev_is_active (&pipe_w)) 1973 if (ev_is_active (&pipe_w))
1800 { 1974 {
1801 /* this "locks" the handlers against writing to the pipe */ 1975 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1802 /* while we modify the fd vars */
1803 sig_pending = 1;
1804#if EV_ASYNC_ENABLE
1805 async_pending = 1;
1806#endif
1807 1976
1808 ev_ref (EV_A); 1977 ev_ref (EV_A);
1809 ev_io_stop (EV_A_ &pipe_w); 1978 ev_io_stop (EV_A_ &pipe_w);
1810 1979
1811#if EV_USE_EVENTFD 1980#if EV_USE_EVENTFD
… …
1840 loop_init (EV_A_ flags); 2009 loop_init (EV_A_ flags);
1841 2010
1842 if (ev_backend (EV_A)) 2011 if (ev_backend (EV_A))
1843 return EV_A; 2012 return EV_A;
1844 2013
2014 ev_free (EV_A);
1845 return 0; 2015 return 0;
1846} 2016}
1847 2017
1848void
1849ev_loop_destroy (EV_P)
1850{
1851 loop_destroy (EV_A);
1852 ev_free (loop);
1853}
1854
1855void
1856ev_loop_fork (EV_P)
1857{
1858 postfork = 1; /* must be in line with ev_default_fork */
1859}
1860#endif /* multiplicity */ 2018#endif /* multiplicity */
1861 2019
1862#if EV_VERIFY 2020#if EV_VERIFY
1863static void noinline 2021static void noinline
1864verify_watcher (EV_P_ W w) 2022verify_watcher (EV_P_ W w)
… …
1939#if EV_FORK_ENABLE 2097#if EV_FORK_ENABLE
1940 assert (forkmax >= forkcnt); 2098 assert (forkmax >= forkcnt);
1941 array_verify (EV_A_ (W *)forks, forkcnt); 2099 array_verify (EV_A_ (W *)forks, forkcnt);
1942#endif 2100#endif
1943 2101
2102#if EV_CLEANUP_ENABLE
2103 assert (cleanupmax >= cleanupcnt);
2104 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2105#endif
2106
1944#if EV_ASYNC_ENABLE 2107#if EV_ASYNC_ENABLE
1945 assert (asyncmax >= asynccnt); 2108 assert (asyncmax >= asynccnt);
1946 array_verify (EV_A_ (W *)asyncs, asynccnt); 2109 array_verify (EV_A_ (W *)asyncs, asynccnt);
1947#endif 2110#endif
1948 2111
… …
1966} 2129}
1967#endif 2130#endif
1968 2131
1969#if EV_MULTIPLICITY 2132#if EV_MULTIPLICITY
1970struct ev_loop * 2133struct ev_loop *
1971ev_default_loop_init (unsigned int flags)
1972#else 2134#else
1973int 2135int
2136#endif
1974ev_default_loop (unsigned int flags) 2137ev_default_loop (unsigned int flags)
1975#endif
1976{ 2138{
1977 if (!ev_default_loop_ptr) 2139 if (!ev_default_loop_ptr)
1978 { 2140 {
1979#if EV_MULTIPLICITY 2141#if EV_MULTIPLICITY
1980 EV_P = ev_default_loop_ptr = &default_loop_struct; 2142 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1999 2161
2000 return ev_default_loop_ptr; 2162 return ev_default_loop_ptr;
2001} 2163}
2002 2164
2003void 2165void
2004ev_default_destroy (void) 2166ev_loop_fork (EV_P)
2005{ 2167{
2006#if EV_MULTIPLICITY
2007 EV_P = ev_default_loop_ptr;
2008#endif
2009
2010 ev_default_loop_ptr = 0;
2011
2012#if EV_CHILD_ENABLE
2013 ev_ref (EV_A); /* child watcher */
2014 ev_signal_stop (EV_A_ &childev);
2015#endif
2016
2017 loop_destroy (EV_A);
2018}
2019
2020void
2021ev_default_fork (void)
2022{
2023#if EV_MULTIPLICITY
2024 EV_P = ev_default_loop_ptr;
2025#endif
2026
2027 postfork = 1; /* must be in line with ev_loop_fork */ 2168 postfork = 1; /* must be in line with ev_default_fork */
2028} 2169}
2029 2170
2030/*****************************************************************************/ 2171/*****************************************************************************/
2031 2172
2032void 2173void
… …
2054 2195
2055 for (pri = NUMPRI; pri--; ) 2196 for (pri = NUMPRI; pri--; )
2056 while (pendingcnt [pri]) 2197 while (pendingcnt [pri])
2057 { 2198 {
2058 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2199 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2059
2060 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2061 /* ^ this is no longer true, as pending_w could be here */
2062 2200
2063 p->w->pending = 0; 2201 p->w->pending = 0;
2064 EV_CB_INVOKE (p->w, p->events); 2202 EV_CB_INVOKE (p->w, p->events);
2065 EV_FREQUENT_CHECK; 2203 EV_FREQUENT_CHECK;
2066 } 2204 }
… …
2128 feed_reverse_done (EV_A_ EV_TIMER); 2266 feed_reverse_done (EV_A_ EV_TIMER);
2129 } 2267 }
2130} 2268}
2131 2269
2132#if EV_PERIODIC_ENABLE 2270#if EV_PERIODIC_ENABLE
2271
2272static void noinline
2273periodic_recalc (EV_P_ ev_periodic *w)
2274{
2275 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2276 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2277
2278 /* the above almost always errs on the low side */
2279 while (at <= ev_rt_now)
2280 {
2281 ev_tstamp nat = at + w->interval;
2282
2283 /* when resolution fails us, we use ev_rt_now */
2284 if (expect_false (nat == at))
2285 {
2286 at = ev_rt_now;
2287 break;
2288 }
2289
2290 at = nat;
2291 }
2292
2293 ev_at (w) = at;
2294}
2295
2133/* make periodics pending */ 2296/* make periodics pending */
2134inline_size void 2297inline_size void
2135periodics_reify (EV_P) 2298periodics_reify (EV_P)
2136{ 2299{
2137 EV_FREQUENT_CHECK; 2300 EV_FREQUENT_CHECK;
… …
2156 ANHE_at_cache (periodics [HEAP0]); 2319 ANHE_at_cache (periodics [HEAP0]);
2157 downheap (periodics, periodiccnt, HEAP0); 2320 downheap (periodics, periodiccnt, HEAP0);
2158 } 2321 }
2159 else if (w->interval) 2322 else if (w->interval)
2160 { 2323 {
2161 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2324 periodic_recalc (EV_A_ w);
2162 /* if next trigger time is not sufficiently in the future, put it there */
2163 /* this might happen because of floating point inexactness */
2164 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2165 {
2166 ev_at (w) += w->interval;
2167
2168 /* if interval is unreasonably low we might still have a time in the past */
2169 /* so correct this. this will make the periodic very inexact, but the user */
2170 /* has effectively asked to get triggered more often than possible */
2171 if (ev_at (w) < ev_rt_now)
2172 ev_at (w) = ev_rt_now;
2173 }
2174
2175 ANHE_at_cache (periodics [HEAP0]); 2325 ANHE_at_cache (periodics [HEAP0]);
2176 downheap (periodics, periodiccnt, HEAP0); 2326 downheap (periodics, periodiccnt, HEAP0);
2177 } 2327 }
2178 else 2328 else
2179 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2329 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2200 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2350 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2201 2351
2202 if (w->reschedule_cb) 2352 if (w->reschedule_cb)
2203 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2353 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2204 else if (w->interval) 2354 else if (w->interval)
2205 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2355 periodic_recalc (EV_A_ w);
2206 2356
2207 ANHE_at_cache (periodics [i]); 2357 ANHE_at_cache (periodics [i]);
2208 } 2358 }
2209 2359
2210 reheap (periodics, periodiccnt); 2360 reheap (periodics, periodiccnt);
… …
2257 * doesn't hurt either as we only do this on time-jumps or 2407 * doesn't hurt either as we only do this on time-jumps or
2258 * in the unlikely event of having been preempted here. 2408 * in the unlikely event of having been preempted here.
2259 */ 2409 */
2260 for (i = 4; --i; ) 2410 for (i = 4; --i; )
2261 { 2411 {
2412 ev_tstamp diff;
2262 rtmn_diff = ev_rt_now - mn_now; 2413 rtmn_diff = ev_rt_now - mn_now;
2263 2414
2415 diff = odiff - rtmn_diff;
2416
2264 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2417 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2265 return; /* all is well */ 2418 return; /* all is well */
2266 2419
2267 ev_rt_now = ev_time (); 2420 ev_rt_now = ev_time ();
2268 mn_now = get_clock (); 2421 mn_now = get_clock ();
2269 now_floor = mn_now; 2422 now_floor = mn_now;
… …
2292 mn_now = ev_rt_now; 2445 mn_now = ev_rt_now;
2293 } 2446 }
2294} 2447}
2295 2448
2296void 2449void
2297ev_loop (EV_P_ int flags) 2450ev_run (EV_P_ int flags)
2298{ 2451{
2299#if EV_FEATURE_API 2452#if EV_FEATURE_API
2300 ++loop_depth; 2453 ++loop_depth;
2301#endif 2454#endif
2302 2455
2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2456 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2304 2457
2305 loop_done = EVUNLOOP_CANCEL; 2458 loop_done = EVBREAK_CANCEL;
2306 2459
2307 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2460 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2308 2461
2309 do 2462 do
2310 { 2463 {
… …
2353 /* calculate blocking time */ 2506 /* calculate blocking time */
2354 { 2507 {
2355 ev_tstamp waittime = 0.; 2508 ev_tstamp waittime = 0.;
2356 ev_tstamp sleeptime = 0.; 2509 ev_tstamp sleeptime = 0.;
2357 2510
2511 /* remember old timestamp for io_blocktime calculation */
2512 ev_tstamp prev_mn_now = mn_now;
2513
2514 /* update time to cancel out callback processing overhead */
2515 time_update (EV_A_ 1e100);
2516
2517 /* from now on, we want a pipe-wake-up */
2518 pipe_write_wanted = 1;
2519
2358 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2520 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2359 { 2521 {
2360 /* remember old timestamp for io_blocktime calculation */
2361 ev_tstamp prev_mn_now = mn_now;
2362
2363 /* update time to cancel out callback processing overhead */
2364 time_update (EV_A_ 1e100);
2365
2366 waittime = MAX_BLOCKTIME; 2522 waittime = MAX_BLOCKTIME;
2367 2523
2368 if (timercnt) 2524 if (timercnt)
2369 { 2525 {
2370 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2526 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2371 if (waittime > to) waittime = to; 2527 if (waittime > to) waittime = to;
2372 } 2528 }
2373 2529
2374#if EV_PERIODIC_ENABLE 2530#if EV_PERIODIC_ENABLE
2375 if (periodiccnt) 2531 if (periodiccnt)
2376 { 2532 {
2377 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2533 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2378 if (waittime > to) waittime = to; 2534 if (waittime > to) waittime = to;
2379 } 2535 }
2380#endif 2536#endif
2381 2537
2382 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2538 /* don't let timeouts decrease the waittime below timeout_blocktime */
2383 if (expect_false (waittime < timeout_blocktime)) 2539 if (expect_false (waittime < timeout_blocktime))
2384 waittime = timeout_blocktime; 2540 waittime = timeout_blocktime;
2541
2542 /* at this point, we NEED to wait, so we have to ensure */
2543 /* to pass a minimum nonzero value to the backend */
2544 if (expect_false (waittime < backend_mintime))
2545 waittime = backend_mintime;
2385 2546
2386 /* extra check because io_blocktime is commonly 0 */ 2547 /* extra check because io_blocktime is commonly 0 */
2387 if (expect_false (io_blocktime)) 2548 if (expect_false (io_blocktime))
2388 { 2549 {
2389 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2550 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2390 2551
2391 if (sleeptime > waittime - backend_fudge) 2552 if (sleeptime > waittime - backend_mintime)
2392 sleeptime = waittime - backend_fudge; 2553 sleeptime = waittime - backend_mintime;
2393 2554
2394 if (expect_true (sleeptime > 0.)) 2555 if (expect_true (sleeptime > 0.))
2395 { 2556 {
2396 ev_sleep (sleeptime); 2557 ev_sleep (sleeptime);
2397 waittime -= sleeptime; 2558 waittime -= sleeptime;
… …
2400 } 2561 }
2401 2562
2402#if EV_FEATURE_API 2563#if EV_FEATURE_API
2403 ++loop_count; 2564 ++loop_count;
2404#endif 2565#endif
2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2566 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2406 backend_poll (EV_A_ waittime); 2567 backend_poll (EV_A_ waittime);
2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2568 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2569
2570 pipe_write_wanted = 0;
2571
2572 if (pipe_write_skipped)
2573 {
2574 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2575 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2576 }
2577
2408 2578
2409 /* update ev_rt_now, do magic */ 2579 /* update ev_rt_now, do magic */
2410 time_update (EV_A_ waittime + sleeptime); 2580 time_update (EV_A_ waittime + sleeptime);
2411 } 2581 }
2412 2582
… …
2430 EV_INVOKE_PENDING; 2600 EV_INVOKE_PENDING;
2431 } 2601 }
2432 while (expect_true ( 2602 while (expect_true (
2433 activecnt 2603 activecnt
2434 && !loop_done 2604 && !loop_done
2435 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2605 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2436 )); 2606 ));
2437 2607
2438 if (loop_done == EVUNLOOP_ONE) 2608 if (loop_done == EVBREAK_ONE)
2439 loop_done = EVUNLOOP_CANCEL; 2609 loop_done = EVBREAK_CANCEL;
2440 2610
2441#if EV_FEATURE_API 2611#if EV_FEATURE_API
2442 --loop_depth; 2612 --loop_depth;
2443#endif 2613#endif
2444} 2614}
2445 2615
2446void 2616void
2447ev_unloop (EV_P_ int how) 2617ev_break (EV_P_ int how)
2448{ 2618{
2449 loop_done = how; 2619 loop_done = how;
2450} 2620}
2451 2621
2452void 2622void
… …
2702 if (w->reschedule_cb) 2872 if (w->reschedule_cb)
2703 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2873 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2704 else if (w->interval) 2874 else if (w->interval)
2705 { 2875 {
2706 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2876 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2707 /* this formula differs from the one in periodic_reify because we do not always round up */ 2877 periodic_recalc (EV_A_ w);
2708 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2709 } 2878 }
2710 else 2879 else
2711 ev_at (w) = w->offset; 2880 ev_at (w) = w->offset;
2712 2881
2713 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
… …
2834 sa.sa_handler = ev_sighandler; 3003 sa.sa_handler = ev_sighandler;
2835 sigfillset (&sa.sa_mask); 3004 sigfillset (&sa.sa_mask);
2836 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 3005 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2837 sigaction (w->signum, &sa, 0); 3006 sigaction (w->signum, &sa, 0);
2838 3007
3008 if (origflags & EVFLAG_NOSIGMASK)
3009 {
2839 sigemptyset (&sa.sa_mask); 3010 sigemptyset (&sa.sa_mask);
2840 sigaddset (&sa.sa_mask, w->signum); 3011 sigaddset (&sa.sa_mask, w->signum);
2841 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 3012 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
3013 }
2842#endif 3014#endif
2843 } 3015 }
2844 3016
2845 EV_FREQUENT_CHECK; 3017 EV_FREQUENT_CHECK;
2846} 3018}
… …
2987 if (!pend || pend == path) 3159 if (!pend || pend == path)
2988 break; 3160 break;
2989 3161
2990 *pend = 0; 3162 *pend = 0;
2991 w->wd = inotify_add_watch (fs_fd, path, mask); 3163 w->wd = inotify_add_watch (fs_fd, path, mask);
2992 } 3164 }
2993 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3165 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2994 } 3166 }
2995 } 3167 }
2996 3168
2997 if (w->wd >= 0) 3169 if (w->wd >= 0)
… …
3062 { 3234 {
3063 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3235 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3064 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3236 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3065 ofs += sizeof (struct inotify_event) + ev->len; 3237 ofs += sizeof (struct inotify_event) + ev->len;
3066 } 3238 }
3067}
3068
3069inline_size unsigned int
3070ev_linux_version (void)
3071{
3072 struct utsname buf;
3073 unsigned int v;
3074 int i;
3075 char *p = buf.release;
3076
3077 if (uname (&buf))
3078 return 0;
3079
3080 for (i = 3+1; --i; )
3081 {
3082 unsigned int c = 0;
3083
3084 for (;;)
3085 {
3086 if (*p >= '0' && *p <= '9')
3087 c = c * 10 + *p++ - '0';
3088 else
3089 {
3090 p += *p == '.';
3091 break;
3092 }
3093 }
3094
3095 v = (v << 8) | c;
3096 }
3097
3098 return v;
3099} 3239}
3100 3240
3101inline_size void 3241inline_size void
3102ev_check_2625 (EV_P) 3242ev_check_2625 (EV_P)
3103{ 3243{
… …
3427 3567
3428#if EV_EMBED_ENABLE 3568#if EV_EMBED_ENABLE
3429void noinline 3569void noinline
3430ev_embed_sweep (EV_P_ ev_embed *w) 3570ev_embed_sweep (EV_P_ ev_embed *w)
3431{ 3571{
3432 ev_loop (w->other, EVLOOP_NONBLOCK); 3572 ev_run (w->other, EVRUN_NOWAIT);
3433} 3573}
3434 3574
3435static void 3575static void
3436embed_io_cb (EV_P_ ev_io *io, int revents) 3576embed_io_cb (EV_P_ ev_io *io, int revents)
3437{ 3577{
3438 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3578 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3439 3579
3440 if (ev_cb (w)) 3580 if (ev_cb (w))
3441 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3581 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3442 else 3582 else
3443 ev_loop (w->other, EVLOOP_NONBLOCK); 3583 ev_run (w->other, EVRUN_NOWAIT);
3444} 3584}
3445 3585
3446static void 3586static void
3447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3587embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3448{ 3588{
… …
3452 EV_P = w->other; 3592 EV_P = w->other;
3453 3593
3454 while (fdchangecnt) 3594 while (fdchangecnt)
3455 { 3595 {
3456 fd_reify (EV_A); 3596 fd_reify (EV_A);
3457 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3597 ev_run (EV_A_ EVRUN_NOWAIT);
3458 } 3598 }
3459 } 3599 }
3460} 3600}
3461 3601
3462static void 3602static void
… …
3468 3608
3469 { 3609 {
3470 EV_P = w->other; 3610 EV_P = w->other;
3471 3611
3472 ev_loop_fork (EV_A); 3612 ev_loop_fork (EV_A);
3473 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3613 ev_run (EV_A_ EVRUN_NOWAIT);
3474 } 3614 }
3475 3615
3476 ev_embed_start (EV_A_ w); 3616 ev_embed_start (EV_A_ w);
3477} 3617}
3478 3618
… …
3570 3710
3571 EV_FREQUENT_CHECK; 3711 EV_FREQUENT_CHECK;
3572} 3712}
3573#endif 3713#endif
3574 3714
3575#if EV_ASYNC_ENABLE 3715#if EV_CLEANUP_ENABLE
3576void 3716void
3577ev_async_start (EV_P_ ev_async *w) 3717ev_cleanup_start (EV_P_ ev_cleanup *w)
3578{ 3718{
3579 if (expect_false (ev_is_active (w))) 3719 if (expect_false (ev_is_active (w)))
3580 return; 3720 return;
3721
3722 EV_FREQUENT_CHECK;
3723
3724 ev_start (EV_A_ (W)w, ++cleanupcnt);
3725 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3726 cleanups [cleanupcnt - 1] = w;
3727
3728 /* cleanup watchers should never keep a refcount on the loop */
3729 ev_unref (EV_A);
3730 EV_FREQUENT_CHECK;
3731}
3732
3733void
3734ev_cleanup_stop (EV_P_ ev_cleanup *w)
3735{
3736 clear_pending (EV_A_ (W)w);
3737 if (expect_false (!ev_is_active (w)))
3738 return;
3739
3740 EV_FREQUENT_CHECK;
3741 ev_ref (EV_A);
3742
3743 {
3744 int active = ev_active (w);
3745
3746 cleanups [active - 1] = cleanups [--cleanupcnt];
3747 ev_active (cleanups [active - 1]) = active;
3748 }
3749
3750 ev_stop (EV_A_ (W)w);
3751
3752 EV_FREQUENT_CHECK;
3753}
3754#endif
3755
3756#if EV_ASYNC_ENABLE
3757void
3758ev_async_start (EV_P_ ev_async *w)
3759{
3760 if (expect_false (ev_is_active (w)))
3761 return;
3762
3763 w->sent = 0;
3581 3764
3582 evpipe_init (EV_A); 3765 evpipe_init (EV_A);
3583 3766
3584 EV_FREQUENT_CHECK; 3767 EV_FREQUENT_CHECK;
3585 3768
… …
3805 3988
3806#if EV_MULTIPLICITY 3989#if EV_MULTIPLICITY
3807 #include "ev_wrap.h" 3990 #include "ev_wrap.h"
3808#endif 3991#endif
3809 3992
3810#ifdef __cplusplus 3993EV_CPP(})
3811}
3812#endif
3813 3994

Diff Legend

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