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

Comparing libev/ev.c (file contents):
Revision 1.340 by root, Tue Mar 16 20:39:29 2010 UTC vs.
Revision 1.368 by root, Mon Jan 17 12:11:11 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 *
… …
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
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP EV_FEATURE_OS 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT EV_FEATURE_BACKENDS 98# define EV_USE_POLL EV_FEATURE_BACKENDS
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL EV_FEATURE_BACKENDS
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# ifndef EV_USE_EPOLL
108# define EV_USE_EPOLL EV_FEATURE_BACKENDS 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
109# else
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
115# ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# ifndef EV_USE_PORT
124# define EV_USE_PORT EV_FEATURE_BACKENDS 125# define EV_USE_PORT EV_FEATURE_BACKENDS
125# else
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
133# ifndef EV_USE_INOTIFY
132# define EV_USE_INOTIFY EV_FEATURE_OS 134# define EV_USE_INOTIFY EV_FEATURE_OS
133# else
134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
142# ifndef EV_USE_SIGNALFD
140# define EV_USE_SIGNALFD EV_FEATURE_OS 143# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else
142# define EV_USE_SIGNALFD 0
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD EV_FEATURE_OS 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
… …
172#ifdef EV_H 177#ifdef EV_H
173# include EV_H 178# include EV_H
174#else 179#else
175# include "ev.h" 180# include "ev.h"
176#endif 181#endif
182
183EV_CPP(extern "C" {)
177 184
178#ifndef _WIN32 185#ifndef _WIN32
179# include <sys/time.h> 186# include <sys/time.h>
180# include <sys/wait.h> 187# include <sys/wait.h>
181# include <unistd.h> 188# include <unistd.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
188# endif 195# endif
189# undef EV_AVOID_STDIO 196# undef EV_AVOID_STDIO
190#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
191 206
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
193 208
194/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
367# include <sys/select.h> 382# include <sys/select.h>
368# endif 383# endif
369#endif 384#endif
370 385
371#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
372# include <sys/utsname.h>
373# include <sys/statfs.h> 387# include <sys/statfs.h>
374# include <sys/inotify.h> 388# include <sys/inotify.h>
375/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
376# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
377# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
394# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
395# else 409# else
396# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
397# endif 411# endif
398# endif 412# endif
399# ifdef __cplusplus
400extern "C" {
401# endif
402int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
403# ifdef __cplusplus
404}
405# endif
406#endif 414#endif
407 415
408#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h> 418# include <stdint.h>
… …
416# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
417# else 425# else
418# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
419# endif 427# endif
420# endif 428# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
425 430
426struct signalfd_siginfo 431struct signalfd_siginfo
427{ 432{
428 uint32_t ssi_signo; 433 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
430}; 435};
431# ifdef __cplusplus
432}
433# endif 436#endif
434#endif
435
436 437
437/**/ 438/**/
438 439
439#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
440# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
454 455
455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
457 458
459#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)
461
458#if __GNUC__ >= 4 462#if __GNUC__ >= 4
459# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
460# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
461#else 465#else
462# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
494#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
495#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
496 500
497#if EV_USE_REALTIME 501#if EV_USE_REALTIME
498/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
499/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
500static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
501#endif 505#endif
502 506
503#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
515#endif 519#endif
516 520
517#ifdef _WIN32 521#ifdef _WIN32
518# include "ev_win32.c" 522# include "ev_win32.c"
519#endif 523#endif
524
525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
520 566
521/*****************************************************************************/ 567/*****************************************************************************/
522 568
523#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
524static void noinline 570static void noinline
… …
545 if (syserr_cb) 591 if (syserr_cb)
546 syserr_cb (msg); 592 syserr_cb (msg);
547 else 593 else
548 { 594 {
549#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg); 596 ev_printerr (msg);
553 ev_printerr (": "); 597 ev_printerr (": ");
554 ev_printerr (err); 598 ev_printerr (strerror (errno));
555 ev_printerr ("\n"); 599 ev_printerr ("\n");
556#else 600#else
557 perror (msg); 601 perror (msg);
558#endif 602#endif
559 abort (); 603 abort ();
… …
593 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
594 638
595 if (!ptr && size) 639 if (!ptr && size)
596 { 640 {
597#if EV_AVOID_STDIO 641#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n"); 642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
599#else 643#else
600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
601#endif 645#endif
602 abort (); 646 abort ();
603 } 647 }
604 648
605 return ptr; 649 return ptr;
… …
622 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
623 unsigned char unused; 667 unsigned char unused;
624#if EV_USE_EPOLL 668#if EV_USE_EPOLL
625 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
626#endif 670#endif
627#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
628 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
629#endif 676#endif
630} ANFD; 677} ANFD;
631 678
632/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
633typedef struct 680typedef struct
… …
698# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
699# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
700# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
701#endif 748#endif
702 749
703#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
704 751
705/*****************************************************************************/ 752/*****************************************************************************/
706 753
707#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
708ev_tstamp 755ev_tstamp
… …
752 if (delay > 0.) 799 if (delay > 0.)
753 { 800 {
754#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
755 struct timespec ts; 802 struct timespec ts;
756 803
757 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
758 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
759
760 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
761#elif defined(_WIN32) 806#elif defined(_WIN32)
762 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
763#else 808#else
764 struct timeval tv; 809 struct timeval tv;
765 810
766 tv.tv_sec = (time_t)delay;
767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
768
769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
770 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
771 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
772 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
773#endif 816#endif
774 } 817 }
775} 818}
776 819
820inline_speed int
821ev_timeout_to_ms (ev_tstamp timeout)
822{
823 int ms = timeout * 1000. + .999999;
824
825 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
826}
827
777/*****************************************************************************/ 828/*****************************************************************************/
778 829
779#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
780 831
781/* find a suitable new size for the given array, */ 832/* find a suitable new size for the given array, */
782/* hopefully by rounding to a ncie-to-malloc size */ 833/* hopefully by rounding to a nice-to-malloc size */
783inline_size int 834inline_size int
784array_nextsize (int elem, int cur, int cnt) 835array_nextsize (int elem, int cur, int cnt)
785{ 836{
786 int ncur = cur + 1; 837 int ncur = cur + 1;
787 838
… …
928 { 979 {
929 int fd = fdchanges [i]; 980 int fd = fdchanges [i];
930 ANFD *anfd = anfds + fd; 981 ANFD *anfd = anfds + fd;
931 ev_io *w; 982 ev_io *w;
932 983
933 unsigned char events = 0; 984 unsigned char o_events = anfd->events;
985 unsigned char o_reify = anfd->reify;
934 986
935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 987 anfd->reify = 0;
936 events |= (unsigned char)w->events;
937 988
938#if EV_SELECT_IS_WINSOCKET 989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
939 if (events) 990 if (o_reify & EV__IOFDSET)
940 { 991 {
941 unsigned long arg; 992 unsigned long arg;
942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 993 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
944 } 996 }
945#endif 997#endif
946 998
999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
947 { 1000 {
948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
950
951 anfd->reify = 0;
952 anfd->events = events; 1001 anfd->events = 0;
953 1002
954 if (o_events != events || o_reify & EV__IOFDSET) 1003 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1004 anfd->events |= (unsigned char)w->events;
1005
1006 if (o_events != anfd->events)
1007 o_reify = EV__IOFDSET; /* actually |= */
1008 }
1009
1010 if (o_reify & EV__IOFDSET)
955 backend_modify (EV_A_ fd, o_events, events); 1011 backend_modify (EV_A_ fd, o_events, anfd->events);
956 }
957 } 1012 }
958 1013
959 fdchangecnt = 0; 1014 fdchangecnt = 0;
960} 1015}
961 1016
… …
1054} 1109}
1055 1110
1056/*****************************************************************************/ 1111/*****************************************************************************/
1057 1112
1058/* 1113/*
1059 * the heap functions want a real array index. array index 0 uis guaranteed to not 1114 * the heap functions want a real array index. array index 0 is guaranteed to not
1060 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1115 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1061 * the branching factor of the d-tree. 1116 * the branching factor of the d-tree.
1062 */ 1117 */
1063 1118
1064/* 1119/*
… …
1264 uint64_t counter = 1; 1319 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t)); 1320 write (evfd, &counter, sizeof (uint64_t));
1266 } 1321 }
1267 else 1322 else
1268#endif 1323#endif
1324 /* win32 people keep sending patches that change this write() to send() */
1325 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1326 /* so when you think this write should be a send instead, please find out */
1327 /* where your send() is from - it's definitely not the microsoft send, and */
1328 /* tell me. thank you. */
1269 write (evpipe [1], &dummy, 1); 1329 write (evpipe [1], &dummy, 1);
1270 1330
1271 errno = old_errno; 1331 errno = old_errno;
1272 } 1332 }
1273} 1333}
… …
1287 } 1347 }
1288 else 1348 else
1289#endif 1349#endif
1290 { 1350 {
1291 char dummy; 1351 char dummy;
1352 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1292 read (evpipe [0], &dummy, 1); 1353 read (evpipe [0], &dummy, 1);
1293 } 1354 }
1294 1355
1295 if (sig_pending) 1356 if (sig_pending)
1296 { 1357 {
… …
1316#endif 1377#endif
1317} 1378}
1318 1379
1319/*****************************************************************************/ 1380/*****************************************************************************/
1320 1381
1382void
1383ev_feed_signal (int signum)
1384{
1385#if EV_MULTIPLICITY
1386 EV_P = signals [signum - 1].loop;
1387
1388 if (!EV_A)
1389 return;
1390#endif
1391
1392 signals [signum - 1].pending = 1;
1393 evpipe_write (EV_A_ &sig_pending);
1394}
1395
1321static void 1396static void
1322ev_sighandler (int signum) 1397ev_sighandler (int signum)
1323{ 1398{
1324#if EV_MULTIPLICITY
1325 EV_P = signals [signum - 1].loop;
1326#endif
1327
1328#ifdef _WIN32 1399#ifdef _WIN32
1329 signal (signum, ev_sighandler); 1400 signal (signum, ev_sighandler);
1330#endif 1401#endif
1331 1402
1332 signals [signum - 1].pending = 1; 1403 ev_feed_signal (signum);
1333 evpipe_write (EV_A_ &sig_pending);
1334} 1404}
1335 1405
1336void noinline 1406void noinline
1337ev_feed_signal_event (EV_P_ int signum) 1407ev_feed_signal_event (EV_P_ int signum)
1338{ 1408{
… …
1438 1508
1439#endif 1509#endif
1440 1510
1441/*****************************************************************************/ 1511/*****************************************************************************/
1442 1512
1513#if EV_USE_IOCP
1514# include "ev_iocp.c"
1515#endif
1443#if EV_USE_PORT 1516#if EV_USE_PORT
1444# include "ev_port.c" 1517# include "ev_port.c"
1445#endif 1518#endif
1446#if EV_USE_KQUEUE 1519#if EV_USE_KQUEUE
1447# include "ev_kqueue.c" 1520# include "ev_kqueue.c"
… …
1507#ifdef __APPLE__ 1580#ifdef __APPLE__
1508 /* only select works correctly on that "unix-certified" platform */ 1581 /* only select works correctly on that "unix-certified" platform */
1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1582 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1510 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1583 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1511#endif 1584#endif
1585#ifdef __FreeBSD__
1586 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1587#endif
1512 1588
1513 return flags; 1589 return flags;
1514} 1590}
1515 1591
1516unsigned int 1592unsigned int
1517ev_embeddable_backends (void) 1593ev_embeddable_backends (void)
1518{ 1594{
1519 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1595 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1520 1596
1521 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1597 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1522 /* please fix it and tell me how to detect the fix */ 1598 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1523 flags &= ~EVBACKEND_EPOLL; 1599 flags &= ~EVBACKEND_EPOLL;
1524 1600
1525 return flags; 1601 return flags;
1526} 1602}
1527 1603
1528unsigned int 1604unsigned int
… …
1584static void noinline 1660static void noinline
1585loop_init (EV_P_ unsigned int flags) 1661loop_init (EV_P_ unsigned int flags)
1586{ 1662{
1587 if (!backend) 1663 if (!backend)
1588 { 1664 {
1665 origflags = flags;
1666
1589#if EV_USE_REALTIME 1667#if EV_USE_REALTIME
1590 if (!have_realtime) 1668 if (!have_realtime)
1591 { 1669 {
1592 struct timespec ts; 1670 struct timespec ts;
1593 1671
… …
1638#endif 1716#endif
1639#if EV_USE_SIGNALFD 1717#if EV_USE_SIGNALFD
1640 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1718 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1641#endif 1719#endif
1642 1720
1643 if (!(flags & 0x0000ffffU)) 1721 if (!(flags & EVBACKEND_MASK))
1644 flags |= ev_recommended_backends (); 1722 flags |= ev_recommended_backends ();
1645 1723
1724#if EV_USE_IOCP
1725 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1726#endif
1646#if EV_USE_PORT 1727#if EV_USE_PORT
1647 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1728 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1648#endif 1729#endif
1649#if EV_USE_KQUEUE 1730#if EV_USE_KQUEUE
1650 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1667#endif 1748#endif
1668 } 1749 }
1669} 1750}
1670 1751
1671/* free up a loop structure */ 1752/* free up a loop structure */
1672static void noinline 1753void
1673loop_destroy (EV_P) 1754ev_loop_destroy (EV_P)
1674{ 1755{
1675 int i; 1756 int i;
1757
1758#if EV_MULTIPLICITY
1759 /* mimic free (0) */
1760 if (!EV_A)
1761 return;
1762#endif
1763
1764#if EV_CLEANUP_ENABLE
1765 /* queue cleanup watchers (and execute them) */
1766 if (expect_false (cleanupcnt))
1767 {
1768 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1769 EV_INVOKE_PENDING;
1770 }
1771#endif
1772
1773#if EV_CHILD_ENABLE
1774 if (ev_is_active (&childev))
1775 {
1776 ev_ref (EV_A); /* child watcher */
1777 ev_signal_stop (EV_A_ &childev);
1778 }
1779#endif
1676 1780
1677 if (ev_is_active (&pipe_w)) 1781 if (ev_is_active (&pipe_w))
1678 { 1782 {
1679 /*ev_ref (EV_A);*/ 1783 /*ev_ref (EV_A);*/
1680 /*ev_io_stop (EV_A_ &pipe_w);*/ 1784 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1702#endif 1806#endif
1703 1807
1704 if (backend_fd >= 0) 1808 if (backend_fd >= 0)
1705 close (backend_fd); 1809 close (backend_fd);
1706 1810
1811#if EV_USE_IOCP
1812 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1813#endif
1707#if EV_USE_PORT 1814#if EV_USE_PORT
1708 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1815 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1709#endif 1816#endif
1710#if EV_USE_KQUEUE 1817#if EV_USE_KQUEUE
1711 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1818 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1738 array_free (periodic, EMPTY); 1845 array_free (periodic, EMPTY);
1739#endif 1846#endif
1740#if EV_FORK_ENABLE 1847#if EV_FORK_ENABLE
1741 array_free (fork, EMPTY); 1848 array_free (fork, EMPTY);
1742#endif 1849#endif
1850#if EV_CLEANUP_ENABLE
1851 array_free (cleanup, EMPTY);
1852#endif
1743 array_free (prepare, EMPTY); 1853 array_free (prepare, EMPTY);
1744 array_free (check, EMPTY); 1854 array_free (check, EMPTY);
1745#if EV_ASYNC_ENABLE 1855#if EV_ASYNC_ENABLE
1746 array_free (async, EMPTY); 1856 array_free (async, EMPTY);
1747#endif 1857#endif
1748 1858
1749 backend = 0; 1859 backend = 0;
1860
1861#if EV_MULTIPLICITY
1862 if (ev_is_default_loop (EV_A))
1863#endif
1864 ev_default_loop_ptr = 0;
1865#if EV_MULTIPLICITY
1866 else
1867 ev_free (EV_A);
1868#endif
1750} 1869}
1751 1870
1752#if EV_USE_INOTIFY 1871#if EV_USE_INOTIFY
1753inline_size void infy_fork (EV_P); 1872inline_size void infy_fork (EV_P);
1754#endif 1873#endif
… …
1813 loop_init (EV_A_ flags); 1932 loop_init (EV_A_ flags);
1814 1933
1815 if (ev_backend (EV_A)) 1934 if (ev_backend (EV_A))
1816 return EV_A; 1935 return EV_A;
1817 1936
1937 ev_free (EV_A);
1818 return 0; 1938 return 0;
1819} 1939}
1820 1940
1821void
1822ev_loop_destroy (EV_P)
1823{
1824 loop_destroy (EV_A);
1825 ev_free (loop);
1826}
1827
1828void
1829ev_loop_fork (EV_P)
1830{
1831 postfork = 1; /* must be in line with ev_default_fork */
1832}
1833#endif /* multiplicity */ 1941#endif /* multiplicity */
1834 1942
1835#if EV_VERIFY 1943#if EV_VERIFY
1836static void noinline 1944static void noinline
1837verify_watcher (EV_P_ W w) 1945verify_watcher (EV_P_ W w)
… …
1912#if EV_FORK_ENABLE 2020#if EV_FORK_ENABLE
1913 assert (forkmax >= forkcnt); 2021 assert (forkmax >= forkcnt);
1914 array_verify (EV_A_ (W *)forks, forkcnt); 2022 array_verify (EV_A_ (W *)forks, forkcnt);
1915#endif 2023#endif
1916 2024
2025#if EV_CLEANUP_ENABLE
2026 assert (cleanupmax >= cleanupcnt);
2027 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2028#endif
2029
1917#if EV_ASYNC_ENABLE 2030#if EV_ASYNC_ENABLE
1918 assert (asyncmax >= asynccnt); 2031 assert (asyncmax >= asynccnt);
1919 array_verify (EV_A_ (W *)asyncs, asynccnt); 2032 array_verify (EV_A_ (W *)asyncs, asynccnt);
1920#endif 2033#endif
1921 2034
… …
1939} 2052}
1940#endif 2053#endif
1941 2054
1942#if EV_MULTIPLICITY 2055#if EV_MULTIPLICITY
1943struct ev_loop * 2056struct ev_loop *
1944ev_default_loop_init (unsigned int flags)
1945#else 2057#else
1946int 2058int
2059#endif
1947ev_default_loop (unsigned int flags) 2060ev_default_loop (unsigned int flags)
1948#endif
1949{ 2061{
1950 if (!ev_default_loop_ptr) 2062 if (!ev_default_loop_ptr)
1951 { 2063 {
1952#if EV_MULTIPLICITY 2064#if EV_MULTIPLICITY
1953 EV_P = ev_default_loop_ptr = &default_loop_struct; 2065 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1972 2084
1973 return ev_default_loop_ptr; 2085 return ev_default_loop_ptr;
1974} 2086}
1975 2087
1976void 2088void
1977ev_default_destroy (void) 2089ev_loop_fork (EV_P)
1978{ 2090{
1979#if EV_MULTIPLICITY
1980 EV_P = ev_default_loop_ptr;
1981#endif
1982
1983 ev_default_loop_ptr = 0;
1984
1985#if EV_CHILD_ENABLE
1986 ev_ref (EV_A); /* child watcher */
1987 ev_signal_stop (EV_A_ &childev);
1988#endif
1989
1990 loop_destroy (EV_A);
1991}
1992
1993void
1994ev_default_fork (void)
1995{
1996#if EV_MULTIPLICITY
1997 EV_P = ev_default_loop_ptr;
1998#endif
1999
2000 postfork = 1; /* must be in line with ev_loop_fork */ 2091 postfork = 1; /* must be in line with ev_default_fork */
2001} 2092}
2002 2093
2003/*****************************************************************************/ 2094/*****************************************************************************/
2004 2095
2005void 2096void
… …
2027 2118
2028 for (pri = NUMPRI; pri--; ) 2119 for (pri = NUMPRI; pri--; )
2029 while (pendingcnt [pri]) 2120 while (pendingcnt [pri])
2030 { 2121 {
2031 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2122 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2032
2033 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2034 /* ^ this is no longer true, as pending_w could be here */
2035 2123
2036 p->w->pending = 0; 2124 p->w->pending = 0;
2037 EV_CB_INVOKE (p->w, p->events); 2125 EV_CB_INVOKE (p->w, p->events);
2038 EV_FREQUENT_CHECK; 2126 EV_FREQUENT_CHECK;
2039 } 2127 }
… …
2096 EV_FREQUENT_CHECK; 2184 EV_FREQUENT_CHECK;
2097 feed_reverse (EV_A_ (W)w); 2185 feed_reverse (EV_A_ (W)w);
2098 } 2186 }
2099 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2187 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2100 2188
2101 feed_reverse_done (EV_A_ EV_TIMEOUT); 2189 feed_reverse_done (EV_A_ EV_TIMER);
2102 } 2190 }
2103} 2191}
2104 2192
2105#if EV_PERIODIC_ENABLE 2193#if EV_PERIODIC_ENABLE
2106/* make periodics pending */ 2194/* make periodics pending */
… …
2159 feed_reverse_done (EV_A_ EV_PERIODIC); 2247 feed_reverse_done (EV_A_ EV_PERIODIC);
2160 } 2248 }
2161} 2249}
2162 2250
2163/* simply recalculate all periodics */ 2251/* simply recalculate all periodics */
2164/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2252/* TODO: maybe ensure that at least one event happens when jumping forward? */
2165static void noinline 2253static void noinline
2166periodics_reschedule (EV_P) 2254periodics_reschedule (EV_P)
2167{ 2255{
2168 int i; 2256 int i;
2169 2257
… …
2265 mn_now = ev_rt_now; 2353 mn_now = ev_rt_now;
2266 } 2354 }
2267} 2355}
2268 2356
2269void 2357void
2270ev_loop (EV_P_ int flags) 2358ev_run (EV_P_ int flags)
2271{ 2359{
2272#if EV_FEATURE_API 2360#if EV_FEATURE_API
2273 ++loop_depth; 2361 ++loop_depth;
2274#endif 2362#endif
2275 2363
2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2364 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2277 2365
2278 loop_done = EVUNLOOP_CANCEL; 2366 loop_done = EVBREAK_CANCEL;
2279 2367
2280 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2368 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2281 2369
2282 do 2370 do
2283 { 2371 {
… …
2326 /* calculate blocking time */ 2414 /* calculate blocking time */
2327 { 2415 {
2328 ev_tstamp waittime = 0.; 2416 ev_tstamp waittime = 0.;
2329 ev_tstamp sleeptime = 0.; 2417 ev_tstamp sleeptime = 0.;
2330 2418
2419 /* remember old timestamp for io_blocktime calculation */
2420 ev_tstamp prev_mn_now = mn_now;
2421
2422 /* update time to cancel out callback processing overhead */
2423 time_update (EV_A_ 1e100);
2424
2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2425 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2332 { 2426 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
2336 /* update time to cancel out callback processing overhead */
2337 time_update (EV_A_ 1e100);
2338
2339 waittime = MAX_BLOCKTIME; 2427 waittime = MAX_BLOCKTIME;
2340 2428
2341 if (timercnt) 2429 if (timercnt)
2342 { 2430 {
2343 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2431 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2373 } 2461 }
2374 2462
2375#if EV_FEATURE_API 2463#if EV_FEATURE_API
2376 ++loop_count; 2464 ++loop_count;
2377#endif 2465#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2466 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2379 backend_poll (EV_A_ waittime); 2467 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2468 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2381 2469
2382 /* update ev_rt_now, do magic */ 2470 /* update ev_rt_now, do magic */
2383 time_update (EV_A_ waittime + sleeptime); 2471 time_update (EV_A_ waittime + sleeptime);
2384 } 2472 }
2385 2473
… …
2403 EV_INVOKE_PENDING; 2491 EV_INVOKE_PENDING;
2404 } 2492 }
2405 while (expect_true ( 2493 while (expect_true (
2406 activecnt 2494 activecnt
2407 && !loop_done 2495 && !loop_done
2408 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2496 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2409 )); 2497 ));
2410 2498
2411 if (loop_done == EVUNLOOP_ONE) 2499 if (loop_done == EVBREAK_ONE)
2412 loop_done = EVUNLOOP_CANCEL; 2500 loop_done = EVBREAK_CANCEL;
2413 2501
2414#if EV_FEATURE_API 2502#if EV_FEATURE_API
2415 --loop_depth; 2503 --loop_depth;
2416#endif 2504#endif
2417} 2505}
2418 2506
2419void 2507void
2420ev_unloop (EV_P_ int how) 2508ev_break (EV_P_ int how)
2421{ 2509{
2422 loop_done = how; 2510 loop_done = how;
2423} 2511}
2424 2512
2425void 2513void
… …
2573 EV_FREQUENT_CHECK; 2661 EV_FREQUENT_CHECK;
2574 2662
2575 wlist_del (&anfds[w->fd].head, (WL)w); 2663 wlist_del (&anfds[w->fd].head, (WL)w);
2576 ev_stop (EV_A_ (W)w); 2664 ev_stop (EV_A_ (W)w);
2577 2665
2578 fd_change (EV_A_ w->fd, 1); 2666 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2579 2667
2580 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2581} 2669}
2582 2670
2583void noinline 2671void noinline
… …
2807 sa.sa_handler = ev_sighandler; 2895 sa.sa_handler = ev_sighandler;
2808 sigfillset (&sa.sa_mask); 2896 sigfillset (&sa.sa_mask);
2809 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2897 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2810 sigaction (w->signum, &sa, 0); 2898 sigaction (w->signum, &sa, 0);
2811 2899
2900 if (origflags & EVFLAG_NOSIGMASK)
2901 {
2812 sigemptyset (&sa.sa_mask); 2902 sigemptyset (&sa.sa_mask);
2813 sigaddset (&sa.sa_mask, w->signum); 2903 sigaddset (&sa.sa_mask, w->signum);
2814 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2904 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2905 }
2815#endif 2906#endif
2816 } 2907 }
2817 2908
2818 EV_FREQUENT_CHECK; 2909 EV_FREQUENT_CHECK;
2819} 2910}
… …
3035 { 3126 {
3036 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3127 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3037 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3128 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3038 ofs += sizeof (struct inotify_event) + ev->len; 3129 ofs += sizeof (struct inotify_event) + ev->len;
3039 } 3130 }
3040}
3041
3042inline_size unsigned int
3043ev_linux_version (void)
3044{
3045 struct utsname buf;
3046 unsigned int v;
3047 int i;
3048 char *p = buf.release;
3049
3050 if (uname (&buf))
3051 return 0;
3052
3053 for (i = 3+1; --i; )
3054 {
3055 unsigned int c = 0;
3056
3057 for (;;)
3058 {
3059 if (*p >= '0' && *p <= '9')
3060 c = c * 10 + *p++ - '0';
3061 else
3062 {
3063 p += *p == '.';
3064 break;
3065 }
3066 }
3067
3068 v = (v << 8) | c;
3069 }
3070
3071 return v;
3072} 3131}
3073 3132
3074inline_size void 3133inline_size void
3075ev_check_2625 (EV_P) 3134ev_check_2625 (EV_P)
3076{ 3135{
… …
3400 3459
3401#if EV_EMBED_ENABLE 3460#if EV_EMBED_ENABLE
3402void noinline 3461void noinline
3403ev_embed_sweep (EV_P_ ev_embed *w) 3462ev_embed_sweep (EV_P_ ev_embed *w)
3404{ 3463{
3405 ev_loop (w->other, EVLOOP_NONBLOCK); 3464 ev_run (w->other, EVRUN_NOWAIT);
3406} 3465}
3407 3466
3408static void 3467static void
3409embed_io_cb (EV_P_ ev_io *io, int revents) 3468embed_io_cb (EV_P_ ev_io *io, int revents)
3410{ 3469{
3411 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3470 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3412 3471
3413 if (ev_cb (w)) 3472 if (ev_cb (w))
3414 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3473 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3415 else 3474 else
3416 ev_loop (w->other, EVLOOP_NONBLOCK); 3475 ev_run (w->other, EVRUN_NOWAIT);
3417} 3476}
3418 3477
3419static void 3478static void
3420embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3479embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3421{ 3480{
… …
3425 EV_P = w->other; 3484 EV_P = w->other;
3426 3485
3427 while (fdchangecnt) 3486 while (fdchangecnt)
3428 { 3487 {
3429 fd_reify (EV_A); 3488 fd_reify (EV_A);
3430 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3489 ev_run (EV_A_ EVRUN_NOWAIT);
3431 } 3490 }
3432 } 3491 }
3433} 3492}
3434 3493
3435static void 3494static void
… …
3441 3500
3442 { 3501 {
3443 EV_P = w->other; 3502 EV_P = w->other;
3444 3503
3445 ev_loop_fork (EV_A); 3504 ev_loop_fork (EV_A);
3446 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3505 ev_run (EV_A_ EVRUN_NOWAIT);
3447 } 3506 }
3448 3507
3449 ev_embed_start (EV_A_ w); 3508 ev_embed_start (EV_A_ w);
3450} 3509}
3451 3510
… …
3543 3602
3544 EV_FREQUENT_CHECK; 3603 EV_FREQUENT_CHECK;
3545} 3604}
3546#endif 3605#endif
3547 3606
3548#if EV_ASYNC_ENABLE 3607#if EV_CLEANUP_ENABLE
3549void 3608void
3550ev_async_start (EV_P_ ev_async *w) 3609ev_cleanup_start (EV_P_ ev_cleanup *w)
3551{ 3610{
3552 if (expect_false (ev_is_active (w))) 3611 if (expect_false (ev_is_active (w)))
3553 return; 3612 return;
3613
3614 EV_FREQUENT_CHECK;
3615
3616 ev_start (EV_A_ (W)w, ++cleanupcnt);
3617 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3618 cleanups [cleanupcnt - 1] = w;
3619
3620 /* cleanup watchers should never keep a refcount on the loop */
3621 ev_unref (EV_A);
3622 EV_FREQUENT_CHECK;
3623}
3624
3625void
3626ev_cleanup_stop (EV_P_ ev_cleanup *w)
3627{
3628 clear_pending (EV_A_ (W)w);
3629 if (expect_false (!ev_is_active (w)))
3630 return;
3631
3632 EV_FREQUENT_CHECK;
3633 ev_ref (EV_A);
3634
3635 {
3636 int active = ev_active (w);
3637
3638 cleanups [active - 1] = cleanups [--cleanupcnt];
3639 ev_active (cleanups [active - 1]) = active;
3640 }
3641
3642 ev_stop (EV_A_ (W)w);
3643
3644 EV_FREQUENT_CHECK;
3645}
3646#endif
3647
3648#if EV_ASYNC_ENABLE
3649void
3650ev_async_start (EV_P_ ev_async *w)
3651{
3652 if (expect_false (ev_is_active (w)))
3653 return;
3654
3655 w->sent = 0;
3554 3656
3555 evpipe_init (EV_A); 3657 evpipe_init (EV_A);
3556 3658
3557 EV_FREQUENT_CHECK; 3659 EV_FREQUENT_CHECK;
3558 3660
… …
3636{ 3738{
3637 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3739 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3638 3740
3639 if (expect_false (!once)) 3741 if (expect_false (!once))
3640 { 3742 {
3641 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3743 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3642 return; 3744 return;
3643 } 3745 }
3644 3746
3645 once->cb = cb; 3747 once->cb = cb;
3646 once->arg = arg; 3748 once->arg = arg;
… …
3778 3880
3779#if EV_MULTIPLICITY 3881#if EV_MULTIPLICITY
3780 #include "ev_wrap.h" 3882 #include "ev_wrap.h"
3781#endif 3883#endif
3782 3884
3783#ifdef __cplusplus 3885EV_CPP(})
3784}
3785#endif
3786 3886

Diff Legend

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