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

Comparing libev/ev.c (file contents):
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC vs.
Revision 1.309 by root, Sun Jul 26 04:24:17 2009 UTC

… …
210#elif defined (_sys_nsig) 210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 212#else
213# error "unable to find value for NSIG, please report" 213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 64 215# define EV_NSIG 65
216#endif 216#endif
217 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 */
225#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
228# else 221# else
229# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
964 957
965 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 959 if (anfds [fd].events)
967 { 960 {
968 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
969 return; 962 break;
970 } 963 }
971} 964}
972 965
973/* 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 */
974static void noinline 967static void noinline
… …
1064 1057
1065 for (;;) 1058 for (;;)
1066 { 1059 {
1067 int c = k << 1; 1060 int c = k << 1;
1068 1061
1069 if (c > N + HEAP0 - 1) 1062 if (c >= N + HEAP0)
1070 break; 1063 break;
1071 1064
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1065 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1066 ? 1 : 0;
1074 1067
… …
1133/*****************************************************************************/ 1126/*****************************************************************************/
1134 1127
1135/* associate signal watchers to a signal signal */ 1128/* associate signal watchers to a signal signal */
1136typedef struct 1129typedef struct
1137{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1138 WL head; 1135 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1136} ANSIG;
1141 1137
1142static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1139
1147/*****************************************************************************/ 1140/*****************************************************************************/
1148 1141
1149/* used to prepare libev internal fd's */ 1142/* used to prepare libev internal fd's */
1150/* this is not fork-safe */ 1143/* this is not fork-safe */
… …
1218/* called whenever the libev signal pipe */ 1211/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1212/* got some events (signal, async) */
1220static void 1213static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1215{
1216 int i;
1217
1223#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1219 if (evfd >= 0)
1225 { 1220 {
1226 uint64_t counter; 1221 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
… …
1231 { 1226 {
1232 char dummy; 1227 char dummy;
1233 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
1234 } 1229 }
1235 1230
1236 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
1237 { 1232 {
1238 int signum; 1233 sig_pending = 0;
1239 gotsig = 0;
1240 1234
1241 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1238 }
1245 1239
1246#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
1247 if (gotasync) 1241 if (async_pending)
1248 { 1242 {
1249 int i; 1243 async_pending = 0;
1250 gotasync = 0;
1251 1244
1252 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
1254 { 1247 {
1255 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
… …
1263 1256
1264static void 1257static void
1265ev_sighandler (int signum) 1258ev_sighandler (int signum)
1266{ 1259{
1267#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
1269#endif 1262#endif
1270 1263
1271#if _WIN32 1264#if _WIN32
1272 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
1273#endif 1266#endif
1274 1267
1275 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
1277} 1270}
1278 1271
1279void noinline 1272void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
1281{ 1274{
1282 WL w; 1275 WL w;
1283 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
1284#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1285 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 */
1286#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1285
1288 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1287 return;
1288#endif
1292 1289
1293 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
1294 1291
1295 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1294}
1298 1295
1299#if EV_USE_SIGNALFD 1296#if EV_USE_SIGNALFD
1300static void 1297static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1298sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1299{
1303 struct signalfd_siginfo si[4], *sip; 1300 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1301
1305 for (;;) 1302 for (;;)
1306 { 1303 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1304 ssize_t res = read (sigfd, si, sizeof (si));
1308 1305
… …
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1540 have_monotonic = 1;
1544 } 1541 }
1545#endif 1542#endif
1546 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
1547 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1556 mn_now = get_clock ();
1549 now_floor = mn_now; 1557 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1558 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1559#if EV_MINIMAL < 2
… …
1554 1562
1555 io_blocktime = 0.; 1563 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1557 backend = 0; 1565 backend = 0;
1558 backend_fd = -1; 1566 backend_fd = -1;
1559 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1560#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1561 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1573#endif
1563#if EV_USE_SIGNALFD 1574#if EV_USE_SIGNALFD
1564 sigfd = -2; 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1565#endif 1576#endif
1566
1567 /* pid check not overridable via env */
1568#ifndef _WIN32
1569 if (flags & EVFLAG_FORKCHECK)
1570 curpid = getpid ();
1571#endif
1572
1573 if (!(flags & EVFLAG_NOENV)
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577 1577
1578 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1580 1580
1581#if EV_USE_PORT 1581#if EV_USE_PORT
… …
1709 1709
1710 if (ev_is_active (&pipe_w)) 1710 if (ev_is_active (&pipe_w))
1711 { 1711 {
1712 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1714 gotsig = 1; 1714 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1716 async_pending = 1;
1717#endif 1717#endif
1718 1718
1719 ev_ref (EV_A); 1719 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1720 ev_io_stop (EV_A_ &pipe_w);
1721 1721
… …
1741#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1742 1742
1743struct ev_loop * 1743struct ev_loop *
1744ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1745{ 1745{
1746 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));
1747 1747
1748 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1750 1750
1751 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1752 return loop; 1752 return EV_A;
1753 1753
1754 return 0; 1754 return 0;
1755} 1755}
1756 1756
1757void 1757void
… …
1861 assert (checkmax >= checkcnt); 1861 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1862 array_verify (EV_A_ (W *)checks, checkcnt);
1863 1863
1864# if 0 1864# if 0
1865 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)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1867# endif 1867# endif
1868#endif 1868#endif
1869} 1869}
1870#endif 1870#endif
1871 1871
… …
1878#endif 1878#endif
1879{ 1879{
1880 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1881 { 1881 {
1882#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1884#else
1885 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1886#endif 1886#endif
1887 1887
1888 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
… …
1905 1905
1906void 1906void
1907ev_default_destroy (void) 1907ev_default_destroy (void)
1908{ 1908{
1909#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1911#endif 1911#endif
1912 1912
1913 ev_default_loop_ptr = 0; 1913 ev_default_loop_ptr = 0;
1914 1914
1915#ifndef _WIN32 1915#ifndef _WIN32
… …
1922 1922
1923void 1923void
1924ev_default_fork (void) 1924ev_default_fork (void)
1925{ 1925{
1926#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1928#endif 1928#endif
1929 1929
1930 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1931} 1931}
1932 1932
… …
2398inline_size void 2398inline_size void
2399wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2400{ 2400{
2401 while (*head) 2401 while (*head)
2402 { 2402 {
2403 if (*head == elem) 2403 if (expect_true (*head == elem))
2404 { 2404 {
2405 *head = elem->next; 2405 *head = elem->next;
2406 return; 2406 break;
2407 } 2407 }
2408 2408
2409 head = &(*head)->next; 2409 head = &(*head)->next;
2410 } 2410 }
2411} 2411}
… …
2665#endif 2665#endif
2666 2666
2667void noinline 2667void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2669{ 2669{
2670#if EV_MULTIPLICITY
2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2672#endif
2673 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2674 return; 2671 return;
2675 2672
2676 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));
2674
2675#if EV_MULTIPLICITY
2676 assert (("libev: a signal must not be attached to two different loops",
2677 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2678
2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2677 2681
2678 EV_FREQUENT_CHECK; 2682 EV_FREQUENT_CHECK;
2679 2683
2680#if EV_USE_SIGNALFD 2684#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2685 if (sigfd == -2)
… …
2703 sigaddset (&sigfd_set, w->signum); 2707 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2708 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2709
2706 signalfd (sigfd, &sigfd_set, 0); 2710 signalfd (sigfd, &sigfd_set, 0);
2707 } 2711 }
2708 else
2709#endif
2710 evpipe_init (EV_A);
2711
2712 {
2713#ifndef _WIN32
2714 sigset_t full, prev;
2715 sigfillset (&full);
2716 sigprocmask (SIG_SETMASK, &full, &prev);
2717#endif
2718
2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2720
2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif 2712#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2713
2730 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2716
2733 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2718# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2719 if (sigfd < 0) /*TODO*/
2740# endif 2720# endif
2741 { 2721 {
2722# if _WIN32
2723 signal (w->signum, ev_sighandler);
2724# else
2742 struct sigaction sa = { }; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2743 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2745 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 */
2746 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);
2737#endif
2747 } 2738 }
2748#endif
2749 }
2750 2739
2751 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2752} 2741}
2753 2742
2754void noinline 2743void noinline
… …
2762 2751
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2765 2754
2766 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
2767#if EV_USE_SIGNALFD 2760#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2761 if (sigfd >= 0)
2769 { 2762 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2771 sigdelset (&sigfd_set, w->signum); 2764 sigdelset (&sigfd_set, w->signum);
2772 signalfd (sigfd, &sigfd_set, 0); 2765 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2774 /*TODO: maybe unblock signal? */ 2767 /*TODO: maybe unblock signal? */
2775 } 2768 }
2776 else 2769 else
2777#endif 2770#endif
2778 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2779 2773
2780 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2781} 2775}
2782 2776
2783void 2777void
… …
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3258{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3260
3267 { 3261 {
3268 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
3269 3263
3270 while (fdchangecnt) 3264 while (fdchangecnt)
3271 { 3265 {
3272 fd_reify (EV_A); 3266 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3281 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));
3282 3276
3283 ev_embed_stop (EV_A_ w); 3277 ev_embed_stop (EV_A_ w);
3284 3278
3285 { 3279 {
3286 struct ev_loop *loop = w->other; 3280 EV_P = w->other;
3287 3281
3288 ev_loop_fork (EV_A); 3282 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3284 }
3291 3285
… …
3305{ 3299{
3306 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
3307 return; 3301 return;
3308 3302
3309 { 3303 {
3310 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
3311 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 ()));
3312 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);
3313 } 3307 }
3314 3308
3315 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
… …
3427 3421
3428void 3422void
3429ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
3430{ 3424{
3431 w->sent = 1; 3425 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
3433} 3427}
3434#endif 3428#endif
3435 3429
3436/*****************************************************************************/ 3430/*****************************************************************************/
3437 3431
… …
3586 if (types & EV_CHECK) 3580 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3581 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3582 cb (EV_A_ EV_CHECK, checks [i]);
3589 3583
3590 if (types & EV_SIGNAL) 3584 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3585 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3586 for (wl = signals [i].head; wl; )
3593 { 3587 {
3594 wn = wl->next; 3588 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3589 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3590 wl = wn;

Diff Legend

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