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

Comparing libev/ev.c (file contents):
Revision 1.18 by root, Wed Oct 31 16:29:52 2007 UTC vs.
Revision 1.32 by root, Thu Nov 1 09:21:51 2007 UTC

… …
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29#if EV_USE_CONFIG_H
30# include "config.h"
31#endif
29 32
30#include <math.h> 33#include <math.h>
31#include <stdlib.h> 34#include <stdlib.h>
32#include <unistd.h> 35#include <unistd.h>
33#include <fcntl.h> 36#include <fcntl.h>
… …
36 39
37#include <stdio.h> 40#include <stdio.h>
38 41
39#include <assert.h> 42#include <assert.h>
40#include <errno.h> 43#include <errno.h>
44#include <sys/types.h>
45#include <sys/wait.h>
41#include <sys/time.h> 46#include <sys/time.h>
42#include <time.h> 47#include <time.h>
43 48
44#define HAVE_EPOLL 1
45
46#ifndef HAVE_MONOTONIC 49#ifndef EV_USE_MONOTONIC
47# ifdef CLOCK_MONOTONIC 50# ifdef CLOCK_MONOTONIC
48# define HAVE_MONOTONIC 1 51# define EV_USE_MONOTONIC 1
49# endif 52# endif
50#endif 53#endif
51 54
52#ifndef HAVE_SELECT 55#ifndef EV_USE_SELECT
53# define HAVE_SELECT 1 56# define EV_USE_SELECT 1
54#endif 57#endif
55 58
56#ifndef HAVE_EPOLL 59#ifndef EV_USE_EPOLL
57# define HAVE_EPOLL 0 60# define EV_USE_EPOLL 0
58#endif 61#endif
59 62
63#ifndef CLOCK_REALTIME
64# define EV_USE_REALTIME 0
65#endif
60#ifndef HAVE_REALTIME 66#ifndef EV_USE_REALTIME
61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 67# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */
62#endif 68#endif
63 69
64#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 70#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
65#define MAX_BLOCKTIME 60. 71#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */
72#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 */
66 74
67#include "ev.h" 75#include "ev.h"
68 76
69typedef struct ev_watcher *W; 77typedef struct ev_watcher *W;
70typedef struct ev_watcher_list *WL; 78typedef struct ev_watcher_list *WL;
… …
83/*****************************************************************************/ 91/*****************************************************************************/
84 92
85ev_tstamp 93ev_tstamp
86ev_time (void) 94ev_time (void)
87{ 95{
88#if HAVE_REALTIME 96#if EV_USE_REALTIME
89 struct timespec ts; 97 struct timespec ts;
90 clock_gettime (CLOCK_REALTIME, &ts); 98 clock_gettime (CLOCK_REALTIME, &ts);
91 return ts.tv_sec + ts.tv_nsec * 1e-9; 99 return ts.tv_sec + ts.tv_nsec * 1e-9;
92#else 100#else
93 struct timeval tv; 101 struct timeval tv;
… …
97} 105}
98 106
99static ev_tstamp 107static ev_tstamp
100get_clock (void) 108get_clock (void)
101{ 109{
102#if HAVE_MONOTONIC 110#if EV_USE_MONOTONIC
103 if (have_monotonic) 111 if (have_monotonic)
104 { 112 {
105 struct timespec ts; 113 struct timespec ts;
106 clock_gettime (CLOCK_MONOTONIC, &ts); 114 clock_gettime (CLOCK_MONOTONIC, &ts);
107 return ts.tv_sec + ts.tv_nsec * 1e-9; 115 return ts.tv_sec + ts.tv_nsec * 1e-9;
… …
109#endif 117#endif
110 118
111 return ev_time (); 119 return ev_time ();
112} 120}
113 121
122#define array_roundsize(base,n) ((n) | 4 & ~3)
123
114#define array_needsize(base,cur,cnt,init) \ 124#define array_needsize(base,cur,cnt,init) \
115 if ((cnt) > cur) \ 125 if ((cnt) > cur) \
116 { \ 126 { \
117 int newcnt = cur ? cur << 1 : 16; \ 127 int newcnt = cur; \
128 do \
129 { \
130 newcnt = array_roundsize (base, newcnt << 1); \
131 } \
132 while ((cnt) > newcnt); \
133 \
118 base = realloc (base, sizeof (*base) * (newcnt)); \ 134 base = realloc (base, sizeof (*base) * (newcnt)); \
119 init (base + cur, newcnt - cur); \ 135 init (base + cur, newcnt - cur); \
120 cur = newcnt; \ 136 cur = newcnt; \
121 } 137 }
122 138
123/*****************************************************************************/ 139/*****************************************************************************/
124 140
125typedef struct 141typedef struct
126{ 142{
127 struct ev_io *head; 143 struct ev_io *head;
128 unsigned char wev, rev; /* want, received event set */ 144 int events;
129} ANFD; 145} ANFD;
130 146
131static ANFD *anfds; 147static ANFD *anfds;
132static int anfdmax; 148static int anfdmax;
133 149
134static int *fdchanges;
135static int fdchangemax, fdchangecnt;
136
137static void 150static void
138anfds_init (ANFD *base, int count) 151anfds_init (ANFD *base, int count)
139{ 152{
140 while (count--) 153 while (count--)
141 { 154 {
142 base->head = 0; 155 base->head = 0;
143 base->wev = base->rev = EV_NONE; 156 base->events = EV_NONE;
144 ++base; 157 ++base;
145 } 158 }
146} 159}
147 160
148typedef struct 161typedef struct
… …
155static int pendingmax, pendingcnt; 168static int pendingmax, pendingcnt;
156 169
157static void 170static void
158event (W w, int events) 171event (W w, int events)
159{ 172{
160 if (w->active) 173 if (w->pending)
174 {
175 pendings [w->pending - 1].events |= events;
176 return;
161 { 177 }
178
162 w->pending = ++pendingcnt; 179 w->pending = ++pendingcnt;
163 array_needsize (pendings, pendingmax, pendingcnt, ); 180 array_needsize (pendings, pendingmax, pendingcnt, );
164 pendings [pendingcnt - 1].w = w; 181 pendings [pendingcnt - 1].w = w;
165 pendings [pendingcnt - 1].events = events; 182 pendings [pendingcnt - 1].events = events;
166 } 183}
184
185static void
186queue_events (W *events, int eventcnt, int type)
187{
188 int i;
189
190 for (i = 0; i < eventcnt; ++i)
191 event (events [i], type);
167} 192}
168 193
169static void 194static void
170fd_event (int fd, int events) 195fd_event (int fd, int events)
171{ 196{
… …
179 if (ev) 204 if (ev)
180 event ((W)w, ev); 205 event ((W)w, ev);
181 } 206 }
182} 207}
183 208
209/*****************************************************************************/
210
211static int *fdchanges;
212static int fdchangemax, fdchangecnt;
213
184static void 214static void
185queue_events (W *events, int eventcnt, int type) 215fd_reify (void)
186{ 216{
187 int i; 217 int i;
188 218
189 for (i = 0; i < eventcnt; ++i) 219 for (i = 0; i < fdchangecnt; ++i)
190 event (events [i], type); 220 {
221 int fd = fdchanges [i];
222 ANFD *anfd = anfds + fd;
223 struct ev_io *w;
224
225 int events = 0;
226
227 for (w = anfd->head; w; w = w->next)
228 events |= w->events;
229
230 anfd->events &= ~EV_REIFY;
231
232 if (anfd->events != events)
233 {
234 method_modify (fd, anfd->events, events);
235 anfd->events = events;
236 }
237 }
238
239 fdchangecnt = 0;
240}
241
242static void
243fd_change (int fd)
244{
245 if (anfds [fd].events & EV_REIFY || fdchangecnt < 0)
246 return;
247
248 anfds [fd].events |= EV_REIFY;
249
250 ++fdchangecnt;
251 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
252 fdchanges [fdchangecnt - 1] = fd;
253}
254
255/* called on EBADF to verify fds */
256static void
257fd_recheck (void)
258{
259 int fd;
260
261 for (fd = 0; fd < anfdmax; ++fd)
262 if (anfds [fd].events)
263 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
264 while (anfds [fd].head)
265 {
266 ev_io_stop (anfds [fd].head);
267 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT);
268 }
191} 269}
192 270
193/*****************************************************************************/ 271/*****************************************************************************/
194 272
195static struct ev_timer **timers; 273static struct ev_timer **timers;
… …
304 382
305 /* rather than sort out wether we really need nb, set it */ 383 /* rather than sort out wether we really need nb, set it */
306 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 384 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
307 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 385 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
308 386
309 evio_set (&sigev, sigpipe [0], EV_READ); 387 ev_io_set (&sigev, sigpipe [0], EV_READ);
310 evio_start (&sigev); 388 ev_io_start (&sigev);
311} 389}
312 390
313/*****************************************************************************/ 391/*****************************************************************************/
314 392
315static struct ev_idle **idles; 393static struct ev_idle **idles;
316static int idlemax, idlecnt; 394static int idlemax, idlecnt;
317 395
396static struct ev_prepare **prepares;
397static int preparemax, preparecnt;
398
318static struct ev_check **checks; 399static struct ev_check **checks;
319static int checkmax, checkcnt; 400static int checkmax, checkcnt;
320 401
321/*****************************************************************************/ 402/*****************************************************************************/
322 403
404static struct ev_child *childs [PID_HASHSIZE];
405static struct ev_signal childev;
406
407#ifndef WCONTINUED
408# define WCONTINUED 0
409#endif
410
411static void
412childcb (struct ev_signal *sw, int revents)
413{
414 struct ev_child *w;
415 int pid, status;
416
417 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
418 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
419 if (w->pid == pid || w->pid == -1)
420 {
421 w->status = status;
422 event ((W)w, EV_CHILD);
423 }
424}
425
426/*****************************************************************************/
427
323#if HAVE_EPOLL 428#if EV_USE_EPOLL
324# include "ev_epoll.c" 429# include "ev_epoll.c"
325#endif 430#endif
326#if HAVE_SELECT 431#if EV_USE_SELECT
327# include "ev_select.c" 432# include "ev_select.c"
328#endif 433#endif
329 434
435int
436ev_version_major (void)
437{
438 return EV_VERSION_MAJOR;
439}
440
441int
442ev_version_minor (void)
443{
444 return EV_VERSION_MINOR;
445}
446
330int ev_init (int flags) 447int ev_init (int flags)
331{ 448{
332#if HAVE_MONOTONIC
333 {
334 struct timespec ts;
335 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
336 have_monotonic = 1;
337 }
338#endif
339
340 ev_now = ev_time ();
341 now = get_clock ();
342 diff = ev_now - now;
343
344 if (pipe (sigpipe))
345 return 0;
346
347 ev_method = EVMETHOD_NONE;
348#if HAVE_EPOLL
349 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
350#endif
351#if HAVE_SELECT
352 if (ev_method == EVMETHOD_NONE) select_init (flags);
353#endif
354
355 if (ev_method) 449 if (!ev_method)
450 {
451#if EV_USE_MONOTONIC
356 { 452 {
453 struct timespec ts;
454 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
455 have_monotonic = 1;
456 }
457#endif
458
459 ev_now = ev_time ();
460 now = get_clock ();
461 diff = ev_now - now;
462
463 if (pipe (sigpipe))
464 return 0;
465
466 ev_method = EVMETHOD_NONE;
467#if EV_USE_EPOLL
468 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
469#endif
470#if EV_USE_SELECT
471 if (ev_method == EVMETHOD_NONE) select_init (flags);
472#endif
473
474 if (ev_method)
475 {
357 evw_init (&sigev, sigcb); 476 ev_watcher_init (&sigev, sigcb);
358 siginit (); 477 siginit ();
478
479 ev_signal_init (&childev, childcb, SIGCHLD);
480 ev_signal_start (&childev);
481 }
359 } 482 }
360 483
361 return ev_method; 484 return ev_method;
362} 485}
363 486
364/*****************************************************************************/ 487/*****************************************************************************/
365 488
489void
366void ev_prefork (void) 490ev_prefork (void)
367{ 491{
368 /* nop */ 492 /* nop */
369} 493}
370 494
495void
371void ev_postfork_parent (void) 496ev_postfork_parent (void)
372{ 497{
373 /* nop */ 498 /* nop */
374} 499}
375 500
501void
376void ev_postfork_child (void) 502ev_postfork_child (void)
377{ 503{
378#if HAVE_EPOLL 504#if EV_USE_EPOLL
379 if (ev_method == EVMETHOD_EPOLL) 505 if (ev_method == EVMETHOD_EPOLL)
380 epoll_postfork_child (); 506 epoll_postfork_child ();
381#endif 507#endif
382 508
383 evio_stop (&sigev); 509 ev_io_stop (&sigev);
384 close (sigpipe [0]); 510 close (sigpipe [0]);
385 close (sigpipe [1]); 511 close (sigpipe [1]);
386 pipe (sigpipe); 512 pipe (sigpipe);
387 siginit (); 513 siginit ();
388} 514}
389 515
390/*****************************************************************************/ 516/*****************************************************************************/
391 517
392static void 518static void
393fd_reify (void)
394{
395 int i;
396
397 for (i = 0; i < fdchangecnt; ++i)
398 {
399 int fd = fdchanges [i];
400 ANFD *anfd = anfds + fd;
401 struct ev_io *w;
402
403 int wev = 0;
404
405 for (w = anfd->head; w; w = w->next)
406 wev |= w->events;
407
408 if (anfd->wev != wev)
409 {
410 method_modify (fd, anfd->wev, wev);
411 anfd->wev = wev;
412 }
413 }
414
415 fdchangecnt = 0;
416}
417
418static void
419call_pending () 519call_pending (void)
420{ 520{
421 while (pendingcnt) 521 while (pendingcnt)
422 { 522 {
423 ANPENDING *p = pendings + --pendingcnt; 523 ANPENDING *p = pendings + --pendingcnt;
424 524
… …
429 } 529 }
430 } 530 }
431} 531}
432 532
433static void 533static void
434timers_reify () 534timers_reify (void)
435{ 535{
436 while (timercnt && timers [0]->at <= now) 536 while (timercnt && timers [0]->at <= now)
437 { 537 {
438 struct ev_timer *w = timers [0]; 538 struct ev_timer *w = timers [0];
439
440 event ((W)w, EV_TIMEOUT);
441 539
442 /* first reschedule or stop timer */ 540 /* first reschedule or stop timer */
443 if (w->repeat) 541 if (w->repeat)
444 { 542 {
445 w->at = now + w->repeat; 543 w->at = now + w->repeat;
446 assert (("timer timeout in the past, negative repeat?", w->at > now)); 544 assert (("timer timeout in the past, negative repeat?", w->at > now));
447 downheap ((WT *)timers, timercnt, 0); 545 downheap ((WT *)timers, timercnt, 0);
448 } 546 }
449 else 547 else
450 evtimer_stop (w); /* nonrepeating: stop timer */ 548 ev_timer_stop (w); /* nonrepeating: stop timer */
451 }
452}
453 549
550 event ((W)w, EV_TIMEOUT);
551 }
552}
553
454static void 554static void
455periodics_reify () 555periodics_reify (void)
456{ 556{
457 while (periodiccnt && periodics [0]->at <= ev_now) 557 while (periodiccnt && periodics [0]->at <= ev_now)
458 { 558 {
459 struct ev_periodic *w = periodics [0]; 559 struct ev_periodic *w = periodics [0];
460 560
… …
464 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 564 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
465 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 565 assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
466 downheap ((WT *)periodics, periodiccnt, 0); 566 downheap ((WT *)periodics, periodiccnt, 0);
467 } 567 }
468 else 568 else
469 evperiodic_stop (w); /* nonrepeating: stop timer */ 569 ev_periodic_stop (w); /* nonrepeating: stop timer */
470 570
471 event ((W)w, EV_TIMEOUT); 571 event ((W)w, EV_TIMEOUT);
472 } 572 }
473} 573}
474 574
… …
486 { 586 {
487 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 587 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
488 588
489 if (fabs (diff) >= 1e-4) 589 if (fabs (diff) >= 1e-4)
490 { 590 {
491 evperiodic_stop (w); 591 ev_periodic_stop (w);
492 evperiodic_start (w); 592 ev_periodic_start (w);
493 593
494 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 594 i = 0; /* restart loop, inefficient, but time jumps should be rare */
495 } 595 }
496 } 596 }
497 } 597 }
498} 598}
499 599
500static void 600static void
501time_update () 601time_update (void)
502{ 602{
503 int i; 603 int i;
504 604
505 ev_now = ev_time (); 605 ev_now = ev_time ();
506 606
… …
540int ev_loop_done; 640int ev_loop_done;
541 641
542void ev_loop (int flags) 642void ev_loop (int flags)
543{ 643{
544 double block; 644 double block;
545 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 645 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
546
547 if (checkcnt)
548 {
549 queue_events ((W *)checks, checkcnt, EV_CHECK);
550 call_pending ();
551 }
552 646
553 do 647 do
554 { 648 {
649 /* queue check watchers (and execute them) */
650 if (preparecnt)
651 {
652 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
653 call_pending ();
654 }
655
555 /* update fd-related kernel structures */ 656 /* update fd-related kernel structures */
556 fd_reify (); 657 fd_reify ();
557 658
558 /* calculate blocking time */ 659 /* calculate blocking time */
559 660
560 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 661 /* we only need this for !monotonic clockor timers, but as we basically
662 always have timers, we just calculate it always */
561 ev_now = ev_time (); 663 ev_now = ev_time ();
562 664
563 if (flags & EVLOOP_NONBLOCK || idlecnt) 665 if (flags & EVLOOP_NONBLOCK || idlecnt)
564 block = 0.; 666 block = 0.;
565 else 667 else
… …
585 687
586 /* update ev_now, do magic */ 688 /* update ev_now, do magic */
587 time_update (); 689 time_update ();
588 690
589 /* queue pending timers and reschedule them */ 691 /* queue pending timers and reschedule them */
692 timers_reify (); /* relative timers called last */
590 periodics_reify (); /* absolute timers first */ 693 periodics_reify (); /* absolute timers called first */
591 timers_reify (); /* relative timers second */
592 694
593 /* queue idle watchers unless io or timers are pending */ 695 /* queue idle watchers unless io or timers are pending */
594 if (!pendingcnt) 696 if (!pendingcnt)
595 queue_events ((W *)idles, idlecnt, EV_IDLE); 697 queue_events ((W *)idles, idlecnt, EV_IDLE);
596 698
597 /* queue check and possibly idle watchers */ 699 /* queue check watchers, to be executed first */
700 if (checkcnt)
598 queue_events ((W *)checks, checkcnt, EV_CHECK); 701 queue_events ((W *)checks, checkcnt, EV_CHECK);
599 702
600 call_pending (); 703 call_pending ();
601 } 704 }
602 while (!ev_loop_done); 705 while (!ev_loop_done);
603 706
… …
652} 755}
653 756
654/*****************************************************************************/ 757/*****************************************************************************/
655 758
656void 759void
657evio_start (struct ev_io *w) 760ev_io_start (struct ev_io *w)
658{ 761{
659 if (ev_is_active (w)) 762 if (ev_is_active (w))
660 return; 763 return;
661 764
662 int fd = w->fd; 765 int fd = w->fd;
663 766
664 ev_start ((W)w, 1); 767 ev_start ((W)w, 1);
665 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 768 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
666 wlist_add ((WL *)&anfds[fd].head, (WL)w); 769 wlist_add ((WL *)&anfds[fd].head, (WL)w);
667 770
668 ++fdchangecnt; 771 fd_change (fd);
669 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
670 fdchanges [fdchangecnt - 1] = fd;
671} 772}
672 773
673void 774void
674evio_stop (struct ev_io *w) 775ev_io_stop (struct ev_io *w)
675{ 776{
676 ev_clear ((W)w); 777 ev_clear ((W)w);
677 if (!ev_is_active (w)) 778 if (!ev_is_active (w))
678 return; 779 return;
679 780
680 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 781 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
681 ev_stop ((W)w); 782 ev_stop ((W)w);
682 783
683 ++fdchangecnt; 784 fd_change (w->fd);
684 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
685 fdchanges [fdchangecnt - 1] = w->fd;
686} 785}
687 786
688void 787void
689evtimer_start (struct ev_timer *w) 788ev_timer_start (struct ev_timer *w)
690{ 789{
691 if (ev_is_active (w)) 790 if (ev_is_active (w))
692 return; 791 return;
693 792
694 w->at += now; 793 w->at += now;
… …
700 timers [timercnt - 1] = w; 799 timers [timercnt - 1] = w;
701 upheap ((WT *)timers, timercnt - 1); 800 upheap ((WT *)timers, timercnt - 1);
702} 801}
703 802
704void 803void
705evtimer_stop (struct ev_timer *w) 804ev_timer_stop (struct ev_timer *w)
706{ 805{
707 ev_clear ((W)w); 806 ev_clear ((W)w);
708 if (!ev_is_active (w)) 807 if (!ev_is_active (w))
709 return; 808 return;
710 809
… …
718 817
719 ev_stop ((W)w); 818 ev_stop ((W)w);
720} 819}
721 820
722void 821void
723evtimer_again (struct ev_timer *w) 822ev_timer_again (struct ev_timer *w)
724{ 823{
725 if (ev_is_active (w)) 824 if (ev_is_active (w))
726 { 825 {
727 if (w->repeat) 826 if (w->repeat)
728 { 827 {
729 w->at = now + w->repeat; 828 w->at = now + w->repeat;
730 downheap ((WT *)timers, timercnt, w->active - 1); 829 downheap ((WT *)timers, timercnt, w->active - 1);
731 } 830 }
732 else 831 else
733 evtimer_stop (w); 832 ev_timer_stop (w);
734 } 833 }
735 else if (w->repeat) 834 else if (w->repeat)
736 evtimer_start (w); 835 ev_timer_start (w);
737} 836}
738 837
739void 838void
740evperiodic_start (struct ev_periodic *w) 839ev_periodic_start (struct ev_periodic *w)
741{ 840{
742 if (ev_is_active (w)) 841 if (ev_is_active (w))
743 return; 842 return;
744 843
745 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 844 assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
… …
753 periodics [periodiccnt - 1] = w; 852 periodics [periodiccnt - 1] = w;
754 upheap ((WT *)periodics, periodiccnt - 1); 853 upheap ((WT *)periodics, periodiccnt - 1);
755} 854}
756 855
757void 856void
758evperiodic_stop (struct ev_periodic *w) 857ev_periodic_stop (struct ev_periodic *w)
759{ 858{
760 ev_clear ((W)w); 859 ev_clear ((W)w);
761 if (!ev_is_active (w)) 860 if (!ev_is_active (w))
762 return; 861 return;
763 862
… …
769 868
770 ev_stop ((W)w); 869 ev_stop ((W)w);
771} 870}
772 871
773void 872void
774evsignal_start (struct ev_signal *w) 873ev_signal_start (struct ev_signal *w)
775{ 874{
776 if (ev_is_active (w)) 875 if (ev_is_active (w))
777 return; 876 return;
778 877
779 ev_start ((W)w, 1); 878 ev_start ((W)w, 1);
… …
789 sigaction (w->signum, &sa, 0); 888 sigaction (w->signum, &sa, 0);
790 } 889 }
791} 890}
792 891
793void 892void
794evsignal_stop (struct ev_signal *w) 893ev_signal_stop (struct ev_signal *w)
795{ 894{
796 ev_clear ((W)w); 895 ev_clear ((W)w);
797 if (!ev_is_active (w)) 896 if (!ev_is_active (w))
798 return; 897 return;
799 898
… …
802 901
803 if (!signals [w->signum - 1].head) 902 if (!signals [w->signum - 1].head)
804 signal (w->signum, SIG_DFL); 903 signal (w->signum, SIG_DFL);
805} 904}
806 905
906void
807void evidle_start (struct ev_idle *w) 907ev_idle_start (struct ev_idle *w)
808{ 908{
809 if (ev_is_active (w)) 909 if (ev_is_active (w))
810 return; 910 return;
811 911
812 ev_start ((W)w, ++idlecnt); 912 ev_start ((W)w, ++idlecnt);
813 array_needsize (idles, idlemax, idlecnt, ); 913 array_needsize (idles, idlemax, idlecnt, );
814 idles [idlecnt - 1] = w; 914 idles [idlecnt - 1] = w;
815} 915}
816 916
917void
817void evidle_stop (struct ev_idle *w) 918ev_idle_stop (struct ev_idle *w)
818{ 919{
819 ev_clear ((W)w); 920 ev_clear ((W)w);
820 if (ev_is_active (w)) 921 if (ev_is_active (w))
821 return; 922 return;
822 923
823 idles [w->active - 1] = idles [--idlecnt]; 924 idles [w->active - 1] = idles [--idlecnt];
824 ev_stop ((W)w); 925 ev_stop ((W)w);
825} 926}
826 927
928void
929ev_prepare_start (struct ev_prepare *w)
930{
931 if (ev_is_active (w))
932 return;
933
934 ev_start ((W)w, ++preparecnt);
935 array_needsize (prepares, preparemax, preparecnt, );
936 prepares [preparecnt - 1] = w;
937}
938
939void
940ev_prepare_stop (struct ev_prepare *w)
941{
942 ev_clear ((W)w);
943 if (ev_is_active (w))
944 return;
945
946 prepares [w->active - 1] = prepares [--preparecnt];
947 ev_stop ((W)w);
948}
949
950void
827void evcheck_start (struct ev_check *w) 951ev_check_start (struct ev_check *w)
828{ 952{
829 if (ev_is_active (w)) 953 if (ev_is_active (w))
830 return; 954 return;
831 955
832 ev_start ((W)w, ++checkcnt); 956 ev_start ((W)w, ++checkcnt);
833 array_needsize (checks, checkmax, checkcnt, ); 957 array_needsize (checks, checkmax, checkcnt, );
834 checks [checkcnt - 1] = w; 958 checks [checkcnt - 1] = w;
835} 959}
836 960
961void
837void evcheck_stop (struct ev_check *w) 962ev_check_stop (struct ev_check *w)
838{ 963{
839 ev_clear ((W)w); 964 ev_clear ((W)w);
840 if (ev_is_active (w)) 965 if (ev_is_active (w))
841 return; 966 return;
842 967
843 checks [w->active - 1] = checks [--checkcnt]; 968 checks [w->active - 1] = checks [--checkcnt];
969 ev_stop ((W)w);
970}
971
972void
973ev_child_start (struct ev_child *w)
974{
975 if (ev_is_active (w))
976 return;
977
978 ev_start ((W)w, 1);
979 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
980}
981
982void
983ev_child_stop (struct ev_child *w)
984{
985 ev_clear ((W)w);
986 if (ev_is_active (w))
987 return;
988
989 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
844 ev_stop ((W)w); 990 ev_stop ((W)w);
845} 991}
846 992
847/*****************************************************************************/ 993/*****************************************************************************/
848 994
… …
858once_cb (struct ev_once *once, int revents) 1004once_cb (struct ev_once *once, int revents)
859{ 1005{
860 void (*cb)(int revents, void *arg) = once->cb; 1006 void (*cb)(int revents, void *arg) = once->cb;
861 void *arg = once->arg; 1007 void *arg = once->arg;
862 1008
863 evio_stop (&once->io); 1009 ev_io_stop (&once->io);
864 evtimer_stop (&once->to); 1010 ev_timer_stop (&once->to);
865 free (once); 1011 free (once);
866 1012
867 cb (revents, arg); 1013 cb (revents, arg);
868} 1014}
869 1015
… …
883ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1029ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
884{ 1030{
885 struct ev_once *once = malloc (sizeof (struct ev_once)); 1031 struct ev_once *once = malloc (sizeof (struct ev_once));
886 1032
887 if (!once) 1033 if (!once)
888 cb (EV_ERROR, arg); 1034 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
889 else 1035 else
890 { 1036 {
891 once->cb = cb; 1037 once->cb = cb;
892 once->arg = arg; 1038 once->arg = arg;
893 1039
894 evw_init (&once->io, once_cb_io); 1040 ev_watcher_init (&once->io, once_cb_io);
895
896 if (fd >= 0) 1041 if (fd >= 0)
897 { 1042 {
898 evio_set (&once->io, fd, events); 1043 ev_io_set (&once->io, fd, events);
899 evio_start (&once->io); 1044 ev_io_start (&once->io);
900 } 1045 }
901 1046
902 evw_init (&once->to, once_cb_to); 1047 ev_watcher_init (&once->to, once_cb_to);
903
904 if (timeout >= 0.) 1048 if (timeout >= 0.)
905 { 1049 {
906 evtimer_set (&once->to, timeout, 0.); 1050 ev_timer_set (&once->to, timeout, 0.);
907 evtimer_start (&once->to); 1051 ev_timer_start (&once->to);
908 } 1052 }
909 } 1053 }
910} 1054}
911 1055
912/*****************************************************************************/ 1056/*****************************************************************************/
… …
923 1067
924static void 1068static void
925ocb (struct ev_timer *w, int revents) 1069ocb (struct ev_timer *w, int revents)
926{ 1070{
927 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); 1071 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
928 evtimer_stop (w); 1072 ev_timer_stop (w);
929 evtimer_start (w); 1073 ev_timer_start (w);
930} 1074}
931 1075
932static void 1076static void
933scb (struct ev_signal *w, int revents) 1077scb (struct ev_signal *w, int revents)
934{ 1078{
935 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1079 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
936 evio_stop (&wio); 1080 ev_io_stop (&wio);
937 evio_start (&wio); 1081 ev_io_start (&wio);
938} 1082}
939 1083
940static void 1084static void
941gcb (struct ev_signal *w, int revents) 1085gcb (struct ev_signal *w, int revents)
942{ 1086{
… …
946 1090
947int main (void) 1091int main (void)
948{ 1092{
949 ev_init (0); 1093 ev_init (0);
950 1094
951 evio_init (&wio, sin_cb, 0, EV_READ); 1095 ev_io_init (&wio, sin_cb, 0, EV_READ);
952 evio_start (&wio); 1096 ev_io_start (&wio);
953 1097
954 struct ev_timer t[10000]; 1098 struct ev_timer t[10000];
955 1099
956#if 0 1100#if 0
957 int i; 1101 int i;
958 for (i = 0; i < 10000; ++i) 1102 for (i = 0; i < 10000; ++i)
959 { 1103 {
960 struct ev_timer *w = t + i; 1104 struct ev_timer *w = t + i;
961 evw_init (w, ocb, i); 1105 ev_watcher_init (w, ocb, i);
962 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1106 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
963 evtimer_start (w); 1107 ev_timer_start (w);
964 if (drand48 () < 0.5) 1108 if (drand48 () < 0.5)
965 evtimer_stop (w); 1109 ev_timer_stop (w);
966 } 1110 }
967#endif 1111#endif
968 1112
969 struct ev_timer t1; 1113 struct ev_timer t1;
970 evtimer_init (&t1, ocb, 5, 10); 1114 ev_timer_init (&t1, ocb, 5, 10);
971 evtimer_start (&t1); 1115 ev_timer_start (&t1);
972 1116
973 struct ev_signal sig; 1117 struct ev_signal sig;
974 evsignal_init (&sig, scb, SIGQUIT); 1118 ev_signal_init (&sig, scb, SIGQUIT);
975 evsignal_start (&sig); 1119 ev_signal_start (&sig);
976 1120
977 struct ev_check cw; 1121 struct ev_check cw;
978 evcheck_init (&cw, gcb); 1122 ev_check_init (&cw, gcb);
979 evcheck_start (&cw); 1123 ev_check_start (&cw);
980 1124
981 struct ev_idle iw; 1125 struct ev_idle iw;
982 evidle_init (&iw, gcb); 1126 ev_idle_init (&iw, gcb);
983 evidle_start (&iw); 1127 ev_idle_start (&iw);
984 1128
985 ev_loop (0); 1129 ev_loop (0);
986 1130
987 return 0; 1131 return 0;
988} 1132}

Diff Legend

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