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

Comparing libev/ev.c (file contents):
Revision 1.94 by root, Sun Nov 11 01:29:49 2007 UTC vs.
Revision 1.97 by root, Sun Nov 11 01:53:07 2007 UTC

… …
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# include "config.h" 37# include "config.h"
38 38
39# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
40# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
41# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
42# endif 46# endif
43 47
44# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
45# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
46# endif 50# endif
47 51
48# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
49# define EV_USE_POLL 1 53# define EV_USE_POLL 1
50# endif 54# endif
51 55
52# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
53# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
54# endif 58# endif
55 59
56# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
57# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
58# endif 62# endif
59 63
60#endif 64#endif
61 65
… …
1434 1438
1435void 1439void
1436ev_idle_stop (EV_P_ struct ev_idle *w) 1440ev_idle_stop (EV_P_ struct ev_idle *w)
1437{ 1441{
1438 ev_clear_pending (EV_A_ (W)w); 1442 ev_clear_pending (EV_A_ (W)w);
1439 if (!ev_is_active (w)) 1443 if (ev_is_active (w))
1440 return; 1444 return;
1441 1445
1442 idles [((W)w)->active - 1] = idles [--idlecnt]; 1446 idles [((W)w)->active - 1] = idles [--idlecnt];
1443 ev_stop (EV_A_ (W)w); 1447 ev_stop (EV_A_ (W)w);
1444} 1448}
… …
1456 1460
1457void 1461void
1458ev_prepare_stop (EV_P_ struct ev_prepare *w) 1462ev_prepare_stop (EV_P_ struct ev_prepare *w)
1459{ 1463{
1460 ev_clear_pending (EV_A_ (W)w); 1464 ev_clear_pending (EV_A_ (W)w);
1461 if (!ev_is_active (w)) 1465 if (ev_is_active (w))
1462 return; 1466 return;
1463 1467
1464 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1468 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1465 ev_stop (EV_A_ (W)w); 1469 ev_stop (EV_A_ (W)w);
1466} 1470}
… …
1549 1553
1550void 1554void
1551ev_child_stop (EV_P_ struct ev_child *w) 1555ev_child_stop (EV_P_ struct ev_child *w)
1552{ 1556{
1553 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1554 if (ev_is_active (w)) 1558 if (!ev_is_active (w))
1555 return; 1559 return;
1556 1560
1557 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1561 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1558 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1559} 1563}

Diff Legend

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