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

Comparing libev/ev.c (file contents):
Revision 1.33 by root, Thu Nov 1 11:11:22 2007 UTC vs.
Revision 1.47 by root, Sat Nov 3 11:44:44 2007 UTC

1/* 1/*
2 * libev event processing core, watcher management
3 *
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved. 5 * All rights reserved.
4 * 6 *
5 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 8 * modification, are permitted provided that the following conditions are
… …
40#include <stdio.h> 42#include <stdio.h>
41 43
42#include <assert.h> 44#include <assert.h>
43#include <errno.h> 45#include <errno.h>
44#include <sys/types.h> 46#include <sys/types.h>
47#ifndef WIN32
45#include <sys/wait.h> 48# include <sys/wait.h>
49#endif
46#include <sys/time.h> 50#include <sys/time.h>
47#include <time.h> 51#include <time.h>
48 52
53/**/
54
49#ifndef EV_USE_MONOTONIC 55#ifndef EV_USE_MONOTONIC
50# ifdef CLOCK_MONOTONIC
51# define EV_USE_MONOTONIC 1 56# define EV_USE_MONOTONIC 1
52# endif
53#endif 57#endif
54 58
55#ifndef EV_USE_SELECT 59#ifndef EV_USE_SELECT
56# define EV_USE_SELECT 1 60# define EV_USE_SELECT 1
57#endif 61#endif
58 62
63#ifndef EV_USE_POLL
64# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif
66
59#ifndef EV_USE_EPOLL 67#ifndef EV_USE_EPOLL
60# define EV_USE_EPOLL 0 68# define EV_USE_EPOLL 0
61#endif 69#endif
62 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/**/
80
81#ifndef CLOCK_MONOTONIC
82# undef EV_USE_MONOTONIC
83# define EV_USE_MONOTONIC 0
84#endif
85
63#ifndef CLOCK_REALTIME 86#ifndef CLOCK_REALTIME
87# undef EV_USE_REALTIME
64# define EV_USE_REALTIME 0 88# define EV_USE_REALTIME 0
65#endif 89#endif
66#ifndef EV_USE_REALTIME 90
67# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */ 91/**/
68#endif
69 92
70#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) */
71#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) */
72#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 */
73#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 */
74 97
75#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)
76 113
77typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
78typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
79typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
80 117
81static ev_tstamp now, diff; /* monotonic clock */ 118static ev_tstamp now_floor, now, diff; /* monotonic clock */
82ev_tstamp ev_now; 119ev_tstamp ev_now;
83int ev_method; 120int ev_method;
84 121
85static int have_monotonic; /* runtime */ 122static int have_monotonic; /* runtime */
86 123
… …
106 143
107static ev_tstamp 144static ev_tstamp
108get_clock (void) 145get_clock (void)
109{ 146{
110#if EV_USE_MONOTONIC 147#if EV_USE_MONOTONIC
111 if (have_monotonic) 148 if (expect_true (have_monotonic))
112 { 149 {
113 struct timespec ts; 150 struct timespec ts;
114 clock_gettime (CLOCK_MONOTONIC, &ts); 151 clock_gettime (CLOCK_MONOTONIC, &ts);
115 return ts.tv_sec + ts.tv_nsec * 1e-9; 152 return ts.tv_sec + ts.tv_nsec * 1e-9;
116 } 153 }
… …
120} 157}
121 158
122#define array_roundsize(base,n) ((n) | 4 & ~3) 159#define array_roundsize(base,n) ((n) | 4 & ~3)
123 160
124#define array_needsize(base,cur,cnt,init) \ 161#define array_needsize(base,cur,cnt,init) \
125 if ((cnt) > cur) \ 162 if (expect_false ((cnt) > cur)) \
126 { \ 163 { \
127 int newcnt = cur; \ 164 int newcnt = cur; \
128 do \ 165 do \
129 { \ 166 { \
130 newcnt = array_roundsize (base, newcnt << 1); \ 167 newcnt = array_roundsize (base, newcnt << 1); \
… …
165{ 202{
166 W w; 203 W w;
167 int events; 204 int events;
168} ANPENDING; 205} ANPENDING;
169 206
170static ANPENDING *pendings; 207static ANPENDING *pendings [NUMPRI];
171static int pendingmax, pendingcnt; 208static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
172 209
173static void 210static void
174event (W w, int events) 211event (W w, int events)
175{ 212{
176 if (w->pending) 213 if (w->pending)
177 { 214 {
178 pendings [w->pending - 1].events |= events; 215 pendings [ABSPRI (w)][w->pending - 1].events |= events;
179 return; 216 return;
180 } 217 }
181 218
182 w->pending = ++pendingcnt; 219 w->pending = ++pendingcnt [ABSPRI (w)];
183 array_needsize (pendings, pendingmax, pendingcnt, ); 220 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
184 pendings [pendingcnt - 1].w = w; 221 pendings [ABSPRI (w)][w->pending - 1].w = w;
185 pendings [pendingcnt - 1].events = events; 222 pendings [ABSPRI (w)][w->pending - 1].events = events;
186} 223}
187 224
188static void 225static void
189queue_events (W *events, int eventcnt, int type) 226queue_events (W *events, int eventcnt, int type)
190{ 227{
… …
253 ++fdchangecnt; 290 ++fdchangecnt;
254 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 291 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
255 fdchanges [fdchangecnt - 1] = fd; 292 fdchanges [fdchangecnt - 1] = fd;
256} 293}
257 294
295static void
296fd_kill (int fd)
297{
298 struct ev_io *w;
299
300 printf ("killing fd %d\n", fd);//D
301 while ((w = anfds [fd].head))
302 {
303 ev_io_stop (w);
304 event ((W)w, EV_ERROR | EV_READ | EV_WRITE);
305 }
306}
307
258/* called on EBADF to verify fds */ 308/* called on EBADF to verify fds */
259static void 309static void
260fd_recheck (void) 310fd_ebadf (void)
261{ 311{
262 int fd; 312 int fd;
263 313
264 for (fd = 0; fd < anfdmax; ++fd) 314 for (fd = 0; fd < anfdmax; ++fd)
265 if (anfds [fd].events) 315 if (anfds [fd].events)
266 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 316 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
267 while (anfds [fd].head) 317 fd_kill (fd);
318}
319
320/* called on ENOMEM in select/poll to kill some fds and retry */
321static void
322fd_enomem (void)
323{
324 int fd = anfdmax;
325
326 while (fd--)
327 if (anfds [fd].events)
268 { 328 {
269 ev_io_stop (anfds [fd].head); 329 close (fd);
270 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE); 330 fd_kill (fd);
331 return;
271 } 332 }
272} 333}
273 334
274/*****************************************************************************/ 335/*****************************************************************************/
275 336
276static struct ev_timer **timers; 337static struct ev_timer **timers;
… …
323/*****************************************************************************/ 384/*****************************************************************************/
324 385
325typedef struct 386typedef struct
326{ 387{
327 struct ev_signal *head; 388 struct ev_signal *head;
328 sig_atomic_t gotsig; 389 sig_atomic_t volatile gotsig;
329} ANSIG; 390} ANSIG;
330 391
331static ANSIG *signals; 392static ANSIG *signals;
332static int signalmax; 393static int signalmax;
333 394
334static int sigpipe [2]; 395static int sigpipe [2];
335static sig_atomic_t gotsig; 396static sig_atomic_t volatile gotsig;
336static struct ev_io sigev; 397static struct ev_io sigev;
337 398
338static void 399static void
339signals_init (ANSIG *base, int count) 400signals_init (ANSIG *base, int count)
340{ 401{
… …
353 signals [signum - 1].gotsig = 1; 414 signals [signum - 1].gotsig = 1;
354 415
355 if (!gotsig) 416 if (!gotsig)
356 { 417 {
357 gotsig = 1; 418 gotsig = 1;
358 write (sigpipe [1], &gotsig, 1); 419 write (sigpipe [1], &signum, 1);
359 } 420 }
360} 421}
361 422
362static void 423static void
363sigcb (struct ev_io *iow, int revents) 424sigcb (struct ev_io *iow, int revents)
364{ 425{
365 struct ev_signal *w; 426 struct ev_signal *w;
366 int sig; 427 int signum;
367 428
429 read (sigpipe [0], &revents, 1);
368 gotsig = 0; 430 gotsig = 0;
369 read (sigpipe [0], &revents, 1);
370 431
371 for (sig = signalmax; sig--; ) 432 for (signum = signalmax; signum--; )
372 if (signals [sig].gotsig) 433 if (signals [signum].gotsig)
373 { 434 {
374 signals [sig].gotsig = 0; 435 signals [signum].gotsig = 0;
375 436
376 for (w = signals [sig].head; w; w = w->next) 437 for (w = signals [signum].head; w; w = w->next)
377 event ((W)w, EV_SIGNAL); 438 event ((W)w, EV_SIGNAL);
378 } 439 }
379} 440}
380 441
381static void 442static void
382siginit (void) 443siginit (void)
383{ 444{
445#ifndef WIN32
384 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 446 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
385 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 447 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
386 448
387 /* rather than sort out wether we really need nb, set it */ 449 /* rather than sort out wether we really need nb, set it */
388 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 450 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
389 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 451 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
452#endif
390 453
391 ev_io_set (&sigev, sigpipe [0], EV_READ); 454 ev_io_set (&sigev, sigpipe [0], EV_READ);
392 ev_io_start (&sigev); 455 ev_io_start (&sigev);
393} 456}
394 457
… …
406/*****************************************************************************/ 469/*****************************************************************************/
407 470
408static struct ev_child *childs [PID_HASHSIZE]; 471static struct ev_child *childs [PID_HASHSIZE];
409static struct ev_signal childev; 472static struct ev_signal childev;
410 473
474#ifndef WIN32
475
411#ifndef WCONTINUED 476#ifndef WCONTINUED
412# define WCONTINUED 0 477# define WCONTINUED 0
413#endif 478#endif
414 479
415static void 480static void
481child_reap (struct ev_signal *sw, int chain, int pid, int status)
482{
483 struct ev_child *w;
484
485 for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
486 if (w->pid == pid || !w->pid)
487 {
488 w->priority = sw->priority; /* need to do it *now* */
489 w->rpid = pid;
490 w->rstatus = status;
491 printf ("rpid %p %d %d\n", w, pid, w->pid);//D
492 event ((W)w, EV_CHILD);
493 }
494}
495
496static void
416childcb (struct ev_signal *sw, int revents) 497childcb (struct ev_signal *sw, int revents)
417{ 498{
418 struct ev_child *w;
419 int pid, status; 499 int pid, status;
420 500
501 printf ("chld %x\n", revents);//D
421 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 502 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
422 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 503 {
423 if (w->pid == pid || w->pid == -1) 504 /* make sure we are called again until all childs have been reaped */
424 {
425 w->status = status;
426 event ((W)w, EV_CHILD); 505 event ((W)sw, EV_SIGNAL);
427 } 506
507 child_reap (sw, pid, pid, status);
508 child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
509 }
428} 510}
511
512#endif
429 513
430/*****************************************************************************/ 514/*****************************************************************************/
431 515
516#if EV_USE_KQUEUE
517# include "ev_kqueue.c"
518#endif
432#if EV_USE_EPOLL 519#if EV_USE_EPOLL
433# include "ev_epoll.c" 520# include "ev_epoll.c"
434#endif 521#endif
522#if EV_USE_POLL
523# include "ev_poll.c"
524#endif
435#if EV_USE_SELECT 525#if EV_USE_SELECT
436# include "ev_select.c" 526# include "ev_select.c"
437#endif 527#endif
438 528
439int 529int
… …
446ev_version_minor (void) 536ev_version_minor (void)
447{ 537{
448 return EV_VERSION_MINOR; 538 return EV_VERSION_MINOR;
449} 539}
450 540
541/* return true if we are running with elevated privileges and ignore env variables */
542static int
543enable_secure ()
544{
545 return getuid () != geteuid ()
546 || getgid () != getegid ();
547}
548
451int ev_init (int flags) 549int ev_init (int methods)
452{ 550{
453 if (!ev_method) 551 if (!ev_method)
454 { 552 {
455#if EV_USE_MONOTONIC 553#if EV_USE_MONOTONIC
456 { 554 {
… …
458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 556 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
459 have_monotonic = 1; 557 have_monotonic = 1;
460 } 558 }
461#endif 559#endif
462 560
463 ev_now = ev_time (); 561 ev_now = ev_time ();
464 now = get_clock (); 562 now = get_clock ();
563 now_floor = now;
465 diff = ev_now - now; 564 diff = ev_now - now;
466 565
467 if (pipe (sigpipe)) 566 if (pipe (sigpipe))
468 return 0; 567 return 0;
469 568
569 if (methods == EVMETHOD_AUTO)
570 if (!enable_secure () && getenv ("LIBEV_METHODS"))
571 methods = atoi (getenv ("LIBEV_METHODS"));
572 else
470 ev_method = EVMETHOD_NONE; 573 methods = EVMETHOD_ANY;
574
575 ev_method = 0;
576#if EV_USE_KQUEUE
577 if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
578#endif
471#if EV_USE_EPOLL 579#if EV_USE_EPOLL
472 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 580 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
581#endif
582#if EV_USE_POLL
583 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
473#endif 584#endif
474#if EV_USE_SELECT 585#if EV_USE_SELECT
475 if (ev_method == EVMETHOD_NONE) select_init (flags); 586 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
476#endif 587#endif
477 588
478 if (ev_method) 589 if (ev_method)
479 { 590 {
480 ev_watcher_init (&sigev, sigcb); 591 ev_watcher_init (&sigev, sigcb);
592 ev_set_priority (&sigev, EV_MAXPRI);
481 siginit (); 593 siginit ();
482 594
595#ifndef WIN32
483 ev_signal_init (&childev, childcb, SIGCHLD); 596 ev_signal_init (&childev, childcb, SIGCHLD);
597 ev_set_priority (&childev, EV_MAXPRI);
484 ev_signal_start (&childev); 598 ev_signal_start (&childev);
599#endif
485 } 600 }
486 } 601 }
487 602
488 return ev_method; 603 return ev_method;
489} 604}
490 605
491/*****************************************************************************/ 606/*****************************************************************************/
492 607
493void 608void
494ev_prefork (void) 609ev_fork_prepare (void)
495{ 610{
496 /* nop */ 611 /* nop */
497} 612}
498 613
499void 614void
500ev_postfork_parent (void) 615ev_fork_parent (void)
501{ 616{
502 /* nop */ 617 /* nop */
503} 618}
504 619
505void 620void
506ev_postfork_child (void) 621ev_fork_child (void)
507{ 622{
508#if EV_USE_EPOLL 623#if EV_USE_EPOLL
509 if (ev_method == EVMETHOD_EPOLL) 624 if (ev_method == EVMETHOD_EPOLL)
510 epoll_postfork_child (); 625 epoll_postfork_child ();
511#endif 626#endif
… …
520/*****************************************************************************/ 635/*****************************************************************************/
521 636
522static void 637static void
523call_pending (void) 638call_pending (void)
524{ 639{
640 int pri;
641
642 for (pri = NUMPRI; pri--; )
525 while (pendingcnt) 643 while (pendingcnt [pri])
526 { 644 {
527 ANPENDING *p = pendings + --pendingcnt; 645 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
528 646
529 if (p->w) 647 if (p->w)
530 { 648 {
531 p->w->pending = 0; 649 p->w->pending = 0;
532 p->w->cb (p->w, p->events); 650 p->w->cb (p->w, p->events);
533 } 651 }
534 } 652 }
535} 653}
536 654
537static void 655static void
538timers_reify (void) 656timers_reify (void)
539{ 657{
… …
599 } 717 }
600 } 718 }
601 } 719 }
602} 720}
603 721
722static int
723time_update_monotonic (void)
724{
725 now = get_clock ();
726
727 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
728 {
729 ev_now = now + diff;
730 return 0;
731 }
732 else
733 {
734 now_floor = now;
735 ev_now = ev_time ();
736 return 1;
737 }
738}
739
604static void 740static void
605time_update (void) 741time_update (void)
606{ 742{
607 int i; 743 int i;
608 744
609 ev_now = ev_time (); 745#if EV_USE_MONOTONIC
610
611 if (have_monotonic) 746 if (expect_true (have_monotonic))
612 { 747 {
613 ev_tstamp odiff = diff; 748 if (time_update_monotonic ())
614
615 for (i = 4; --i; ) /* loop a few times, before making important decisions */
616 { 749 {
617 now = get_clock (); 750 ev_tstamp odiff = diff;
751
752 for (i = 4; --i; ) /* loop a few times, before making important decisions */
753 {
618 diff = ev_now - now; 754 diff = ev_now - now;
619 755
620 if (fabs (odiff - diff) < MIN_TIMEJUMP) 756 if (fabs (odiff - diff) < MIN_TIMEJUMP)
621 return; /* all is well */ 757 return; /* all is well */
622 758
623 ev_now = ev_time (); 759 ev_now = ev_time ();
760 now = get_clock ();
761 now_floor = now;
762 }
763
764 periodics_reschedule (diff - odiff);
765 /* no timer adjustment, as the monotonic clock doesn't jump */
624 } 766 }
625
626 periodics_reschedule (diff - odiff);
627 /* no timer adjustment, as the monotonic clock doesn't jump */
628 } 767 }
629 else 768 else
769#endif
630 { 770 {
771 ev_now = ev_time ();
772
631 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 773 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
632 { 774 {
633 periodics_reschedule (ev_now - now); 775 periodics_reschedule (ev_now - now);
634 776
635 /* adjust timers. this is easy, as the offset is the same for all */ 777 /* adjust timers. this is easy, as the offset is the same for all */
636 for (i = 0; i < timercnt; ++i) 778 for (i = 0; i < timercnt; ++i)
… …
649 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 791 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
650 792
651 do 793 do
652 { 794 {
653 /* queue check watchers (and execute them) */ 795 /* queue check watchers (and execute them) */
654 if (preparecnt) 796 if (expect_false (preparecnt))
655 { 797 {
656 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 798 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
657 call_pending (); 799 call_pending ();
658 } 800 }
659 801
… …
662 804
663 /* calculate blocking time */ 805 /* calculate blocking time */
664 806
665 /* we only need this for !monotonic clockor timers, but as we basically 807 /* we only need this for !monotonic clockor timers, but as we basically
666 always have timers, we just calculate it always */ 808 always have timers, we just calculate it always */
809#if EV_USE_MONOTONIC
810 if (expect_true (have_monotonic))
811 time_update_monotonic ();
812 else
813#endif
814 {
667 ev_now = ev_time (); 815 ev_now = ev_time ();
816 now = ev_now;
817 }
668 818
669 if (flags & EVLOOP_NONBLOCK || idlecnt) 819 if (flags & EVLOOP_NONBLOCK || idlecnt)
670 block = 0.; 820 block = 0.;
671 else 821 else
672 { 822 {
673 block = MAX_BLOCKTIME; 823 block = MAX_BLOCKTIME;
674 824
675 if (timercnt) 825 if (timercnt)
676 { 826 {
677 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 827 ev_tstamp to = timers [0]->at - now + method_fudge;
678 if (block > to) block = to; 828 if (block > to) block = to;
679 } 829 }
680 830
681 if (periodiccnt) 831 if (periodiccnt)
682 { 832 {
… …
739static void 889static void
740ev_clear_pending (W w) 890ev_clear_pending (W w)
741{ 891{
742 if (w->pending) 892 if (w->pending)
743 { 893 {
744 pendings [w->pending - 1].w = 0; 894 pendings [ABSPRI (w)][w->pending - 1].w = 0;
745 w->pending = 0; 895 w->pending = 0;
746 } 896 }
747} 897}
748 898
749static void 899static void
750ev_start (W w, int active) 900ev_start (W w, int active)
751{ 901{
902 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
903 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
904
752 w->active = active; 905 w->active = active;
753} 906}
754 907
755static void 908static void
756ev_stop (W w) 909ev_stop (W w)
… …
761/*****************************************************************************/ 914/*****************************************************************************/
762 915
763void 916void
764ev_io_start (struct ev_io *w) 917ev_io_start (struct ev_io *w)
765{ 918{
919 int fd = w->fd;
920
766 if (ev_is_active (w)) 921 if (ev_is_active (w))
767 return; 922 return;
768
769 int fd = w->fd;
770 923
771 assert (("ev_io_start called with negative fd", fd >= 0)); 924 assert (("ev_io_start called with negative fd", fd >= 0));
772 925
773 ev_start ((W)w, 1); 926 ev_start ((W)w, 1);
774 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 927 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
… …
873 } 1026 }
874 1027
875 ev_stop ((W)w); 1028 ev_stop ((W)w);
876} 1029}
877 1030
1031#ifndef SA_RESTART
1032# define SA_RESTART 0
1033#endif
1034
878void 1035void
879ev_signal_start (struct ev_signal *w) 1036ev_signal_start (struct ev_signal *w)
880{ 1037{
881 if (ev_is_active (w)) 1038 if (ev_is_active (w))
882 return; 1039 return;
… …
890 if (!w->next) 1047 if (!w->next)
891 { 1048 {
892 struct sigaction sa; 1049 struct sigaction sa;
893 sa.sa_handler = sighandler; 1050 sa.sa_handler = sighandler;
894 sigfillset (&sa.sa_mask); 1051 sigfillset (&sa.sa_mask);
895 sa.sa_flags = 0; 1052 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
896 sigaction (w->signum, &sa, 0); 1053 sigaction (w->signum, &sa, 0);
897 } 1054 }
898} 1055}
899 1056
900void 1057void

Diff Legend

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