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

Comparing libev/ev.c (file contents):
Revision 1.38 by root, Thu Nov 1 15:21:13 2007 UTC vs.
Revision 1.51 by root, Sat Nov 3 21:58:51 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31#if EV_USE_CONFIG_H 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33#endif 33#endif
34 34
35#include <math.h> 35#include <math.h>
36#include <stdlib.h> 36#include <stdlib.h>
42#include <stdio.h> 42#include <stdio.h>
43 43
44#include <assert.h> 44#include <assert.h>
45#include <errno.h> 45#include <errno.h>
46#include <sys/types.h> 46#include <sys/types.h>
47#ifndef WIN32
47#include <sys/wait.h> 48# include <sys/wait.h>
49#endif
48#include <sys/time.h> 50#include <sys/time.h>
49#include <time.h> 51#include <time.h>
50 52
53/**/
54
51#ifndef EV_USE_MONOTONIC 55#ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 1 56# define EV_USE_MONOTONIC 1
53#endif 57#endif
58
59#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1
61#endif
62
63#ifndef EV_USEV_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif
66
67#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0
69#endif
70
71#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0
73#endif
74
75#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1
77#endif
78
79/**/
54 80
55#ifndef CLOCK_MONOTONIC 81#ifndef CLOCK_MONOTONIC
56# undef EV_USE_MONOTONIC 82# undef EV_USE_MONOTONIC
57# define EV_USE_MONOTONIC 0 83# define EV_USE_MONOTONIC 0
58#endif 84#endif
59 85
60#ifndef EV_USE_SELECT
61# define EV_USE_SELECT 1
62#endif
63
64#ifndef EV_USE_EPOLL
65# define EV_USE_EPOLL 0
66#endif
67
68#ifndef CLOCK_REALTIME 86#ifndef CLOCK_REALTIME
87# undef EV_USE_REALTIME
69# define EV_USE_REALTIME 0 88# define EV_USE_REALTIME 0
70#endif 89#endif
71#ifndef EV_USE_REALTIME 90
72# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */ 91/**/
73#endif
74 92
75#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 93#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
76#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */ 94#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
77#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 95#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
78#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 96/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
79 97
80#include "ev.h" 98#include "ev.h"
99
100#if __GNUC__ >= 3
101# define expect(expr,value) __builtin_expect ((expr),(value))
102# define inline inline
103#else
104# define expect(expr,value) (expr)
105# define inline static
106#endif
107
108#define expect_false(expr) expect ((expr) != 0, 0)
109#define expect_true(expr) expect ((expr) != 0, 1)
110
111#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
112#define ABSPRI(w) ((w)->priority - EV_MINPRI)
81 113
82typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
83typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
84typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
85 117
86static ev_tstamp now, diff; /* monotonic clock */ 118static ev_tstamp now_floor, mn_now, diff; /* monotonic clock */
87ev_tstamp ev_now; 119static ev_tstamp rt_now;
88int ev_method; 120static int method;
89 121
90static int have_monotonic; /* runtime */ 122static int have_monotonic; /* runtime */
91 123
92static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */ 124static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
93static void (*method_modify)(int fd, int oev, int nev); 125static void (*method_modify)(EV_P_ int fd, int oev, int nev);
94static void (*method_poll)(ev_tstamp timeout); 126static void (*method_poll)(EV_P_ ev_tstamp timeout);
127
128static int activecnt; /* number of active events */
129
130#if EV_USE_SELECT
131static unsigned char *vec_ri, *vec_ro, *vec_wi, *vec_wo;
132static int vec_max;
133#endif
134
135#if EV_USEV_POLL
136static struct pollfd *polls;
137static int pollmax, pollcnt;
138static int *pollidxs; /* maps fds into structure indices */
139static int pollidxmax;
140#endif
141
142#if EV_USE_EPOLL
143static int epoll_fd = -1;
144
145static struct epoll_event *events;
146static int eventmax;
147#endif
148
149#if EV_USE_KQUEUE
150static int kqueue_fd;
151static struct kevent *kqueue_changes;
152static int kqueue_changemax, kqueue_changecnt;
153static struct kevent *kqueue_events;
154static int kqueue_eventmax;
155#endif
95 156
96/*****************************************************************************/ 157/*****************************************************************************/
97 158
98ev_tstamp 159inline ev_tstamp
99ev_time (void) 160ev_time (void)
100{ 161{
101#if EV_USE_REALTIME 162#if EV_USE_REALTIME
102 struct timespec ts; 163 struct timespec ts;
103 clock_gettime (CLOCK_REALTIME, &ts); 164 clock_gettime (CLOCK_REALTIME, &ts);
107 gettimeofday (&tv, 0); 168 gettimeofday (&tv, 0);
108 return tv.tv_sec + tv.tv_usec * 1e-6; 169 return tv.tv_sec + tv.tv_usec * 1e-6;
109#endif 170#endif
110} 171}
111 172
112static ev_tstamp 173inline ev_tstamp
113get_clock (void) 174get_clock (void)
114{ 175{
115#if EV_USE_MONOTONIC 176#if EV_USE_MONOTONIC
116 if (have_monotonic) 177 if (expect_true (have_monotonic))
117 { 178 {
118 struct timespec ts; 179 struct timespec ts;
119 clock_gettime (CLOCK_MONOTONIC, &ts); 180 clock_gettime (CLOCK_MONOTONIC, &ts);
120 return ts.tv_sec + ts.tv_nsec * 1e-9; 181 return ts.tv_sec + ts.tv_nsec * 1e-9;
121 } 182 }
122#endif 183#endif
123 184
124 return ev_time (); 185 return ev_time ();
125} 186}
126 187
188ev_tstamp
189ev_now (EV_P)
190{
191 return rt_now;
192}
193
127#define array_roundsize(base,n) ((n) | 4 & ~3) 194#define array_roundsize(base,n) ((n) | 4 & ~3)
128 195
129#define array_needsize(base,cur,cnt,init) \ 196#define array_needsize(base,cur,cnt,init) \
130 if ((cnt) > cur) \ 197 if (expect_false ((cnt) > cur)) \
131 { \ 198 { \
132 int newcnt = cur; \ 199 int newcnt = cur; \
133 do \ 200 do \
134 { \ 201 { \
135 newcnt = array_roundsize (base, newcnt << 1); \ 202 newcnt = array_roundsize (base, newcnt << 1); \
143 210
144/*****************************************************************************/ 211/*****************************************************************************/
145 212
146typedef struct 213typedef struct
147{ 214{
148 struct ev_io *head; 215 struct ev_watcher_list *head;
149 unsigned char events; 216 unsigned char events;
150 unsigned char reify; 217 unsigned char reify;
151} ANFD; 218} ANFD;
152 219
153static ANFD *anfds; 220static ANFD *anfds;
170{ 237{
171 W w; 238 W w;
172 int events; 239 int events;
173} ANPENDING; 240} ANPENDING;
174 241
175static ANPENDING *pendings; 242static ANPENDING *pendings [NUMPRI];
176static int pendingmax, pendingcnt; 243static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
177 244
178static void 245static void
179event (W w, int events) 246event (EV_P_ W w, int events)
180{ 247{
181 if (w->pending) 248 if (w->pending)
182 { 249 {
183 pendings [w->pending - 1].events |= events; 250 pendings [ABSPRI (w)][w->pending - 1].events |= events;
184 return; 251 return;
185 } 252 }
186 253
187 w->pending = ++pendingcnt; 254 w->pending = ++pendingcnt [ABSPRI (w)];
188 array_needsize (pendings, pendingmax, pendingcnt, ); 255 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
189 pendings [pendingcnt - 1].w = w; 256 pendings [ABSPRI (w)][w->pending - 1].w = w;
190 pendings [pendingcnt - 1].events = events; 257 pendings [ABSPRI (w)][w->pending - 1].events = events;
191} 258}
192 259
193static void 260static void
194queue_events (W *events, int eventcnt, int type) 261queue_events (EV_P_ W *events, int eventcnt, int type)
195{ 262{
196 int i; 263 int i;
197 264
198 for (i = 0; i < eventcnt; ++i) 265 for (i = 0; i < eventcnt; ++i)
199 event (events [i], type); 266 event (EV_A_ events [i], type);
200} 267}
201 268
202static void 269static void
203fd_event (int fd, int events) 270fd_event (EV_P_ int fd, int events)
204{ 271{
205 ANFD *anfd = anfds + fd; 272 ANFD *anfd = anfds + fd;
206 struct ev_io *w; 273 struct ev_io *w;
207 274
208 for (w = anfd->head; w; w = w->next) 275 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
209 { 276 {
210 int ev = w->events & events; 277 int ev = w->events & events;
211 278
212 if (ev) 279 if (ev)
213 event ((W)w, ev); 280 event (EV_A_ (W)w, ev);
214 } 281 }
215} 282}
216 283
217/*****************************************************************************/ 284/*****************************************************************************/
218 285
219static int *fdchanges; 286static int *fdchanges;
220static int fdchangemax, fdchangecnt; 287static int fdchangemax, fdchangecnt;
221 288
222static void 289static void
223fd_reify (void) 290fd_reify (EV_P)
224{ 291{
225 int i; 292 int i;
226 293
227 for (i = 0; i < fdchangecnt; ++i) 294 for (i = 0; i < fdchangecnt; ++i)
228 { 295 {
230 ANFD *anfd = anfds + fd; 297 ANFD *anfd = anfds + fd;
231 struct ev_io *w; 298 struct ev_io *w;
232 299
233 int events = 0; 300 int events = 0;
234 301
235 for (w = anfd->head; w; w = w->next) 302 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
236 events |= w->events; 303 events |= w->events;
237 304
238 anfd->reify = 0; 305 anfd->reify = 0;
239 306
240 if (anfd->events != events) 307 if (anfd->events != events)
241 { 308 {
242 method_modify (fd, anfd->events, events); 309 method_modify (EV_A_ fd, anfd->events, events);
243 anfd->events = events; 310 anfd->events = events;
244 } 311 }
245 } 312 }
246 313
247 fdchangecnt = 0; 314 fdchangecnt = 0;
248} 315}
249 316
250static void 317static void
251fd_change (int fd) 318fd_change (EV_P_ int fd)
252{ 319{
253 if (anfds [fd].reify || fdchangecnt < 0) 320 if (anfds [fd].reify || fdchangecnt < 0)
254 return; 321 return;
255 322
256 anfds [fd].reify = 1; 323 anfds [fd].reify = 1;
258 ++fdchangecnt; 325 ++fdchangecnt;
259 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 326 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
260 fdchanges [fdchangecnt - 1] = fd; 327 fdchanges [fdchangecnt - 1] = fd;
261} 328}
262 329
330static void
331fd_kill (EV_P_ int fd)
332{
333 struct ev_io *w;
334
335 while ((w = (struct ev_io *)anfds [fd].head))
336 {
337 ev_io_stop (EV_A_ w);
338 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
339 }
340}
341
263/* called on EBADF to verify fds */ 342/* called on EBADF to verify fds */
264static void 343static void
265fd_recheck (void) 344fd_ebadf (EV_P)
266{ 345{
267 int fd; 346 int fd;
268 347
269 for (fd = 0; fd < anfdmax; ++fd) 348 for (fd = 0; fd < anfdmax; ++fd)
270 if (anfds [fd].events) 349 if (anfds [fd].events)
271 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 350 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
272 while (anfds [fd].head) 351 fd_kill (EV_A_ fd);
352}
353
354/* called on ENOMEM in select/poll to kill some fds and retry */
355static void
356fd_enomem (EV_P)
357{
358 int fd = anfdmax;
359
360 while (fd--)
361 if (anfds [fd].events)
273 { 362 {
274 ev_io_stop (anfds [fd].head); 363 close (fd);
275 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE); 364 fd_kill (EV_A_ fd);
365 return;
276 } 366 }
277} 367}
278 368
279/*****************************************************************************/ 369/*****************************************************************************/
280 370
281static struct ev_timer **timers; 371static struct ev_timer **timers;
327 417
328/*****************************************************************************/ 418/*****************************************************************************/
329 419
330typedef struct 420typedef struct
331{ 421{
332 struct ev_signal *head; 422 struct ev_watcher_list *head;
333 sig_atomic_t volatile gotsig; 423 sig_atomic_t volatile gotsig;
334} ANSIG; 424} ANSIG;
335 425
336static ANSIG *signals; 426static ANSIG *signals;
337static int signalmax; 427static int signalmax;
357{ 447{
358 signals [signum - 1].gotsig = 1; 448 signals [signum - 1].gotsig = 1;
359 449
360 if (!gotsig) 450 if (!gotsig)
361 { 451 {
452 int old_errno = errno;
362 gotsig = 1; 453 gotsig = 1;
363 write (sigpipe [1], &signum, 1); 454 write (sigpipe [1], &signum, 1);
455 errno = old_errno;
364 } 456 }
365} 457}
366 458
367static void 459static void
368sigcb (struct ev_io *iow, int revents) 460sigcb (EV_P_ struct ev_io *iow, int revents)
369{ 461{
370 struct ev_signal *w; 462 struct ev_watcher_list *w;
371 int signum; 463 int signum;
372 464
373 read (sigpipe [0], &revents, 1); 465 read (sigpipe [0], &revents, 1);
374 gotsig = 0; 466 gotsig = 0;
375 467
377 if (signals [signum].gotsig) 469 if (signals [signum].gotsig)
378 { 470 {
379 signals [signum].gotsig = 0; 471 signals [signum].gotsig = 0;
380 472
381 for (w = signals [signum].head; w; w = w->next) 473 for (w = signals [signum].head; w; w = w->next)
382 event ((W)w, EV_SIGNAL); 474 event (EV_A_ (W)w, EV_SIGNAL);
383 } 475 }
384} 476}
385 477
386static void 478static void
387siginit (void) 479siginit (EV_P)
388{ 480{
481#ifndef WIN32
389 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 482 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
390 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 483 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
391 484
392 /* rather than sort out wether we really need nb, set it */ 485 /* rather than sort out wether we really need nb, set it */
393 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 486 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
394 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 487 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
488#endif
395 489
396 ev_io_set (&sigev, sigpipe [0], EV_READ); 490 ev_io_set (&sigev, sigpipe [0], EV_READ);
397 ev_io_start (&sigev); 491 ev_io_start (&sigev);
398} 492}
399 493
411/*****************************************************************************/ 505/*****************************************************************************/
412 506
413static struct ev_child *childs [PID_HASHSIZE]; 507static struct ev_child *childs [PID_HASHSIZE];
414static struct ev_signal childev; 508static struct ev_signal childev;
415 509
510#ifndef WIN32
511
416#ifndef WCONTINUED 512#ifndef WCONTINUED
417# define WCONTINUED 0 513# define WCONTINUED 0
418#endif 514#endif
419 515
420static void 516static void
421childcb (struct ev_signal *sw, int revents) 517child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
422{ 518{
423 struct ev_child *w; 519 struct ev_child *w;
520
521 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
522 if (w->pid == pid || !w->pid)
523 {
524 w->priority = sw->priority; /* need to do it *now* */
525 w->rpid = pid;
526 w->rstatus = status;
527 event (EV_A_ (W)w, EV_CHILD);
528 }
529}
530
531static void
532childcb (EV_P_ struct ev_signal *sw, int revents)
533{
424 int pid, status; 534 int pid, status;
425 535
426 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 536 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
427 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 537 {
428 if (w->pid == pid || w->pid == -1) 538 /* make sure we are called again until all childs have been reaped */
429 { 539 event (EV_A_ (W)sw, EV_SIGNAL);
430 w->status = status; 540
431 event ((W)w, EV_CHILD); 541 child_reap (EV_A_ sw, pid, pid, status);
432 } 542 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
543 }
433} 544}
545
546#endif
434 547
435/*****************************************************************************/ 548/*****************************************************************************/
436 549
550#if EV_USE_KQUEUE
551# include "ev_kqueue.c"
552#endif
437#if EV_USE_EPOLL 553#if EV_USE_EPOLL
438# include "ev_epoll.c" 554# include "ev_epoll.c"
439#endif 555#endif
556#if EV_USEV_POLL
557# include "ev_poll.c"
558#endif
440#if EV_USE_SELECT 559#if EV_USE_SELECT
441# include "ev_select.c" 560# include "ev_select.c"
442#endif 561#endif
443 562
444int 563int
451ev_version_minor (void) 570ev_version_minor (void)
452{ 571{
453 return EV_VERSION_MINOR; 572 return EV_VERSION_MINOR;
454} 573}
455 574
456int ev_init (int flags) 575/* return true if we are running with elevated privileges and should ignore env variables */
576static int
577enable_secure (void)
457{ 578{
579#ifdef WIN32
580 return 0;
581#else
582 return getuid () != geteuid ()
583 || getgid () != getegid ();
584#endif
585}
586
587int
588ev_method (EV_P)
589{
590 return method;
591}
592
593int
594ev_init (EV_P_ int methods)
595{
458 if (!ev_method) 596 if (!method)
459 { 597 {
460#if EV_USE_MONOTONIC 598#if EV_USE_MONOTONIC
461 { 599 {
462 struct timespec ts; 600 struct timespec ts;
463 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 601 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
464 have_monotonic = 1; 602 have_monotonic = 1;
465 } 603 }
466#endif 604#endif
467 605
468 ev_now = ev_time (); 606 rt_now = ev_time ();
469 now = get_clock (); 607 mn_now = get_clock ();
608 now_floor = mn_now;
470 diff = ev_now - now; 609 diff = rt_now - mn_now;
471 610
472 if (pipe (sigpipe)) 611 if (pipe (sigpipe))
473 return 0; 612 return 0;
474 613
614 if (methods == EVMETHOD_AUTO)
615 if (!enable_secure () && getenv ("LIBmethodS"))
616 methods = atoi (getenv ("LIBmethodS"));
617 else
475 ev_method = EVMETHOD_NONE; 618 methods = EVMETHOD_ANY;
619
620 method = 0;
621#if EV_USE_KQUEUE
622 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
623#endif
476#if EV_USE_EPOLL 624#if EV_USE_EPOLL
477 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 625 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
626#endif
627#if EV_USEV_POLL
628 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
478#endif 629#endif
479#if EV_USE_SELECT 630#if EV_USE_SELECT
480 if (ev_method == EVMETHOD_NONE) select_init (flags); 631 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
481#endif 632#endif
482 633
483 if (ev_method) 634 if (method)
484 { 635 {
485 ev_watcher_init (&sigev, sigcb); 636 ev_watcher_init (&sigev, sigcb);
637 ev_set_priority (&sigev, EV_MAXPRI);
486 siginit (); 638 siginit (EV_A);
487 639
640#ifndef WIN32
488 ev_signal_init (&childev, childcb, SIGCHLD); 641 ev_signal_init (&childev, childcb, SIGCHLD);
642 ev_set_priority (&childev, EV_MAXPRI);
489 ev_signal_start (&childev); 643 ev_signal_start (EV_A_ &childev);
644#endif
490 } 645 }
491 } 646 }
492 647
493 return ev_method; 648 return method;
494} 649}
495 650
496/*****************************************************************************/ 651/*****************************************************************************/
497 652
498void 653void
509 664
510void 665void
511ev_fork_child (void) 666ev_fork_child (void)
512{ 667{
513#if EV_USE_EPOLL 668#if EV_USE_EPOLL
514 if (ev_method == EVMETHOD_EPOLL) 669 if (method == EVMETHOD_EPOLL)
515 epoll_postfork_child (); 670 epoll_postfork_child ();
516#endif 671#endif
517 672
518 ev_io_stop (&sigev); 673 ev_io_stop (&sigev);
519 close (sigpipe [0]); 674 close (sigpipe [0]);
523} 678}
524 679
525/*****************************************************************************/ 680/*****************************************************************************/
526 681
527static void 682static void
528call_pending (void) 683call_pending (EV_P)
529{ 684{
685 int pri;
686
687 for (pri = NUMPRI; pri--; )
530 while (pendingcnt) 688 while (pendingcnt [pri])
531 { 689 {
532 ANPENDING *p = pendings + --pendingcnt; 690 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
533 691
534 if (p->w) 692 if (p->w)
535 { 693 {
536 p->w->pending = 0; 694 p->w->pending = 0;
537 p->w->cb (p->w, p->events); 695 p->w->cb (EV_A_ p->w, p->events);
538 } 696 }
539 } 697 }
540} 698}
541 699
542static void 700static void
543timers_reify (void) 701timers_reify (EV_P)
544{ 702{
545 while (timercnt && timers [0]->at <= now) 703 while (timercnt && timers [0]->at <= mn_now)
546 { 704 {
547 struct ev_timer *w = timers [0]; 705 struct ev_timer *w = timers [0];
548 706
549 /* first reschedule or stop timer */ 707 /* first reschedule or stop timer */
550 if (w->repeat) 708 if (w->repeat)
551 { 709 {
552 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 710 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
553 w->at = now + w->repeat; 711 w->at = mn_now + w->repeat;
554 downheap ((WT *)timers, timercnt, 0); 712 downheap ((WT *)timers, timercnt, 0);
555 } 713 }
556 else 714 else
557 ev_timer_stop (w); /* nonrepeating: stop timer */ 715 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
558 716
559 event ((W)w, EV_TIMEOUT); 717 event ((W)w, EV_TIMEOUT);
560 } 718 }
561} 719}
562 720
563static void 721static void
564periodics_reify (void) 722periodics_reify (EV_P)
565{ 723{
566 while (periodiccnt && periodics [0]->at <= ev_now) 724 while (periodiccnt && periodics [0]->at <= rt_now)
567 { 725 {
568 struct ev_periodic *w = periodics [0]; 726 struct ev_periodic *w = periodics [0];
569 727
570 /* first reschedule or stop timer */ 728 /* first reschedule or stop timer */
571 if (w->interval) 729 if (w->interval)
572 { 730 {
573 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 731 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
574 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now)); 732 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
575 downheap ((WT *)periodics, periodiccnt, 0); 733 downheap ((WT *)periodics, periodiccnt, 0);
576 } 734 }
577 else 735 else
578 ev_periodic_stop (w); /* nonrepeating: stop timer */ 736 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
579 737
580 event ((W)w, EV_PERIODIC); 738 event (EV_A_ (W)w, EV_PERIODIC);
581 } 739 }
582} 740}
583 741
584static void 742static void
585periodics_reschedule (ev_tstamp diff) 743periodics_reschedule (EV_P_ ev_tstamp diff)
586{ 744{
587 int i; 745 int i;
588 746
589 /* adjust periodics after time jump */ 747 /* adjust periodics after time jump */
590 for (i = 0; i < periodiccnt; ++i) 748 for (i = 0; i < periodiccnt; ++i)
591 { 749 {
592 struct ev_periodic *w = periodics [i]; 750 struct ev_periodic *w = periodics [i];
593 751
594 if (w->interval) 752 if (w->interval)
595 { 753 {
596 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 754 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
597 755
598 if (fabs (diff) >= 1e-4) 756 if (fabs (diff) >= 1e-4)
599 { 757 {
600 ev_periodic_stop (w); 758 ev_periodic_stop (EV_A_ w);
601 ev_periodic_start (w); 759 ev_periodic_start (EV_A_ w);
602 760
603 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 761 i = 0; /* restart loop, inefficient, but time jumps should be rare */
604 } 762 }
605 } 763 }
606 } 764 }
607} 765}
608 766
767inline int
768time_update_monotonic (EV_P)
769{
770 mn_now = get_clock ();
771
772 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
773 {
774 rt_now = mn_now + diff;
775 return 0;
776 }
777 else
778 {
779 now_floor = mn_now;
780 rt_now = ev_time ();
781 return 1;
782 }
783}
784
609static void 785static void
610time_update (void) 786time_update (EV_P)
611{ 787{
612 int i; 788 int i;
613 789
614 ev_now = ev_time (); 790#if EV_USE_MONOTONIC
615
616 if (have_monotonic) 791 if (expect_true (have_monotonic))
617 { 792 {
618 ev_tstamp odiff = diff; 793 if (time_update_monotonic (EV_A))
619
620 for (i = 4; --i; ) /* loop a few times, before making important decisions */
621 { 794 {
622 now = get_clock (); 795 ev_tstamp odiff = diff;
796
797 for (i = 4; --i; ) /* loop a few times, before making important decisions */
798 {
623 diff = ev_now - now; 799 diff = rt_now - mn_now;
624 800
625 if (fabs (odiff - diff) < MIN_TIMEJUMP) 801 if (fabs (odiff - diff) < MIN_TIMEJUMP)
626 return; /* all is well */ 802 return; /* all is well */
627 803
628 ev_now = ev_time (); 804 rt_now = ev_time ();
805 mn_now = get_clock ();
806 now_floor = mn_now;
807 }
808
809 periodics_reschedule (EV_A_ diff - odiff);
810 /* no timer adjustment, as the monotonic clock doesn't jump */
629 } 811 }
630
631 periodics_reschedule (diff - odiff);
632 /* no timer adjustment, as the monotonic clock doesn't jump */
633 } 812 }
634 else 813 else
814#endif
635 { 815 {
636 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 816 rt_now = ev_time ();
817
818 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
637 { 819 {
638 periodics_reschedule (ev_now - now); 820 periodics_reschedule (EV_A_ rt_now - mn_now);
639 821
640 /* adjust timers. this is easy, as the offset is the same for all */ 822 /* adjust timers. this is easy, as the offset is the same for all */
641 for (i = 0; i < timercnt; ++i) 823 for (i = 0; i < timercnt; ++i)
642 timers [i]->at += diff; 824 timers [i]->at += diff;
643 } 825 }
644 826
645 now = ev_now; 827 mn_now = rt_now;
646 } 828 }
647} 829}
648 830
649int ev_loop_done; 831void
832ev_ref (EV_P)
833{
834 ++activecnt;
835}
650 836
837void
838ev_unref (EV_P)
839{
840 --activecnt;
841}
842
843static int loop_done;
844
845void
651void ev_loop (int flags) 846ev_loop (EV_P_ int flags)
652{ 847{
653 double block; 848 double block;
654 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 849 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
655 850
656 do 851 do
657 { 852 {
658 /* queue check watchers (and execute them) */ 853 /* queue check watchers (and execute them) */
659 if (preparecnt) 854 if (expect_false (preparecnt))
660 { 855 {
661 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 856 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
662 call_pending (); 857 call_pending (EV_A);
663 } 858 }
664 859
665 /* update fd-related kernel structures */ 860 /* update fd-related kernel structures */
666 fd_reify (); 861 fd_reify (EV_A);
667 862
668 /* calculate blocking time */ 863 /* calculate blocking time */
669 864
670 /* we only need this for !monotonic clockor timers, but as we basically 865 /* we only need this for !monotonic clockor timers, but as we basically
671 always have timers, we just calculate it always */ 866 always have timers, we just calculate it always */
867#if EV_USE_MONOTONIC
868 if (expect_true (have_monotonic))
869 time_update_monotonic (EV_A);
870 else
871#endif
872 {
672 ev_now = ev_time (); 873 rt_now = ev_time ();
874 mn_now = rt_now;
875 }
673 876
674 if (flags & EVLOOP_NONBLOCK || idlecnt) 877 if (flags & EVLOOP_NONBLOCK || idlecnt)
675 block = 0.; 878 block = 0.;
676 else 879 else
677 { 880 {
678 block = MAX_BLOCKTIME; 881 block = MAX_BLOCKTIME;
679 882
680 if (timercnt) 883 if (timercnt)
681 { 884 {
682 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 885 ev_tstamp to = timers [0]->at - mn_now + method_fudge;
683 if (block > to) block = to; 886 if (block > to) block = to;
684 } 887 }
685 888
686 if (periodiccnt) 889 if (periodiccnt)
687 { 890 {
688 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 891 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
689 if (block > to) block = to; 892 if (block > to) block = to;
690 } 893 }
691 894
692 if (block < 0.) block = 0.; 895 if (block < 0.) block = 0.;
693 } 896 }
694 897
695 method_poll (block); 898 method_poll (EV_A_ block);
696 899
697 /* update ev_now, do magic */ 900 /* update rt_now, do magic */
698 time_update (); 901 time_update (EV_A);
699 902
700 /* queue pending timers and reschedule them */ 903 /* queue pending timers and reschedule them */
701 timers_reify (); /* relative timers called last */ 904 timers_reify (EV_A); /* relative timers called last */
702 periodics_reify (); /* absolute timers called first */ 905 periodics_reify (EV_A); /* absolute timers called first */
703 906
704 /* queue idle watchers unless io or timers are pending */ 907 /* queue idle watchers unless io or timers are pending */
705 if (!pendingcnt) 908 if (!pendingcnt)
706 queue_events ((W *)idles, idlecnt, EV_IDLE); 909 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
707 910
708 /* queue check watchers, to be executed first */ 911 /* queue check watchers, to be executed first */
709 if (checkcnt) 912 if (checkcnt)
710 queue_events ((W *)checks, checkcnt, EV_CHECK); 913 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
711 914
712 call_pending (); 915 call_pending (EV_A);
916 printf ("activecnt %d\n", activecnt);//D
713 } 917 }
714 while (!ev_loop_done); 918 while (activecnt && !loop_done);
715 919
716 if (ev_loop_done != 2) 920 if (loop_done != 2)
717 ev_loop_done = 0; 921 loop_done = 0;
922}
923
924void
925ev_unloop (EV_P_ int how)
926{
927 loop_done = how;
718} 928}
719 929
720/*****************************************************************************/ 930/*****************************************************************************/
721 931
722static void 932inline void
723wlist_add (WL *head, WL elem) 933wlist_add (WL *head, WL elem)
724{ 934{
725 elem->next = *head; 935 elem->next = *head;
726 *head = elem; 936 *head = elem;
727} 937}
728 938
729static void 939inline void
730wlist_del (WL *head, WL elem) 940wlist_del (WL *head, WL elem)
731{ 941{
732 while (*head) 942 while (*head)
733 { 943 {
734 if (*head == elem) 944 if (*head == elem)
739 949
740 head = &(*head)->next; 950 head = &(*head)->next;
741 } 951 }
742} 952}
743 953
744static void 954inline void
745ev_clear_pending (W w) 955ev_clear_pending (EV_P_ W w)
746{ 956{
747 if (w->pending) 957 if (w->pending)
748 { 958 {
749 pendings [w->pending - 1].w = 0; 959 pendings [ABSPRI (w)][w->pending - 1].w = 0;
750 w->pending = 0; 960 w->pending = 0;
751 } 961 }
752} 962}
753 963
754static void 964inline void
755ev_start (W w, int active) 965ev_start (EV_P_ W w, int active)
756{ 966{
967 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
968 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
969
757 w->active = active; 970 w->active = active;
971 ev_ref (EV_A);
758} 972}
759 973
760static void 974inline void
761ev_stop (W w) 975ev_stop (EV_P_ W w)
762{ 976{
977 ev_unref (EV_A);
763 w->active = 0; 978 w->active = 0;
764} 979}
765 980
766/*****************************************************************************/ 981/*****************************************************************************/
767 982
768void 983void
769ev_io_start (struct ev_io *w) 984ev_io_start (EV_P_ struct ev_io *w)
770{ 985{
771 int fd = w->fd; 986 int fd = w->fd;
772 987
773 if (ev_is_active (w)) 988 if (ev_is_active (w))
774 return; 989 return;
775 990
776 assert (("ev_io_start called with negative fd", fd >= 0)); 991 assert (("ev_io_start called with negative fd", fd >= 0));
777 992
778 ev_start ((W)w, 1); 993 ev_start (EV_A_ (W)w, 1);
779 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 994 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
780 wlist_add ((WL *)&anfds[fd].head, (WL)w); 995 wlist_add ((WL *)&anfds[fd].head, (WL)w);
781 996
782 fd_change (fd); 997 fd_change (EV_A_ fd);
783} 998}
784 999
785void 1000void
786ev_io_stop (struct ev_io *w) 1001ev_io_stop (EV_P_ struct ev_io *w)
787{ 1002{
788 ev_clear_pending ((W)w); 1003 ev_clear_pending (EV_A_ (W)w);
789 if (!ev_is_active (w)) 1004 if (!ev_is_active (w))
790 return; 1005 return;
791 1006
792 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1007 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
793 ev_stop ((W)w); 1008 ev_stop (EV_A_ (W)w);
794 1009
795 fd_change (w->fd); 1010 fd_change (EV_A_ w->fd);
796} 1011}
797 1012
798void 1013void
799ev_timer_start (struct ev_timer *w) 1014ev_timer_start (EV_P_ struct ev_timer *w)
800{ 1015{
801 if (ev_is_active (w)) 1016 if (ev_is_active (w))
802 return; 1017 return;
803 1018
804 w->at += now; 1019 w->at += mn_now;
805 1020
806 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1021 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
807 1022
808 ev_start ((W)w, ++timercnt); 1023 ev_start (EV_A_ (W)w, ++timercnt);
809 array_needsize (timers, timermax, timercnt, ); 1024 array_needsize (timers, timermax, timercnt, );
810 timers [timercnt - 1] = w; 1025 timers [timercnt - 1] = w;
811 upheap ((WT *)timers, timercnt - 1); 1026 upheap ((WT *)timers, timercnt - 1);
812} 1027}
813 1028
814void 1029void
815ev_timer_stop (struct ev_timer *w) 1030ev_timer_stop (EV_P_ struct ev_timer *w)
816{ 1031{
817 ev_clear_pending ((W)w); 1032 ev_clear_pending (EV_A_ (W)w);
818 if (!ev_is_active (w)) 1033 if (!ev_is_active (w))
819 return; 1034 return;
820 1035
821 if (w->active < timercnt--) 1036 if (w->active < timercnt--)
822 { 1037 {
824 downheap ((WT *)timers, timercnt, w->active - 1); 1039 downheap ((WT *)timers, timercnt, w->active - 1);
825 } 1040 }
826 1041
827 w->at = w->repeat; 1042 w->at = w->repeat;
828 1043
829 ev_stop ((W)w); 1044 ev_stop (EV_A_ (W)w);
830} 1045}
831 1046
832void 1047void
833ev_timer_again (struct ev_timer *w) 1048ev_timer_again (EV_P_ struct ev_timer *w)
834{ 1049{
835 if (ev_is_active (w)) 1050 if (ev_is_active (w))
836 { 1051 {
837 if (w->repeat) 1052 if (w->repeat)
838 { 1053 {
839 w->at = now + w->repeat; 1054 w->at = mn_now + w->repeat;
840 downheap ((WT *)timers, timercnt, w->active - 1); 1055 downheap ((WT *)timers, timercnt, w->active - 1);
841 } 1056 }
842 else 1057 else
843 ev_timer_stop (w); 1058 ev_timer_stop (EV_A_ w);
844 } 1059 }
845 else if (w->repeat) 1060 else if (w->repeat)
846 ev_timer_start (w); 1061 ev_timer_start (EV_A_ w);
847} 1062}
848 1063
849void 1064void
850ev_periodic_start (struct ev_periodic *w) 1065ev_periodic_start (EV_P_ struct ev_periodic *w)
851{ 1066{
852 if (ev_is_active (w)) 1067 if (ev_is_active (w))
853 return; 1068 return;
854 1069
855 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1070 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
856 1071
857 /* this formula differs from the one in periodic_reify because we do not always round up */ 1072 /* this formula differs from the one in periodic_reify because we do not always round up */
858 if (w->interval) 1073 if (w->interval)
859 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1074 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
860 1075
861 ev_start ((W)w, ++periodiccnt); 1076 ev_start (EV_A_ (W)w, ++periodiccnt);
862 array_needsize (periodics, periodicmax, periodiccnt, ); 1077 array_needsize (periodics, periodicmax, periodiccnt, );
863 periodics [periodiccnt - 1] = w; 1078 periodics [periodiccnt - 1] = w;
864 upheap ((WT *)periodics, periodiccnt - 1); 1079 upheap ((WT *)periodics, periodiccnt - 1);
865} 1080}
866 1081
867void 1082void
868ev_periodic_stop (struct ev_periodic *w) 1083ev_periodic_stop (EV_P_ struct ev_periodic *w)
869{ 1084{
870 ev_clear_pending ((W)w); 1085 ev_clear_pending (EV_A_ (W)w);
871 if (!ev_is_active (w)) 1086 if (!ev_is_active (w))
872 return; 1087 return;
873 1088
874 if (w->active < periodiccnt--) 1089 if (w->active < periodiccnt--)
875 { 1090 {
876 periodics [w->active - 1] = periodics [periodiccnt]; 1091 periodics [w->active - 1] = periodics [periodiccnt];
877 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1092 downheap ((WT *)periodics, periodiccnt, w->active - 1);
878 } 1093 }
879 1094
880 ev_stop ((W)w); 1095 ev_stop (EV_A_ (W)w);
881} 1096}
882 1097
1098#ifndef SA_RESTART
1099# define SA_RESTART 0
1100#endif
1101
883void 1102void
884ev_signal_start (struct ev_signal *w) 1103ev_signal_start (EV_P_ struct ev_signal *w)
885{ 1104{
886 if (ev_is_active (w)) 1105 if (ev_is_active (w))
887 return; 1106 return;
888 1107
889 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1108 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
890 1109
891 ev_start ((W)w, 1); 1110 ev_start (EV_A_ (W)w, 1);
892 array_needsize (signals, signalmax, w->signum, signals_init); 1111 array_needsize (signals, signalmax, w->signum, signals_init);
893 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1112 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
894 1113
895 if (!w->next) 1114 if (!w->next)
896 { 1115 {
897 struct sigaction sa; 1116 struct sigaction sa;
898 sa.sa_handler = sighandler; 1117 sa.sa_handler = sighandler;
899 sigfillset (&sa.sa_mask); 1118 sigfillset (&sa.sa_mask);
900 sa.sa_flags = 0; 1119 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
901 sigaction (w->signum, &sa, 0); 1120 sigaction (w->signum, &sa, 0);
902 } 1121 }
903} 1122}
904 1123
905void 1124void
906ev_signal_stop (struct ev_signal *w) 1125ev_signal_stop (EV_P_ struct ev_signal *w)
907{ 1126{
908 ev_clear_pending ((W)w); 1127 ev_clear_pending (EV_A_ (W)w);
909 if (!ev_is_active (w)) 1128 if (!ev_is_active (w))
910 return; 1129 return;
911 1130
912 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1131 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
913 ev_stop ((W)w); 1132 ev_stop (EV_A_ (W)w);
914 1133
915 if (!signals [w->signum - 1].head) 1134 if (!signals [w->signum - 1].head)
916 signal (w->signum, SIG_DFL); 1135 signal (w->signum, SIG_DFL);
917} 1136}
918 1137
919void 1138void
920ev_idle_start (struct ev_idle *w) 1139ev_idle_start (EV_P_ struct ev_idle *w)
921{ 1140{
922 if (ev_is_active (w)) 1141 if (ev_is_active (w))
923 return; 1142 return;
924 1143
925 ev_start ((W)w, ++idlecnt); 1144 ev_start (EV_A_ (W)w, ++idlecnt);
926 array_needsize (idles, idlemax, idlecnt, ); 1145 array_needsize (idles, idlemax, idlecnt, );
927 idles [idlecnt - 1] = w; 1146 idles [idlecnt - 1] = w;
928} 1147}
929 1148
930void 1149void
931ev_idle_stop (struct ev_idle *w) 1150ev_idle_stop (EV_P_ struct ev_idle *w)
932{ 1151{
933 ev_clear_pending ((W)w); 1152 ev_clear_pending (EV_A_ (W)w);
934 if (ev_is_active (w)) 1153 if (ev_is_active (w))
935 return; 1154 return;
936 1155
937 idles [w->active - 1] = idles [--idlecnt]; 1156 idles [w->active - 1] = idles [--idlecnt];
938 ev_stop ((W)w); 1157 ev_stop (EV_A_ (W)w);
939} 1158}
940 1159
941void 1160void
942ev_prepare_start (struct ev_prepare *w) 1161ev_prepare_start (EV_P_ struct ev_prepare *w)
943{ 1162{
944 if (ev_is_active (w)) 1163 if (ev_is_active (w))
945 return; 1164 return;
946 1165
947 ev_start ((W)w, ++preparecnt); 1166 ev_start (EV_A_ (W)w, ++preparecnt);
948 array_needsize (prepares, preparemax, preparecnt, ); 1167 array_needsize (prepares, preparemax, preparecnt, );
949 prepares [preparecnt - 1] = w; 1168 prepares [preparecnt - 1] = w;
950} 1169}
951 1170
952void 1171void
953ev_prepare_stop (struct ev_prepare *w) 1172ev_prepare_stop (EV_P_ struct ev_prepare *w)
954{ 1173{
955 ev_clear_pending ((W)w); 1174 ev_clear_pending (EV_A_ (W)w);
956 if (ev_is_active (w)) 1175 if (ev_is_active (w))
957 return; 1176 return;
958 1177
959 prepares [w->active - 1] = prepares [--preparecnt]; 1178 prepares [w->active - 1] = prepares [--preparecnt];
960 ev_stop ((W)w); 1179 ev_stop (EV_A_ (W)w);
961} 1180}
962 1181
963void 1182void
964ev_check_start (struct ev_check *w) 1183ev_check_start (EV_P_ struct ev_check *w)
965{ 1184{
966 if (ev_is_active (w)) 1185 if (ev_is_active (w))
967 return; 1186 return;
968 1187
969 ev_start ((W)w, ++checkcnt); 1188 ev_start (EV_A_ (W)w, ++checkcnt);
970 array_needsize (checks, checkmax, checkcnt, ); 1189 array_needsize (checks, checkmax, checkcnt, );
971 checks [checkcnt - 1] = w; 1190 checks [checkcnt - 1] = w;
972} 1191}
973 1192
974void 1193void
975ev_check_stop (struct ev_check *w) 1194ev_check_stop (EV_P_ struct ev_check *w)
976{ 1195{
977 ev_clear_pending ((W)w); 1196 ev_clear_pending (EV_A_ (W)w);
978 if (ev_is_active (w)) 1197 if (ev_is_active (w))
979 return; 1198 return;
980 1199
981 checks [w->active - 1] = checks [--checkcnt]; 1200 checks [w->active - 1] = checks [--checkcnt];
982 ev_stop ((W)w); 1201 ev_stop (EV_A_ (W)w);
983} 1202}
984 1203
985void 1204void
986ev_child_start (struct ev_child *w) 1205ev_child_start (EV_P_ struct ev_child *w)
987{ 1206{
988 if (ev_is_active (w)) 1207 if (ev_is_active (w))
989 return; 1208 return;
990 1209
991 ev_start ((W)w, 1); 1210 ev_start (EV_A_ (W)w, 1);
992 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1211 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
993} 1212}
994 1213
995void 1214void
996ev_child_stop (struct ev_child *w) 1215ev_child_stop (EV_P_ struct ev_child *w)
997{ 1216{
998 ev_clear_pending ((W)w); 1217 ev_clear_pending (EV_A_ (W)w);
999 if (ev_is_active (w)) 1218 if (ev_is_active (w))
1000 return; 1219 return;
1001 1220
1002 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1221 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1003 ev_stop ((W)w); 1222 ev_stop (EV_A_ (W)w);
1004} 1223}
1005 1224
1006/*****************************************************************************/ 1225/*****************************************************************************/
1007 1226
1008struct ev_once 1227struct ev_once
1012 void (*cb)(int revents, void *arg); 1231 void (*cb)(int revents, void *arg);
1013 void *arg; 1232 void *arg;
1014}; 1233};
1015 1234
1016static void 1235static void
1017once_cb (struct ev_once *once, int revents) 1236once_cb (EV_P_ struct ev_once *once, int revents)
1018{ 1237{
1019 void (*cb)(int revents, void *arg) = once->cb; 1238 void (*cb)(int revents, void *arg) = once->cb;
1020 void *arg = once->arg; 1239 void *arg = once->arg;
1021 1240
1022 ev_io_stop (&once->io); 1241 ev_io_stop (EV_A_ &once->io);
1023 ev_timer_stop (&once->to); 1242 ev_timer_stop (EV_A_ &once->to);
1024 free (once); 1243 free (once);
1025 1244
1026 cb (revents, arg); 1245 cb (revents, arg);
1027} 1246}
1028 1247
1029static void 1248static void
1030once_cb_io (struct ev_io *w, int revents) 1249once_cb_io (EV_P_ struct ev_io *w, int revents)
1031{ 1250{
1032 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1251 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1033} 1252}
1034 1253
1035static void 1254static void
1036once_cb_to (struct ev_timer *w, int revents) 1255once_cb_to (EV_P_ struct ev_timer *w, int revents)
1037{ 1256{
1038 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1257 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1039} 1258}
1040 1259
1041void 1260void
1042ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1261ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1043{ 1262{
1044 struct ev_once *once = malloc (sizeof (struct ev_once)); 1263 struct ev_once *once = malloc (sizeof (struct ev_once));
1045 1264
1046 if (!once) 1265 if (!once)
1047 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1266 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1052 1271
1053 ev_watcher_init (&once->io, once_cb_io); 1272 ev_watcher_init (&once->io, once_cb_io);
1054 if (fd >= 0) 1273 if (fd >= 0)
1055 { 1274 {
1056 ev_io_set (&once->io, fd, events); 1275 ev_io_set (&once->io, fd, events);
1057 ev_io_start (&once->io); 1276 ev_io_start (EV_A_ &once->io);
1058 } 1277 }
1059 1278
1060 ev_watcher_init (&once->to, once_cb_to); 1279 ev_watcher_init (&once->to, once_cb_to);
1061 if (timeout >= 0.) 1280 if (timeout >= 0.)
1062 { 1281 {
1063 ev_timer_set (&once->to, timeout, 0.); 1282 ev_timer_set (&once->to, timeout, 0.);
1064 ev_timer_start (&once->to); 1283 ev_timer_start (EV_A_ &once->to);
1065 } 1284 }
1066 } 1285 }
1067} 1286}
1068 1287
1069/*****************************************************************************/ 1288/*****************************************************************************/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines