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

Comparing libev/ev.c (file contents):
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC vs.
Revision 1.309 by root, Sun Jul 26 04:24:17 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
… …
391# define inline_speed static noinline 444# define inline_speed static noinline
392#else 445#else
393# define inline_speed static inline 446# define inline_speed static inline
394#endif 447#endif
395 448
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 449#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
450
451#if EV_MINPRI == EV_MAXPRI
452# define ABSPRI(w) (((W)w), 0)
453#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 454# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
455#endif
398 456
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 457#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 458#define EMPTY2(a,b) /* used to suppress some warnings */
401 459
402typedef ev_watcher *W; 460typedef ev_watcher *W;
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 543#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 544#define ev_free(ptr) ev_realloc ((ptr), 0)
487 545
488/*****************************************************************************/ 546/*****************************************************************************/
489 547
548/* set in reify when reification needed */
549#define EV_ANFD_REIFY 1
550
490/* file descriptor info structure */ 551/* file descriptor info structure */
491typedef struct 552typedef struct
492{ 553{
493 WL head; 554 WL head;
494 unsigned char events; /* the events watched for */ 555 unsigned char events; /* the events watched for */
495 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) */
496 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 */
497 unsigned char unused; 558 unsigned char unused;
498#if EV_USE_EPOLL 559#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 560 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 561#endif
… …
562 623
563 static int ev_default_loop_ptr; 624 static int ev_default_loop_ptr;
564 625
565#endif 626#endif
566 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
567/*****************************************************************************/ 640/*****************************************************************************/
568 641
569#ifndef EV_HAVE_EV_TIME 642#ifndef EV_HAVE_EV_TIME
570ev_tstamp 643ev_tstamp
571ev_time (void) 644ev_time (void)
… …
627 700
628 tv.tv_sec = (time_t)delay; 701 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 703
631 /* 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 */
632 /* somehting not guaranteed by newer posix versions, but guaranteed */ 705 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 706 /* by older ones */
634 select (0, 0, 0, 0, &tv); 707 select (0, 0, 0, 0, &tv);
635#endif 708#endif
636 } 709 }
637} 710}
… …
745} 818}
746 819
747/*****************************************************************************/ 820/*****************************************************************************/
748 821
749inline_speed void 822inline_speed void
750fd_event (EV_P_ int fd, int revents) 823fd_event_nc (EV_P_ int fd, int revents)
751{ 824{
752 ANFD *anfd = anfds + fd; 825 ANFD *anfd = anfds + fd;
753 ev_io *w; 826 ev_io *w;
754 827
755 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)
… …
759 if (ev) 832 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 833 ev_feed_event (EV_A_ (W)w, ev);
761 } 834 }
762} 835}
763 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
764void 848void
765ev_feed_fd_event (EV_P_ int fd, int revents) 849ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 850{
767 if (fd >= 0 && fd < anfdmax) 851 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 852 fd_event_nc (EV_A_ fd, revents);
769} 853}
770 854
771/* make sure the external fd watch events are in-sync */ 855/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 856/* with the kernel/libev internal state */
773inline_size void 857inline_size void
… …
873 957
874 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 959 if (anfds [fd].events)
876 { 960 {
877 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
878 return; 962 break;
879 } 963 }
880} 964}
881 965
882/* 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 */
883static void noinline 967static void noinline
… …
888 for (fd = 0; fd < anfdmax; ++fd) 972 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 973 if (anfds [fd].events)
890 { 974 {
891 anfds [fd].events = 0; 975 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 976 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 978 }
895} 979}
896 980
897/*****************************************************************************/ 981/*****************************************************************************/
898 982
… …
973 1057
974 for (;;) 1058 for (;;)
975 { 1059 {
976 int c = k << 1; 1060 int c = k << 1;
977 1061
978 if (c > N + HEAP0 - 1) 1062 if (c >= N + HEAP0)
979 break; 1063 break;
980 1064
981 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])
982 ? 1 : 0; 1066 ? 1 : 0;
983 1067
… …
1042/*****************************************************************************/ 1126/*****************************************************************************/
1043 1127
1044/* associate signal watchers to a signal signal */ 1128/* associate signal watchers to a signal signal */
1045typedef struct 1129typedef struct
1046{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1047 WL head; 1135 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1136} ANSIG;
1050 1137
1051static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1139
1056/*****************************************************************************/ 1140/*****************************************************************************/
1057 1141
1058/* used to prepare libev internal fd's */ 1142/* used to prepare libev internal fd's */
1059/* this is not fork-safe */ 1143/* this is not fork-safe */
… …
1073evpipe_init (EV_P) 1157evpipe_init (EV_P)
1074{ 1158{
1075 if (!ev_is_active (&pipe_w)) 1159 if (!ev_is_active (&pipe_w))
1076 { 1160 {
1077#if EV_USE_EVENTFD 1161#if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1164 evfd = eventfd (0, 0);
1165
1166 if (evfd >= 0)
1079 { 1167 {
1080 evpipe [0] = -1; 1168 evpipe [0] = -1;
1081 fd_intern (evfd); 1169 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1170 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1171 }
1084 else 1172 else
1085#endif 1173#endif
1086 { 1174 {
… …
1123/* called whenever the libev signal pipe */ 1211/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1212/* got some events (signal, async) */
1125static void 1213static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1215{
1216 int i;
1217
1128#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1219 if (evfd >= 0)
1130 { 1220 {
1131 uint64_t counter; 1221 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
… …
1136 { 1226 {
1137 char dummy; 1227 char dummy;
1138 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
1139 } 1229 }
1140 1230
1141 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
1142 { 1232 {
1143 int signum; 1233 sig_pending = 0;
1144 gotsig = 0;
1145 1234
1146 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1238 }
1150 1239
1151#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
1152 if (gotasync) 1241 if (async_pending)
1153 { 1242 {
1154 int i; 1243 async_pending = 0;
1155 gotasync = 0;
1156 1244
1157 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
1159 { 1247 {
1160 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
… …
1168 1256
1169static void 1257static void
1170ev_sighandler (int signum) 1258ev_sighandler (int signum)
1171{ 1259{
1172#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
1174#endif 1262#endif
1175 1263
1176#if _WIN32 1264#if _WIN32
1177 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
1178#endif 1266#endif
1179 1267
1180 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
1182} 1270}
1183 1271
1184void noinline 1272void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
1186{ 1274{
1187 WL w; 1275 WL w;
1188 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
1189#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1190 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 */
1191#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1285
1193 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1287 return;
1288#endif
1197 1289
1198 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
1199 1291
1200 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 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
1203 1315
1204/*****************************************************************************/ 1316/*****************************************************************************/
1205 1317
1206static WL childs [EV_PID_HASHSIZE]; 1318static WL childs [EV_PID_HASHSIZE];
1207 1319
… …
1352ev_backend (EV_P) 1464ev_backend (EV_P)
1353{ 1465{
1354 return backend; 1466 return backend;
1355} 1467}
1356 1468
1469#if EV_MINIMAL < 2
1357unsigned int 1470unsigned int
1358ev_loop_count (EV_P) 1471ev_loop_count (EV_P)
1359{ 1472{
1360 return loop_count; 1473 return loop_count;
1361} 1474}
… …
1375void 1488void
1376ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1489ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1377{ 1490{
1378 timeout_blocktime = interval; 1491 timeout_blocktime = interval;
1379} 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
1380 1517
1381/* initialise a loop structure, must be zero-initialised */ 1518/* initialise a loop structure, must be zero-initialised */
1382static void noinline 1519static void noinline
1383loop_init (EV_P_ unsigned int flags) 1520loop_init (EV_P_ unsigned int flags)
1384{ 1521{
… …
1402 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1403 have_monotonic = 1; 1540 have_monotonic = 1;
1404 } 1541 }
1405#endif 1542#endif
1406 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
1407 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1408 mn_now = get_clock (); 1556 mn_now = get_clock ();
1409 now_floor = mn_now; 1557 now_floor = mn_now;
1410 rtmn_diff = ev_rt_now - mn_now; 1558 rtmn_diff = ev_rt_now - mn_now;
1559#if EV_MINIMAL < 2
1560 invoke_cb = ev_invoke_pending;
1561#endif
1411 1562
1412 io_blocktime = 0.; 1563 io_blocktime = 0.;
1413 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1414 backend = 0; 1565 backend = 0;
1415 backend_fd = -1; 1566 backend_fd = -1;
1416 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1417#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1418 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1419#endif 1573#endif
1420 1574#if EV_USE_SIGNALFD
1421 /* pid check not overridable via env */ 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1422#ifndef _WIN32
1423 if (flags & EVFLAG_FORKCHECK)
1424 curpid = getpid ();
1425#endif 1576#endif
1426
1427 if (!(flags & EVFLAG_NOENV)
1428 && !enable_secure ()
1429 && getenv ("LIBEV_FLAGS"))
1430 flags = atoi (getenv ("LIBEV_FLAGS"));
1431 1577
1432 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1433 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1434 1580
1435#if EV_USE_PORT 1581#if EV_USE_PORT
… …
1461{ 1607{
1462 int i; 1608 int i;
1463 1609
1464 if (ev_is_active (&pipe_w)) 1610 if (ev_is_active (&pipe_w))
1465 { 1611 {
1466 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1467 ev_io_stop (EV_A_ &pipe_w); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1468 1614
1469#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1470 if (evfd >= 0) 1616 if (evfd >= 0)
1471 close (evfd); 1617 close (evfd);
1472#endif 1618#endif
… …
1476 close (evpipe [0]); 1622 close (evpipe [0]);
1477 close (evpipe [1]); 1623 close (evpipe [1]);
1478 } 1624 }
1479 } 1625 }
1480 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
1481#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1482 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1483 close (fs_fd); 1639 close (fs_fd);
1484#endif 1640#endif
1485 1641
… …
1508#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1509 array_free (idle, [i]); 1665 array_free (idle, [i]);
1510#endif 1666#endif
1511 } 1667 }
1512 1668
1513 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1514 1670
1515 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1516 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1517 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1518 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
… …
1553 1709
1554 if (ev_is_active (&pipe_w)) 1710 if (ev_is_active (&pipe_w))
1555 { 1711 {
1556 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1557 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1558 gotsig = 1; 1714 sig_pending = 1;
1559#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1560 gotasync = 1; 1716 async_pending = 1;
1561#endif 1717#endif
1562 1718
1563 ev_ref (EV_A); 1719 ev_ref (EV_A);
1564 ev_io_stop (EV_A_ &pipe_w); 1720 ev_io_stop (EV_A_ &pipe_w);
1565 1721
… …
1585#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1586 1742
1587struct ev_loop * 1743struct ev_loop *
1588ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1589{ 1745{
1590 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));
1591 1747
1592 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1593
1594 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1595 1750
1596 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1597 return loop; 1752 return EV_A;
1598 1753
1599 return 0; 1754 return 0;
1600} 1755}
1601 1756
1602void 1757void
… …
1609void 1764void
1610ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1611{ 1766{
1612 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1613} 1768}
1769#endif /* multiplicity */
1614 1770
1615#if EV_VERIFY 1771#if EV_VERIFY
1616static void noinline 1772static void noinline
1617verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1618{ 1774{
… …
1646 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1647 } 1803 }
1648} 1804}
1649#endif 1805#endif
1650 1806
1807#if EV_MINIMAL < 2
1651void 1808void
1652ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1653{ 1810{
1654#if EV_VERIFY 1811#if EV_VERIFY
1655 int i; 1812 int i;
… …
1704 assert (checkmax >= checkcnt); 1861 assert (checkmax >= checkcnt);
1705 array_verify (EV_A_ (W *)checks, checkcnt); 1862 array_verify (EV_A_ (W *)checks, checkcnt);
1706 1863
1707# if 0 1864# if 0
1708 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)
1709 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1710# endif 1867# endif
1711#endif 1868#endif
1712} 1869}
1713 1870#endif
1714#endif /* multiplicity */
1715 1871
1716#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1717struct ev_loop * 1873struct ev_loop *
1718ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1719#else 1875#else
… …
1722#endif 1878#endif
1723{ 1879{
1724 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1725 { 1881 {
1726#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1728#else 1884#else
1729 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1730#endif 1886#endif
1731 1887
1732 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
… …
1749 1905
1750void 1906void
1751ev_default_destroy (void) 1907ev_default_destroy (void)
1752{ 1908{
1753#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1754 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1755#endif 1911#endif
1756 1912
1757 ev_default_loop_ptr = 0; 1913 ev_default_loop_ptr = 0;
1758 1914
1759#ifndef _WIN32 1915#ifndef _WIN32
… …
1766 1922
1767void 1923void
1768ev_default_fork (void) 1924ev_default_fork (void)
1769{ 1925{
1770#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1772#endif 1928#endif
1773 1929
1774 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1775} 1931}
1776 1932
… …
1780ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1781{ 1937{
1782 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1783} 1939}
1784 1940
1785inline_speed void 1941unsigned int
1786call_pending (EV_P) 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
1954ev_invoke_pending (EV_P)
1787{ 1955{
1788 int pri; 1956 int pri;
1789 1957
1790 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1791 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
… …
2029} 2197}
2030 2198
2031void 2199void
2032ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
2033{ 2201{
2202#if EV_MINIMAL < 2
2034 ++loop_depth; 2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2035 2207
2036 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
2037 2209
2038 call_pending (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 */
2039 2211
2040 do 2212 do
2041 { 2213 {
2042#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
2043 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
… …
2056 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
2057 if (expect_false (postfork)) 2229 if (expect_false (postfork))
2058 if (forkcnt) 2230 if (forkcnt)
2059 { 2231 {
2060 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2061 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
2062 } 2234 }
2063#endif 2235#endif
2064 2236
2065 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
2066 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
2067 { 2239 {
2068 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2069 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
2070 } 2242 }
2243
2244 if (expect_false (loop_done))
2245 break;
2071 2246
2072 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2073 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2074 loop_fork (EV_A); 2249 loop_fork (EV_A);
2075 2250
… …
2123 waittime -= sleeptime; 2298 waittime -= sleeptime;
2124 } 2299 }
2125 } 2300 }
2126 } 2301 }
2127 2302
2303#if EV_MINIMAL < 2
2128 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2129 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2130 2309
2131 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2132 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2133 } 2312 }
2134 2313
… …
2145 2324
2146 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2147 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2148 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2149 2328
2150 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2151 } 2330 }
2152 while (expect_true ( 2331 while (expect_true (
2153 activecnt 2332 activecnt
2154 && !loop_done 2333 && !loop_done
2155 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2156 )); 2335 ));
2157 2336
2158 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2159 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2160 2339
2340#if EV_MINIMAL < 2
2161 --loop_depth; 2341 --loop_depth;
2342#endif
2162} 2343}
2163 2344
2164void 2345void
2165ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2166{ 2347{
… …
2217inline_size void 2398inline_size void
2218wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2219{ 2400{
2220 while (*head) 2401 while (*head)
2221 { 2402 {
2222 if (*head == elem) 2403 if (expect_true (*head == elem))
2223 { 2404 {
2224 *head = elem->next; 2405 *head = elem->next;
2225 return; 2406 break;
2226 } 2407 }
2227 2408
2228 head = &(*head)->next; 2409 head = &(*head)->next;
2229 } 2410 }
2230} 2411}
… …
2258} 2439}
2259 2440
2260inline_size void 2441inline_size void
2261pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2262{ 2443{
2263 int pri = w->priority; 2444 int pri = ev_priority (w);
2264 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2265 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2266 w->priority = pri; 2447 ev_set_priority (w, pri);
2267} 2448}
2268 2449
2269inline_speed void 2450inline_speed void
2270ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2271{ 2452{
… …
2298 2479
2299 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2300 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2301 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2302 2483
2303 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2304 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2305 2486
2306 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2307} 2488}
2308 2489
… …
2402 } 2583 }
2403 2584
2404 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2405} 2586}
2406 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
2407#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2408void noinline 2595void noinline
2409ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2410{ 2597{
2411 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2478#endif 2665#endif
2479 2666
2480void noinline 2667void noinline
2481ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2482{ 2669{
2483#if EV_MULTIPLICITY
2484 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2485#endif
2486 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2487 return; 2671 return;
2488 2672
2489 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));
2490 2674
2491 evpipe_init (EV_A); 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));
2492 2678
2493 EV_FREQUENT_CHECK; 2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2494 2681
2682 EV_FREQUENT_CHECK;
2683
2684#if EV_USE_SIGNALFD
2685 if (sigfd == -2)
2495 { 2686 {
2496#ifndef _WIN32 2687 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2497 sigset_t full, prev; 2688 if (sigfd < 0 && errno == EINVAL)
2498 sigfillset (&full); 2689 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2499 sigprocmask (SIG_SETMASK, &full, &prev);
2500#endif
2501 2690
2502 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 */
2503 2694
2504#ifndef _WIN32 2695 sigemptyset (&sigfd_set);
2505 sigprocmask (SIG_SETMASK, &prev, 0); 2696
2506#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 }
2507 } 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
2508 2713
2509 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2510 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2511 2716
2512 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/
2720# endif
2513 { 2721 {
2514#if _WIN32 2722# if _WIN32
2515 signal (w->signum, ev_sighandler); 2723 signal (w->signum, ev_sighandler);
2516#else 2724# else
2517 struct sigaction sa; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2518 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2519 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2520 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 */
2521 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);
2522#endif 2737#endif
2523 } 2738 }
2524 2739
2525 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2526} 2741}
2527 2742
2528void noinline 2743void noinline
… …
2536 2751
2537 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2538 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2539 2754
2540 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
2541 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2542 2773
2543 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2544} 2775}
2545 2776
2546void 2777void
… …
3026embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3027{ 3258{
3028 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3029 3260
3030 { 3261 {
3031 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
3032 3263
3033 while (fdchangecnt) 3264 while (fdchangecnt)
3034 { 3265 {
3035 fd_reify (EV_A); 3266 fd_reify (EV_A);
3036 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3044 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));
3045 3276
3046 ev_embed_stop (EV_A_ w); 3277 ev_embed_stop (EV_A_ w);
3047 3278
3048 { 3279 {
3049 struct ev_loop *loop = w->other; 3280 EV_P = w->other;
3050 3281
3051 ev_loop_fork (EV_A); 3282 ev_loop_fork (EV_A);
3052 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3053 } 3284 }
3054 3285
… …
3068{ 3299{
3069 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
3070 return; 3301 return;
3071 3302
3072 { 3303 {
3073 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
3074 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 ()));
3075 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);
3076 } 3307 }
3077 3308
3078 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
… …
3190 3421
3191void 3422void
3192ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
3193{ 3424{
3194 w->sent = 1; 3425 w->sent = 1;
3195 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
3196} 3427}
3197#endif 3428#endif
3198 3429
3199/*****************************************************************************/ 3430/*****************************************************************************/
3200 3431
… …
3349 if (types & EV_CHECK) 3580 if (types & EV_CHECK)
3350 for (i = checkcnt; i--; ) 3581 for (i = checkcnt; i--; )
3351 cb (EV_A_ EV_CHECK, checks [i]); 3582 cb (EV_A_ EV_CHECK, checks [i]);
3352 3583
3353 if (types & EV_SIGNAL) 3584 if (types & EV_SIGNAL)
3354 for (i = 0; i < signalmax; ++i) 3585 for (i = 0; i < EV_NSIG - 1; ++i)
3355 for (wl = signals [i].head; wl; ) 3586 for (wl = signals [i].head; wl; )
3356 { 3587 {
3357 wn = wl->next; 3588 wn = wl->next;
3358 cb (EV_A_ EV_SIGNAL, wl); 3589 cb (EV_A_ EV_SIGNAL, wl);
3359 wl = wn; 3590 wl = wn;

Diff Legend

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