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

Comparing libev/ev.c (file contents):
Revision 1.8 by root, Wed Oct 31 00:32:33 2007 UTC vs.
Revision 1.17 by root, Wed Oct 31 14:44:15 2007 UTC

1/*
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met:
8 *
9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * * Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided
15 * with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
21 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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.
28 */
29
1#include <math.h> 30#include <math.h>
2#include <stdlib.h> 31#include <stdlib.h>
3#include <unistd.h> 32#include <unistd.h>
4#include <fcntl.h> 33#include <fcntl.h>
5#include <signal.h> 34#include <signal.h>
35#include <stddef.h>
6 36
7#include <stdio.h> 37#include <stdio.h>
8 38
9#include <assert.h> 39#include <assert.h>
10#include <errno.h> 40#include <errno.h>
11#include <sys/time.h> 41#include <sys/time.h>
12#include <time.h> 42#include <time.h>
13 43
14#ifdef CLOCK_MONOTONIC
15# define HAVE_MONOTONIC 1
16#endif
17
18#define HAVE_REALTIME 1
19#define HAVE_EPOLL 1 44#define HAVE_EPOLL 1
45
46#ifndef HAVE_MONOTONIC
47# ifdef CLOCK_MONOTONIC
48# define HAVE_MONOTONIC 1
49# endif
50#endif
51
52#ifndef HAVE_SELECT
20#define HAVE_SELECT 1 53# define HAVE_SELECT 1
54#endif
55
56#ifndef HAVE_EPOLL
57# define HAVE_EPOLL 0
58#endif
59
60#ifndef HAVE_REALTIME
61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
62#endif
21 63
22#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 64#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
23#define MAX_BLOCKTIME 60. 65#define MAX_BLOCKTIME 60.
24 66
25#include "ev.h" 67#include "ev.h"
26 68
27struct ev_watcher { 69typedef struct ev_watcher *W;
28 EV_WATCHER (ev_watcher);
29};
30
31struct ev_watcher_list { 70typedef struct ev_watcher_list *WL;
32 EV_WATCHER_LIST (ev_watcher_list); 71typedef struct ev_watcher_time *WT;
33};
34 72
35static ev_tstamp now, diff; /* monotonic clock */ 73static ev_tstamp now, diff; /* monotonic clock */
36ev_tstamp ev_now; 74ev_tstamp ev_now;
37int ev_method; 75int ev_method;
38 76
75 113
76#define array_needsize(base,cur,cnt,init) \ 114#define array_needsize(base,cur,cnt,init) \
77 if ((cnt) > cur) \ 115 if ((cnt) > cur) \
78 { \ 116 { \
79 int newcnt = cur ? cur << 1 : 16; \ 117 int newcnt = cur ? cur << 1 : 16; \
80 fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\
81 base = realloc (base, sizeof (*base) * (newcnt)); \ 118 base = realloc (base, sizeof (*base) * (newcnt)); \
82 init (base + cur, newcnt - cur); \ 119 init (base + cur, newcnt - cur); \
83 cur = newcnt; \ 120 cur = newcnt; \
84 } 121 }
85 122
108 } 145 }
109} 146}
110 147
111typedef struct 148typedef struct
112{ 149{
113 struct ev_watcher *w; 150 W w;
114 int events; 151 int events;
115} ANPENDING; 152} ANPENDING;
116 153
117static ANPENDING *pendings; 154static ANPENDING *pendings;
118static int pendingmax, pendingcnt; 155static int pendingmax, pendingcnt;
119 156
120static void 157static void
121event (struct ev_watcher *w, int events) 158event (W w, int events)
122{ 159{
160 if (w->active)
161 {
123 w->pending = ++pendingcnt; 162 w->pending = ++pendingcnt;
124 array_needsize (pendings, pendingmax, pendingcnt, ); 163 array_needsize (pendings, pendingmax, pendingcnt, );
125 pendings [pendingcnt - 1].w = w; 164 pendings [pendingcnt - 1].w = w;
126 pendings [pendingcnt - 1].events = events; 165 pendings [pendingcnt - 1].events = events;
166 }
127} 167}
128 168
129static void 169static void
130fd_event (int fd, int events) 170fd_event (int fd, int events)
131{ 171{
135 for (w = anfd->head; w; w = w->next) 175 for (w = anfd->head; w; w = w->next)
136 { 176 {
137 int ev = w->events & events; 177 int ev = w->events & events;
138 178
139 if (ev) 179 if (ev)
140 event ((struct ev_watcher *)w, ev); 180 event ((W)w, ev);
141 } 181 }
142} 182}
143 183
144/*****************************************************************************/ 184static void
185queue_events (W *events, int eventcnt, int type)
186{
187 int i;
145 188
189 for (i = 0; i < eventcnt; ++i)
190 event (events [i], type);
191}
192
193/*****************************************************************************/
194
146static struct ev_timer **atimers; 195static struct ev_timer **timers;
147static int atimermax, atimercnt; 196static int timermax, timercnt;
148 197
149static struct ev_timer **rtimers; 198static struct ev_periodic **periodics;
150static int rtimermax, rtimercnt; 199static int periodicmax, periodiccnt;
151 200
152static void 201static void
153upheap (struct ev_timer **timers, int k) 202upheap (WT *timers, int k)
154{ 203{
155 struct ev_timer *w = timers [k]; 204 WT w = timers [k];
156 205
157 while (k && timers [k >> 1]->at > w->at) 206 while (k && timers [k >> 1]->at > w->at)
158 { 207 {
159 timers [k] = timers [k >> 1]; 208 timers [k] = timers [k >> 1];
160 timers [k]->active = k + 1; 209 timers [k]->active = k + 1;
165 timers [k]->active = k + 1; 214 timers [k]->active = k + 1;
166 215
167} 216}
168 217
169static void 218static void
170downheap (struct ev_timer **timers, int N, int k) 219downheap (WT *timers, int N, int k)
171{ 220{
172 struct ev_timer *w = timers [k]; 221 WT w = timers [k];
173 222
174 while (k < (N >> 1)) 223 while (k < (N >> 1))
175 { 224 {
176 int j = k << 1; 225 int j = k << 1;
177 226
241 if (signals [sig].gotsig) 290 if (signals [sig].gotsig)
242 { 291 {
243 signals [sig].gotsig = 0; 292 signals [sig].gotsig = 0;
244 293
245 for (w = signals [sig].head; w; w = w->next) 294 for (w = signals [sig].head; w; w = w->next)
246 event ((struct ev_watcher *)w, EV_SIGNAL); 295 event ((W)w, EV_SIGNAL);
247 } 296 }
248} 297}
249 298
250static void 299static void
251siginit (void) 300siginit (void)
258 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 307 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
259 308
260 evio_set (&sigev, sigpipe [0], EV_READ); 309 evio_set (&sigev, sigpipe [0], EV_READ);
261 evio_start (&sigev); 310 evio_start (&sigev);
262} 311}
312
313/*****************************************************************************/
314
315static struct ev_idle **idles;
316static int idlemax, idlecnt;
317
318static struct ev_check **checks;
319static int checkmax, checkcnt;
263 320
264/*****************************************************************************/ 321/*****************************************************************************/
265 322
266#if HAVE_EPOLL 323#if HAVE_EPOLL
267# include "ev_epoll.c" 324# include "ev_epoll.c"
295 if (ev_method == EVMETHOD_NONE) select_init (flags); 352 if (ev_method == EVMETHOD_NONE) select_init (flags);
296#endif 353#endif
297 354
298 if (ev_method) 355 if (ev_method)
299 { 356 {
300 evw_init (&sigev, sigcb, 0); 357 evw_init (&sigev, sigcb);
301 siginit (); 358 siginit ();
302 } 359 }
303 360
304 return ev_method; 361 return ev_method;
305} 362}
306 363
307/*****************************************************************************/ 364/*****************************************************************************/
308 365
309void ev_prefork (void) 366void ev_prefork (void)
310{ 367{
368 /* nop */
311} 369}
312 370
313void ev_postfork_parent (void) 371void ev_postfork_parent (void)
314{ 372{
373 /* nop */
315} 374}
316 375
317void ev_postfork_child (void) 376void ev_postfork_child (void)
318{ 377{
319#if HAVE_EPOLL 378#if HAVE_EPOLL
328 siginit (); 387 siginit ();
329} 388}
330 389
331/*****************************************************************************/ 390/*****************************************************************************/
332 391
333static ev_hook hooks [EVHOOK_NUM];
334
335void
336ev_hook_register (int type, ev_hook hook)
337{
338 hooks [type] = hook;
339}
340
341void
342ev_hook_unregister (int type, ev_hook hook)
343{
344 hooks [type] = 0;
345}
346
347static void
348hook_call (int type)
349{
350 if (hooks [type])
351 hooks [type] ();
352}
353
354static void 392static void
355fd_reify (void) 393fd_reify (void)
356{ 394{
357 int i; 395 int i;
358 396
395 433
396 pendingcnt = 0; 434 pendingcnt = 0;
397} 435}
398 436
399static void 437static void
400timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now) 438timers_reify ()
401{ 439{
402 while (timercnt && timers [0]->at <= now) 440 while (timercnt && timers [0]->at <= now)
403 { 441 {
404 struct ev_timer *w = timers [0]; 442 struct ev_timer *w = timers [0];
443
444 event ((W)w, EV_TIMEOUT);
405 445
406 /* first reschedule or stop timer */ 446 /* first reschedule or stop timer */
407 if (w->repeat) 447 if (w->repeat)
408 { 448 {
409 if (w->is_abs)
410 w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat;
411 else
412 w->at = now + w->repeat; 449 w->at = now + w->repeat;
413 450 assert (("timer timeout in the past, negative repeat?", w->at > now));
414 assert (w->at > now);
415
416 downheap (timers, timercnt, 0); 451 downheap ((WT *)timers, timercnt, 0);
417 } 452 }
418 else 453 else
419 {
420 evtimer_stop (w); /* nonrepeating: stop timer */ 454 evtimer_stop (w); /* nonrepeating: stop timer */
421 --timercnt; /* maybe pass by reference instead? */ 455 }
456}
457
458static void
459periodics_reify ()
460{
461 while (periodiccnt && periodics [0]->at <= ev_now)
462 {
463 struct ev_periodic *w = periodics [0];
464
465 /* first reschedule or stop timer */
466 if (w->interval)
422 } 467 {
468 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
469 assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
470 downheap ((WT *)periodics, periodiccnt, 0);
471 }
472 else
473 evperiodic_stop (w); /* nonrepeating: stop timer */
423 474
424 event ((struct ev_watcher *)w, EV_TIMEOUT); 475 event ((W)w, EV_TIMEOUT);
476 }
477}
478
479static void
480periodics_reschedule (ev_tstamp diff)
481{
482 int i;
483
484 /* adjust periodics after time jump */
485 for (i = 0; i < periodiccnt; ++i)
486 {
487 struct ev_periodic *w = periodics [i];
488
489 if (w->interval)
490 {
491 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
492
493 if (fabs (diff) >= 1e-4)
494 {
495 evperiodic_stop (w);
496 evperiodic_start (w);
497
498 i = 0; /* restart loop, inefficient, but time jumps should be rare */
499 }
500 }
425 } 501 }
426} 502}
427 503
428static void 504static void
429time_update () 505time_update ()
430{ 506{
431 int i; 507 int i;
508
432 ev_now = ev_time (); 509 ev_now = ev_time ();
433 510
434 if (have_monotonic) 511 if (have_monotonic)
435 { 512 {
436 ev_tstamp odiff = diff; 513 ev_tstamp odiff = diff;
437 514
438 /* detecting time jumps is much more difficult */
439 for (i = 2; --i; ) /* loop a few times, before making important decisions */ 515 for (i = 4; --i; ) /* loop a few times, before making important decisions */
440 { 516 {
441 now = get_clock (); 517 now = get_clock ();
442 diff = ev_now - now; 518 diff = ev_now - now;
443 519
444 if (fabs (odiff - diff) < MIN_TIMEJUMP) 520 if (fabs (odiff - diff) < MIN_TIMEJUMP)
445 return; /* all is well */ 521 return; /* all is well */
446 522
447 ev_now = ev_time (); 523 ev_now = ev_time ();
448 } 524 }
449 525
450 /* time jump detected, reschedule atimers */ 526 periodics_reschedule (diff - odiff);
451 for (i = 0; i < atimercnt; ++i) 527 /* no timer adjustment, as the monotonic clock doesn't jump */
452 {
453 struct ev_timer *w = atimers [i];
454 w->at += ceil ((ev_now - w->at) / w->repeat + 1.) * w->repeat;
455 }
456 } 528 }
457 else 529 else
458 { 530 {
459 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 531 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
460 /* time jump detected, adjust rtimers */ 532 {
533 periodics_reschedule (ev_now - now);
534
535 /* adjust timers. this is easy, as the offset is the same for all */
461 for (i = 0; i < rtimercnt; ++i) 536 for (i = 0; i < timercnt; ++i)
462 rtimers [i]->at += ev_now - now; 537 timers [i]->at += diff;
538 }
463 539
464 now = ev_now; 540 now = ev_now;
465 } 541 }
466} 542}
467 543
468int ev_loop_done; 544int ev_loop_done;
469 545
470void ev_loop (int flags) 546void ev_loop (int flags)
471{ 547{
472 double block; 548 double block;
473 ev_loop_done = flags & EVLOOP_ONESHOT; 549 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
550
551 if (checkcnt)
552 {
553 queue_events ((W *)checks, checkcnt, EV_CHECK);
554 call_pending ();
555 }
474 556
475 do 557 do
476 { 558 {
477 hook_call (EVHOOK_PREPOLL);
478
479 /* update fd-related kernel structures */ 559 /* update fd-related kernel structures */
480 fd_reify (); 560 fd_reify ();
481 561
482 /* calculate blocking time */ 562 /* calculate blocking time */
563
564 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */
565 ev_now = ev_time ();
566
483 if (flags & EVLOOP_NONBLOCK) 567 if (flags & EVLOOP_NONBLOCK || idlecnt)
484 block = 0.; 568 block = 0.;
485 else 569 else
486 { 570 {
487 block = MAX_BLOCKTIME; 571 block = MAX_BLOCKTIME;
488 572
489 if (rtimercnt) 573 if (timercnt)
490 { 574 {
491 ev_tstamp to = rtimers [0]->at - get_clock () + method_fudge; 575 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;
492 if (block > to) block = to; 576 if (block > to) block = to;
493 } 577 }
494 578
495 if (atimercnt) 579 if (periodiccnt)
496 { 580 {
497 ev_tstamp to = atimers [0]->at - ev_time () + method_fudge; 581 ev_tstamp to = periodics [0]->at - ev_now + method_fudge;
498 if (block > to) block = to; 582 if (block > to) block = to;
499 } 583 }
500 584
501 if (block < 0.) block = 0.; 585 if (block < 0.) block = 0.;
502 } 586 }
504 method_poll (block); 588 method_poll (block);
505 589
506 /* update ev_now, do magic */ 590 /* update ev_now, do magic */
507 time_update (); 591 time_update ();
508 592
509 hook_call (EVHOOK_POSTPOLL);
510
511 /* put pending timers into pendign queue and reschedule them */ 593 /* queue pending timers and reschedule them */
512 /* absolute timers first */ 594 periodics_reify (); /* absolute timers first */
513 timers_reify (atimers, atimercnt, ev_now);
514 /* relative timers second */ 595 timers_reify (); /* relative timers second */
515 timers_reify (rtimers, rtimercnt, now); 596
597 /* queue idle watchers unless io or timers are pending */
598 if (!pendingcnt)
599 queue_events ((W *)idles, idlecnt, EV_IDLE);
600
601 /* queue check and possibly idle watchers */
602 queue_events ((W *)checks, checkcnt, EV_CHECK);
516 603
517 call_pending (); 604 call_pending ();
518 } 605 }
519 while (!ev_loop_done); 606 while (!ev_loop_done);
520}
521 607
522/*****************************************************************************/ 608 if (ev_loop_done != 2)
609 ev_loop_done = 0;
610}
523 611
612/*****************************************************************************/
613
524static void 614static void
525wlist_add (struct ev_watcher_list **head, struct ev_watcher_list *elem) 615wlist_add (WL *head, WL elem)
526{ 616{
527 elem->next = *head; 617 elem->next = *head;
528 *head = elem; 618 *head = elem;
529} 619}
530 620
531static void 621static void
532wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem) 622wlist_del (WL *head, WL elem)
533{ 623{
534 while (*head) 624 while (*head)
535 { 625 {
536 if (*head == elem) 626 if (*head == elem)
537 { 627 {
542 head = &(*head)->next; 632 head = &(*head)->next;
543 } 633 }
544} 634}
545 635
546static void 636static void
547ev_start (struct ev_watcher *w, int active) 637ev_clear (W w)
548{ 638{
639 if (w->pending)
640 {
641 pendings [w->pending - 1].w = 0;
549 w->pending = 0; 642 w->pending = 0;
643 }
644}
645
646static void
647ev_start (W w, int active)
648{
550 w->active = active; 649 w->active = active;
551} 650}
552 651
553static void 652static void
554ev_stop (struct ev_watcher *w) 653ev_stop (W w)
555{ 654{
556 if (w->pending)
557 pendings [w->pending - 1].w = 0;
558
559 w->active = 0; 655 w->active = 0;
560 /* nop */
561} 656}
562 657
563/*****************************************************************************/ 658/*****************************************************************************/
564 659
565void 660void
568 if (ev_is_active (w)) 663 if (ev_is_active (w))
569 return; 664 return;
570 665
571 int fd = w->fd; 666 int fd = w->fd;
572 667
573 ev_start ((struct ev_watcher *)w, 1); 668 ev_start ((W)w, 1);
574 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 669 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
575 wlist_add ((struct ev_watcher_list **)&anfds[fd].head, (struct ev_watcher_list *)w); 670 wlist_add ((WL *)&anfds[fd].head, (WL)w);
576 671
577 ++fdchangecnt; 672 ++fdchangecnt;
578 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 673 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
579 fdchanges [fdchangecnt - 1] = fd; 674 fdchanges [fdchangecnt - 1] = fd;
580} 675}
581 676
582void 677void
583evio_stop (struct ev_io *w) 678evio_stop (struct ev_io *w)
584{ 679{
680 ev_clear ((W)w);
585 if (!ev_is_active (w)) 681 if (!ev_is_active (w))
586 return; 682 return;
587 683
588 wlist_del ((struct ev_watcher_list **)&anfds[w->fd].head, (struct ev_watcher_list *)w); 684 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
589 ev_stop ((struct ev_watcher *)w); 685 ev_stop ((W)w);
590 686
591 ++fdchangecnt; 687 ++fdchangecnt;
592 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 688 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
593 fdchanges [fdchangecnt - 1] = w->fd; 689 fdchanges [fdchangecnt - 1] = w->fd;
594} 690}
597evtimer_start (struct ev_timer *w) 693evtimer_start (struct ev_timer *w)
598{ 694{
599 if (ev_is_active (w)) 695 if (ev_is_active (w))
600 return; 696 return;
601 697
602 if (w->is_abs) 698 w->at += now;
603 {
604 /* this formula differs from the one in timer_reify becuse we do not round up */
605 if (w->repeat)
606 w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
607 699
608 ev_start ((struct ev_watcher *)w, ++atimercnt); 700 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));
701
702 ev_start ((W)w, ++timercnt);
609 array_needsize (atimers, atimermax, atimercnt, ); 703 array_needsize (timers, timermax, timercnt, );
610 atimers [atimercnt - 1] = w; 704 timers [timercnt - 1] = w;
611 upheap (atimers, atimercnt - 1); 705 upheap ((WT *)timers, timercnt - 1);
612 }
613 else
614 {
615 w->at += now;
616
617 ev_start ((struct ev_watcher *)w, ++rtimercnt);
618 array_needsize (rtimers, rtimermax, rtimercnt, );
619 rtimers [rtimercnt - 1] = w;
620 upheap (rtimers, rtimercnt - 1);
621 }
622
623} 706}
624 707
625void 708void
626evtimer_stop (struct ev_timer *w) 709evtimer_stop (struct ev_timer *w)
627{ 710{
711 ev_clear ((W)w);
628 if (!ev_is_active (w)) 712 if (!ev_is_active (w))
629 return; 713 return;
630 714
631 if (w->is_abs)
632 {
633 if (w->active < atimercnt--) 715 if (w->active < timercnt--)
634 { 716 {
635 atimers [w->active - 1] = atimers [atimercnt]; 717 timers [w->active - 1] = timers [timercnt];
718 downheap ((WT *)timers, timercnt, w->active - 1);
719 }
720
721 w->at = w->repeat;
722
723 ev_stop ((W)w);
724}
725
726void
727evtimer_again (struct ev_timer *w)
728{
729 if (ev_is_active (w))
730 {
731 if (w->repeat)
732 {
733 w->at = now + w->repeat;
636 downheap (atimers, atimercnt, w->active - 1); 734 downheap ((WT *)timers, timercnt, w->active - 1);
637 }
638 }
639 else
640 {
641 if (w->active < rtimercnt--)
642 { 735 }
643 rtimers [w->active - 1] = rtimers [rtimercnt]; 736 else
644 downheap (rtimers, rtimercnt, w->active - 1); 737 evtimer_stop (w);
645 } 738 }
739 else if (w->repeat)
740 evtimer_start (w);
741}
742
743void
744evperiodic_start (struct ev_periodic *w)
745{
746 if (ev_is_active (w))
747 return;
748
749 assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
750
751 /* this formula differs from the one in periodic_reify because we do not always round up */
752 if (w->interval)
753 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
754
755 ev_start ((W)w, ++periodiccnt);
756 array_needsize (periodics, periodicmax, periodiccnt, );
757 periodics [periodiccnt - 1] = w;
758 upheap ((WT *)periodics, periodiccnt - 1);
759}
760
761void
762evperiodic_stop (struct ev_periodic *w)
763{
764 ev_clear ((W)w);
765 if (!ev_is_active (w))
766 return;
767
768 if (w->active < periodiccnt--)
646 } 769 {
770 periodics [w->active - 1] = periodics [periodiccnt];
771 downheap ((WT *)periodics, periodiccnt, w->active - 1);
772 }
647 773
648 ev_stop ((struct ev_watcher *)w); 774 ev_stop ((W)w);
649} 775}
650 776
651void 777void
652evsignal_start (struct ev_signal *w) 778evsignal_start (struct ev_signal *w)
653{ 779{
654 if (ev_is_active (w)) 780 if (ev_is_active (w))
655 return; 781 return;
656 782
657 ev_start ((struct ev_watcher *)w, 1); 783 ev_start ((W)w, 1);
658 array_needsize (signals, signalmax, w->signum, signals_init); 784 array_needsize (signals, signalmax, w->signum, signals_init);
659 wlist_add ((struct ev_watcher_list **)&signals [w->signum - 1].head, (struct ev_watcher_list *)w); 785 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
660 786
661 if (!w->next) 787 if (!w->next)
662 { 788 {
663 struct sigaction sa; 789 struct sigaction sa;
664 sa.sa_handler = sighandler; 790 sa.sa_handler = sighandler;
669} 795}
670 796
671void 797void
672evsignal_stop (struct ev_signal *w) 798evsignal_stop (struct ev_signal *w)
673{ 799{
800 ev_clear ((W)w);
674 if (!ev_is_active (w)) 801 if (!ev_is_active (w))
675 return; 802 return;
676 803
677 wlist_del ((struct ev_watcher_list **)&signals [w->signum - 1].head, (struct ev_watcher_list *)w); 804 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
678 ev_stop ((struct ev_watcher *)w); 805 ev_stop ((W)w);
679 806
680 if (!signals [w->signum - 1].head) 807 if (!signals [w->signum - 1].head)
681 signal (w->signum, SIG_DFL); 808 signal (w->signum, SIG_DFL);
682} 809}
683 810
811void evidle_start (struct ev_idle *w)
812{
813 if (ev_is_active (w))
814 return;
815
816 ev_start ((W)w, ++idlecnt);
817 array_needsize (idles, idlemax, idlecnt, );
818 idles [idlecnt - 1] = w;
819}
820
821void evidle_stop (struct ev_idle *w)
822{
823 ev_clear ((W)w);
824 if (ev_is_active (w))
825 return;
826
827 idles [w->active - 1] = idles [--idlecnt];
828 ev_stop ((W)w);
829}
830
831void evcheck_start (struct ev_check *w)
832{
833 if (ev_is_active (w))
834 return;
835
836 ev_start ((W)w, ++checkcnt);
837 array_needsize (checks, checkmax, checkcnt, );
838 checks [checkcnt - 1] = w;
839}
840
841void evcheck_stop (struct ev_check *w)
842{
843 ev_clear ((W)w);
844 if (ev_is_active (w))
845 return;
846
847 checks [w->active - 1] = checks [--checkcnt];
848 ev_stop ((W)w);
849}
850
684/*****************************************************************************/ 851/*****************************************************************************/
852
853struct ev_once
854{
855 struct ev_io io;
856 struct ev_timer to;
857 void (*cb)(int revents, void *arg);
858 void *arg;
859};
860
861static void
862once_cb (struct ev_once *once, int revents)
863{
864 void (*cb)(int revents, void *arg) = once->cb;
865 void *arg = once->arg;
866
867 evio_stop (&once->io);
868 evtimer_stop (&once->to);
869 free (once);
870
871 cb (revents, arg);
872}
873
874static void
875once_cb_io (struct ev_io *w, int revents)
876{
877 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
878}
879
880static void
881once_cb_to (struct ev_timer *w, int revents)
882{
883 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
884}
885
886void
887ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
888{
889 struct ev_once *once = malloc (sizeof (struct ev_once));
890
891 if (!once)
892 cb (EV_ERROR, arg);
893 else
894 {
895 once->cb = cb;
896 once->arg = arg;
897
898 evw_init (&once->io, once_cb_io);
899
900 if (fd >= 0)
901 {
902 evio_set (&once->io, fd, events);
903 evio_start (&once->io);
904 }
905
906 evw_init (&once->to, once_cb_to);
907
908 if (timeout >= 0.)
909 {
910 evtimer_set (&once->to, timeout, 0.);
911 evtimer_start (&once->to);
912 }
913 }
914}
915
916/*****************************************************************************/
917
685#if 1 918#if 0
919
920struct ev_io wio;
686 921
687static void 922static void
688sin_cb (struct ev_io *w, int revents) 923sin_cb (struct ev_io *w, int revents)
689{ 924{
690 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents); 925 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
700 935
701static void 936static void
702scb (struct ev_signal *w, int revents) 937scb (struct ev_signal *w, int revents)
703{ 938{
704 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 939 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
940 evio_stop (&wio);
941 evio_start (&wio);
942}
943
944static void
945gcb (struct ev_signal *w, int revents)
946{
947 fprintf (stderr, "generic %x\n", revents);
948
705} 949}
706 950
707int main (void) 951int main (void)
708{ 952{
709 struct ev_io sin;
710
711 ev_init (0); 953 ev_init (0);
712 954
713 evw_init (&sin, sin_cb, 55);
714 evio_set (&sin, 0, EV_READ); 955 evio_init (&wio, sin_cb, 0, EV_READ);
715 evio_start (&sin); 956 evio_start (&wio);
716 957
717 struct ev_timer t[10000]; 958 struct ev_timer t[10000];
718 959
719#if 1 960#if 0
720 int i; 961 int i;
721 for (i = 0; i < 10000; ++i) 962 for (i = 0; i < 10000; ++i)
722 { 963 {
723 struct ev_timer *w = t + i; 964 struct ev_timer *w = t + i;
724 evw_init (w, ocb, i); 965 evw_init (w, ocb, i);
725 evtimer_set_abs (w, drand48 (), 0.99775533); 966 evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
726 evtimer_start (w); 967 evtimer_start (w);
727 if (drand48 () < 0.5) 968 if (drand48 () < 0.5)
728 evtimer_stop (w); 969 evtimer_stop (w);
729 } 970 }
730#endif 971#endif
731 972
732 struct ev_timer t1; 973 struct ev_timer t1;
733 evw_init (&t1, ocb, 0); 974 evtimer_init (&t1, ocb, 5, 10);
734 evtimer_set_abs (&t1, 5, 10);
735 evtimer_start (&t1); 975 evtimer_start (&t1);
736 976
737 struct ev_signal sig; 977 struct ev_signal sig;
738 evw_init (&sig, scb, 65535);
739 evsignal_set (&sig, SIGQUIT); 978 evsignal_init (&sig, scb, SIGQUIT);
740 evsignal_start (&sig); 979 evsignal_start (&sig);
741 980
981 struct ev_check cw;
982 evcheck_init (&cw, gcb);
983 evcheck_start (&cw);
984
985 struct ev_idle iw;
986 evidle_init (&iw, gcb);
987 evidle_start (&iw);
988
742 ev_loop (0); 989 ev_loop (0);
743 990
744 return 0; 991 return 0;
745} 992}
746 993

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines