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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.332 by root, Tue Mar 9 08:58:17 2010 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 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 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 *
… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
… …
182# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 185# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
186# endif 188# endif
189# undef EV_AVOID_STDIO
187#endif 190#endif
188 191
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
190 193
191/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 195#if defined (EV_NSIG)
194/* use what's provided */ 196/* use what's provided */
195#elif defined (NSIG) 197#elif defined (NSIG)
196# define EV_NSIG (NSIG) 198# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 199#elif defined(_NSIG)
… …
303# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
304# endif 306# endif
305#endif 307#endif
306 308
307#ifndef EV_USE_SIGNALFD 309#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 311# define EV_USE_SIGNALFD 1
310# else 312# else
311# define EV_USE_SIGNALFD 0 313# define EV_USE_SIGNALFD 0
312# endif 314# endif
313#endif 315#endif
… …
344# endif 346# endif
345#endif 347#endif
346 348
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
356
349#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
352#endif 360#endif
353 361
… …
387# include <stdint.h> 395# include <stdint.h>
388# ifndef EFD_NONBLOCK 396# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 397# define EFD_NONBLOCK O_NONBLOCK
390# endif 398# endif
391# ifndef EFD_CLOEXEC 399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
393# endif 405# endif
394# ifdef __cplusplus 406# ifdef __cplusplus
395extern "C" { 407extern "C" {
396# endif 408# endif
397int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
398# ifdef __cplusplus 410# ifdef __cplusplus
399} 411}
400# endif 412# endif
401#endif 413#endif
402 414
403#if EV_USE_SIGNALFD 415#if EV_USE_SIGNALFD
404# include <sys/signalfd.h> 416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
405#endif 420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
406 443
407/**/ 444/**/
408 445
409#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
422 */ 459 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 461
425#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
426#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
428 464
429#if __GNUC__ >= 4 465#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
432#else 468#else
… …
473 509
474#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 512#endif
477 513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
522#endif
523
478#ifdef _WIN32 524#ifdef _WIN32
479# include "ev_win32.c" 525# include "ev_win32.c"
480#endif 526#endif
481 527
482/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
483 537
484static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
485 539
486void 540void
487ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
… …
497 551
498 if (syserr_cb) 552 if (syserr_cb)
499 syserr_cb (msg); 553 syserr_cb (msg);
500 else 554 else
501 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
502 perror (msg); 564 perror (msg);
565#endif
503 abort (); 566 abort ();
504 } 567 }
505} 568}
506 569
507static void * 570static void *
… …
509{ 572{
510 /* some systems, notably openbsd and darwin, fail to properly 573 /* some systems, notably openbsd and darwin, fail to properly
511 * implement realloc (x, 0) (as required by both ansi c-98 and 574 * implement realloc (x, 0) (as required by both ansi c-98 and
512 * the single unix specification, so work around them here. 575 * the single unix specification, so work around them here.
513 */ 576 */
514
515 if (size) 577 if (size)
516 return realloc (ptr, size); 578 return realloc (ptr, size);
517 579
518 free (ptr); 580 free (ptr);
519 return 0; 581 return 0;
… …
532{ 594{
533 ptr = alloc (ptr, size); 595 ptr = alloc (ptr, size);
534 596
535 if (!ptr && size) 597 if (!ptr && size)
536 { 598 {
599#if EV_AVOID_STDIO
600 ev_printerr ("libev: memory allocation failed, aborting.\n");
601#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 602 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
603#endif
538 abort (); 604 abort ();
539 } 605 }
540 606
541 return ptr; 607 return ptr;
542} 608}
… …
873 939
874#if EV_SELECT_IS_WINSOCKET 940#if EV_SELECT_IS_WINSOCKET
875 if (events) 941 if (events)
876 { 942 {
877 unsigned long arg; 943 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 944 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
880 #else
881 anfd->handle = _get_osfhandle (fd);
882 #endif
883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 945 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
884 } 946 }
885#endif 947#endif
886 948
887 { 949 {
… …
930/* check whether the given fd is atcually valid, for error recovery */ 992/* check whether the given fd is atcually valid, for error recovery */
931inline_size int 993inline_size int
932fd_valid (int fd) 994fd_valid (int fd)
933{ 995{
934#ifdef _WIN32 996#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 997 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 998#else
937 return fcntl (fd, F_GETFD) != -1; 999 return fcntl (fd, F_GETFD) != -1;
938#endif 1000#endif
939} 1001}
940 1002
… …
958 1020
959 for (fd = anfdmax; fd--; ) 1021 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1022 if (anfds [fd].events)
961 { 1023 {
962 fd_kill (EV_A_ fd); 1024 fd_kill (EV_A_ fd);
963 return; 1025 break;
964 } 1026 }
965} 1027}
966 1028
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1029/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1030static void noinline
… …
1058 1120
1059 for (;;) 1121 for (;;)
1060 { 1122 {
1061 int c = k << 1; 1123 int c = k << 1;
1062 1124
1063 if (c > N + HEAP0 - 1) 1125 if (c >= N + HEAP0)
1064 break; 1126 break;
1065 1127
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1128 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1129 ? 1 : 0;
1068 1130
… …
1104 1166
1105/* move an element suitably so it is in a correct place */ 1167/* move an element suitably so it is in a correct place */
1106inline_size void 1168inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1169adjustheap (ANHE *heap, int N, int k)
1108{ 1170{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1171 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1172 upheap (heap, k);
1111 else 1173 else
1112 downheap (heap, N, k); 1174 downheap (heap, N, k);
1113} 1175}
1114 1176
… …
1127/*****************************************************************************/ 1189/*****************************************************************************/
1128 1190
1129/* associate signal watchers to a signal signal */ 1191/* associate signal watchers to a signal signal */
1130typedef struct 1192typedef struct
1131{ 1193{
1194 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1195#if EV_MULTIPLICITY
1133 EV_P; 1196 EV_P;
1134#endif 1197#endif
1135 WL head; 1198 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1199} ANSIG;
1138 1200
1139static ANSIG signals [EV_NSIG - 1]; 1201static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1202
1142/*****************************************************************************/ 1203/*****************************************************************************/
1143 1204
1144/* used to prepare libev internal fd's */ 1205/* used to prepare libev internal fd's */
1145/* this is not fork-safe */ 1206/* this is not fork-safe */
1146inline_speed void 1207inline_speed void
1147fd_intern (int fd) 1208fd_intern (int fd)
1148{ 1209{
1149#ifdef _WIN32 1210#ifdef _WIN32
1150 unsigned long arg = 1; 1211 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1212 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1152#else 1213#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC); 1214 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK); 1215 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif 1216#endif
1156} 1217}
… …
1213/* called whenever the libev signal pipe */ 1274/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1275/* got some events (signal, async) */
1215static void 1276static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1277pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1278{
1279 int i;
1280
1218#if EV_USE_EVENTFD 1281#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1282 if (evfd >= 0)
1220 { 1283 {
1221 uint64_t counter; 1284 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1285 read (evfd, &counter, sizeof (uint64_t));
… …
1226 { 1289 {
1227 char dummy; 1290 char dummy;
1228 read (evpipe [0], &dummy, 1); 1291 read (evpipe [0], &dummy, 1);
1229 } 1292 }
1230 1293
1231 if (gotsig && ev_is_default_loop (EV_A)) 1294 if (sig_pending)
1232 { 1295 {
1233 int signum; 1296 sig_pending = 0;
1234 gotsig = 0;
1235 1297
1236 for (signum = EV_NSIG - 1; signum--; ) 1298 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1299 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1300 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1301 }
1240 1302
1241#if EV_ASYNC_ENABLE 1303#if EV_ASYNC_ENABLE
1242 if (gotasync) 1304 if (async_pending)
1243 { 1305 {
1244 int i; 1306 async_pending = 0;
1245 gotasync = 0;
1246 1307
1247 for (i = asynccnt; i--; ) 1308 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1309 if (asyncs [i]->sent)
1249 { 1310 {
1250 asyncs [i]->sent = 0; 1311 asyncs [i]->sent = 0;
… …
1261{ 1322{
1262#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1324 EV_P = signals [signum - 1].loop;
1264#endif 1325#endif
1265 1326
1266#if _WIN32 1327#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1328 signal (signum, ev_sighandler);
1268#endif 1329#endif
1269 1330
1270 signals [signum - 1].gotsig = 1; 1331 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1332 evpipe_write (EV_A_ &sig_pending);
1272} 1333}
1273 1334
1274void noinline 1335void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1336ev_feed_signal_event (EV_P_ int signum)
1276{ 1337{
1277 WL w; 1338 WL w;
1278 1339
1340 if (expect_false (signum <= 0 || signum > EV_NSIG))
1341 return;
1342
1343 --signum;
1344
1279#if EV_MULTIPLICITY 1345#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1346 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1347 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1348
1283 if (signum <= 0 || signum > EV_NSIG) 1349 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1350 return;
1351#endif
1285 1352
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1353 signals [signum].pending = 0;
1289 1354
1290 for (w = signals [signum].head; w; w = w->next) 1355 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1356 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1357}
1293 1358
… …
1560 1625
1561 io_blocktime = 0.; 1626 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1627 timeout_blocktime = 0.;
1563 backend = 0; 1628 backend = 0;
1564 backend_fd = -1; 1629 backend_fd = -1;
1565 gotasync = 0; 1630 sig_pending = 0;
1631#if EV_ASYNC_ENABLE
1632 async_pending = 0;
1633#endif
1566#if EV_USE_INOTIFY 1634#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1635 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1636#endif
1569#if EV_USE_SIGNALFD 1637#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1638 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1639#endif
1572 1640
1573 if (!(flags & 0x0000ffffU)) 1641 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1642 flags |= ev_recommended_backends ();
1575 1643
… …
1612 close (evfd); 1680 close (evfd);
1613#endif 1681#endif
1614 1682
1615 if (evpipe [0] >= 0) 1683 if (evpipe [0] >= 0)
1616 { 1684 {
1617 close (evpipe [0]); 1685 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1686 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1687 }
1620 } 1688 }
1621 1689
1622#if EV_USE_SIGNALFD 1690#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1691 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1692 close (sigfd);
1629 }
1630#endif 1693#endif
1631 1694
1632#if EV_USE_INOTIFY 1695#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1696 if (fs_fd >= 0)
1634 close (fs_fd); 1697 close (fs_fd);
… …
1704 1767
1705 if (ev_is_active (&pipe_w)) 1768 if (ev_is_active (&pipe_w))
1706 { 1769 {
1707 /* this "locks" the handlers against writing to the pipe */ 1770 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1771 /* while we modify the fd vars */
1709 gotsig = 1; 1772 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1773#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1774 async_pending = 1;
1712#endif 1775#endif
1713 1776
1714 ev_ref (EV_A); 1777 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1778 ev_io_stop (EV_A_ &pipe_w);
1716 1779
… …
1719 close (evfd); 1782 close (evfd);
1720#endif 1783#endif
1721 1784
1722 if (evpipe [0] >= 0) 1785 if (evpipe [0] >= 0)
1723 { 1786 {
1724 close (evpipe [0]); 1787 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1788 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1789 }
1727 1790
1728 evpipe_init (EV_A); 1791 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1792 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1793 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1856 assert (checkmax >= checkcnt); 1919 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1920 array_verify (EV_A_ (W *)checks, checkcnt);
1858 1921
1859# if 0 1922# if 0
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1923 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 1924 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1862# endif 1925# endif
1863#endif 1926#endif
1864} 1927}
1865#endif 1928#endif
1866 1929
… …
2122 ANHE_at_cache (*he); 2185 ANHE_at_cache (*he);
2123 } 2186 }
2124} 2187}
2125 2188
2126/* fetch new monotonic and realtime times from the kernel */ 2189/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2190/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2191inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2192time_update (EV_P_ ev_tstamp max_block)
2130{ 2193{
2131#if EV_USE_MONOTONIC 2194#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2195 if (expect_true (have_monotonic))
… …
2393inline_size void 2456inline_size void
2394wlist_del (WL *head, WL elem) 2457wlist_del (WL *head, WL elem)
2395{ 2458{
2396 while (*head) 2459 while (*head)
2397 { 2460 {
2398 if (*head == elem) 2461 if (expect_true (*head == elem))
2399 { 2462 {
2400 *head = elem->next; 2463 *head = elem->next;
2401 return; 2464 break;
2402 } 2465 }
2403 2466
2404 head = &(*head)->next; 2467 head = &(*head)->next;
2405 } 2468 }
2406} 2469}
… …
2466 2529
2467 if (expect_false (ev_is_active (w))) 2530 if (expect_false (ev_is_active (w)))
2468 return; 2531 return;
2469 2532
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2533 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2534 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2535
2473 EV_FREQUENT_CHECK; 2536 EV_FREQUENT_CHECK;
2474 2537
2475 ev_start (EV_A_ (W)w, 1); 2538 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2539 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2546 timers [active] = timers [timercnt + HEAP0]; 2609 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2610 adjustheap (timers, timercnt, active);
2548 } 2611 }
2549 } 2612 }
2550 2613
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2614 ev_at (w) -= mn_now;
2554 2615
2555 ev_stop (EV_A_ (W)w); 2616 ev_stop (EV_A_ (W)w);
2617
2618 EV_FREQUENT_CHECK;
2556} 2619}
2557 2620
2558void noinline 2621void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2622ev_timer_again (EV_P_ ev_timer *w)
2560{ 2623{
… …
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2702 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2703 adjustheap (periodics, periodiccnt, active);
2641 } 2704 }
2642 } 2705 }
2643 2706
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2707 ev_stop (EV_A_ (W)w);
2708
2709 EV_FREQUENT_CHECK;
2647} 2710}
2648 2711
2649void noinline 2712void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2713ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2714{
… …
2666 return; 2729 return;
2667 2730
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2731 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2732
2670#if EV_MULTIPLICITY 2733#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2734 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2735 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2736
2674 signals [w->signum - 1].loop = EV_A; 2737 signals [w->signum - 1].loop = EV_A;
2675#endif 2738#endif
2676 2739
… …
2712 if (!((WL)w)->next) 2775 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2776# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2777 if (sigfd < 0) /*TODO*/
2715# endif 2778# endif
2716 { 2779 {
2717# if _WIN32 2780# ifdef _WIN32
2781 evpipe_init (EV_A);
2782
2718 signal (w->signum, ev_sighandler); 2783 signal (w->signum, ev_sighandler);
2719# else 2784# else
2720 struct sigaction sa; 2785 struct sigaction sa;
2721 2786
2722 evpipe_init (EV_A); 2787 evpipe_init (EV_A);
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2812 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2813 ev_stop (EV_A_ (W)w);
2749 2814
2750 if (!signals [w->signum - 1].head) 2815 if (!signals [w->signum - 1].head)
2751 { 2816 {
2752 #if EV_MULTIPLICITY 2817#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2818 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2819#endif
2755 #if EV_USE_SIGNALFD 2820#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2821 if (sigfd >= 0)
2757 { 2822 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2823 sigset_t ss;
2824
2825 sigemptyset (&ss);
2826 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2827 sigdelset (&sigfd_set, w->signum);
2828
2760 signalfd (sigfd, &sigfd_set, 0); 2829 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2830 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2831 }
2764 else 2832 else
2765 #endif 2833#endif
2766 signal (w->signum, SIG_DFL); 2834 signal (w->signum, SIG_DFL);
2767 } 2835 }
2768 2836
2769 EV_FREQUENT_CHECK; 2837 EV_FREQUENT_CHECK;
2770} 2838}
… …
2813#define MIN_STAT_INTERVAL 0.1074891 2881#define MIN_STAT_INTERVAL 0.1074891
2814 2882
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2883static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 2884
2817#if EV_USE_INOTIFY 2885#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 2886
2887/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2888# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 2889
2820static void noinline 2890static void noinline
2821infy_add (EV_P_ ev_stat *w) 2891infy_add (EV_P_ ev_stat *w)
2822{ 2892{
2823 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2893 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2824 2894
2825 if (w->wd < 0) 2895 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 /* now local changes will be tracked by inotify, but remote changes won't */
2900 /* unless the filesystem is known to be local, we therefore still poll */
2901 /* also do poll on <2.6.25, but with normal frequency */
2902
2903 if (!fs_2625)
2904 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2905 else if (!statfs (w->path, &sfs)
2906 && (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */))
2912 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2913 else
2914 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 2915 }
2916 else
2917 {
2918 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2919 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 2920
2830 /* monitor some parent directory for speedup hints */ 2921 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2922 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 2923 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2924 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 2925 {
2835 char path [4096]; 2926 char path [4096];
… …
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2942 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 2943 }
2853 } 2944 }
2854 2945
2855 if (w->wd >= 0) 2946 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2947 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2858 2948
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 2949 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 2950 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 2951 ev_timer_again (EV_A_ &w->timer);
2875 } 2952 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 2953}
2877 2954
2878static void noinline 2955static void noinline
2879infy_del (EV_P_ ev_stat *w) 2956infy_del (EV_P_ ev_stat *w)
2880{ 2957{
… …
2925 3002
2926static void 3003static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3004infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3005{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3006 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3007 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3008 int len = read (fs_fd, buf, sizeof (buf));
2933 3009
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3010 for (ofs = 0; ofs < len; )
3011 {
3012 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3013 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3014 ofs += sizeof (struct inotify_event) + ev->len;
3015 }
3016}
3017
3018inline_size unsigned int
3019ev_linux_version (void)
3020{
3021 struct utsname buf;
3022 unsigned int v;
3023 int i;
3024 char *p = buf.release;
3025
3026 if (uname (&buf))
3027 return 0;
3028
3029 for (i = 3+1; --i; )
3030 {
3031 unsigned int c = 0;
3032
3033 for (;;)
3034 {
3035 if (*p >= '0' && *p <= '9')
3036 c = c * 10 + *p++ - '0';
3037 else
3038 {
3039 p += *p == '.';
3040 break;
3041 }
3042 }
3043
3044 v = (v << 8) | c;
3045 }
3046
3047 return v;
2936} 3048}
2937 3049
2938inline_size void 3050inline_size void
2939check_2625 (EV_P) 3051ev_check_2625 (EV_P)
2940{ 3052{
2941 /* kernels < 2.6.25 are borked 3053 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3054 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */ 3055 */
2944 struct utsname buf; 3056 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3057 return;
2949 3058
2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951 return;
2952
2953 if (major < 2
2954 || (major == 2 && minor < 6)
2955 || (major == 2 && minor == 6 && micro < 25))
2956 return;
2957
2958 fs_2625 = 1; 3059 fs_2625 = 1;
3060}
3061
3062inline_size int
3063infy_newfd (void)
3064{
3065#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3066 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3067 if (fd >= 0)
3068 return fd;
3069#endif
3070 return inotify_init ();
2959} 3071}
2960 3072
2961inline_size void 3073inline_size void
2962infy_init (EV_P) 3074infy_init (EV_P)
2963{ 3075{
2964 if (fs_fd != -2) 3076 if (fs_fd != -2)
2965 return; 3077 return;
2966 3078
2967 fs_fd = -1; 3079 fs_fd = -1;
2968 3080
2969 check_2625 (EV_A); 3081 ev_check_2625 (EV_A);
2970 3082
2971 fs_fd = inotify_init (); 3083 fs_fd = infy_newfd ();
2972 3084
2973 if (fs_fd >= 0) 3085 if (fs_fd >= 0)
2974 { 3086 {
3087 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3088 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3089 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3090 ev_io_start (EV_A_ &fs_w);
3091 ev_unref (EV_A);
2978 } 3092 }
2979} 3093}
2980 3094
2981inline_size void 3095inline_size void
2982infy_fork (EV_P) 3096infy_fork (EV_P)
… …
2984 int slot; 3098 int slot;
2985 3099
2986 if (fs_fd < 0) 3100 if (fs_fd < 0)
2987 return; 3101 return;
2988 3102
3103 ev_ref (EV_A);
3104 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3105 close (fs_fd);
2990 fs_fd = inotify_init (); 3106 fs_fd = infy_newfd ();
3107
3108 if (fs_fd >= 0)
3109 {
3110 fd_intern (fs_fd);
3111 ev_io_set (&fs_w, fs_fd, EV_READ);
3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
3114 }
2991 3115
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3116 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2993 { 3117 {
2994 WL w_ = fs_hash [slot].head; 3118 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3119 fs_hash [slot].head = 0;
… …
3002 w->wd = -1; 3126 w->wd = -1;
3003 3127
3004 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3129 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3130 else
3131 {
3132 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3133 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3134 ev_timer_again (EV_A_ &w->timer);
3135 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3136 }
3008 } 3137 }
3009 } 3138 }
3010} 3139}
3011 3140
3012#endif 3141#endif
… …
3029static void noinline 3158static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3159stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3160{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3161 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3162
3034 /* we copy this here each the time so that */ 3163 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3164 ev_stat_stat (EV_A_ w);
3038 3165
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3166 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3167 if (
3041 w->prev.st_dev != w->attr.st_dev 3168 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3169 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3170 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3171 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3172 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3173 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3174 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3175 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3176 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3177 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3178 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3179 ) {
3180 /* we only update w->prev on actual differences */
3181 /* in case we test more often than invoke the callback, */
3182 /* to ensure that prev is always different to attr */
3183 w->prev = prev;
3184
3053 #if EV_USE_INOTIFY 3185 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3186 if (fs_fd >= 0)
3055 { 3187 {
3056 infy_del (EV_A_ w); 3188 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3189 infy_add (EV_A_ w);
… …
3082 3214
3083 if (fs_fd >= 0) 3215 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
3085 else 3217 else
3086#endif 3218#endif
3219 {
3087 ev_timer_again (EV_A_ &w->timer); 3220 ev_timer_again (EV_A_ &w->timer);
3221 ev_unref (EV_A);
3222 }
3088 3223
3089 ev_start (EV_A_ (W)w, 1); 3224 ev_start (EV_A_ (W)w, 1);
3090 3225
3091 EV_FREQUENT_CHECK; 3226 EV_FREQUENT_CHECK;
3092} 3227}
… …
3101 EV_FREQUENT_CHECK; 3236 EV_FREQUENT_CHECK;
3102 3237
3103#if EV_USE_INOTIFY 3238#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3239 infy_del (EV_A_ w);
3105#endif 3240#endif
3241
3242 if (ev_is_active (&w->timer))
3243 {
3244 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3245 ev_timer_stop (EV_A_ &w->timer);
3246 }
3107 3247
3108 ev_stop (EV_A_ (W)w); 3248 ev_stop (EV_A_ (W)w);
3109 3249
3110 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
3111} 3251}
… …
3331 3471
3332 ev_io_stop (EV_A_ &w->io); 3472 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3473 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3474 ev_fork_stop (EV_A_ &w->fork);
3335 3475
3476 ev_stop (EV_A_ (W)w);
3477
3336 EV_FREQUENT_CHECK; 3478 EV_FREQUENT_CHECK;
3337} 3479}
3338#endif 3480#endif
3339 3481
3340#if EV_FORK_ENABLE 3482#if EV_FORK_ENABLE
… …
3416 3558
3417void 3559void
3418ev_async_send (EV_P_ ev_async *w) 3560ev_async_send (EV_P_ ev_async *w)
3419{ 3561{
3420 w->sent = 1; 3562 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3563 evpipe_write (EV_A_ &async_pending);
3422} 3564}
3423#endif 3565#endif
3424 3566
3425/*****************************************************************************/ 3567/*****************************************************************************/
3426 3568

Diff Legend

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