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

Comparing libev/ev.c (file contents):
Revision 1.216 by root, Sat Mar 8 07:04:55 2008 UTC vs.
Revision 1.219 by root, Wed Apr 2 10:55:39 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);
… …
865} 865}
866 866
867/*****************************************************************************/ 867/*****************************************************************************/
868 868
869static void 869static void
870sighandler (int signum) 870ev_sighandler (int signum)
871{ 871{
872#if EV_MULTIPLICITY 872#if EV_MULTIPLICITY
873 struct ev_loop *loop = &default_loop_struct; 873 struct ev_loop *loop = &default_loop_struct;
874#endif 874#endif
875 875
876#if _WIN32 876#if _WIN32
877 signal (signum, sighandler); 877 signal (signum, ev_sighandler);
878#endif 878#endif
879 879
880 signals [signum - 1].gotsig = 1; 880 signals [signum - 1].gotsig = 1;
881 evpipe_write (EV_A_ &gotsig); 881 evpipe_write (EV_A_ &gotsig);
882} 882}
… …
1542static int loop_done; 1542static int loop_done;
1543 1543
1544void 1544void
1545ev_loop (EV_P_ int flags) 1545ev_loop (EV_P_ int flags)
1546{ 1546{
1547 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1547 loop_done = EVUNLOOP_CANCEL;
1548 ? EVUNLOOP_ONE
1549 : EVUNLOOP_CANCEL;
1550 1548
1551 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1549 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1552 1550
1553 do 1551 do
1554 { 1552 {
… …
1650 /* queue check watchers, to be executed first */ 1648 /* queue check watchers, to be executed first */
1651 if (expect_false (checkcnt)) 1649 if (expect_false (checkcnt))
1652 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1650 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1653 1651
1654 call_pending (EV_A); 1652 call_pending (EV_A);
1655
1656 } 1653 }
1657 while (expect_true (activecnt && !loop_done)); 1654 while (expect_true (
1655 activecnt
1656 && !loop_done
1657 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1658 ));
1658 1659
1659 if (loop_done == EVUNLOOP_ONE) 1660 if (loop_done == EVUNLOOP_ONE)
1660 loop_done = EVUNLOOP_CANCEL; 1661 loop_done = EVUNLOOP_CANCEL;
1661} 1662}
1662 1663
… …
1930 wlist_add (&signals [w->signum - 1].head, (WL)w); 1931 wlist_add (&signals [w->signum - 1].head, (WL)w);
1931 1932
1932 if (!((WL)w)->next) 1933 if (!((WL)w)->next)
1933 { 1934 {
1934#if _WIN32 1935#if _WIN32
1935 signal (w->signum, sighandler); 1936 signal (w->signum, ev_sighandler);
1936#else 1937#else
1937 struct sigaction sa; 1938 struct sigaction sa;
1938 sa.sa_handler = sighandler; 1939 sa.sa_handler = ev_sighandler;
1939 sigfillset (&sa.sa_mask); 1940 sigfillset (&sa.sa_mask);
1940 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1941 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1941 sigaction (w->signum, &sa, 0); 1942 sigaction (w->signum, &sa, 0);
1942#endif 1943#endif
1943 } 1944 }

Diff Legend

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