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

Comparing libev/ev.c (file contents):
Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC vs.
Revision 1.305 by root, Sun Jul 19 03:49:04 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 64
216#endif
217
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
183#ifndef EV_USE_CLOCK_SYSCALL 225#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 226# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 227# define EV_USE_CLOCK_SYSCALL 1
186# else 228# else
187# define EV_USE_CLOCK_SYSCALL 0 229# define EV_USE_CLOCK_SYSCALL 0
… …
263#ifndef EV_USE_EVENTFD 305#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 306# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 307# define EV_USE_EVENTFD 1
266# else 308# else
267# define EV_USE_EVENTFD 0 309# define EV_USE_EVENTFD 0
310# endif
311#endif
312
313#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
315# define EV_USE_SIGNALFD 1
316# else
317# define EV_USE_SIGNALFD 0
268# endif 318# endif
269#endif 319#endif
270 320
271#if 0 /* debugging */ 321#if 0 /* debugging */
272# define EV_VERIFY 3 322# define EV_VERIFY 3
… …
339#endif 389#endif
340 390
341#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 392/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC
399# endif
344# ifdef __cplusplus 400# ifdef __cplusplus
345extern "C" { 401extern "C" {
346# endif 402# endif
347int eventfd (unsigned int initval, int flags); 403int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 404# ifdef __cplusplus
349} 405}
350# endif 406# endif
407#endif
408
409#if EV_USE_SIGNALFD
410# include <sys/signalfd.h>
351#endif 411#endif
352 412
353/**/ 413/**/
354 414
355#if EV_VERIFY >= 3 415#if EV_VERIFY >= 3
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 550#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 551#define ev_free(ptr) ev_realloc ((ptr), 0)
492 552
493/*****************************************************************************/ 553/*****************************************************************************/
494 554
555/* set in reify when reification needed */
556#define EV_ANFD_REIFY 1
557
495/* file descriptor info structure */ 558/* file descriptor info structure */
496typedef struct 559typedef struct
497{ 560{
498 WL head; 561 WL head;
499 unsigned char events; /* the events watched for */ 562 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 563 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 */ 564 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 565 unsigned char unused;
503#if EV_USE_EPOLL 566#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 567 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 568#endif
… …
568 static int ev_default_loop_ptr; 631 static int ev_default_loop_ptr;
569 632
570#endif 633#endif
571 634
572#if EV_MINIMAL < 2 635#if EV_MINIMAL < 2
573# define EV_SUSPEND_CB if (expect_false (suspend_cb)) suspend_cb (EV_A)
574# define EV_RESUME_CB if (expect_false (resume_cb )) resume_cb (EV_A) 636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
637# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
575# define EV_INVOKE_PENDING invoke_cb (EV_A) 638# define EV_INVOKE_PENDING invoke_cb (EV_A)
576#else 639#else
577# define EV_SUSPEND_CB (void)0
578# define EV_RESUME_CB (void)0 640# define EV_RELEASE_CB (void)0
641# define EV_ACQUIRE_CB (void)0
579# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 642# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
580#endif 643#endif
644
645#define EVUNLOOP_RECURSE 0x80
581 646
582/*****************************************************************************/ 647/*****************************************************************************/
583 648
584#ifndef EV_HAVE_EV_TIME 649#ifndef EV_HAVE_EV_TIME
585ev_tstamp 650ev_tstamp
… …
642 707
643 tv.tv_sec = (time_t)delay; 708 tv.tv_sec = (time_t)delay;
644 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 709 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
645 710
646 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 711 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
647 /* somehting not guaranteed by newer posix versions, but guaranteed */ 712 /* something not guaranteed by newer posix versions, but guaranteed */
648 /* by older ones */ 713 /* by older ones */
649 select (0, 0, 0, 0, &tv); 714 select (0, 0, 0, 0, &tv);
650#endif 715#endif
651 } 716 }
652} 717}
… …
760} 825}
761 826
762/*****************************************************************************/ 827/*****************************************************************************/
763 828
764inline_speed void 829inline_speed void
765fd_event (EV_P_ int fd, int revents) 830fd_event_nc (EV_P_ int fd, int revents)
766{ 831{
767 ANFD *anfd = anfds + fd; 832 ANFD *anfd = anfds + fd;
768 ev_io *w; 833 ev_io *w;
769 834
770 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
774 if (ev) 839 if (ev)
775 ev_feed_event (EV_A_ (W)w, ev); 840 ev_feed_event (EV_A_ (W)w, ev);
776 } 841 }
777} 842}
778 843
844/* do not submit kernel events for fds that have reify set */
845/* because that means they changed while we were polling for new events */
846inline_speed void
847fd_event (EV_P_ int fd, int revents)
848{
849 ANFD *anfd = anfds + fd;
850
851 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents);
853}
854
779void 855void
780ev_feed_fd_event (EV_P_ int fd, int revents) 856ev_feed_fd_event (EV_P_ int fd, int revents)
781{ 857{
782 if (fd >= 0 && fd < anfdmax) 858 if (fd >= 0 && fd < anfdmax)
783 fd_event (EV_A_ fd, revents); 859 fd_event_nc (EV_A_ fd, revents);
784} 860}
785 861
786/* make sure the external fd watch events are in-sync */ 862/* make sure the external fd watch events are in-sync */
787/* with the kernel/libev internal state */ 863/* with the kernel/libev internal state */
788inline_size void 864inline_size void
… …
903 for (fd = 0; fd < anfdmax; ++fd) 979 for (fd = 0; fd < anfdmax; ++fd)
904 if (anfds [fd].events) 980 if (anfds [fd].events)
905 { 981 {
906 anfds [fd].events = 0; 982 anfds [fd].events = 0;
907 anfds [fd].emask = 0; 983 anfds [fd].emask = 0;
908 fd_change (EV_A_ fd, EV__IOFDSET | 1); 984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
909 } 985 }
910} 986}
911 987
912/*****************************************************************************/ 988/*****************************************************************************/
913 989
… …
1088evpipe_init (EV_P) 1164evpipe_init (EV_P)
1089{ 1165{
1090 if (!ev_is_active (&pipe_w)) 1166 if (!ev_is_active (&pipe_w))
1091 { 1167 {
1092#if EV_USE_EVENTFD 1168#if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL)
1093 if ((evfd = eventfd (0, 0)) >= 0) 1171 evfd = eventfd (0, 0);
1172
1173 if (evfd >= 0)
1094 { 1174 {
1095 evpipe [0] = -1; 1175 evpipe [0] = -1;
1096 fd_intern (evfd); 1176 fd_intern (evfd); /* doing it twice doesn't hurt */
1097 ev_io_set (&pipe_w, evfd, EV_READ); 1177 ev_io_set (&pipe_w, evfd, EV_READ);
1098 } 1178 }
1099 else 1179 else
1100#endif 1180#endif
1101 { 1181 {
… …
1213 signals [signum].gotsig = 0; 1293 signals [signum].gotsig = 0;
1214 1294
1215 for (w = signals [signum].head; w; w = w->next) 1295 for (w = signals [signum].head; w; w = w->next)
1216 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1217} 1297}
1298
1299#if EV_USE_SIGNALFD
1300static void
1301sigfdcb (EV_P_ ev_io *iow, int revents)
1302{
1303 struct signalfd_siginfo si[4], *sip;
1304
1305 for (;;)
1306 {
1307 ssize_t res = read (sigfd, si, sizeof (si));
1308
1309 /* not ISO-C, as res might be -1, but works with SuS */
1310 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1311 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1312
1313 if (res < (ssize_t)sizeof (si))
1314 break;
1315 }
1316}
1317#endif
1218 1318
1219/*****************************************************************************/ 1319/*****************************************************************************/
1220 1320
1221static WL childs [EV_PID_HASHSIZE]; 1321static WL childs [EV_PID_HASHSIZE];
1222 1322
… …
1409void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1509void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1410{ 1510{
1411 invoke_cb = invoke_pending_cb; 1511 invoke_cb = invoke_pending_cb;
1412} 1512}
1413 1513
1414void ev_set_blocking_cb (EV_P_ void (*suspend_cb_)(EV_P), void (*resume_cb_)(EV_P)) 1514void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1415{ 1515{
1416 suspend_cb = suspend_cb_; 1516 release_cb = release;
1417 resume_cb = resume_cb_; 1517 acquire_cb = acquire;
1418} 1518}
1419#endif 1519#endif
1420 1520
1421/* initialise a loop structure, must be zero-initialised */ 1521/* initialise a loop structure, must be zero-initialised */
1422static void noinline 1522static void noinline
… …
1458 backend_fd = -1; 1558 backend_fd = -1;
1459 gotasync = 0; 1559 gotasync = 0;
1460#if EV_USE_INOTIFY 1560#if EV_USE_INOTIFY
1461 fs_fd = -2; 1561 fs_fd = -2;
1462#endif 1562#endif
1563#if EV_USE_SIGNALFD
1564 sigfd = -2;
1565#endif
1463 1566
1464 /* pid check not overridable via env */ 1567 /* pid check not overridable via env */
1465#ifndef _WIN32 1568#ifndef _WIN32
1466 if (flags & EVFLAG_FORKCHECK) 1569 if (flags & EVFLAG_FORKCHECK)
1467 curpid = getpid (); 1570 curpid = getpid ();
… …
1504{ 1607{
1505 int i; 1608 int i;
1506 1609
1507 if (ev_is_active (&pipe_w)) 1610 if (ev_is_active (&pipe_w))
1508 { 1611 {
1509 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1510 ev_io_stop (EV_A_ &pipe_w); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1511 1614
1512#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1513 if (evfd >= 0) 1616 if (evfd >= 0)
1514 close (evfd); 1617 close (evfd);
1515#endif 1618#endif
… …
1519 close (evpipe [0]); 1622 close (evpipe [0]);
1520 close (evpipe [1]); 1623 close (evpipe [1]);
1521 } 1624 }
1522 } 1625 }
1523 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
1524#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1525 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1526 close (fs_fd); 1639 close (fs_fd);
1527#endif 1640#endif
1528 1641
… …
1551#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1552 array_free (idle, [i]); 1665 array_free (idle, [i]);
1553#endif 1666#endif
1554 } 1667 }
1555 1668
1556 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1557 1670
1558 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1559 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1560 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1561 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
… …
1631ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1632{ 1745{
1633 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1634 1747
1635 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (loop, 0, sizeof (struct ev_loop));
1636
1637 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1638 1750
1639 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1640 return loop; 1752 return loop;
1641 1753
… …
1822 1934
1823void 1935void
1824ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1825{ 1937{
1826 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1939}
1940
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;
1827} 1951}
1828 1952
1829void noinline 1953void noinline
1830ev_invoke_pending (EV_P) 1954ev_invoke_pending (EV_P)
1831{ 1955{
… …
2077{ 2201{
2078#if EV_MINIMAL < 2 2202#if EV_MINIMAL < 2
2079 ++loop_depth; 2203 ++loop_depth;
2080#endif 2204#endif
2081 2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207
2082 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
2083 2209
2084 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2085 2211
2086 do 2212 do
… …
2113 { 2239 {
2114 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2115 EV_INVOKE_PENDING; 2241 EV_INVOKE_PENDING;
2116 } 2242 }
2117 2243
2244 if (expect_false (loop_done))
2245 break;
2246
2118 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2119 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2120 loop_fork (EV_A); 2249 loop_fork (EV_A);
2121 2250
2122 /* update fd-related kernel structures */ 2251 /* update fd-related kernel structures */
… …
2172 } 2301 }
2173 2302
2174#if EV_MINIMAL < 2 2303#if EV_MINIMAL < 2
2175 ++loop_count; 2304 ++loop_count;
2176#endif 2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2177 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2178 2309
2179 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2180 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2181 } 2312 }
2182 2313
… …
2348 2479
2349 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2350 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2351 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2352 2483
2353 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2354 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2355 2486
2356 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2357} 2488}
2358 2489
… …
2452 } 2583 }
2453 2584
2454 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2455} 2586}
2456 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
2457#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2458void noinline 2595void noinline
2459ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2460{ 2597{
2461 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2536 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2537 return; 2674 return;
2538 2675
2539 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2540 2677
2678 EV_FREQUENT_CHECK;
2679
2680#if EV_USE_SIGNALFD
2681 if (sigfd == -2)
2682 {
2683 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2684 if (sigfd < 0 && errno == EINVAL)
2685 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2686
2687 if (sigfd >= 0)
2688 {
2689 fd_intern (sigfd); /* doing it twice will not hurt */
2690
2691 sigemptyset (&sigfd_set);
2692
2693 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2694 ev_set_priority (&sigfd_w, EV_MAXPRI);
2695 ev_io_start (EV_A_ &sigfd_w);
2696 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2697 }
2698 }
2699
2700 if (sigfd >= 0)
2701 {
2702 /* TODO: check .head */
2703 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705
2706 signalfd (sigfd, &sigfd_set, 0);
2707 }
2708 else
2709#endif
2541 evpipe_init (EV_A); 2710 evpipe_init (EV_A);
2542
2543 EV_FREQUENT_CHECK;
2544 2711
2545 { 2712 {
2546#ifndef _WIN32 2713#ifndef _WIN32
2547 sigset_t full, prev; 2714 sigset_t full, prev;
2548 sigfillset (&full); 2715 sigfillset (&full);
… …
2550#endif 2717#endif
2551 2718
2552 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2553 2720
2554#ifndef _WIN32 2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif
2725 sigdelset (&prev, w->signum);
2555 sigprocmask (SIG_SETMASK, &prev, 0); 2726 sigprocmask (SIG_SETMASK, &prev, 0);
2556#endif 2727#endif
2557 } 2728 }
2558 2729
2559 ev_start (EV_A_ (W)w, 1); 2730 ev_start (EV_A_ (W)w, 1);
… …
2562 if (!((WL)w)->next) 2733 if (!((WL)w)->next)
2563 { 2734 {
2564#if _WIN32 2735#if _WIN32
2565 signal (w->signum, ev_sighandler); 2736 signal (w->signum, ev_sighandler);
2566#else 2737#else
2738# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/
2740# endif
2741 {
2567 struct sigaction sa; 2742 struct sigaction sa = { };
2568 sa.sa_handler = ev_sighandler; 2743 sa.sa_handler = ev_sighandler;
2569 sigfillset (&sa.sa_mask); 2744 sigfillset (&sa.sa_mask);
2570 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2571 sigaction (w->signum, &sa, 0); 2746 sigaction (w->signum, &sa, 0);
2747 }
2572#endif 2748#endif
2573 } 2749 }
2574 2750
2575 EV_FREQUENT_CHECK; 2751 EV_FREQUENT_CHECK;
2576} 2752}
… …
2586 2762
2587 wlist_del (&signals [w->signum - 1].head, (WL)w); 2763 wlist_del (&signals [w->signum - 1].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2764 ev_stop (EV_A_ (W)w);
2589 2765
2590 if (!signals [w->signum - 1].head) 2766 if (!signals [w->signum - 1].head)
2767#if EV_USE_SIGNALFD
2768 if (sigfd >= 0)
2769 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2771 sigdelset (&sigfd_set, w->signum);
2772 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2774 /*TODO: maybe unblock signal? */
2775 }
2776 else
2777#endif
2591 signal (w->signum, SIG_DFL); 2778 signal (w->signum, SIG_DFL);
2592 2779
2593 EV_FREQUENT_CHECK; 2780 EV_FREQUENT_CHECK;
2594} 2781}
2595 2782
2596void 2783void

Diff Legend

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