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

Comparing libev/ev.c (file contents):
Revision 1.209 by root, Tue Feb 5 23:56:33 2008 UTC vs.
Revision 1.214 by root, Tue Feb 19 19:21:20 2008 UTC

810 fd_intern (evpipe [0]); 810 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 811 fd_intern (evpipe [1]);
812 812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 813 ev_io_set (&pipeev, evpipe [0], EV_READ);
814 ev_io_start (EV_A_ &pipeev); 814 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* child watcher should not keep loop alive */ 815 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 816 }
817} 817}
818 818
819void inline_size 819void inline_size
820evpipe_write (EV_P_ int sig, int async) 820evpipe_write (EV_P_ EV_ATOMIC_T *flag)
821{ 821{
822 if (!(gotasync || gotsig)) 822 if (!*flag)
823 { 823 {
824 int old_errno = errno; 824 int old_errno = errno; /* save errno becaue write might clobber it */
825 825
826 if (sig) gotsig = 1; 826 *flag = 1;
827 if (async) gotasync = 1;
828
829 write (evpipe [1], &old_errno, 1); 827 write (evpipe [1], &old_errno, 1);
828
830 errno = old_errno; 829 errno = old_errno;
831 } 830 }
832} 831}
833 832
834static void 833static void
837 { 836 {
838 int dummy; 837 int dummy;
839 read (evpipe [0], &dummy, 1); 838 read (evpipe [0], &dummy, 1);
840 } 839 }
841 840
842 if (gotsig) 841 if (gotsig && ev_is_default_loop (EV_A))
843 { 842 {
844 int signum; 843 int signum;
845 gotsig = 0; 844 gotsig = 0;
846 845
847 for (signum = signalmax; signum--; ) 846 for (signum = signalmax; signum--; )
877#if _WIN32 876#if _WIN32
878 signal (signum, sighandler); 877 signal (signum, sighandler);
879#endif 878#endif
880 879
881 signals [signum - 1].gotsig = 1; 880 signals [signum - 1].gotsig = 1;
882 evpipe_write (EV_A_ 1, 0); 881 evpipe_write (EV_A_ &gotsig);
883} 882}
884 883
885void noinline 884void noinline
886ev_feed_signal_event (EV_P_ int signum) 885ev_feed_signal_event (EV_P_ int signum)
887{ 886{
1217#endif 1216#endif
1218 1217
1219 if (ev_is_active (&pipeev)) 1218 if (ev_is_active (&pipeev))
1220 { 1219 {
1221 /* this "locks" the handlers against writing to the pipe */ 1220 /* this "locks" the handlers against writing to the pipe */
1221 /* while we modify the fd vars */
1222 gotsig = 1;
1223#if EV_ASYNC_ENABLE
1222 gotsig = gotasync = 1; 1224 gotasync = 1;
1225#endif
1223 1226
1224 ev_ref (EV_A); 1227 ev_ref (EV_A);
1225 ev_io_stop (EV_A_ &pipeev); 1228 ev_io_stop (EV_A_ &pipeev);
1226 close (evpipe [0]); 1229 close (evpipe [0]);
1227 close (evpipe [1]); 1230 close (evpipe [1]);
2463 2466
2464void 2467void
2465ev_async_send (EV_P_ ev_async *w) 2468ev_async_send (EV_P_ ev_async *w)
2466{ 2469{
2467 w->sent = 1; 2470 w->sent = 1;
2468 evpipe_write (EV_A_ 0, 1); 2471 evpipe_write (EV_A_ &gotasync);
2469} 2472}
2470#endif 2473#endif
2471 2474
2472/*****************************************************************************/ 2475/*****************************************************************************/
2473 2476

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines