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

Comparing libev/ev.c (file contents):
Revision 1.288 by root, Sat Apr 25 14:12:48 2009 UTC vs.
Revision 1.309 by root, Sun Jul 26 04:24:17 2009 UTC

… …
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
… …
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 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
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
176# endif 186# endif
177#endif 187#endif
178 188
179/* 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 */
180 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
181#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
184# else 221# else
185# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
264# else 301# else
265# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
266# endif 303# endif
267#endif 304#endif
268 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
311# endif
312#endif
313
269#if 0 /* debugging */ 314#if 0 /* debugging */
270# define EV_VERIFY 3 315# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
273#endif 318#endif
… …
280# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
281#endif 326#endif
282 327
283#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
285#endif 344#endif
286 345
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 347
289#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
… …
320 379
321#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 381# include <winsock.h>
323#endif 382#endif
324 383
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
335/* 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 */
336# 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
337# ifdef __cplusplus 393# ifdef __cplusplus
338extern "C" { 394extern "C" {
339# endif 395# endif
340int eventfd (unsigned int initval, int flags); 396int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 397# ifdef __cplusplus
342} 398}
343# endif 399# endif
400#endif
401
402#if EV_USE_SIGNALFD
403# include <sys/signalfd.h>
344#endif 404#endif
345 405
346/**/ 406/**/
347 407
348#if EV_VERIFY >= 3 408#if EV_VERIFY >= 3
… …
384# define inline_speed static noinline 444# define inline_speed static noinline
385#else 445#else
386# define inline_speed static inline 446# define inline_speed static inline
387#endif 447#endif
388 448
389#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
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 454# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
455#endif
391 456
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 457#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 458#define EMPTY2(a,b) /* used to suppress some warnings */
394 459
395typedef ev_watcher *W; 460typedef ev_watcher *W;
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 543#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 544#define ev_free(ptr) ev_realloc ((ptr), 0)
480 545
481/*****************************************************************************/ 546/*****************************************************************************/
482 547
548/* set in reify when reification needed */
549#define EV_ANFD_REIFY 1
550
483/* file descriptor info structure */ 551/* file descriptor info structure */
484typedef struct 552typedef struct
485{ 553{
486 WL head; 554 WL head;
487 unsigned char events; /* the events watched for */ 555 unsigned char events; /* the events watched for */
488 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) */
489 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 */
490 unsigned char unused; 558 unsigned char unused;
491#if EV_USE_EPOLL 559#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 560 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 561#endif
… …
555 623
556 static int ev_default_loop_ptr; 624 static int ev_default_loop_ptr;
557 625
558#endif 626#endif
559 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
560/*****************************************************************************/ 640/*****************************************************************************/
561 641
642#ifndef EV_HAVE_EV_TIME
562ev_tstamp 643ev_tstamp
563ev_time (void) 644ev_time (void)
564{ 645{
565#if EV_USE_REALTIME 646#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 647 if (expect_true (have_realtime))
… …
573 654
574 struct timeval tv; 655 struct timeval tv;
575 gettimeofday (&tv, 0); 656 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 657 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 658}
659#endif
578 660
579inline_size ev_tstamp 661inline_size ev_tstamp
580get_clock (void) 662get_clock (void)
581{ 663{
582#if EV_USE_MONOTONIC 664#if EV_USE_MONOTONIC
… …
618 700
619 tv.tv_sec = (time_t)delay; 701 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 703
622 /* 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 */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 705 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 706 /* by older ones */
625 select (0, 0, 0, 0, &tv); 707 select (0, 0, 0, 0, &tv);
626#endif 708#endif
627 } 709 }
628} 710}
… …
736} 818}
737 819
738/*****************************************************************************/ 820/*****************************************************************************/
739 821
740inline_speed void 822inline_speed void
741fd_event (EV_P_ int fd, int revents) 823fd_event_nc (EV_P_ int fd, int revents)
742{ 824{
743 ANFD *anfd = anfds + fd; 825 ANFD *anfd = anfds + fd;
744 ev_io *w; 826 ev_io *w;
745 827
746 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)
… …
750 if (ev) 832 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 833 ev_feed_event (EV_A_ (W)w, ev);
752 } 834 }
753} 835}
754 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
755void 848void
756ev_feed_fd_event (EV_P_ int fd, int revents) 849ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 850{
758 if (fd >= 0 && fd < anfdmax) 851 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 852 fd_event_nc (EV_A_ fd, revents);
760} 853}
761 854
762/* make sure the external fd watch events are in-sync */ 855/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 856/* with the kernel/libev internal state */
764inline_size void 857inline_size void
… …
864 957
865 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 959 if (anfds [fd].events)
867 { 960 {
868 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
869 return; 962 break;
870 } 963 }
871} 964}
872 965
873/* 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 */
874static void noinline 967static void noinline
… …
879 for (fd = 0; fd < anfdmax; ++fd) 972 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 973 if (anfds [fd].events)
881 { 974 {
882 anfds [fd].events = 0; 975 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 976 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 978 }
886} 979}
887 980
888/*****************************************************************************/ 981/*****************************************************************************/
889 982
… …
964 1057
965 for (;;) 1058 for (;;)
966 { 1059 {
967 int c = k << 1; 1060 int c = k << 1;
968 1061
969 if (c > N + HEAP0 - 1) 1062 if (c >= N + HEAP0)
970 break; 1063 break;
971 1064
972 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])
973 ? 1 : 0; 1066 ? 1 : 0;
974 1067
… …
1033/*****************************************************************************/ 1126/*****************************************************************************/
1034 1127
1035/* associate signal watchers to a signal signal */ 1128/* associate signal watchers to a signal signal */
1036typedef struct 1129typedef struct
1037{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1038 WL head; 1135 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1136} ANSIG;
1041 1137
1042static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1139
1047/*****************************************************************************/ 1140/*****************************************************************************/
1048 1141
1049/* used to prepare libev internal fd's */ 1142/* used to prepare libev internal fd's */
1050/* this is not fork-safe */ 1143/* this is not fork-safe */
… …
1064evpipe_init (EV_P) 1157evpipe_init (EV_P)
1065{ 1158{
1066 if (!ev_is_active (&pipe_w)) 1159 if (!ev_is_active (&pipe_w))
1067 { 1160 {
1068#if EV_USE_EVENTFD 1161#if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1164 evfd = eventfd (0, 0);
1165
1166 if (evfd >= 0)
1070 { 1167 {
1071 evpipe [0] = -1; 1168 evpipe [0] = -1;
1072 fd_intern (evfd); 1169 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1170 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1171 }
1075 else 1172 else
1076#endif 1173#endif
1077 { 1174 {
… …
1114/* called whenever the libev signal pipe */ 1211/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1212/* got some events (signal, async) */
1116static void 1213static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1215{
1216 int i;
1217
1119#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1219 if (evfd >= 0)
1121 { 1220 {
1122 uint64_t counter; 1221 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
… …
1127 { 1226 {
1128 char dummy; 1227 char dummy;
1129 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
1130 } 1229 }
1131 1230
1132 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
1133 { 1232 {
1134 int signum; 1233 sig_pending = 0;
1135 gotsig = 0;
1136 1234
1137 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1238 }
1141 1239
1142#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
1143 if (gotasync) 1241 if (async_pending)
1144 { 1242 {
1145 int i; 1243 async_pending = 0;
1146 gotasync = 0;
1147 1244
1148 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
1150 { 1247 {
1151 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
… …
1159 1256
1160static void 1257static void
1161ev_sighandler (int signum) 1258ev_sighandler (int signum)
1162{ 1259{
1163#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
1165#endif 1262#endif
1166 1263
1167#if _WIN32 1264#if _WIN32
1168 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
1169#endif 1266#endif
1170 1267
1171 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
1173} 1270}
1174 1271
1175void noinline 1272void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
1177{ 1274{
1178 WL w; 1275 WL w;
1179 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
1180#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1181 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 */
1182#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1285
1184 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1287 return;
1288#endif
1188 1289
1189 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
1190 1291
1191 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 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
1194 1315
1195/*****************************************************************************/ 1316/*****************************************************************************/
1196 1317
1197static WL childs [EV_PID_HASHSIZE]; 1318static WL childs [EV_PID_HASHSIZE];
1198 1319
… …
1343ev_backend (EV_P) 1464ev_backend (EV_P)
1344{ 1465{
1345 return backend; 1466 return backend;
1346} 1467}
1347 1468
1469#if EV_MINIMAL < 2
1348unsigned int 1470unsigned int
1349ev_loop_count (EV_P) 1471ev_loop_count (EV_P)
1350{ 1472{
1351 return loop_count; 1473 return loop_count;
1352} 1474}
1353 1475
1476unsigned int
1477ev_loop_depth (EV_P)
1478{
1479 return loop_depth;
1480}
1481
1354void 1482void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1483ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1484{
1357 io_blocktime = interval; 1485 io_blocktime = interval;
1358} 1486}
… …
1360void 1488void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1489ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1490{
1363 timeout_blocktime = interval; 1491 timeout_blocktime = interval;
1364} 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
1365 1517
1366/* initialise a loop structure, must be zero-initialised */ 1518/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1519static void noinline
1368loop_init (EV_P_ unsigned int flags) 1520loop_init (EV_P_ unsigned int flags)
1369{ 1521{
… …
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1540 have_monotonic = 1;
1389 } 1541 }
1390#endif 1542#endif
1391 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
1392 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1556 mn_now = get_clock ();
1394 now_floor = mn_now; 1557 now_floor = mn_now;
1395 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
1396 1562
1397 io_blocktime = 0.; 1563 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1399 backend = 0; 1565 backend = 0;
1400 backend_fd = -1; 1566 backend_fd = -1;
1401 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1402#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1403 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1573#endif
1405 1574#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1576#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1577
1417 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1419 1580
1420#if EV_USE_PORT 1581#if EV_USE_PORT
… …
1446{ 1607{
1447 int i; 1608 int i;
1448 1609
1449 if (ev_is_active (&pipe_w)) 1610 if (ev_is_active (&pipe_w))
1450 { 1611 {
1451 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1614
1454#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1616 if (evfd >= 0)
1456 close (evfd); 1617 close (evfd);
1457#endif 1618#endif
… …
1461 close (evpipe [0]); 1622 close (evpipe [0]);
1462 close (evpipe [1]); 1623 close (evpipe [1]);
1463 } 1624 }
1464 } 1625 }
1465 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
1466#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1468 close (fs_fd); 1639 close (fs_fd);
1469#endif 1640#endif
1470 1641
… …
1493#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1665 array_free (idle, [i]);
1495#endif 1666#endif
1496 } 1667 }
1497 1668
1498 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1670
1500 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
… …
1538 1709
1539 if (ev_is_active (&pipe_w)) 1710 if (ev_is_active (&pipe_w))
1540 { 1711 {
1541 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1543 gotsig = 1; 1714 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1716 async_pending = 1;
1546#endif 1717#endif
1547 1718
1548 ev_ref (EV_A); 1719 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1720 ev_io_stop (EV_A_ &pipe_w);
1550 1721
… …
1570#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1571 1742
1572struct ev_loop * 1743struct ev_loop *
1573ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1574{ 1745{
1575 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));
1576 1747
1577 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1580 1750
1581 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1582 return loop; 1752 return EV_A;
1583 1753
1584 return 0; 1754 return 0;
1585} 1755}
1586 1756
1587void 1757void
… …
1594void 1764void
1595ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1596{ 1766{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1598} 1768}
1769#endif /* multiplicity */
1599 1770
1600#if EV_VERIFY 1771#if EV_VERIFY
1601static void noinline 1772static void noinline
1602verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1603{ 1774{
… …
1631 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1632 } 1803 }
1633} 1804}
1634#endif 1805#endif
1635 1806
1807#if EV_MINIMAL < 2
1636void 1808void
1637ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1638{ 1810{
1639#if EV_VERIFY 1811#if EV_VERIFY
1640 int i; 1812 int i;
… …
1689 assert (checkmax >= checkcnt); 1861 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1862 array_verify (EV_A_ (W *)checks, checkcnt);
1691 1863
1692# if 0 1864# if 0
1693 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)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1695# endif 1867# endif
1696#endif 1868#endif
1697} 1869}
1698 1870#endif
1699#endif /* multiplicity */
1700 1871
1701#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1702struct ev_loop * 1873struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1704#else 1875#else
… …
1707#endif 1878#endif
1708{ 1879{
1709 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1710 { 1881 {
1711#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1884#else
1714 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1715#endif 1886#endif
1716 1887
1717 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
… …
1734 1905
1735void 1906void
1736ev_default_destroy (void) 1907ev_default_destroy (void)
1737{ 1908{
1738#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1740#endif 1911#endif
1741 1912
1742 ev_default_loop_ptr = 0; 1913 ev_default_loop_ptr = 0;
1743 1914
1744#ifndef _WIN32 1915#ifndef _WIN32
… …
1751 1922
1752void 1923void
1753ev_default_fork (void) 1924ev_default_fork (void)
1754{ 1925{
1755#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1757#endif 1928#endif
1758 1929
1759 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1760} 1931}
1761 1932
… …
1765ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1766{ 1937{
1767 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1768} 1939}
1769 1940
1770inline_speed void 1941unsigned int
1771call_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)
1772{ 1955{
1773 int pri; 1956 int pri;
1774 1957
1775 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
… …
1948/* fetch new monotonic and realtime times from the kernel */ 2131/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2132/* also detetc if there was a timejump, and act accordingly */
1950inline_speed void 2133inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2134time_update (EV_P_ ev_tstamp max_block)
1952{ 2135{
1953 int i;
1954
1955#if EV_USE_MONOTONIC 2136#if EV_USE_MONOTONIC
1956 if (expect_true (have_monotonic)) 2137 if (expect_true (have_monotonic))
1957 { 2138 {
2139 int i;
1958 ev_tstamp odiff = rtmn_diff; 2140 ev_tstamp odiff = rtmn_diff;
1959 2141
1960 mn_now = get_clock (); 2142 mn_now = get_clock ();
1961 2143
1962 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2144 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
2012 2194
2013 mn_now = ev_rt_now; 2195 mn_now = ev_rt_now;
2014 } 2196 }
2015} 2197}
2016 2198
2017static int loop_done;
2018
2019void 2199void
2020ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
2021{ 2201{
2202#if EV_MINIMAL < 2
2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207
2022 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
2023 2209
2024 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 */
2025 2211
2026 do 2212 do
2027 { 2213 {
2028#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
2029 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
… …
2042 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
2043 if (expect_false (postfork)) 2229 if (expect_false (postfork))
2044 if (forkcnt) 2230 if (forkcnt)
2045 { 2231 {
2046 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2047 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
2048 } 2234 }
2049#endif 2235#endif
2050 2236
2051 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
2052 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
2053 { 2239 {
2054 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2055 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
2056 } 2242 }
2243
2244 if (expect_false (loop_done))
2245 break;
2057 2246
2058 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2059 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2060 loop_fork (EV_A); 2249 loop_fork (EV_A);
2061 2250
… …
2067 ev_tstamp waittime = 0.; 2256 ev_tstamp waittime = 0.;
2068 ev_tstamp sleeptime = 0.; 2257 ev_tstamp sleeptime = 0.;
2069 2258
2070 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2071 { 2260 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2072 /* update time to cancel out callback processing overhead */ 2264 /* update time to cancel out callback processing overhead */
2073 time_update (EV_A_ 1e100); 2265 time_update (EV_A_ 1e100);
2074 2266
2075 waittime = MAX_BLOCKTIME; 2267 waittime = MAX_BLOCKTIME;
2076 2268
… …
2086 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2278 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2087 if (waittime > to) waittime = to; 2279 if (waittime > to) waittime = to;
2088 } 2280 }
2089#endif 2281#endif
2090 2282
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */
2091 if (expect_false (waittime < timeout_blocktime)) 2284 if (expect_false (waittime < timeout_blocktime))
2092 waittime = timeout_blocktime; 2285 waittime = timeout_blocktime;
2093 2286
2094 sleeptime = waittime - backend_fudge; 2287 /* extra check because io_blocktime is commonly 0 */
2095
2096 if (expect_true (sleeptime > io_blocktime)) 2288 if (expect_false (io_blocktime))
2097 sleeptime = io_blocktime;
2098
2099 if (sleeptime)
2100 { 2289 {
2290 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2291
2292 if (sleeptime > waittime - backend_fudge)
2293 sleeptime = waittime - backend_fudge;
2294
2295 if (expect_true (sleeptime > 0.))
2296 {
2101 ev_sleep (sleeptime); 2297 ev_sleep (sleeptime);
2102 waittime -= sleeptime; 2298 waittime -= sleeptime;
2299 }
2103 } 2300 }
2104 } 2301 }
2105 2302
2303#if EV_MINIMAL < 2
2106 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2107 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2108 2309
2109 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2110 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2111 } 2312 }
2112 2313
… …
2123 2324
2124 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2125 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2126 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2127 2328
2128 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2129 } 2330 }
2130 while (expect_true ( 2331 while (expect_true (
2131 activecnt 2332 activecnt
2132 && !loop_done 2333 && !loop_done
2133 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2134 )); 2335 ));
2135 2336
2136 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2137 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2339
2340#if EV_MINIMAL < 2
2341 --loop_depth;
2342#endif
2138} 2343}
2139 2344
2140void 2345void
2141ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2142{ 2347{
… …
2193inline_size void 2398inline_size void
2194wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2195{ 2400{
2196 while (*head) 2401 while (*head)
2197 { 2402 {
2198 if (*head == elem) 2403 if (expect_true (*head == elem))
2199 { 2404 {
2200 *head = elem->next; 2405 *head = elem->next;
2201 return; 2406 break;
2202 } 2407 }
2203 2408
2204 head = &(*head)->next; 2409 head = &(*head)->next;
2205 } 2410 }
2206} 2411}
… …
2234} 2439}
2235 2440
2236inline_size void 2441inline_size void
2237pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2238{ 2443{
2239 int pri = w->priority; 2444 int pri = ev_priority (w);
2240 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2241 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2242 w->priority = pri; 2447 ev_set_priority (w, pri);
2243} 2448}
2244 2449
2245inline_speed void 2450inline_speed void
2246ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2247{ 2452{
… …
2274 2479
2275 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2276 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2277 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2278 2483
2279 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2280 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2281 2486
2282 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2283} 2488}
2284 2489
… …
2378 } 2583 }
2379 2584
2380 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2381} 2586}
2382 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
2383#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2384void noinline 2595void noinline
2385ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2386{ 2597{
2387 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2454#endif 2665#endif
2455 2666
2456void noinline 2667void noinline
2457ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2458{ 2669{
2459#if EV_MULTIPLICITY
2460 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2461#endif
2462 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2463 return; 2671 return;
2464 2672
2465 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));
2466 2674
2467 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));
2468 2678
2469 EV_FREQUENT_CHECK; 2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2470 2681
2682 EV_FREQUENT_CHECK;
2683
2684#if EV_USE_SIGNALFD
2685 if (sigfd == -2)
2471 { 2686 {
2472#ifndef _WIN32 2687 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2473 sigset_t full, prev; 2688 if (sigfd < 0 && errno == EINVAL)
2474 sigfillset (&full); 2689 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2475 sigprocmask (SIG_SETMASK, &full, &prev);
2476#endif
2477 2690
2478 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 */
2479 2694
2480#ifndef _WIN32 2695 sigemptyset (&sigfd_set);
2481 sigprocmask (SIG_SETMASK, &prev, 0); 2696
2482#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 }
2483 } 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
2484 2713
2485 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2486 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2487 2716
2488 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/
2720# endif
2489 { 2721 {
2490#if _WIN32 2722# if _WIN32
2491 signal (w->signum, ev_sighandler); 2723 signal (w->signum, ev_sighandler);
2492#else 2724# else
2493 struct sigaction sa; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2494 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2495 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2496 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 */
2497 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);
2498#endif 2737#endif
2499 } 2738 }
2500 2739
2501 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2502} 2741}
2503 2742
2504void noinline 2743void noinline
… …
2512 2751
2513 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2514 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2515 2754
2516 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
2517 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2518 2773
2519 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2520} 2775}
2521 2776
2522void 2777void
… …
3002embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3003{ 3258{
3004 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3005 3260
3006 { 3261 {
3007 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
3008 3263
3009 while (fdchangecnt) 3264 while (fdchangecnt)
3010 { 3265 {
3011 fd_reify (EV_A); 3266 fd_reify (EV_A);
3012 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3020 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));
3021 3276
3022 ev_embed_stop (EV_A_ w); 3277 ev_embed_stop (EV_A_ w);
3023 3278
3024 { 3279 {
3025 struct ev_loop *loop = w->other; 3280 EV_P = w->other;
3026 3281
3027 ev_loop_fork (EV_A); 3282 ev_loop_fork (EV_A);
3028 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3029 } 3284 }
3030 3285
… …
3044{ 3299{
3045 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
3046 return; 3301 return;
3047 3302
3048 { 3303 {
3049 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
3050 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 ()));
3051 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);
3052 } 3307 }
3053 3308
3054 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
… …
3166 3421
3167void 3422void
3168ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
3169{ 3424{
3170 w->sent = 1; 3425 w->sent = 1;
3171 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
3172} 3427}
3173#endif 3428#endif
3174 3429
3175/*****************************************************************************/ 3430/*****************************************************************************/
3176 3431
… …
3325 if (types & EV_CHECK) 3580 if (types & EV_CHECK)
3326 for (i = checkcnt; i--; ) 3581 for (i = checkcnt; i--; )
3327 cb (EV_A_ EV_CHECK, checks [i]); 3582 cb (EV_A_ EV_CHECK, checks [i]);
3328 3583
3329 if (types & EV_SIGNAL) 3584 if (types & EV_SIGNAL)
3330 for (i = 0; i < signalmax; ++i) 3585 for (i = 0; i < EV_NSIG - 1; ++i)
3331 for (wl = signals [i].head; wl; ) 3586 for (wl = signals [i].head; wl; )
3332 { 3587 {
3333 wn = wl->next; 3588 wn = wl->next;
3334 cb (EV_A_ EV_SIGNAL, wl); 3589 cb (EV_A_ EV_SIGNAL, wl);
3335 wl = wn; 3590 wl = wn;

Diff Legend

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