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.311 by root, Wed Jul 29 09:36:05 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# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
344# ifdef __cplusplus 397# ifdef __cplusplus
345extern "C" { 398extern "C" {
346# endif 399# endif
347int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 401# ifdef __cplusplus
349} 402}
350# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
351#endif 408#endif
352 409
353/**/ 410/**/
354 411
355#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 547#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 548#define ev_free(ptr) ev_realloc ((ptr), 0)
492 549
493/*****************************************************************************/ 550/*****************************************************************************/
494 551
552/* set in reify when reification needed */
553#define EV_ANFD_REIFY 1
554
495/* file descriptor info structure */ 555/* file descriptor info structure */
496typedef struct 556typedef struct
497{ 557{
498 WL head; 558 WL head;
499 unsigned char events; /* the events watched for */ 559 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 560 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 */ 561 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 562 unsigned char unused;
503#if EV_USE_EPOLL 563#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 564 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 565#endif
… …
567 627
568 static int ev_default_loop_ptr; 628 static int ev_default_loop_ptr;
569 629
570#endif 630#endif
571 631
632#if EV_MINIMAL < 2
633# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
634# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
635# define EV_INVOKE_PENDING invoke_cb (EV_A)
636#else
637# define EV_RELEASE_CB (void)0
638# define EV_ACQUIRE_CB (void)0
639# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
640#endif
641
642#define EVUNLOOP_RECURSE 0x80
643
572/*****************************************************************************/ 644/*****************************************************************************/
573 645
574#ifndef EV_HAVE_EV_TIME 646#ifndef EV_HAVE_EV_TIME
575ev_tstamp 647ev_tstamp
576ev_time (void) 648ev_time (void)
… …
632 704
633 tv.tv_sec = (time_t)delay; 705 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 706 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 707
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 708 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 709 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 710 /* by older ones */
639 select (0, 0, 0, 0, &tv); 711 select (0, 0, 0, 0, &tv);
640#endif 712#endif
641 } 713 }
642} 714}
… …
750} 822}
751 823
752/*****************************************************************************/ 824/*****************************************************************************/
753 825
754inline_speed void 826inline_speed void
755fd_event (EV_P_ int fd, int revents) 827fd_event_nc (EV_P_ int fd, int revents)
756{ 828{
757 ANFD *anfd = anfds + fd; 829 ANFD *anfd = anfds + fd;
758 ev_io *w; 830 ev_io *w;
759 831
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 832 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
764 if (ev) 836 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 837 ev_feed_event (EV_A_ (W)w, ev);
766 } 838 }
767} 839}
768 840
841/* do not submit kernel events for fds that have reify set */
842/* because that means they changed while we were polling for new events */
843inline_speed void
844fd_event (EV_P_ int fd, int revents)
845{
846 ANFD *anfd = anfds + fd;
847
848 if (expect_true (!anfd->reify))
849 fd_event_nc (EV_A_ fd, revents);
850}
851
769void 852void
770ev_feed_fd_event (EV_P_ int fd, int revents) 853ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 854{
772 if (fd >= 0 && fd < anfdmax) 855 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 856 fd_event_nc (EV_A_ fd, revents);
774} 857}
775 858
776/* make sure the external fd watch events are in-sync */ 859/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 860/* with the kernel/libev internal state */
778inline_size void 861inline_size void
… …
878 961
879 for (fd = anfdmax; fd--; ) 962 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 963 if (anfds [fd].events)
881 { 964 {
882 fd_kill (EV_A_ fd); 965 fd_kill (EV_A_ fd);
883 return; 966 break;
884 } 967 }
885} 968}
886 969
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 970/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 971static void noinline
… …
893 for (fd = 0; fd < anfdmax; ++fd) 976 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 977 if (anfds [fd].events)
895 { 978 {
896 anfds [fd].events = 0; 979 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 980 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 982 }
900} 983}
901 984
902/*****************************************************************************/ 985/*****************************************************************************/
903 986
… …
978 1061
979 for (;;) 1062 for (;;)
980 { 1063 {
981 int c = k << 1; 1064 int c = k << 1;
982 1065
983 if (c > N + HEAP0 - 1) 1066 if (c >= N + HEAP0)
984 break; 1067 break;
985 1068
986 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1069 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
987 ? 1 : 0; 1070 ? 1 : 0;
988 1071
… …
1024 1107
1025/* move an element suitably so it is in a correct place */ 1108/* move an element suitably so it is in a correct place */
1026inline_size void 1109inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1110adjustheap (ANHE *heap, int N, int k)
1028{ 1111{
1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1112 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1030 upheap (heap, k); 1113 upheap (heap, k);
1031 else 1114 else
1032 downheap (heap, N, k); 1115 downheap (heap, N, k);
1033} 1116}
1034 1117
… …
1047/*****************************************************************************/ 1130/*****************************************************************************/
1048 1131
1049/* associate signal watchers to a signal signal */ 1132/* associate signal watchers to a signal signal */
1050typedef struct 1133typedef struct
1051{ 1134{
1135 EV_ATOMIC_T pending;
1136#if EV_MULTIPLICITY
1137 EV_P;
1138#endif
1052 WL head; 1139 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1140} ANSIG;
1055 1141
1056static ANSIG *signals; 1142static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1143
1061/*****************************************************************************/ 1144/*****************************************************************************/
1062 1145
1063/* used to prepare libev internal fd's */ 1146/* used to prepare libev internal fd's */
1064/* this is not fork-safe */ 1147/* this is not fork-safe */
… …
1078evpipe_init (EV_P) 1161evpipe_init (EV_P)
1079{ 1162{
1080 if (!ev_is_active (&pipe_w)) 1163 if (!ev_is_active (&pipe_w))
1081 { 1164 {
1082#if EV_USE_EVENTFD 1165#if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1168 evfd = eventfd (0, 0);
1169
1170 if (evfd >= 0)
1084 { 1171 {
1085 evpipe [0] = -1; 1172 evpipe [0] = -1;
1086 fd_intern (evfd); 1173 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1174 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1175 }
1089 else 1176 else
1090#endif 1177#endif
1091 { 1178 {
… …
1128/* called whenever the libev signal pipe */ 1215/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1216/* got some events (signal, async) */
1130static void 1217static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1218pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1219{
1220 int i;
1221
1133#if EV_USE_EVENTFD 1222#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1223 if (evfd >= 0)
1135 { 1224 {
1136 uint64_t counter; 1225 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1226 read (evfd, &counter, sizeof (uint64_t));
… …
1141 { 1230 {
1142 char dummy; 1231 char dummy;
1143 read (evpipe [0], &dummy, 1); 1232 read (evpipe [0], &dummy, 1);
1144 } 1233 }
1145 1234
1146 if (gotsig && ev_is_default_loop (EV_A)) 1235 if (sig_pending)
1147 { 1236 {
1148 int signum; 1237 sig_pending = 0;
1149 gotsig = 0;
1150 1238
1151 for (signum = signalmax; signum--; ) 1239 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1240 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1241 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1242 }
1155 1243
1156#if EV_ASYNC_ENABLE 1244#if EV_ASYNC_ENABLE
1157 if (gotasync) 1245 if (async_pending)
1158 { 1246 {
1159 int i; 1247 async_pending = 0;
1160 gotasync = 0;
1161 1248
1162 for (i = asynccnt; i--; ) 1249 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1250 if (asyncs [i]->sent)
1164 { 1251 {
1165 asyncs [i]->sent = 0; 1252 asyncs [i]->sent = 0;
… …
1173 1260
1174static void 1261static void
1175ev_sighandler (int signum) 1262ev_sighandler (int signum)
1176{ 1263{
1177#if EV_MULTIPLICITY 1264#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1265 EV_P = signals [signum - 1].loop;
1179#endif 1266#endif
1180 1267
1181#if _WIN32 1268#if _WIN32
1182 signal (signum, ev_sighandler); 1269 signal (signum, ev_sighandler);
1183#endif 1270#endif
1184 1271
1185 signals [signum - 1].gotsig = 1; 1272 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1273 evpipe_write (EV_A_ &sig_pending);
1187} 1274}
1188 1275
1189void noinline 1276void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1277ev_feed_signal_event (EV_P_ int signum)
1191{ 1278{
1192 WL w; 1279 WL w;
1193 1280
1281 if (expect_false (signum <= 0 || signum > EV_NSIG))
1282 return;
1283
1284 --signum;
1285
1194#if EV_MULTIPLICITY 1286#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1287 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1288 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1289
1198 --signum; 1290 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1291 return;
1292#endif
1202 1293
1203 signals [signum].gotsig = 0; 1294 signals [signum].pending = 0;
1204 1295
1205 for (w = signals [signum].head; w; w = w->next) 1296 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1297 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1298}
1299
1300#if EV_USE_SIGNALFD
1301static void
1302sigfdcb (EV_P_ ev_io *iow, int revents)
1303{
1304 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1305
1306 for (;;)
1307 {
1308 ssize_t res = read (sigfd, si, sizeof (si));
1309
1310 /* not ISO-C, as res might be -1, but works with SuS */
1311 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1312 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1313
1314 if (res < (ssize_t)sizeof (si))
1315 break;
1316 }
1317}
1318#endif
1208 1319
1209/*****************************************************************************/ 1320/*****************************************************************************/
1210 1321
1211static WL childs [EV_PID_HASHSIZE]; 1322static WL childs [EV_PID_HASHSIZE];
1212 1323
… …
1357ev_backend (EV_P) 1468ev_backend (EV_P)
1358{ 1469{
1359 return backend; 1470 return backend;
1360} 1471}
1361 1472
1473#if EV_MINIMAL < 2
1362unsigned int 1474unsigned int
1363ev_loop_count (EV_P) 1475ev_loop_count (EV_P)
1364{ 1476{
1365 return loop_count; 1477 return loop_count;
1366} 1478}
… …
1380void 1492void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1494{
1383 timeout_blocktime = interval; 1495 timeout_blocktime = interval;
1384} 1496}
1497
1498void
1499ev_set_userdata (EV_P_ void *data)
1500{
1501 userdata = data;
1502}
1503
1504void *
1505ev_userdata (EV_P)
1506{
1507 return userdata;
1508}
1509
1510void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1511{
1512 invoke_cb = invoke_pending_cb;
1513}
1514
1515void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1516{
1517 release_cb = release;
1518 acquire_cb = acquire;
1519}
1520#endif
1385 1521
1386/* initialise a loop structure, must be zero-initialised */ 1522/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1523static void noinline
1388loop_init (EV_P_ unsigned int flags) 1524loop_init (EV_P_ unsigned int flags)
1389{ 1525{
… …
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1543 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1544 have_monotonic = 1;
1409 } 1545 }
1410#endif 1546#endif
1411 1547
1548 /* pid check not overridable via env */
1549#ifndef _WIN32
1550 if (flags & EVFLAG_FORKCHECK)
1551 curpid = getpid ();
1552#endif
1553
1554 if (!(flags & EVFLAG_NOENV)
1555 && !enable_secure ()
1556 && getenv ("LIBEV_FLAGS"))
1557 flags = atoi (getenv ("LIBEV_FLAGS"));
1558
1412 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1560 mn_now = get_clock ();
1414 now_floor = mn_now; 1561 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1562 rtmn_diff = ev_rt_now - mn_now;
1563#if EV_MINIMAL < 2
1416 invoke_cb = ev_invoke_pending; 1564 invoke_cb = ev_invoke_pending;
1565#endif
1417 1566
1418 io_blocktime = 0.; 1567 io_blocktime = 0.;
1419 timeout_blocktime = 0.; 1568 timeout_blocktime = 0.;
1420 backend = 0; 1569 backend = 0;
1421 backend_fd = -1; 1570 backend_fd = -1;
1422 gotasync = 0; 1571 sig_pending = 0;
1572#if EV_ASYNC_ENABLE
1573 async_pending = 0;
1574#endif
1423#if EV_USE_INOTIFY 1575#if EV_USE_INOTIFY
1424 fs_fd = -2; 1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1425#endif 1577#endif
1426 1578#if EV_USE_SIGNALFD
1427 /* pid check not overridable via env */ 1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1428#ifndef _WIN32
1429 if (flags & EVFLAG_FORKCHECK)
1430 curpid = getpid ();
1431#endif 1580#endif
1432
1433 if (!(flags & EVFLAG_NOENV)
1434 && !enable_secure ()
1435 && getenv ("LIBEV_FLAGS"))
1436 flags = atoi (getenv ("LIBEV_FLAGS"));
1437 1581
1438 if (!(flags & 0x0000ffffU)) 1582 if (!(flags & 0x0000ffffU))
1439 flags |= ev_recommended_backends (); 1583 flags |= ev_recommended_backends ();
1440 1584
1441#if EV_USE_PORT 1585#if EV_USE_PORT
… …
1467{ 1611{
1468 int i; 1612 int i;
1469 1613
1470 if (ev_is_active (&pipe_w)) 1614 if (ev_is_active (&pipe_w))
1471 { 1615 {
1472 ev_ref (EV_A); /* signal watcher */ 1616 /*ev_ref (EV_A);*/
1473 ev_io_stop (EV_A_ &pipe_w); 1617 /*ev_io_stop (EV_A_ &pipe_w);*/
1474 1618
1475#if EV_USE_EVENTFD 1619#if EV_USE_EVENTFD
1476 if (evfd >= 0) 1620 if (evfd >= 0)
1477 close (evfd); 1621 close (evfd);
1478#endif 1622#endif
… …
1482 close (evpipe [0]); 1626 close (evpipe [0]);
1483 close (evpipe [1]); 1627 close (evpipe [1]);
1484 } 1628 }
1485 } 1629 }
1486 1630
1631#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd);
1638 }
1639#endif
1640
1487#if EV_USE_INOTIFY 1641#if EV_USE_INOTIFY
1488 if (fs_fd >= 0) 1642 if (fs_fd >= 0)
1489 close (fs_fd); 1643 close (fs_fd);
1490#endif 1644#endif
1491 1645
… …
1514#if EV_IDLE_ENABLE 1668#if EV_IDLE_ENABLE
1515 array_free (idle, [i]); 1669 array_free (idle, [i]);
1516#endif 1670#endif
1517 } 1671 }
1518 1672
1519 ev_free (anfds); anfdmax = 0; 1673 ev_free (anfds); anfds = 0; anfdmax = 0;
1520 1674
1521 /* have to use the microsoft-never-gets-it-right macro */ 1675 /* have to use the microsoft-never-gets-it-right macro */
1522 array_free (rfeed, EMPTY); 1676 array_free (rfeed, EMPTY);
1523 array_free (fdchange, EMPTY); 1677 array_free (fdchange, EMPTY);
1524 array_free (timer, EMPTY); 1678 array_free (timer, EMPTY);
… …
1559 1713
1560 if (ev_is_active (&pipe_w)) 1714 if (ev_is_active (&pipe_w))
1561 { 1715 {
1562 /* this "locks" the handlers against writing to the pipe */ 1716 /* this "locks" the handlers against writing to the pipe */
1563 /* while we modify the fd vars */ 1717 /* while we modify the fd vars */
1564 gotsig = 1; 1718 sig_pending = 1;
1565#if EV_ASYNC_ENABLE 1719#if EV_ASYNC_ENABLE
1566 gotasync = 1; 1720 async_pending = 1;
1567#endif 1721#endif
1568 1722
1569 ev_ref (EV_A); 1723 ev_ref (EV_A);
1570 ev_io_stop (EV_A_ &pipe_w); 1724 ev_io_stop (EV_A_ &pipe_w);
1571 1725
… …
1591#if EV_MULTIPLICITY 1745#if EV_MULTIPLICITY
1592 1746
1593struct ev_loop * 1747struct ev_loop *
1594ev_loop_new (unsigned int flags) 1748ev_loop_new (unsigned int flags)
1595{ 1749{
1596 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1750 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1597 1751
1598 memset (loop, 0, sizeof (struct ev_loop)); 1752 memset (EV_A, 0, sizeof (struct ev_loop));
1599
1600 loop_init (EV_A_ flags); 1753 loop_init (EV_A_ flags);
1601 1754
1602 if (ev_backend (EV_A)) 1755 if (ev_backend (EV_A))
1603 return loop; 1756 return EV_A;
1604 1757
1605 return 0; 1758 return 0;
1606} 1759}
1607 1760
1608void 1761void
… …
1615void 1768void
1616ev_loop_fork (EV_P) 1769ev_loop_fork (EV_P)
1617{ 1770{
1618 postfork = 1; /* must be in line with ev_default_fork */ 1771 postfork = 1; /* must be in line with ev_default_fork */
1619} 1772}
1773#endif /* multiplicity */
1620 1774
1621#if EV_VERIFY 1775#if EV_VERIFY
1622static void noinline 1776static void noinline
1623verify_watcher (EV_P_ W w) 1777verify_watcher (EV_P_ W w)
1624{ 1778{
… …
1652 verify_watcher (EV_A_ ws [cnt]); 1806 verify_watcher (EV_A_ ws [cnt]);
1653 } 1807 }
1654} 1808}
1655#endif 1809#endif
1656 1810
1811#if EV_MINIMAL < 2
1657void 1812void
1658ev_loop_verify (EV_P) 1813ev_loop_verify (EV_P)
1659{ 1814{
1660#if EV_VERIFY 1815#if EV_VERIFY
1661 int i; 1816 int i;
… …
1710 assert (checkmax >= checkcnt); 1865 assert (checkmax >= checkcnt);
1711 array_verify (EV_A_ (W *)checks, checkcnt); 1866 array_verify (EV_A_ (W *)checks, checkcnt);
1712 1867
1713# if 0 1868# if 0
1714 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1869 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) 1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1716# endif 1871# endif
1717#endif 1872#endif
1718} 1873}
1719 1874#endif
1720#endif /* multiplicity */
1721 1875
1722#if EV_MULTIPLICITY 1876#if EV_MULTIPLICITY
1723struct ev_loop * 1877struct ev_loop *
1724ev_default_loop_init (unsigned int flags) 1878ev_default_loop_init (unsigned int flags)
1725#else 1879#else
… …
1728#endif 1882#endif
1729{ 1883{
1730 if (!ev_default_loop_ptr) 1884 if (!ev_default_loop_ptr)
1731 { 1885 {
1732#if EV_MULTIPLICITY 1886#if EV_MULTIPLICITY
1733 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1887 EV_P = ev_default_loop_ptr = &default_loop_struct;
1734#else 1888#else
1735 ev_default_loop_ptr = 1; 1889 ev_default_loop_ptr = 1;
1736#endif 1890#endif
1737 1891
1738 loop_init (EV_A_ flags); 1892 loop_init (EV_A_ flags);
… …
1755 1909
1756void 1910void
1757ev_default_destroy (void) 1911ev_default_destroy (void)
1758{ 1912{
1759#if EV_MULTIPLICITY 1913#if EV_MULTIPLICITY
1760 struct ev_loop *loop = ev_default_loop_ptr; 1914 EV_P = ev_default_loop_ptr;
1761#endif 1915#endif
1762 1916
1763 ev_default_loop_ptr = 0; 1917 ev_default_loop_ptr = 0;
1764 1918
1765#ifndef _WIN32 1919#ifndef _WIN32
… …
1772 1926
1773void 1927void
1774ev_default_fork (void) 1928ev_default_fork (void)
1775{ 1929{
1776#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1777 struct ev_loop *loop = ev_default_loop_ptr; 1931 EV_P = ev_default_loop_ptr;
1778#endif 1932#endif
1779 1933
1780 postfork = 1; /* must be in line with ev_loop_fork */ 1934 postfork = 1; /* must be in line with ev_loop_fork */
1781} 1935}
1782 1936
… …
1786ev_invoke (EV_P_ void *w, int revents) 1940ev_invoke (EV_P_ void *w, int revents)
1787{ 1941{
1788 EV_CB_INVOKE ((W)w, revents); 1942 EV_CB_INVOKE ((W)w, revents);
1789} 1943}
1790 1944
1791void 1945unsigned int
1946ev_pending_count (EV_P)
1947{
1948 int pri;
1949 unsigned int count = 0;
1950
1951 for (pri = NUMPRI; pri--; )
1952 count += pendingcnt [pri];
1953
1954 return count;
1955}
1956
1957void noinline
1792ev_invoke_pending (EV_P) 1958ev_invoke_pending (EV_P)
1793{ 1959{
1794 int pri; 1960 int pri;
1795 1961
1796 for (pri = NUMPRI; pri--; ) 1962 for (pri = NUMPRI; pri--; )
… …
2035} 2201}
2036 2202
2037void 2203void
2038ev_loop (EV_P_ int flags) 2204ev_loop (EV_P_ int flags)
2039{ 2205{
2206#if EV_MINIMAL < 2
2040 ++loop_depth; 2207 ++loop_depth;
2208#endif
2209
2210 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2041 2211
2042 loop_done = EVUNLOOP_CANCEL; 2212 loop_done = EVUNLOOP_CANCEL;
2043 2213
2044 invoke_cb (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2214 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2045 2215
2046 do 2216 do
2047 { 2217 {
2048#if EV_VERIFY >= 2 2218#if EV_VERIFY >= 2
2049 ev_loop_verify (EV_A); 2219 ev_loop_verify (EV_A);
… …
2062 /* we might have forked, so queue fork handlers */ 2232 /* we might have forked, so queue fork handlers */
2063 if (expect_false (postfork)) 2233 if (expect_false (postfork))
2064 if (forkcnt) 2234 if (forkcnt)
2065 { 2235 {
2066 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2067 invoke_cb (EV_A); 2237 EV_INVOKE_PENDING;
2068 } 2238 }
2069#endif 2239#endif
2070 2240
2071 /* queue prepare watchers (and execute them) */ 2241 /* queue prepare watchers (and execute them) */
2072 if (expect_false (preparecnt)) 2242 if (expect_false (preparecnt))
2073 { 2243 {
2074 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2075 invoke_cb (EV_A); 2245 EV_INVOKE_PENDING;
2076 } 2246 }
2247
2248 if (expect_false (loop_done))
2249 break;
2077 2250
2078 /* we might have forked, so reify kernel state if necessary */ 2251 /* we might have forked, so reify kernel state if necessary */
2079 if (expect_false (postfork)) 2252 if (expect_false (postfork))
2080 loop_fork (EV_A); 2253 loop_fork (EV_A);
2081 2254
… …
2129 waittime -= sleeptime; 2302 waittime -= sleeptime;
2130 } 2303 }
2131 } 2304 }
2132 } 2305 }
2133 2306
2307#if EV_MINIMAL < 2
2134 ++loop_count; 2308 ++loop_count;
2309#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2135 backend_poll (EV_A_ waittime); 2311 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2136 2313
2137 /* update ev_rt_now, do magic */ 2314 /* update ev_rt_now, do magic */
2138 time_update (EV_A_ waittime + sleeptime); 2315 time_update (EV_A_ waittime + sleeptime);
2139 } 2316 }
2140 2317
… …
2151 2328
2152 /* queue check watchers, to be executed first */ 2329 /* queue check watchers, to be executed first */
2153 if (expect_false (checkcnt)) 2330 if (expect_false (checkcnt))
2154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2155 2332
2156 invoke_cb (EV_A); 2333 EV_INVOKE_PENDING;
2157 } 2334 }
2158 while (expect_true ( 2335 while (expect_true (
2159 activecnt 2336 activecnt
2160 && !loop_done 2337 && !loop_done
2161 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2338 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2162 )); 2339 ));
2163 2340
2164 if (loop_done == EVUNLOOP_ONE) 2341 if (loop_done == EVUNLOOP_ONE)
2165 loop_done = EVUNLOOP_CANCEL; 2342 loop_done = EVUNLOOP_CANCEL;
2166 2343
2344#if EV_MINIMAL < 2
2167 --loop_depth; 2345 --loop_depth;
2346#endif
2168} 2347}
2169 2348
2170void 2349void
2171ev_unloop (EV_P_ int how) 2350ev_unloop (EV_P_ int how)
2172{ 2351{
… …
2223inline_size void 2402inline_size void
2224wlist_del (WL *head, WL elem) 2403wlist_del (WL *head, WL elem)
2225{ 2404{
2226 while (*head) 2405 while (*head)
2227 { 2406 {
2228 if (*head == elem) 2407 if (expect_true (*head == elem))
2229 { 2408 {
2230 *head = elem->next; 2409 *head = elem->next;
2231 return; 2410 break;
2232 } 2411 }
2233 2412
2234 head = &(*head)->next; 2413 head = &(*head)->next;
2235 } 2414 }
2236} 2415}
… …
2304 2483
2305 ev_start (EV_A_ (W)w, 1); 2484 ev_start (EV_A_ (W)w, 1);
2306 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2307 wlist_add (&anfds[fd].head, (WL)w); 2486 wlist_add (&anfds[fd].head, (WL)w);
2308 2487
2309 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2488 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2310 w->events &= ~EV__IOFDSET; 2489 w->events &= ~EV__IOFDSET;
2311 2490
2312 EV_FREQUENT_CHECK; 2491 EV_FREQUENT_CHECK;
2313} 2492}
2314 2493
… …
2408 } 2587 }
2409 2588
2410 EV_FREQUENT_CHECK; 2589 EV_FREQUENT_CHECK;
2411} 2590}
2412 2591
2592ev_tstamp
2593ev_timer_remaining (EV_P_ ev_timer *w)
2594{
2595 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2596}
2597
2413#if EV_PERIODIC_ENABLE 2598#if EV_PERIODIC_ENABLE
2414void noinline 2599void noinline
2415ev_periodic_start (EV_P_ ev_periodic *w) 2600ev_periodic_start (EV_P_ ev_periodic *w)
2416{ 2601{
2417 if (expect_false (ev_is_active (w))) 2602 if (expect_false (ev_is_active (w)))
… …
2484#endif 2669#endif
2485 2670
2486void noinline 2671void noinline
2487ev_signal_start (EV_P_ ev_signal *w) 2672ev_signal_start (EV_P_ ev_signal *w)
2488{ 2673{
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))) 2674 if (expect_false (ev_is_active (w)))
2493 return; 2675 return;
2494 2676
2495 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2677 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2496 2678
2497 evpipe_init (EV_A); 2679#if EV_MULTIPLICITY
2680 assert (("libev: a signal must not be attached to two different loops",
2681 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2498 2682
2499 EV_FREQUENT_CHECK; 2683 signals [w->signum - 1].loop = EV_A;
2684#endif
2500 2685
2686 EV_FREQUENT_CHECK;
2687
2688#if EV_USE_SIGNALFD
2689 if (sigfd == -2)
2501 { 2690 {
2502#ifndef _WIN32 2691 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2503 sigset_t full, prev; 2692 if (sigfd < 0 && errno == EINVAL)
2504 sigfillset (&full); 2693 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2505 sigprocmask (SIG_SETMASK, &full, &prev);
2506#endif
2507 2694
2508 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2695 if (sigfd >= 0)
2696 {
2697 fd_intern (sigfd); /* doing it twice will not hurt */
2509 2698
2510#ifndef _WIN32 2699 sigemptyset (&sigfd_set);
2511 sigprocmask (SIG_SETMASK, &prev, 0); 2700
2512#endif 2701 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2702 ev_set_priority (&sigfd_w, EV_MAXPRI);
2703 ev_io_start (EV_A_ &sigfd_w);
2704 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2705 }
2513 } 2706 }
2707
2708 if (sigfd >= 0)
2709 {
2710 /* TODO: check .head */
2711 sigaddset (&sigfd_set, w->signum);
2712 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2713
2714 signalfd (sigfd, &sigfd_set, 0);
2715 }
2716#endif
2514 2717
2515 ev_start (EV_A_ (W)w, 1); 2718 ev_start (EV_A_ (W)w, 1);
2516 wlist_add (&signals [w->signum - 1].head, (WL)w); 2719 wlist_add (&signals [w->signum - 1].head, (WL)w);
2517 2720
2518 if (!((WL)w)->next) 2721 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/
2724# endif
2519 { 2725 {
2520#if _WIN32 2726# if _WIN32
2521 signal (w->signum, ev_sighandler); 2727 signal (w->signum, ev_sighandler);
2522#else 2728# else
2523 struct sigaction sa; 2729 struct sigaction sa;
2730
2731 evpipe_init (EV_A);
2732
2524 sa.sa_handler = ev_sighandler; 2733 sa.sa_handler = ev_sighandler;
2525 sigfillset (&sa.sa_mask); 2734 sigfillset (&sa.sa_mask);
2526 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2735 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2527 sigaction (w->signum, &sa, 0); 2736 sigaction (w->signum, &sa, 0);
2737
2738 sigemptyset (&sa.sa_mask);
2739 sigaddset (&sa.sa_mask, w->signum);
2740 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2528#endif 2741#endif
2529 } 2742 }
2530 2743
2531 EV_FREQUENT_CHECK; 2744 EV_FREQUENT_CHECK;
2532} 2745}
2533 2746
2534void noinline 2747void noinline
… …
2542 2755
2543 wlist_del (&signals [w->signum - 1].head, (WL)w); 2756 wlist_del (&signals [w->signum - 1].head, (WL)w);
2544 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2545 2758
2546 if (!signals [w->signum - 1].head) 2759 if (!signals [w->signum - 1].head)
2760 {
2761#if EV_MULTIPLICITY
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif
2764#if EV_USE_SIGNALFD
2765 if (sigfd >= 0)
2766 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2768 sigdelset (&sigfd_set, w->signum);
2769 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2771 /*TODO: maybe unblock signal? */
2772 }
2773 else
2774#endif
2547 signal (w->signum, SIG_DFL); 2775 signal (w->signum, SIG_DFL);
2776 }
2548 2777
2549 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2550} 2779}
2551 2780
2552void 2781void
… …
3032embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3261embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3033{ 3262{
3034 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3263 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3035 3264
3036 { 3265 {
3037 struct ev_loop *loop = w->other; 3266 EV_P = w->other;
3038 3267
3039 while (fdchangecnt) 3268 while (fdchangecnt)
3040 { 3269 {
3041 fd_reify (EV_A); 3270 fd_reify (EV_A);
3042 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3271 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3050 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3279 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3051 3280
3052 ev_embed_stop (EV_A_ w); 3281 ev_embed_stop (EV_A_ w);
3053 3282
3054 { 3283 {
3055 struct ev_loop *loop = w->other; 3284 EV_P = w->other;
3056 3285
3057 ev_loop_fork (EV_A); 3286 ev_loop_fork (EV_A);
3058 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3287 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3059 } 3288 }
3060 3289
… …
3074{ 3303{
3075 if (expect_false (ev_is_active (w))) 3304 if (expect_false (ev_is_active (w)))
3076 return; 3305 return;
3077 3306
3078 { 3307 {
3079 struct ev_loop *loop = w->other; 3308 EV_P = w->other;
3080 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3309 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); 3310 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3082 } 3311 }
3083 3312
3084 EV_FREQUENT_CHECK; 3313 EV_FREQUENT_CHECK;
… …
3196 3425
3197void 3426void
3198ev_async_send (EV_P_ ev_async *w) 3427ev_async_send (EV_P_ ev_async *w)
3199{ 3428{
3200 w->sent = 1; 3429 w->sent = 1;
3201 evpipe_write (EV_A_ &gotasync); 3430 evpipe_write (EV_A_ &async_pending);
3202} 3431}
3203#endif 3432#endif
3204 3433
3205/*****************************************************************************/ 3434/*****************************************************************************/
3206 3435
… …
3355 if (types & EV_CHECK) 3584 if (types & EV_CHECK)
3356 for (i = checkcnt; i--; ) 3585 for (i = checkcnt; i--; )
3357 cb (EV_A_ EV_CHECK, checks [i]); 3586 cb (EV_A_ EV_CHECK, checks [i]);
3358 3587
3359 if (types & EV_SIGNAL) 3588 if (types & EV_SIGNAL)
3360 for (i = 0; i < signalmax; ++i) 3589 for (i = 0; i < EV_NSIG - 1; ++i)
3361 for (wl = signals [i].head; wl; ) 3590 for (wl = signals [i].head; wl; )
3362 { 3591 {
3363 wn = wl->next; 3592 wn = wl->next;
3364 cb (EV_A_ EV_SIGNAL, wl); 3593 cb (EV_A_ EV_SIGNAL, wl);
3365 wl = wn; 3594 wl = wn;

Diff Legend

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