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

Comparing libev/ev.c (file contents):
Revision 1.296 by root, Thu Jul 9 09:11:20 2009 UTC vs.
Revision 1.307 by root, Sun Jul 19 07:20:41 2009 UTC

… …
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
178# endif 186# endif
179#endif 187#endif
180 188
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
182 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
183#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
186# else 221# else
187# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
263#ifndef EV_USE_EVENTFD 298#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 300# define EV_USE_EVENTFD 1
266# else 301# else
267# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
303# endif
304#endif
305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
268# endif 311# endif
269#endif 312#endif
270 313
271#if 0 /* debugging */ 314#if 0 /* debugging */
272# define EV_VERIFY 3 315# define EV_VERIFY 3
… …
339#endif 382#endif
340 383
341#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC
392# endif
344# ifdef __cplusplus 393# ifdef __cplusplus
345extern "C" { 394extern "C" {
346# endif 395# endif
347int eventfd (unsigned int initval, int flags); 396int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 397# ifdef __cplusplus
349} 398}
350# endif 399# endif
400#endif
401
402#if EV_USE_SIGNALFD
403# include <sys/signalfd.h>
351#endif 404#endif
352 405
353/**/ 406/**/
354 407
355#if EV_VERIFY >= 3 408#if EV_VERIFY >= 3
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 543#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 544#define ev_free(ptr) ev_realloc ((ptr), 0)
492 545
493/*****************************************************************************/ 546/*****************************************************************************/
494 547
548/* set in reify when reification needed */
549#define EV_ANFD_REIFY 1
550
495/* file descriptor info structure */ 551/* file descriptor info structure */
496typedef struct 552typedef struct
497{ 553{
498 WL head; 554 WL head;
499 unsigned char events; /* the events watched for */ 555 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 556 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 557 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 558 unsigned char unused;
503#if EV_USE_EPOLL 559#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 560 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 561#endif
… …
567 623
568 static int ev_default_loop_ptr; 624 static int ev_default_loop_ptr;
569 625
570#endif 626#endif
571 627
628#if EV_MINIMAL < 2
629# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
630# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
631# define EV_INVOKE_PENDING invoke_cb (EV_A)
632#else
633# define EV_RELEASE_CB (void)0
634# define EV_ACQUIRE_CB (void)0
635# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
636#endif
637
638#define EVUNLOOP_RECURSE 0x80
639
572/*****************************************************************************/ 640/*****************************************************************************/
573 641
574#ifndef EV_HAVE_EV_TIME 642#ifndef EV_HAVE_EV_TIME
575ev_tstamp 643ev_tstamp
576ev_time (void) 644ev_time (void)
… …
632 700
633 tv.tv_sec = (time_t)delay; 701 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 703
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 704 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 705 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 706 /* by older ones */
639 select (0, 0, 0, 0, &tv); 707 select (0, 0, 0, 0, &tv);
640#endif 708#endif
641 } 709 }
642} 710}
… …
750} 818}
751 819
752/*****************************************************************************/ 820/*****************************************************************************/
753 821
754inline_speed void 822inline_speed void
755fd_event (EV_P_ int fd, int revents) 823fd_event_nc (EV_P_ int fd, int revents)
756{ 824{
757 ANFD *anfd = anfds + fd; 825 ANFD *anfd = anfds + fd;
758 ev_io *w; 826 ev_io *w;
759 827
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 828 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
764 if (ev) 832 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 833 ev_feed_event (EV_A_ (W)w, ev);
766 } 834 }
767} 835}
768 836
837/* do not submit kernel events for fds that have reify set */
838/* because that means they changed while we were polling for new events */
839inline_speed void
840fd_event (EV_P_ int fd, int revents)
841{
842 ANFD *anfd = anfds + fd;
843
844 if (expect_true (!anfd->reify))
845 fd_event_nc (EV_A_ fd, revents);
846}
847
769void 848void
770ev_feed_fd_event (EV_P_ int fd, int revents) 849ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 850{
772 if (fd >= 0 && fd < anfdmax) 851 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 852 fd_event_nc (EV_A_ fd, revents);
774} 853}
775 854
776/* make sure the external fd watch events are in-sync */ 855/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 856/* with the kernel/libev internal state */
778inline_size void 857inline_size void
… …
878 957
879 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 959 if (anfds [fd].events)
881 { 960 {
882 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
883 return; 962 break;
884 } 963 }
885} 964}
886 965
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 966/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 967static void noinline
… …
893 for (fd = 0; fd < anfdmax; ++fd) 972 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 973 if (anfds [fd].events)
895 { 974 {
896 anfds [fd].events = 0; 975 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 976 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 978 }
900} 979}
901 980
902/*****************************************************************************/ 981/*****************************************************************************/
903 982
… …
1047/*****************************************************************************/ 1126/*****************************************************************************/
1048 1127
1049/* associate signal watchers to a signal signal */ 1128/* associate signal watchers to a signal signal */
1050typedef struct 1129typedef struct
1051{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1052 WL head; 1135 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1136} ANSIG;
1055 1137
1056static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1139
1061/*****************************************************************************/ 1140/*****************************************************************************/
1062 1141
1063/* used to prepare libev internal fd's */ 1142/* used to prepare libev internal fd's */
1064/* this is not fork-safe */ 1143/* this is not fork-safe */
… …
1078evpipe_init (EV_P) 1157evpipe_init (EV_P)
1079{ 1158{
1080 if (!ev_is_active (&pipe_w)) 1159 if (!ev_is_active (&pipe_w))
1081 { 1160 {
1082#if EV_USE_EVENTFD 1161#if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1164 evfd = eventfd (0, 0);
1165
1166 if (evfd >= 0)
1084 { 1167 {
1085 evpipe [0] = -1; 1168 evpipe [0] = -1;
1086 fd_intern (evfd); 1169 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1170 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1171 }
1089 else 1172 else
1090#endif 1173#endif
1091 { 1174 {
… …
1128/* called whenever the libev signal pipe */ 1211/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1212/* got some events (signal, async) */
1130static void 1213static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1215{
1216 int i;
1217
1133#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1219 if (evfd >= 0)
1135 { 1220 {
1136 uint64_t counter; 1221 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
… …
1141 { 1226 {
1142 char dummy; 1227 char dummy;
1143 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
1144 } 1229 }
1145 1230
1146 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
1147 { 1232 {
1148 int signum; 1233 sig_pending = 0;
1149 gotsig = 0;
1150 1234
1151 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1238 }
1155 1239
1156#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
1157 if (gotasync) 1241 if (async_pending)
1158 { 1242 {
1159 int i; 1243 async_pending = 0;
1160 gotasync = 0;
1161 1244
1162 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
1164 { 1247 {
1165 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
… …
1173 1256
1174static void 1257static void
1175ev_sighandler (int signum) 1258ev_sighandler (int signum)
1176{ 1259{
1177#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
1179#endif 1262#endif
1180 1263
1181#if _WIN32 1264#if _WIN32
1182 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
1183#endif 1266#endif
1184 1267
1185 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
1187} 1270}
1188 1271
1189void noinline 1272void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
1191{ 1274{
1192 WL w; 1275 WL w;
1193 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
1194#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1283 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1285
1198 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1287 return;
1288#endif
1202 1289
1203 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
1204 1291
1205 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1294}
1295
1296#if EV_USE_SIGNALFD
1297static void
1298sigfdcb (EV_P_ ev_io *iow, int revents)
1299{
1300 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1301
1302 for (;;)
1303 {
1304 ssize_t res = read (sigfd, si, sizeof (si));
1305
1306 /* not ISO-C, as res might be -1, but works with SuS */
1307 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1308 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1309
1310 if (res < (ssize_t)sizeof (si))
1311 break;
1312 }
1313}
1314#endif
1208 1315
1209/*****************************************************************************/ 1316/*****************************************************************************/
1210 1317
1211static WL childs [EV_PID_HASHSIZE]; 1318static WL childs [EV_PID_HASHSIZE];
1212 1319
… …
1357ev_backend (EV_P) 1464ev_backend (EV_P)
1358{ 1465{
1359 return backend; 1466 return backend;
1360} 1467}
1361 1468
1469#if EV_MINIMAL < 2
1362unsigned int 1470unsigned int
1363ev_loop_count (EV_P) 1471ev_loop_count (EV_P)
1364{ 1472{
1365 return loop_count; 1473 return loop_count;
1366} 1474}
… …
1380void 1488void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1489ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1490{
1383 timeout_blocktime = interval; 1491 timeout_blocktime = interval;
1384} 1492}
1493
1494void
1495ev_set_userdata (EV_P_ void *data)
1496{
1497 userdata = data;
1498}
1499
1500void *
1501ev_userdata (EV_P)
1502{
1503 return userdata;
1504}
1505
1506void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1507{
1508 invoke_cb = invoke_pending_cb;
1509}
1510
1511void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1512{
1513 release_cb = release;
1514 acquire_cb = acquire;
1515}
1516#endif
1385 1517
1386/* initialise a loop structure, must be zero-initialised */ 1518/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1519static void noinline
1388loop_init (EV_P_ unsigned int flags) 1520loop_init (EV_P_ unsigned int flags)
1389{ 1521{
… …
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1540 have_monotonic = 1;
1409 } 1541 }
1410#endif 1542#endif
1411 1543
1544 /* pid check not overridable via env */
1545#ifndef _WIN32
1546 if (flags & EVFLAG_FORKCHECK)
1547 curpid = getpid ();
1548#endif
1549
1550 if (!(flags & EVFLAG_NOENV)
1551 && !enable_secure ()
1552 && getenv ("LIBEV_FLAGS"))
1553 flags = atoi (getenv ("LIBEV_FLAGS"));
1554
1412 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1556 mn_now = get_clock ();
1414 now_floor = mn_now; 1557 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1558 rtmn_diff = ev_rt_now - mn_now;
1559#if EV_MINIMAL < 2
1416 invoke_cb = ev_invoke_pending; 1560 invoke_cb = ev_invoke_pending;
1561#endif
1417 1562
1418 io_blocktime = 0.; 1563 io_blocktime = 0.;
1419 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1420 backend = 0; 1565 backend = 0;
1421 backend_fd = -1; 1566 backend_fd = -1;
1422 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1423#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1424 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1425#endif 1573#endif
1426 1574#if EV_USE_SIGNALFD
1427 /* pid check not overridable via env */ 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1428#ifndef _WIN32
1429 if (flags & EVFLAG_FORKCHECK)
1430 curpid = getpid ();
1431#endif 1576#endif
1432
1433 if (!(flags & EVFLAG_NOENV)
1434 && !enable_secure ()
1435 && getenv ("LIBEV_FLAGS"))
1436 flags = atoi (getenv ("LIBEV_FLAGS"));
1437 1577
1438 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1439 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1440 1580
1441#if EV_USE_PORT 1581#if EV_USE_PORT
… …
1467{ 1607{
1468 int i; 1608 int i;
1469 1609
1470 if (ev_is_active (&pipe_w)) 1610 if (ev_is_active (&pipe_w))
1471 { 1611 {
1472 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1473 ev_io_stop (EV_A_ &pipe_w); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1474 1614
1475#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1476 if (evfd >= 0) 1616 if (evfd >= 0)
1477 close (evfd); 1617 close (evfd);
1478#endif 1618#endif
… …
1482 close (evpipe [0]); 1622 close (evpipe [0]);
1483 close (evpipe [1]); 1623 close (evpipe [1]);
1484 } 1624 }
1485 } 1625 }
1486 1626
1627#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd);
1634 }
1635#endif
1636
1487#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1488 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1489 close (fs_fd); 1639 close (fs_fd);
1490#endif 1640#endif
1491 1641
… …
1514#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1515 array_free (idle, [i]); 1665 array_free (idle, [i]);
1516#endif 1666#endif
1517 } 1667 }
1518 1668
1519 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1520 1670
1521 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1522 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1523 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1524 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
… …
1559 1709
1560 if (ev_is_active (&pipe_w)) 1710 if (ev_is_active (&pipe_w))
1561 { 1711 {
1562 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1563 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1564 gotsig = 1; 1714 sig_pending = 1;
1565#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1566 gotasync = 1; 1716 async_pending = 1;
1567#endif 1717#endif
1568 1718
1569 ev_ref (EV_A); 1719 ev_ref (EV_A);
1570 ev_io_stop (EV_A_ &pipe_w); 1720 ev_io_stop (EV_A_ &pipe_w);
1571 1721
… …
1591#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1592 1742
1593struct ev_loop * 1743struct ev_loop *
1594ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1595{ 1745{
1596 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1597 1747
1598 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1599
1600 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1601 1750
1602 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1603 return loop; 1752 return EV_A;
1604 1753
1605 return 0; 1754 return 0;
1606} 1755}
1607 1756
1608void 1757void
… …
1615void 1764void
1616ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1617{ 1766{
1618 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1619} 1768}
1769#endif /* multiplicity */
1620 1770
1621#if EV_VERIFY 1771#if EV_VERIFY
1622static void noinline 1772static void noinline
1623verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1624{ 1774{
… …
1652 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1653 } 1803 }
1654} 1804}
1655#endif 1805#endif
1656 1806
1807#if EV_MINIMAL < 2
1657void 1808void
1658ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1659{ 1810{
1660#if EV_VERIFY 1811#if EV_VERIFY
1661 int i; 1812 int i;
… …
1710 assert (checkmax >= checkcnt); 1861 assert (checkmax >= checkcnt);
1711 array_verify (EV_A_ (W *)checks, checkcnt); 1862 array_verify (EV_A_ (W *)checks, checkcnt);
1712 1863
1713# if 0 1864# if 0
1714 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1715 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1716# endif 1867# endif
1717#endif 1868#endif
1718} 1869}
1719 1870#endif
1720#endif /* multiplicity */
1721 1871
1722#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1723struct ev_loop * 1873struct ev_loop *
1724ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1725#else 1875#else
… …
1728#endif 1878#endif
1729{ 1879{
1730 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1731 { 1881 {
1732#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1733 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1734#else 1884#else
1735 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1736#endif 1886#endif
1737 1887
1738 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
… …
1755 1905
1756void 1906void
1757ev_default_destroy (void) 1907ev_default_destroy (void)
1758{ 1908{
1759#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1760 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1761#endif 1911#endif
1762 1912
1763 ev_default_loop_ptr = 0; 1913 ev_default_loop_ptr = 0;
1764 1914
1765#ifndef _WIN32 1915#ifndef _WIN32
… …
1772 1922
1773void 1923void
1774ev_default_fork (void) 1924ev_default_fork (void)
1775{ 1925{
1776#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1777 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1778#endif 1928#endif
1779 1929
1780 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1781} 1931}
1782 1932
… …
1786ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1787{ 1937{
1788 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1789} 1939}
1790 1940
1791void 1941unsigned int
1942ev_pending_count (EV_P)
1943{
1944 int pri;
1945 unsigned int count = 0;
1946
1947 for (pri = NUMPRI; pri--; )
1948 count += pendingcnt [pri];
1949
1950 return count;
1951}
1952
1953void noinline
1792ev_invoke_pending (EV_P) 1954ev_invoke_pending (EV_P)
1793{ 1955{
1794 int pri; 1956 int pri;
1795 1957
1796 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
… …
2035} 2197}
2036 2198
2037void 2199void
2038ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
2039{ 2201{
2202#if EV_MINIMAL < 2
2040 ++loop_depth; 2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2041 2207
2042 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
2043 2209
2044 invoke_cb (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2045 2211
2046 do 2212 do
2047 { 2213 {
2048#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
2049 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
… …
2062 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
2063 if (expect_false (postfork)) 2229 if (expect_false (postfork))
2064 if (forkcnt) 2230 if (forkcnt)
2065 { 2231 {
2066 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2067 invoke_cb (EV_A); 2233 EV_INVOKE_PENDING;
2068 } 2234 }
2069#endif 2235#endif
2070 2236
2071 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
2072 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
2073 { 2239 {
2074 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2075 invoke_cb (EV_A); 2241 EV_INVOKE_PENDING;
2076 } 2242 }
2243
2244 if (expect_false (loop_done))
2245 break;
2077 2246
2078 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2079 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2080 loop_fork (EV_A); 2249 loop_fork (EV_A);
2081 2250
… …
2129 waittime -= sleeptime; 2298 waittime -= sleeptime;
2130 } 2299 }
2131 } 2300 }
2132 } 2301 }
2133 2302
2303#if EV_MINIMAL < 2
2134 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2135 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2136 2309
2137 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2138 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2139 } 2312 }
2140 2313
… …
2151 2324
2152 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2153 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2155 2328
2156 invoke_cb (EV_A); 2329 EV_INVOKE_PENDING;
2157 } 2330 }
2158 while (expect_true ( 2331 while (expect_true (
2159 activecnt 2332 activecnt
2160 && !loop_done 2333 && !loop_done
2161 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2162 )); 2335 ));
2163 2336
2164 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2165 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2166 2339
2340#if EV_MINIMAL < 2
2167 --loop_depth; 2341 --loop_depth;
2342#endif
2168} 2343}
2169 2344
2170void 2345void
2171ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2172{ 2347{
… …
2223inline_size void 2398inline_size void
2224wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2225{ 2400{
2226 while (*head) 2401 while (*head)
2227 { 2402 {
2228 if (*head == elem) 2403 if (expect_true (*head == elem))
2229 { 2404 {
2230 *head = elem->next; 2405 *head = elem->next;
2231 return; 2406 break;
2232 } 2407 }
2233 2408
2234 head = &(*head)->next; 2409 head = &(*head)->next;
2235 } 2410 }
2236} 2411}
… …
2304 2479
2305 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2306 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2307 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2308 2483
2309 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2310 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2311 2486
2312 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2313} 2488}
2314 2489
… …
2408 } 2583 }
2409 2584
2410 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2411} 2586}
2412 2587
2588ev_tstamp
2589ev_timer_remaining (EV_P_ ev_timer *w)
2590{
2591 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2592}
2593
2413#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2414void noinline 2595void noinline
2415ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2416{ 2597{
2417 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2484#endif 2665#endif
2485 2666
2486void noinline 2667void noinline
2487ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2488{ 2669{
2489#if EV_MULTIPLICITY
2490 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2491#endif
2492 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2493 return; 2671 return;
2494 2672
2495 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2673 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2496 2674
2497 evpipe_init (EV_A); 2675#if EV_MULTIPLICITY
2676 assert (("libev: tried to attach to a signal from two different loops",
2677 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2498 2678
2499 EV_FREQUENT_CHECK; 2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2500 2681
2682 EV_FREQUENT_CHECK;
2683
2684#if EV_USE_SIGNALFD
2685 if (sigfd == -2)
2501 { 2686 {
2502#ifndef _WIN32 2687 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2503 sigset_t full, prev; 2688 if (sigfd < 0 && errno == EINVAL)
2504 sigfillset (&full); 2689 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2505 sigprocmask (SIG_SETMASK, &full, &prev);
2506#endif
2507 2690
2508 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2691 if (sigfd >= 0)
2692 {
2693 fd_intern (sigfd); /* doing it twice will not hurt */
2509 2694
2510#ifndef _WIN32 2695 sigemptyset (&sigfd_set);
2511 sigprocmask (SIG_SETMASK, &prev, 0); 2696
2512#endif 2697 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2698 ev_set_priority (&sigfd_w, EV_MAXPRI);
2699 ev_io_start (EV_A_ &sigfd_w);
2700 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2701 }
2513 } 2702 }
2703
2704 if (sigfd >= 0)
2705 {
2706 /* TODO: check .head */
2707 sigaddset (&sigfd_set, w->signum);
2708 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2709
2710 signalfd (sigfd, &sigfd_set, 0);
2711 }
2712#endif
2514 2713
2515 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2516 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2517 2716
2518 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/
2720# endif
2519 { 2721 {
2520#if _WIN32 2722# if _WIN32
2521 signal (w->signum, ev_sighandler); 2723 signal (w->signum, ev_sighandler);
2522#else 2724# else
2523 struct sigaction sa; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2524 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2525 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2526 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2731 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2527 sigaction (w->signum, &sa, 0); 2732 sigaction (w->signum, &sa, 0);
2733
2734 sigemptyset (&sa.sa_mask);
2735 sigaddset (&sa.sa_mask, w->signum);
2736 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2528#endif 2737#endif
2529 } 2738 }
2530 2739
2531 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2532} 2741}
2533 2742
2534void noinline 2743void noinline
… …
2542 2751
2543 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2544 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2545 2754
2546 if (!signals [w->signum - 1].head) 2755 if (!signals [w->signum - 1].head)
2756 {
2757#if EV_MULTIPLICITY
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif
2760#if EV_USE_SIGNALFD
2761 if (sigfd >= 0)
2762 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2764 sigdelset (&sigfd_set, w->signum);
2765 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2767 /*TODO: maybe unblock signal? */
2768 }
2769 else
2770#endif
2547 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2548 2773
2549 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2550} 2775}
2551 2776
2552void 2777void
… …
3032embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3033{ 3258{
3034 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3035 3260
3036 { 3261 {
3037 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
3038 3263
3039 while (fdchangecnt) 3264 while (fdchangecnt)
3040 { 3265 {
3041 fd_reify (EV_A); 3266 fd_reify (EV_A);
3042 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3050 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3275 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3051 3276
3052 ev_embed_stop (EV_A_ w); 3277 ev_embed_stop (EV_A_ w);
3053 3278
3054 { 3279 {
3055 struct ev_loop *loop = w->other; 3280 EV_P = w->other;
3056 3281
3057 ev_loop_fork (EV_A); 3282 ev_loop_fork (EV_A);
3058 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3059 } 3284 }
3060 3285
… …
3074{ 3299{
3075 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
3076 return; 3301 return;
3077 3302
3078 { 3303 {
3079 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
3080 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3305 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3081 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3306 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3082 } 3307 }
3083 3308
3084 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
… …
3196 3421
3197void 3422void
3198ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
3199{ 3424{
3200 w->sent = 1; 3425 w->sent = 1;
3201 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
3202} 3427}
3203#endif 3428#endif
3204 3429
3205/*****************************************************************************/ 3430/*****************************************************************************/
3206 3431
… …
3355 if (types & EV_CHECK) 3580 if (types & EV_CHECK)
3356 for (i = checkcnt; i--; ) 3581 for (i = checkcnt; i--; )
3357 cb (EV_A_ EV_CHECK, checks [i]); 3582 cb (EV_A_ EV_CHECK, checks [i]);
3358 3583
3359 if (types & EV_SIGNAL) 3584 if (types & EV_SIGNAL)
3360 for (i = 0; i < signalmax; ++i) 3585 for (i = 0; i < EV_NSIG - 1; ++i)
3361 for (wl = signals [i].head; wl; ) 3586 for (wl = signals [i].head; wl; )
3362 { 3587 {
3363 wn = wl->next; 3588 wn = wl->next;
3364 cb (EV_A_ EV_SIGNAL, wl); 3589 cb (EV_A_ EV_SIGNAL, wl);
3365 wl = wn; 3590 wl = wn;

Diff Legend

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