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

Comparing libev/ev.c (file contents):
Revision 1.347 by root, Fri Oct 15 22:44:41 2010 UTC vs.
Revision 1.373 by root, Sun Feb 20 02:56:23 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)
475#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; tv.tv_nsec = (long)((t - tv.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)
476 468
477#if __GNUC__ >= 4 469#if __GNUC__ >= 4
478# define expect(expr,value) __builtin_expect ((expr),(value)) 470# define expect(expr,value) __builtin_expect ((expr),(value))
479# define noinline __attribute__ ((noinline)) 471# define noinline __attribute__ ((noinline))
480#else 472#else
… …
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
… …
771 if (delay > 0.) 854 if (delay > 0.)
772 { 855 {
773#if EV_USE_NANOSLEEP 856#if EV_USE_NANOSLEEP
774 struct timespec ts; 857 struct timespec ts;
775 858
776 EV_SET_TS (ts, delay); 859 EV_TS_SET (ts, delay);
777 nanosleep (&ts, 0); 860 nanosleep (&ts, 0);
778#elif defined(_WIN32) 861#elif defined(_WIN32)
779 Sleep ((unsigned long)(delay * 1e3)); 862 Sleep ((unsigned long)(delay * 1e3));
780#else 863#else
781 struct timeval tv; 864 struct timeval tv;
782 865
783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 866 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
784 /* something not guaranteed by newer posix versions, but guaranteed */ 867 /* something not guaranteed by newer posix versions, but guaranteed */
785 /* by older ones */ 868 /* by older ones */
786 EV_SET_TV (tv, delay); 869 EV_TV_SET (tv, delay);
787 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
788#endif 871#endif
789 } 872 }
873}
874
875inline_speed int
876ev_timeout_to_ms (ev_tstamp timeout)
877{
878 int ms = timeout * 1000. + .999999;
879
880 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
790} 881}
791 882
792/*****************************************************************************/ 883/*****************************************************************************/
793 884
794#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 885#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
… …
937inline_size void 1028inline_size void
938fd_reify (EV_P) 1029fd_reify (EV_P)
939{ 1030{
940 int i; 1031 int i;
941 1032
1033#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1034 for (i = 0; i < fdchangecnt; ++i)
1035 {
1036 int fd = fdchanges [i];
1037 ANFD *anfd = anfds + fd;
1038
1039 if (anfd->reify & EV__IOFDSET)
1040 {
1041 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1042
1043 if (handle != anfd->handle)
1044 {
1045 unsigned long arg;
1046
1047 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1048
1049 /* handle changed, but fd didn't - we need to do it in two steps */
1050 backend_modify (EV_A_ fd, anfd->events, 0);
1051 anfd->events = 0;
1052 anfd->handle = handle;
1053 }
1054 }
1055 }
1056#endif
1057
942 for (i = 0; i < fdchangecnt; ++i) 1058 for (i = 0; i < fdchangecnt; ++i)
943 { 1059 {
944 int fd = fdchanges [i]; 1060 int fd = fdchanges [i];
945 ANFD *anfd = anfds + fd; 1061 ANFD *anfd = anfds + fd;
946 ev_io *w; 1062 ev_io *w;
947 1063
948 unsigned char events = 0; 1064 unsigned char o_events = anfd->events;
1065 unsigned char o_reify = anfd->reify;
949 1066
950 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1067 anfd->reify = 0;
951 events |= (unsigned char)w->events;
952 1068
953#if EV_SELECT_IS_WINSOCKET 1069 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
954 if (events)
955 { 1070 {
956 unsigned long arg; 1071 anfd->events = 0;
957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1072
958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1073 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1074 anfd->events |= (unsigned char)w->events;
1075
1076 if (o_events != anfd->events)
1077 o_reify = EV__IOFDSET; /* actually |= */
959 } 1078 }
960#endif
961 1079
962 { 1080 if (o_reify & EV__IOFDSET)
963 unsigned char o_events = anfd->events;
964 unsigned char o_reify = anfd->reify;
965
966 anfd->reify = 0;
967 anfd->events = events;
968
969 if (o_events != events || o_reify & EV__IOFDSET)
970 backend_modify (EV_A_ fd, o_events, events); 1081 backend_modify (EV_A_ fd, o_events, anfd->events);
971 }
972 } 1082 }
973 1083
974 fdchangecnt = 0; 1084 fdchangecnt = 0;
975} 1085}
976 1086
… …
1311 char dummy; 1421 char dummy;
1312 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1422 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1313 read (evpipe [0], &dummy, 1); 1423 read (evpipe [0], &dummy, 1);
1314 } 1424 }
1315 1425
1426#if EV_SIGNAL_ENABLE
1316 if (sig_pending) 1427 if (sig_pending)
1317 { 1428 {
1318 sig_pending = 0; 1429 sig_pending = 0;
1319 1430
1320 for (i = EV_NSIG - 1; i--; ) 1431 for (i = EV_NSIG - 1; i--; )
1321 if (expect_false (signals [i].pending)) 1432 if (expect_false (signals [i].pending))
1322 ev_feed_signal_event (EV_A_ i + 1); 1433 ev_feed_signal_event (EV_A_ i + 1);
1323 } 1434 }
1435#endif
1324 1436
1325#if EV_ASYNC_ENABLE 1437#if EV_ASYNC_ENABLE
1326 if (async_pending) 1438 if (async_pending)
1327 { 1439 {
1328 async_pending = 0; 1440 async_pending = 0;
… …
1337#endif 1449#endif
1338} 1450}
1339 1451
1340/*****************************************************************************/ 1452/*****************************************************************************/
1341 1453
1454void
1455ev_feed_signal (int signum)
1456{
1457#if EV_MULTIPLICITY
1458 EV_P = signals [signum - 1].loop;
1459
1460 if (!EV_A)
1461 return;
1462#endif
1463
1464 signals [signum - 1].pending = 1;
1465 evpipe_write (EV_A_ &sig_pending);
1466}
1467
1342static void 1468static void
1343ev_sighandler (int signum) 1469ev_sighandler (int signum)
1344{ 1470{
1345#if EV_MULTIPLICITY
1346 EV_P = signals [signum - 1].loop;
1347#endif
1348
1349#ifdef _WIN32 1471#ifdef _WIN32
1350 signal (signum, ev_sighandler); 1472 signal (signum, ev_sighandler);
1351#endif 1473#endif
1352 1474
1353 signals [signum - 1].pending = 1; 1475 ev_feed_signal (signum);
1354 evpipe_write (EV_A_ &sig_pending);
1355} 1476}
1356 1477
1357void noinline 1478void noinline
1358ev_feed_signal_event (EV_P_ int signum) 1479ev_feed_signal_event (EV_P_ int signum)
1359{ 1480{
… …
1459 1580
1460#endif 1581#endif
1461 1582
1462/*****************************************************************************/ 1583/*****************************************************************************/
1463 1584
1585#if EV_USE_IOCP
1586# include "ev_iocp.c"
1587#endif
1464#if EV_USE_PORT 1588#if EV_USE_PORT
1465# include "ev_port.c" 1589# include "ev_port.c"
1466#endif 1590#endif
1467#if EV_USE_KQUEUE 1591#if EV_USE_KQUEUE
1468# include "ev_kqueue.c" 1592# include "ev_kqueue.c"
… …
1541ev_embeddable_backends (void) 1665ev_embeddable_backends (void)
1542{ 1666{
1543 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1667 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1544 1668
1545 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1669 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1546 /* please fix it and tell me how to detect the fix */ 1670 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1547 flags &= ~EVBACKEND_EPOLL; 1671 flags &= ~EVBACKEND_EPOLL;
1548 1672
1549 return flags; 1673 return flags;
1550} 1674}
1551 1675
1552unsigned int 1676unsigned int
… …
1608static void noinline 1732static void noinline
1609loop_init (EV_P_ unsigned int flags) 1733loop_init (EV_P_ unsigned int flags)
1610{ 1734{
1611 if (!backend) 1735 if (!backend)
1612 { 1736 {
1737 origflags = flags;
1738
1613#if EV_USE_REALTIME 1739#if EV_USE_REALTIME
1614 if (!have_realtime) 1740 if (!have_realtime)
1615 { 1741 {
1616 struct timespec ts; 1742 struct timespec ts;
1617 1743
… …
1662#endif 1788#endif
1663#if EV_USE_SIGNALFD 1789#if EV_USE_SIGNALFD
1664 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1790 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1665#endif 1791#endif
1666 1792
1667 if (!(flags & 0x0000ffffU)) 1793 if (!(flags & EVBACKEND_MASK))
1668 flags |= ev_recommended_backends (); 1794 flags |= ev_recommended_backends ();
1669 1795
1796#if EV_USE_IOCP
1797 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1798#endif
1670#if EV_USE_PORT 1799#if EV_USE_PORT
1671 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1800 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1672#endif 1801#endif
1673#if EV_USE_KQUEUE 1802#if EV_USE_KQUEUE
1674 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1803 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1691#endif 1820#endif
1692 } 1821 }
1693} 1822}
1694 1823
1695/* free up a loop structure */ 1824/* free up a loop structure */
1696static void noinline 1825void
1697loop_destroy (EV_P) 1826ev_loop_destroy (EV_P)
1698{ 1827{
1699 int i; 1828 int i;
1829
1830#if EV_MULTIPLICITY
1831 /* mimic free (0) */
1832 if (!EV_A)
1833 return;
1834#endif
1835
1836#if EV_CLEANUP_ENABLE
1837 /* queue cleanup watchers (and execute them) */
1838 if (expect_false (cleanupcnt))
1839 {
1840 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1841 EV_INVOKE_PENDING;
1842 }
1843#endif
1844
1845#if EV_CHILD_ENABLE
1846 if (ev_is_active (&childev))
1847 {
1848 ev_ref (EV_A); /* child watcher */
1849 ev_signal_stop (EV_A_ &childev);
1850 }
1851#endif
1700 1852
1701 if (ev_is_active (&pipe_w)) 1853 if (ev_is_active (&pipe_w))
1702 { 1854 {
1703 /*ev_ref (EV_A);*/ 1855 /*ev_ref (EV_A);*/
1704 /*ev_io_stop (EV_A_ &pipe_w);*/ 1856 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1726#endif 1878#endif
1727 1879
1728 if (backend_fd >= 0) 1880 if (backend_fd >= 0)
1729 close (backend_fd); 1881 close (backend_fd);
1730 1882
1883#if EV_USE_IOCP
1884 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1885#endif
1731#if EV_USE_PORT 1886#if EV_USE_PORT
1732 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1887 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1733#endif 1888#endif
1734#if EV_USE_KQUEUE 1889#if EV_USE_KQUEUE
1735 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1890 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1762 array_free (periodic, EMPTY); 1917 array_free (periodic, EMPTY);
1763#endif 1918#endif
1764#if EV_FORK_ENABLE 1919#if EV_FORK_ENABLE
1765 array_free (fork, EMPTY); 1920 array_free (fork, EMPTY);
1766#endif 1921#endif
1922#if EV_CLEANUP_ENABLE
1923 array_free (cleanup, EMPTY);
1924#endif
1767 array_free (prepare, EMPTY); 1925 array_free (prepare, EMPTY);
1768 array_free (check, EMPTY); 1926 array_free (check, EMPTY);
1769#if EV_ASYNC_ENABLE 1927#if EV_ASYNC_ENABLE
1770 array_free (async, EMPTY); 1928 array_free (async, EMPTY);
1771#endif 1929#endif
1772 1930
1773 backend = 0; 1931 backend = 0;
1932
1933#if EV_MULTIPLICITY
1934 if (ev_is_default_loop (EV_A))
1935#endif
1936 ev_default_loop_ptr = 0;
1937#if EV_MULTIPLICITY
1938 else
1939 ev_free (EV_A);
1940#endif
1774} 1941}
1775 1942
1776#if EV_USE_INOTIFY 1943#if EV_USE_INOTIFY
1777inline_size void infy_fork (EV_P); 1944inline_size void infy_fork (EV_P);
1778#endif 1945#endif
… …
1837 loop_init (EV_A_ flags); 2004 loop_init (EV_A_ flags);
1838 2005
1839 if (ev_backend (EV_A)) 2006 if (ev_backend (EV_A))
1840 return EV_A; 2007 return EV_A;
1841 2008
2009 ev_free (EV_A);
1842 return 0; 2010 return 0;
1843} 2011}
1844 2012
1845void
1846ev_loop_destroy (EV_P)
1847{
1848 loop_destroy (EV_A);
1849 ev_free (loop);
1850}
1851
1852void
1853ev_loop_fork (EV_P)
1854{
1855 postfork = 1; /* must be in line with ev_default_fork */
1856}
1857#endif /* multiplicity */ 2013#endif /* multiplicity */
1858 2014
1859#if EV_VERIFY 2015#if EV_VERIFY
1860static void noinline 2016static void noinline
1861verify_watcher (EV_P_ W w) 2017verify_watcher (EV_P_ W w)
… …
1936#if EV_FORK_ENABLE 2092#if EV_FORK_ENABLE
1937 assert (forkmax >= forkcnt); 2093 assert (forkmax >= forkcnt);
1938 array_verify (EV_A_ (W *)forks, forkcnt); 2094 array_verify (EV_A_ (W *)forks, forkcnt);
1939#endif 2095#endif
1940 2096
2097#if EV_CLEANUP_ENABLE
2098 assert (cleanupmax >= cleanupcnt);
2099 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2100#endif
2101
1941#if EV_ASYNC_ENABLE 2102#if EV_ASYNC_ENABLE
1942 assert (asyncmax >= asynccnt); 2103 assert (asyncmax >= asynccnt);
1943 array_verify (EV_A_ (W *)asyncs, asynccnt); 2104 array_verify (EV_A_ (W *)asyncs, asynccnt);
1944#endif 2105#endif
1945 2106
… …
1963} 2124}
1964#endif 2125#endif
1965 2126
1966#if EV_MULTIPLICITY 2127#if EV_MULTIPLICITY
1967struct ev_loop * 2128struct ev_loop *
1968ev_default_loop_init (unsigned int flags)
1969#else 2129#else
1970int 2130int
2131#endif
1971ev_default_loop (unsigned int flags) 2132ev_default_loop (unsigned int flags)
1972#endif
1973{ 2133{
1974 if (!ev_default_loop_ptr) 2134 if (!ev_default_loop_ptr)
1975 { 2135 {
1976#if EV_MULTIPLICITY 2136#if EV_MULTIPLICITY
1977 EV_P = ev_default_loop_ptr = &default_loop_struct; 2137 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1996 2156
1997 return ev_default_loop_ptr; 2157 return ev_default_loop_ptr;
1998} 2158}
1999 2159
2000void 2160void
2001ev_default_destroy (void) 2161ev_loop_fork (EV_P)
2002{ 2162{
2003#if EV_MULTIPLICITY
2004 EV_P = ev_default_loop_ptr;
2005#endif
2006
2007 ev_default_loop_ptr = 0;
2008
2009#if EV_CHILD_ENABLE
2010 ev_ref (EV_A); /* child watcher */
2011 ev_signal_stop (EV_A_ &childev);
2012#endif
2013
2014 loop_destroy (EV_A);
2015}
2016
2017void
2018ev_default_fork (void)
2019{
2020#if EV_MULTIPLICITY
2021 EV_P = ev_default_loop_ptr;
2022#endif
2023
2024 postfork = 1; /* must be in line with ev_loop_fork */ 2163 postfork = 1; /* must be in line with ev_default_fork */
2025} 2164}
2026 2165
2027/*****************************************************************************/ 2166/*****************************************************************************/
2028 2167
2029void 2168void
… …
2051 2190
2052 for (pri = NUMPRI; pri--; ) 2191 for (pri = NUMPRI; pri--; )
2053 while (pendingcnt [pri]) 2192 while (pendingcnt [pri])
2054 { 2193 {
2055 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2194 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2056
2057 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2058 /* ^ this is no longer true, as pending_w could be here */
2059 2195
2060 p->w->pending = 0; 2196 p->w->pending = 0;
2061 EV_CB_INVOKE (p->w, p->events); 2197 EV_CB_INVOKE (p->w, p->events);
2062 EV_FREQUENT_CHECK; 2198 EV_FREQUENT_CHECK;
2063 } 2199 }
… …
2125 feed_reverse_done (EV_A_ EV_TIMER); 2261 feed_reverse_done (EV_A_ EV_TIMER);
2126 } 2262 }
2127} 2263}
2128 2264
2129#if EV_PERIODIC_ENABLE 2265#if EV_PERIODIC_ENABLE
2266
2267static void noinline
2268periodic_recalc (EV_P_ ev_periodic *w)
2269{
2270 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2271 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2272
2273 /* the above almost always errs on the low side */
2274 while (at <= ev_rt_now)
2275 {
2276 ev_tstamp nat = at + w->interval;
2277
2278 /* when resolution fails us, we use ev_rt_now */
2279 if (expect_false (nat == at))
2280 {
2281 at = ev_rt_now;
2282 break;
2283 }
2284
2285 at = nat;
2286 }
2287
2288 ev_at (w) = at;
2289}
2290
2130/* make periodics pending */ 2291/* make periodics pending */
2131inline_size void 2292inline_size void
2132periodics_reify (EV_P) 2293periodics_reify (EV_P)
2133{ 2294{
2134 EV_FREQUENT_CHECK; 2295 EV_FREQUENT_CHECK;
… …
2153 ANHE_at_cache (periodics [HEAP0]); 2314 ANHE_at_cache (periodics [HEAP0]);
2154 downheap (periodics, periodiccnt, HEAP0); 2315 downheap (periodics, periodiccnt, HEAP0);
2155 } 2316 }
2156 else if (w->interval) 2317 else if (w->interval)
2157 { 2318 {
2158 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2319 periodic_recalc (EV_A_ w);
2159 /* if next trigger time is not sufficiently in the future, put it there */
2160 /* this might happen because of floating point inexactness */
2161 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2162 {
2163 ev_at (w) += w->interval;
2164
2165 /* if interval is unreasonably low we might still have a time in the past */
2166 /* so correct this. this will make the periodic very inexact, but the user */
2167 /* has effectively asked to get triggered more often than possible */
2168 if (ev_at (w) < ev_rt_now)
2169 ev_at (w) = ev_rt_now;
2170 }
2171
2172 ANHE_at_cache (periodics [HEAP0]); 2320 ANHE_at_cache (periodics [HEAP0]);
2173 downheap (periodics, periodiccnt, HEAP0); 2321 downheap (periodics, periodiccnt, HEAP0);
2174 } 2322 }
2175 else 2323 else
2176 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2324 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2197 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2345 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2198 2346
2199 if (w->reschedule_cb) 2347 if (w->reschedule_cb)
2200 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2348 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2201 else if (w->interval) 2349 else if (w->interval)
2202 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2350 periodic_recalc (EV_A_ w);
2203 2351
2204 ANHE_at_cache (periodics [i]); 2352 ANHE_at_cache (periodics [i]);
2205 } 2353 }
2206 2354
2207 reheap (periodics, periodiccnt); 2355 reheap (periodics, periodiccnt);
… …
2254 * doesn't hurt either as we only do this on time-jumps or 2402 * doesn't hurt either as we only do this on time-jumps or
2255 * in the unlikely event of having been preempted here. 2403 * in the unlikely event of having been preempted here.
2256 */ 2404 */
2257 for (i = 4; --i; ) 2405 for (i = 4; --i; )
2258 { 2406 {
2407 ev_tstamp diff;
2259 rtmn_diff = ev_rt_now - mn_now; 2408 rtmn_diff = ev_rt_now - mn_now;
2260 2409
2410 diff = odiff - rtmn_diff;
2411
2261 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2412 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2262 return; /* all is well */ 2413 return; /* all is well */
2263 2414
2264 ev_rt_now = ev_time (); 2415 ev_rt_now = ev_time ();
2265 mn_now = get_clock (); 2416 mn_now = get_clock ();
2266 now_floor = mn_now; 2417 now_floor = mn_now;
… …
2289 mn_now = ev_rt_now; 2440 mn_now = ev_rt_now;
2290 } 2441 }
2291} 2442}
2292 2443
2293void 2444void
2294ev_loop (EV_P_ int flags) 2445ev_run (EV_P_ int flags)
2295{ 2446{
2296#if EV_FEATURE_API 2447#if EV_FEATURE_API
2297 ++loop_depth; 2448 ++loop_depth;
2298#endif 2449#endif
2299 2450
2300 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2451 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2301 2452
2302 loop_done = EVUNLOOP_CANCEL; 2453 loop_done = EVBREAK_CANCEL;
2303 2454
2304 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2455 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2305 2456
2306 do 2457 do
2307 { 2458 {
… …
2350 /* calculate blocking time */ 2501 /* calculate blocking time */
2351 { 2502 {
2352 ev_tstamp waittime = 0.; 2503 ev_tstamp waittime = 0.;
2353 ev_tstamp sleeptime = 0.; 2504 ev_tstamp sleeptime = 0.;
2354 2505
2506 /* remember old timestamp for io_blocktime calculation */
2507 ev_tstamp prev_mn_now = mn_now;
2508
2509 /* update time to cancel out callback processing overhead */
2510 time_update (EV_A_ 1e100);
2511
2355 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2512 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2356 { 2513 {
2357 /* remember old timestamp for io_blocktime calculation */
2358 ev_tstamp prev_mn_now = mn_now;
2359
2360 /* update time to cancel out callback processing overhead */
2361 time_update (EV_A_ 1e100);
2362
2363 waittime = MAX_BLOCKTIME; 2514 waittime = MAX_BLOCKTIME;
2364 2515
2365 if (timercnt) 2516 if (timercnt)
2366 { 2517 {
2367 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2518 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2397 } 2548 }
2398 2549
2399#if EV_FEATURE_API 2550#if EV_FEATURE_API
2400 ++loop_count; 2551 ++loop_count;
2401#endif 2552#endif
2402 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2553 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2403 backend_poll (EV_A_ waittime); 2554 backend_poll (EV_A_ waittime);
2404 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2555 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2405 2556
2406 /* update ev_rt_now, do magic */ 2557 /* update ev_rt_now, do magic */
2407 time_update (EV_A_ waittime + sleeptime); 2558 time_update (EV_A_ waittime + sleeptime);
2408 } 2559 }
2409 2560
… …
2427 EV_INVOKE_PENDING; 2578 EV_INVOKE_PENDING;
2428 } 2579 }
2429 while (expect_true ( 2580 while (expect_true (
2430 activecnt 2581 activecnt
2431 && !loop_done 2582 && !loop_done
2432 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2583 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2433 )); 2584 ));
2434 2585
2435 if (loop_done == EVUNLOOP_ONE) 2586 if (loop_done == EVBREAK_ONE)
2436 loop_done = EVUNLOOP_CANCEL; 2587 loop_done = EVBREAK_CANCEL;
2437 2588
2438#if EV_FEATURE_API 2589#if EV_FEATURE_API
2439 --loop_depth; 2590 --loop_depth;
2440#endif 2591#endif
2441} 2592}
2442 2593
2443void 2594void
2444ev_unloop (EV_P_ int how) 2595ev_break (EV_P_ int how)
2445{ 2596{
2446 loop_done = how; 2597 loop_done = how;
2447} 2598}
2448 2599
2449void 2600void
… …
2597 EV_FREQUENT_CHECK; 2748 EV_FREQUENT_CHECK;
2598 2749
2599 wlist_del (&anfds[w->fd].head, (WL)w); 2750 wlist_del (&anfds[w->fd].head, (WL)w);
2600 ev_stop (EV_A_ (W)w); 2751 ev_stop (EV_A_ (W)w);
2601 2752
2602 fd_change (EV_A_ w->fd, 1); 2753 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2603 2754
2604 EV_FREQUENT_CHECK; 2755 EV_FREQUENT_CHECK;
2605} 2756}
2606 2757
2607void noinline 2758void noinline
… …
2699 if (w->reschedule_cb) 2850 if (w->reschedule_cb)
2700 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2851 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2701 else if (w->interval) 2852 else if (w->interval)
2702 { 2853 {
2703 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2854 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2704 /* this formula differs from the one in periodic_reify because we do not always round up */ 2855 periodic_recalc (EV_A_ w);
2705 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2706 } 2856 }
2707 else 2857 else
2708 ev_at (w) = w->offset; 2858 ev_at (w) = w->offset;
2709 2859
2710 EV_FREQUENT_CHECK; 2860 EV_FREQUENT_CHECK;
… …
2831 sa.sa_handler = ev_sighandler; 2981 sa.sa_handler = ev_sighandler;
2832 sigfillset (&sa.sa_mask); 2982 sigfillset (&sa.sa_mask);
2833 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2983 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2834 sigaction (w->signum, &sa, 0); 2984 sigaction (w->signum, &sa, 0);
2835 2985
2986 if (origflags & EVFLAG_NOSIGMASK)
2987 {
2836 sigemptyset (&sa.sa_mask); 2988 sigemptyset (&sa.sa_mask);
2837 sigaddset (&sa.sa_mask, w->signum); 2989 sigaddset (&sa.sa_mask, w->signum);
2838 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2990 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2991 }
2839#endif 2992#endif
2840 } 2993 }
2841 2994
2842 EV_FREQUENT_CHECK; 2995 EV_FREQUENT_CHECK;
2843} 2996}
… …
2984 if (!pend || pend == path) 3137 if (!pend || pend == path)
2985 break; 3138 break;
2986 3139
2987 *pend = 0; 3140 *pend = 0;
2988 w->wd = inotify_add_watch (fs_fd, path, mask); 3141 w->wd = inotify_add_watch (fs_fd, path, mask);
2989 } 3142 }
2990 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3143 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2991 } 3144 }
2992 } 3145 }
2993 3146
2994 if (w->wd >= 0) 3147 if (w->wd >= 0)
… …
3059 { 3212 {
3060 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3213 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3061 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3214 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3062 ofs += sizeof (struct inotify_event) + ev->len; 3215 ofs += sizeof (struct inotify_event) + ev->len;
3063 } 3216 }
3064}
3065
3066inline_size unsigned int
3067ev_linux_version (void)
3068{
3069 struct utsname buf;
3070 unsigned int v;
3071 int i;
3072 char *p = buf.release;
3073
3074 if (uname (&buf))
3075 return 0;
3076
3077 for (i = 3+1; --i; )
3078 {
3079 unsigned int c = 0;
3080
3081 for (;;)
3082 {
3083 if (*p >= '0' && *p <= '9')
3084 c = c * 10 + *p++ - '0';
3085 else
3086 {
3087 p += *p == '.';
3088 break;
3089 }
3090 }
3091
3092 v = (v << 8) | c;
3093 }
3094
3095 return v;
3096} 3217}
3097 3218
3098inline_size void 3219inline_size void
3099ev_check_2625 (EV_P) 3220ev_check_2625 (EV_P)
3100{ 3221{
… …
3424 3545
3425#if EV_EMBED_ENABLE 3546#if EV_EMBED_ENABLE
3426void noinline 3547void noinline
3427ev_embed_sweep (EV_P_ ev_embed *w) 3548ev_embed_sweep (EV_P_ ev_embed *w)
3428{ 3549{
3429 ev_loop (w->other, EVLOOP_NONBLOCK); 3550 ev_run (w->other, EVRUN_NOWAIT);
3430} 3551}
3431 3552
3432static void 3553static void
3433embed_io_cb (EV_P_ ev_io *io, int revents) 3554embed_io_cb (EV_P_ ev_io *io, int revents)
3434{ 3555{
3435 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3556 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3436 3557
3437 if (ev_cb (w)) 3558 if (ev_cb (w))
3438 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3559 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3439 else 3560 else
3440 ev_loop (w->other, EVLOOP_NONBLOCK); 3561 ev_run (w->other, EVRUN_NOWAIT);
3441} 3562}
3442 3563
3443static void 3564static void
3444embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3565embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3445{ 3566{
… …
3449 EV_P = w->other; 3570 EV_P = w->other;
3450 3571
3451 while (fdchangecnt) 3572 while (fdchangecnt)
3452 { 3573 {
3453 fd_reify (EV_A); 3574 fd_reify (EV_A);
3454 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3575 ev_run (EV_A_ EVRUN_NOWAIT);
3455 } 3576 }
3456 } 3577 }
3457} 3578}
3458 3579
3459static void 3580static void
… …
3465 3586
3466 { 3587 {
3467 EV_P = w->other; 3588 EV_P = w->other;
3468 3589
3469 ev_loop_fork (EV_A); 3590 ev_loop_fork (EV_A);
3470 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3591 ev_run (EV_A_ EVRUN_NOWAIT);
3471 } 3592 }
3472 3593
3473 ev_embed_start (EV_A_ w); 3594 ev_embed_start (EV_A_ w);
3474} 3595}
3475 3596
… …
3567 3688
3568 EV_FREQUENT_CHECK; 3689 EV_FREQUENT_CHECK;
3569} 3690}
3570#endif 3691#endif
3571 3692
3572#if EV_ASYNC_ENABLE 3693#if EV_CLEANUP_ENABLE
3573void 3694void
3574ev_async_start (EV_P_ ev_async *w) 3695ev_cleanup_start (EV_P_ ev_cleanup *w)
3575{ 3696{
3576 if (expect_false (ev_is_active (w))) 3697 if (expect_false (ev_is_active (w)))
3577 return; 3698 return;
3699
3700 EV_FREQUENT_CHECK;
3701
3702 ev_start (EV_A_ (W)w, ++cleanupcnt);
3703 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3704 cleanups [cleanupcnt - 1] = w;
3705
3706 /* cleanup watchers should never keep a refcount on the loop */
3707 ev_unref (EV_A);
3708 EV_FREQUENT_CHECK;
3709}
3710
3711void
3712ev_cleanup_stop (EV_P_ ev_cleanup *w)
3713{
3714 clear_pending (EV_A_ (W)w);
3715 if (expect_false (!ev_is_active (w)))
3716 return;
3717
3718 EV_FREQUENT_CHECK;
3719 ev_ref (EV_A);
3720
3721 {
3722 int active = ev_active (w);
3723
3724 cleanups [active - 1] = cleanups [--cleanupcnt];
3725 ev_active (cleanups [active - 1]) = active;
3726 }
3727
3728 ev_stop (EV_A_ (W)w);
3729
3730 EV_FREQUENT_CHECK;
3731}
3732#endif
3733
3734#if EV_ASYNC_ENABLE
3735void
3736ev_async_start (EV_P_ ev_async *w)
3737{
3738 if (expect_false (ev_is_active (w)))
3739 return;
3740
3741 w->sent = 0;
3578 3742
3579 evpipe_init (EV_A); 3743 evpipe_init (EV_A);
3580 3744
3581 EV_FREQUENT_CHECK; 3745 EV_FREQUENT_CHECK;
3582 3746
… …
3802 3966
3803#if EV_MULTIPLICITY 3967#if EV_MULTIPLICITY
3804 #include "ev_wrap.h" 3968 #include "ev_wrap.h"
3805#endif 3969#endif
3806 3970
3807#ifdef __cplusplus 3971EV_CPP(})
3808}
3809#endif
3810 3972

Diff Legend

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