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

Comparing libev/ev.c (file contents):
Revision 1.290 by root, Mon Jun 29 04:41:34 2009 UTC vs.
Revision 1.308 by root, Sun Jul 19 20:39:54 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
266# else 301# else
267# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
268# endif 303# endif
269#endif 304#endif
270 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
271#if 0 /* debugging */ 314#if 0 /* debugging */
272# define EV_VERIFY 3 315# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
275#endif 318#endif
282# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
283#endif 326#endif
284 327
285#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
287#endif
288
289/* this block fixes any misconfiguration where we know we run into trouble otherwise */
290
291#ifndef CLOCK_MONOTONIC
292# undef EV_USE_MONOTONIC
293# define EV_USE_MONOTONIC 0
294#endif
295
296#ifndef CLOCK_REALTIME
297# undef EV_USE_REALTIME
298# define EV_USE_REALTIME 0
299#endif
300
301#if !EV_STAT_ENABLE
302# undef EV_USE_INOTIFY
303# define EV_USE_INOTIFY 0
304#endif
305
306#if !EV_USE_NANOSLEEP
307# ifndef _WIN32
308# include <sys/select.h>
309# endif
310#endif
311
312#if EV_USE_INOTIFY
313# include <sys/utsname.h>
314# include <sys/statfs.h>
315# include <sys/inotify.h>
316/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
317# ifndef IN_DONT_FOLLOW
318# undef EV_USE_INOTIFY
319# define EV_USE_INOTIFY 0
320# endif
321#endif
322
323#if EV_SELECT_IS_WINSOCKET
324# include <winsock.h>
325#endif 330#endif
326 331
327/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
328/* which makes programs even slower. might work on other unices, too. */ 333/* which makes programs even slower. might work on other unices, too. */
329#if EV_USE_CLOCK_SYSCALL 334#if EV_USE_CLOCK_SYSCALL
336# undef EV_USE_CLOCK_SYSCALL 341# undef EV_USE_CLOCK_SYSCALL
337# define EV_USE_CLOCK_SYSCALL 0 342# define EV_USE_CLOCK_SYSCALL 0
338# endif 343# endif
339#endif 344#endif
340 345
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347
348#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0
351#endif
352
353#ifndef CLOCK_REALTIME
354# undef EV_USE_REALTIME
355# define EV_USE_REALTIME 0
356#endif
357
358#if !EV_STAT_ENABLE
359# undef EV_USE_INOTIFY
360# define EV_USE_INOTIFY 0
361#endif
362
363#if !EV_USE_NANOSLEEP
364# ifndef _WIN32
365# include <sys/select.h>
366# endif
367#endif
368
369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
372# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY
376# define EV_USE_INOTIFY 0
377# endif
378#endif
379
380#if EV_SELECT_IS_WINSOCKET
381# include <winsock.h>
382#endif
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
642#ifndef EV_HAVE_EV_TIME
569ev_tstamp 643ev_tstamp
570ev_time (void) 644ev_time (void)
571{ 645{
572#if EV_USE_REALTIME 646#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 647 if (expect_true (have_realtime))
580 654
581 struct timeval tv; 655 struct timeval tv;
582 gettimeofday (&tv, 0); 656 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 657 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 658}
659#endif
585 660
586inline_size ev_tstamp 661inline_size ev_tstamp
587get_clock (void) 662get_clock (void)
588{ 663{
589#if EV_USE_MONOTONIC 664#if EV_USE_MONOTONIC
625 700
626 tv.tv_sec = (time_t)delay; 701 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 703
629 /* 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 */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 705 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 706 /* by older ones */
632 select (0, 0, 0, 0, &tv); 707 select (0, 0, 0, 0, &tv);
633#endif 708#endif
634 } 709 }
635} 710}
743} 818}
744 819
745/*****************************************************************************/ 820/*****************************************************************************/
746 821
747inline_speed void 822inline_speed void
748fd_event (EV_P_ int fd, int revents) 823fd_event_nc (EV_P_ int fd, int revents)
749{ 824{
750 ANFD *anfd = anfds + fd; 825 ANFD *anfd = anfds + fd;
751 ev_io *w; 826 ev_io *w;
752 827
753 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)
757 if (ev) 832 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 833 ev_feed_event (EV_A_ (W)w, ev);
759 } 834 }
760} 835}
761 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
762void 848void
763ev_feed_fd_event (EV_P_ int fd, int revents) 849ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 850{
765 if (fd >= 0 && fd < anfdmax) 851 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 852 fd_event_nc (EV_A_ fd, revents);
767} 853}
768 854
769/* make sure the external fd watch events are in-sync */ 855/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 856/* with the kernel/libev internal state */
771inline_size void 857inline_size void
871 957
872 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 959 if (anfds [fd].events)
874 { 960 {
875 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
876 return; 962 break;
877 } 963 }
878} 964}
879 965
880/* 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 */
881static void noinline 967static void noinline
886 for (fd = 0; fd < anfdmax; ++fd) 972 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 973 if (anfds [fd].events)
888 { 974 {
889 anfds [fd].events = 0; 975 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 976 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 978 }
893} 979}
894 980
895/*****************************************************************************/ 981/*****************************************************************************/
896 982
1040/*****************************************************************************/ 1126/*****************************************************************************/
1041 1127
1042/* associate signal watchers to a signal signal */ 1128/* associate signal watchers to a signal signal */
1043typedef struct 1129typedef struct
1044{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1045 WL head; 1135 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1136} ANSIG;
1048 1137
1049static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1139
1054/*****************************************************************************/ 1140/*****************************************************************************/
1055 1141
1056/* used to prepare libev internal fd's */ 1142/* used to prepare libev internal fd's */
1057/* this is not fork-safe */ 1143/* this is not fork-safe */
1071evpipe_init (EV_P) 1157evpipe_init (EV_P)
1072{ 1158{
1073 if (!ev_is_active (&pipe_w)) 1159 if (!ev_is_active (&pipe_w))
1074 { 1160 {
1075#if EV_USE_EVENTFD 1161#if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1164 evfd = eventfd (0, 0);
1165
1166 if (evfd >= 0)
1077 { 1167 {
1078 evpipe [0] = -1; 1168 evpipe [0] = -1;
1079 fd_intern (evfd); 1169 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1170 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1171 }
1082 else 1172 else
1083#endif 1173#endif
1084 { 1174 {
1121/* called whenever the libev signal pipe */ 1211/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1212/* got some events (signal, async) */
1123static void 1213static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1215{
1216 int i;
1217
1126#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1219 if (evfd >= 0)
1128 { 1220 {
1129 uint64_t counter; 1221 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
1134 { 1226 {
1135 char dummy; 1227 char dummy;
1136 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
1137 } 1229 }
1138 1230
1139 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
1140 { 1232 {
1141 int signum; 1233 sig_pending = 0;
1142 gotsig = 0;
1143 1234
1144 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1238 }
1148 1239
1149#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
1150 if (gotasync) 1241 if (async_pending)
1151 { 1242 {
1152 int i; 1243 async_pending = 0;
1153 gotasync = 0;
1154 1244
1155 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
1157 { 1247 {
1158 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
1166 1256
1167static void 1257static void
1168ev_sighandler (int signum) 1258ev_sighandler (int signum)
1169{ 1259{
1170#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
1172#endif 1262#endif
1173 1263
1174#if _WIN32 1264#if _WIN32
1175 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
1176#endif 1266#endif
1177 1267
1178 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
1180} 1270}
1181 1271
1182void noinline 1272void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
1184{ 1274{
1185 WL w; 1275 WL w;
1186 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
1187#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1188 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 */
1189#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1285
1191 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1287 return;
1288#endif
1195 1289
1196 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
1197 1291
1198 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 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
1201 1315
1202/*****************************************************************************/ 1316/*****************************************************************************/
1203 1317
1204static WL childs [EV_PID_HASHSIZE]; 1318static WL childs [EV_PID_HASHSIZE];
1205 1319
1350ev_backend (EV_P) 1464ev_backend (EV_P)
1351{ 1465{
1352 return backend; 1466 return backend;
1353} 1467}
1354 1468
1469#if EV_MINIMAL < 2
1355unsigned int 1470unsigned int
1356ev_loop_count (EV_P) 1471ev_loop_count (EV_P)
1357{ 1472{
1358 return loop_count; 1473 return loop_count;
1359} 1474}
1360 1475
1476unsigned int
1477ev_loop_depth (EV_P)
1478{
1479 return loop_depth;
1480}
1481
1361void 1482void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1483ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1484{
1364 io_blocktime = interval; 1485 io_blocktime = interval;
1365} 1486}
1367void 1488void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1489ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1490{
1370 timeout_blocktime = interval; 1491 timeout_blocktime = interval;
1371} 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
1372 1517
1373/* initialise a loop structure, must be zero-initialised */ 1518/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1519static void noinline
1375loop_init (EV_P_ unsigned int flags) 1520loop_init (EV_P_ unsigned int flags)
1376{ 1521{
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1540 have_monotonic = 1;
1396 } 1541 }
1397#endif 1542#endif
1398 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
1399 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1556 mn_now = get_clock ();
1401 now_floor = mn_now; 1557 now_floor = mn_now;
1402 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
1403 1562
1404 io_blocktime = 0.; 1563 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1406 backend = 0; 1565 backend = 0;
1407 backend_fd = -1; 1566 backend_fd = -1;
1408 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1409#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1410 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1573#endif
1412 1574#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1576#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1577
1424 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1426 1580
1427#if EV_USE_PORT 1581#if EV_USE_PORT
1453{ 1607{
1454 int i; 1608 int i;
1455 1609
1456 if (ev_is_active (&pipe_w)) 1610 if (ev_is_active (&pipe_w))
1457 { 1611 {
1458 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1614
1461#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1616 if (evfd >= 0)
1463 close (evfd); 1617 close (evfd);
1464#endif 1618#endif
1468 close (evpipe [0]); 1622 close (evpipe [0]);
1469 close (evpipe [1]); 1623 close (evpipe [1]);
1470 } 1624 }
1471 } 1625 }
1472 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
1473#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1475 close (fs_fd); 1639 close (fs_fd);
1476#endif 1640#endif
1477 1641
1500#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1665 array_free (idle, [i]);
1502#endif 1666#endif
1503 } 1667 }
1504 1668
1505 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1670
1507 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
1545 1709
1546 if (ev_is_active (&pipe_w)) 1710 if (ev_is_active (&pipe_w))
1547 { 1711 {
1548 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1550 gotsig = 1; 1714 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1716 async_pending = 1;
1553#endif 1717#endif
1554 1718
1555 ev_ref (EV_A); 1719 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1720 ev_io_stop (EV_A_ &pipe_w);
1557 1721
1577#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1578 1742
1579struct ev_loop * 1743struct ev_loop *
1580ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1581{ 1745{
1582 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));
1583 1747
1584 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1587 1750
1588 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1589 return loop; 1752 return EV_A;
1590 1753
1591 return 0; 1754 return 0;
1592} 1755}
1593 1756
1594void 1757void
1601void 1764void
1602ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1603{ 1766{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1605} 1768}
1769#endif /* multiplicity */
1606 1770
1607#if EV_VERIFY 1771#if EV_VERIFY
1608static void noinline 1772static void noinline
1609verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1610{ 1774{
1638 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1639 } 1803 }
1640} 1804}
1641#endif 1805#endif
1642 1806
1807#if EV_MINIMAL < 2
1643void 1808void
1644ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1645{ 1810{
1646#if EV_VERIFY 1811#if EV_VERIFY
1647 int i; 1812 int i;
1696 assert (checkmax >= checkcnt); 1861 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1862 array_verify (EV_A_ (W *)checks, checkcnt);
1698 1863
1699# if 0 1864# if 0
1700 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)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif 1867# endif
1703#endif 1868#endif
1704} 1869}
1705 1870#endif
1706#endif /* multiplicity */
1707 1871
1708#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1709struct ev_loop * 1873struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1711#else 1875#else
1714#endif 1878#endif
1715{ 1879{
1716 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1717 { 1881 {
1718#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1884#else
1721 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1722#endif 1886#endif
1723 1887
1724 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
1741 1905
1742void 1906void
1743ev_default_destroy (void) 1907ev_default_destroy (void)
1744{ 1908{
1745#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1747#endif 1911#endif
1748 1912
1749 ev_default_loop_ptr = 0; 1913 ev_default_loop_ptr = 0;
1750 1914
1751#ifndef _WIN32 1915#ifndef _WIN32
1758 1922
1759void 1923void
1760ev_default_fork (void) 1924ev_default_fork (void)
1761{ 1925{
1762#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1764#endif 1928#endif
1765 1929
1766 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1767} 1931}
1768 1932
1772ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1773{ 1937{
1774 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1775} 1939}
1776 1940
1777inline_speed void 1941unsigned int
1778call_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)
1779{ 1955{
1780 int pri; 1956 int pri;
1781 1957
1782 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
2018 2194
2019 mn_now = ev_rt_now; 2195 mn_now = ev_rt_now;
2020 } 2196 }
2021} 2197}
2022 2198
2023static int loop_done;
2024
2025void 2199void
2026ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
2027{ 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
2028 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
2029 2209
2030 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 */
2031 2211
2032 do 2212 do
2033 { 2213 {
2034#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
2048 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2229 if (expect_false (postfork))
2050 if (forkcnt) 2230 if (forkcnt)
2051 { 2231 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
2054 } 2234 }
2055#endif 2235#endif
2056 2236
2057 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
2059 { 2239 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
2062 } 2242 }
2243
2244 if (expect_false (loop_done))
2245 break;
2063 2246
2064 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2066 loop_fork (EV_A); 2249 loop_fork (EV_A);
2067 2250
2073 ev_tstamp waittime = 0.; 2256 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2257 ev_tstamp sleeptime = 0.;
2075 2258
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2260 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2078 /* update time to cancel out callback processing overhead */ 2264 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2265 time_update (EV_A_ 1e100);
2080 2266
2081 waittime = MAX_BLOCKTIME; 2267 waittime = MAX_BLOCKTIME;
2082 2268
2092 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;
2093 if (waittime > to) waittime = to; 2279 if (waittime > to) waittime = to;
2094 } 2280 }
2095#endif 2281#endif
2096 2282
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2284 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2285 waittime = timeout_blocktime;
2099 2286
2100 sleeptime = waittime - backend_fudge; 2287 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2288 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 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 {
2107 ev_sleep (sleeptime); 2297 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2298 waittime -= sleeptime;
2299 }
2109 } 2300 }
2110 } 2301 }
2111 2302
2303#if EV_MINIMAL < 2
2112 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2309
2115 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2117 } 2312 }
2118 2313
2129 2324
2130 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2328
2134 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2135 } 2330 }
2136 while (expect_true ( 2331 while (expect_true (
2137 activecnt 2332 activecnt
2138 && !loop_done 2333 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2335 ));
2141 2336
2142 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2339
2340#if EV_MINIMAL < 2
2341 --loop_depth;
2342#endif
2144} 2343}
2145 2344
2146void 2345void
2147ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2148{ 2347{
2199inline_size void 2398inline_size void
2200wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2201{ 2400{
2202 while (*head) 2401 while (*head)
2203 { 2402 {
2204 if (*head == elem) 2403 if (expect_true (*head == elem))
2205 { 2404 {
2206 *head = elem->next; 2405 *head = elem->next;
2207 return; 2406 break;
2208 } 2407 }
2209 2408
2210 head = &(*head)->next; 2409 head = &(*head)->next;
2211 } 2410 }
2212} 2411}
2240} 2439}
2241 2440
2242inline_size void 2441inline_size void
2243pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2244{ 2443{
2245 int pri = w->priority; 2444 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2447 ev_set_priority (w, pri);
2249} 2448}
2250 2449
2251inline_speed void 2450inline_speed void
2252ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2253{ 2452{
2280 2479
2281 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2284 2483
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2287 2486
2288 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2289} 2488}
2290 2489
2384 } 2583 }
2385 2584
2386 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2387} 2586}
2388 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
2389#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2390void noinline 2595void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2597{
2393 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
2460#endif 2665#endif
2461 2666
2462void noinline 2667void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2464{ 2669{
2465#if EV_MULTIPLICITY
2466 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2467#endif
2468 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2469 return; 2671 return;
2470 2672
2471 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));
2472 2674
2473 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));
2474 2678
2475 EV_FREQUENT_CHECK; 2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2476 2681
2682 EV_FREQUENT_CHECK;
2683
2684#if EV_USE_SIGNALFD
2685 if (sigfd == -2)
2477 { 2686 {
2478#ifndef _WIN32 2687 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2688 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2689 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2690
2484 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 */
2485 2694
2486#ifndef _WIN32 2695 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2696
2488#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 }
2489 } 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
2490 2713
2491 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2716
2494 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/
2720# endif
2495 { 2721 {
2496#if _WIN32 2722# if _WIN32
2497 signal (w->signum, ev_sighandler); 2723 signal (w->signum, ev_sighandler);
2498#else 2724# else
2499 struct sigaction sa; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2500 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2502 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 */
2503 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);
2504#endif 2737#endif
2505 } 2738 }
2506 2739
2507 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2508} 2741}
2509 2742
2510void noinline 2743void noinline
2518 2751
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2521 2754
2522 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
2523 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2524 2773
2525 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2526} 2775}
2527 2776
2528void 2777void
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3258{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3260
3012 { 3261 {
3013 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
3014 3263
3015 while (fdchangecnt) 3264 while (fdchangecnt)
3016 { 3265 {
3017 fd_reify (EV_A); 3266 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3026 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));
3027 3276
3028 ev_embed_stop (EV_A_ w); 3277 ev_embed_stop (EV_A_ w);
3029 3278
3030 { 3279 {
3031 struct ev_loop *loop = w->other; 3280 EV_P = w->other;
3032 3281
3033 ev_loop_fork (EV_A); 3282 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3284 }
3036 3285
3050{ 3299{
3051 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
3052 return; 3301 return;
3053 3302
3054 { 3303 {
3055 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
3056 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 ()));
3057 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);
3058 } 3307 }
3059 3308
3060 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
3172 3421
3173void 3422void
3174ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
3175{ 3424{
3176 w->sent = 1; 3425 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
3178} 3427}
3179#endif 3428#endif
3180 3429
3181/*****************************************************************************/ 3430/*****************************************************************************/
3182 3431
3331 if (types & EV_CHECK) 3580 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3581 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3582 cb (EV_A_ EV_CHECK, checks [i]);
3334 3583
3335 if (types & EV_SIGNAL) 3584 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3585 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3586 for (wl = signals [i].head; wl; )
3338 { 3587 {
3339 wn = wl->next; 3588 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3589 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3590 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines