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

Comparing libev/ev.c (file contents):
Revision 1.213 by root, Tue Feb 19 19:13:50 2008 UTC vs.
Revision 1.217 by root, Sat Mar 22 13:42:45 2008 UTC

… …
451 ts.tv_sec = (time_t)delay; 451 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 453
454 nanosleep (&ts, 0); 454 nanosleep (&ts, 0);
455#elif defined(_WIN32) 455#elif defined(_WIN32)
456 Sleep (delay * 1e3); 456 Sleep ((unsigned long)(delay * 1e3));
457#else 457#else
458 struct timeval tv; 458 struct timeval tv;
459 459
460 tv.tv_sec = (time_t)delay; 460 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
815 ev_unref (EV_A); /* 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 int sent = gotasync || gotsig; 822 if (!*flag)
823
824 if (sig) gotsig = 1;
825 if (async) gotasync = 1;
826
827 if (!sent)
828 { 823 {
829 int old_errno = errno; /* save errno becaue write might clobber it */ 824 int old_errno = errno; /* save errno because write might clobber it */
825
826 *flag = 1;
830 write (evpipe [1], &old_errno, 1); 827 write (evpipe [1], &old_errno, 1);
828
831 errno = old_errno; 829 errno = old_errno;
832 } 830 }
833} 831}
834 832
835static void 833static void
… …
878#if _WIN32 876#if _WIN32
879 signal (signum, sighandler); 877 signal (signum, sighandler);
880#endif 878#endif
881 879
882 signals [signum - 1].gotsig = 1; 880 signals [signum - 1].gotsig = 1;
883 evpipe_write (EV_A_ 1, 0); 881 evpipe_write (EV_A_ &gotsig);
884} 882}
885 883
886void noinline 884void noinline
887ev_feed_signal_event (EV_P_ int signum) 885ev_feed_signal_event (EV_P_ int signum)
888{ 886{
… …
914#ifndef WIFCONTINUED 912#ifndef WIFCONTINUED
915# define WIFCONTINUED(status) 0 913# define WIFCONTINUED(status) 0
916#endif 914#endif
917 915
918void inline_speed 916void inline_speed
919child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 917child_reap (EV_P_ int chain, int pid, int status)
920{ 918{
921 ev_child *w; 919 ev_child *w;
922 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 920 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
923 921
924 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 922 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
925 { 923 {
926 if ((w->pid == pid || !w->pid) 924 if ((w->pid == pid || !w->pid)
927 && (!traced || (w->flags & 1))) 925 && (!traced || (w->flags & 1)))
928 { 926 {
929 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 927 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
930 w->rpid = pid; 928 w->rpid = pid;
931 w->rstatus = status; 929 w->rstatus = status;
932 ev_feed_event (EV_A_ (W)w, EV_CHILD); 930 ev_feed_event (EV_A_ (W)w, EV_CHILD);
933 } 931 }
934 } 932 }
… …
948 if (!WCONTINUED 946 if (!WCONTINUED
949 || errno != EINVAL 947 || errno != EINVAL
950 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 948 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
951 return; 949 return;
952 950
953 /* make sure we are called again until all childs have been reaped */ 951 /* make sure we are called again until all children have been reaped */
954 /* we need to do it this way so that the callback gets called before we continue */ 952 /* we need to do it this way so that the callback gets called before we continue */
955 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 953 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
956 954
957 child_reap (EV_A_ sw, pid, pid, status); 955 child_reap (EV_A_ pid, pid, status);
958 if (EV_PID_HASHSIZE > 1) 956 if (EV_PID_HASHSIZE > 1)
959 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 957 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
960} 958}
961 959
962#endif 960#endif
963 961
964/*****************************************************************************/ 962/*****************************************************************************/
… …
2468 2466
2469void 2467void
2470ev_async_send (EV_P_ ev_async *w) 2468ev_async_send (EV_P_ ev_async *w)
2471{ 2469{
2472 w->sent = 1; 2470 w->sent = 1;
2473 evpipe_write (EV_A_ 0, 1); 2471 evpipe_write (EV_A_ &gotasync);
2474} 2472}
2475#endif 2473#endif
2476 2474
2477/*****************************************************************************/ 2475/*****************************************************************************/
2478 2476

Diff Legend

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