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

Comparing libev/ev.c (file contents):
Revision 1.9 by root, Wed Oct 31 07:24:17 2007 UTC vs.
Revision 1.22 by root, Wed Oct 31 19:07:43 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>
41#include <sys/types.h>
42#include <sys/wait.h>
11#include <sys/time.h> 43#include <sys/time.h>
12#include <time.h> 44#include <time.h>
13 45
46#ifndef HAVE_MONOTONIC
14#ifdef CLOCK_MONOTONIC 47# ifdef CLOCK_MONOTONIC
15# define HAVE_MONOTONIC 1 48# define HAVE_MONOTONIC 1
16#endif 49# endif
50#endif
17 51
18#define HAVE_REALTIME 1 52#ifndef HAVE_SELECT
19#define HAVE_EPOLL 1
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.
66#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */
24 67
25#include "ev.h" 68#include "ev.h"
26 69
27struct ev_watcher { 70typedef struct ev_watcher *W;
28 EV_WATCHER (ev_watcher);
29};
30
31struct ev_watcher_list { 71typedef struct ev_watcher_list *WL;
32 EV_WATCHER_LIST (ev_watcher_list); 72typedef struct ev_watcher_time *WT;
33};
34 73
35static ev_tstamp now, diff; /* monotonic clock */ 74static ev_tstamp now, diff; /* monotonic clock */
36ev_tstamp ev_now; 75ev_tstamp ev_now;
37int ev_method; 76int ev_method;
38 77
… …
75 114
76#define array_needsize(base,cur,cnt,init) \ 115#define array_needsize(base,cur,cnt,init) \
77 if ((cnt) > cur) \ 116 if ((cnt) > cur) \
78 { \ 117 { \
79 int newcnt = cur ? cur << 1 : 16; \ 118 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)); \ 119 base = realloc (base, sizeof (*base) * (newcnt)); \
82 init (base + cur, newcnt - cur); \ 120 init (base + cur, newcnt - cur); \
83 cur = newcnt; \ 121 cur = newcnt; \
84 } 122 }
85 123
… …
108 } 146 }
109} 147}
110 148
111typedef struct 149typedef struct
112{ 150{
113 struct ev_watcher *w; 151 W w;
114 int events; 152 int events;
115} ANPENDING; 153} ANPENDING;
116 154
117static ANPENDING *pendings; 155static ANPENDING *pendings;
118static int pendingmax, pendingcnt; 156static int pendingmax, pendingcnt;
119 157
120static void 158static void
121event (struct ev_watcher *w, int events) 159event (W w, int events)
122{ 160{
161 if (w->active)
162 {
123 w->pending = ++pendingcnt; 163 w->pending = ++pendingcnt;
124 array_needsize (pendings, pendingmax, pendingcnt, ); 164 array_needsize (pendings, pendingmax, pendingcnt, );
125 pendings [pendingcnt - 1].w = w; 165 pendings [pendingcnt - 1].w = w;
126 pendings [pendingcnt - 1].events = events; 166 pendings [pendingcnt - 1].events = events;
167 }
127} 168}
128 169
129static void 170static void
130fd_event (int fd, int events) 171fd_event (int fd, int events)
131{ 172{
… …
135 for (w = anfd->head; w; w = w->next) 176 for (w = anfd->head; w; w = w->next)
136 { 177 {
137 int ev = w->events & events; 178 int ev = w->events & events;
138 179
139 if (ev) 180 if (ev)
140 event ((struct ev_watcher *)w, ev); 181 event ((W)w, ev);
141 } 182 }
142} 183}
143 184
144static void 185static void
145queue_events (struct ev_watcher **events, int eventcnt, int type) 186queue_events (W *events, int eventcnt, int type)
146{ 187{
147 int i; 188 int i;
148 189
149 for (i = 0; i < eventcnt; ++i) 190 for (i = 0; i < eventcnt; ++i)
150 event (events [i], type); 191 event (events [i], type);
151} 192}
152 193
153/*****************************************************************************/ 194/* called on EBADF to verify fds */
195static void
196fd_recheck ()
197{
198 int fd;
154 199
200 for (fd = 0; fd < anfdmax; ++fd)
201 if (anfds [fd].wev)
202 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
203 while (anfds [fd].head)
204 evio_stop (anfds [fd].head);
205}
206
207/*****************************************************************************/
208
155static struct ev_timer **atimers; 209static struct ev_timer **timers;
156static int atimermax, atimercnt; 210static int timermax, timercnt;
157 211
158static struct ev_timer **rtimers; 212static struct ev_periodic **periodics;
159static int rtimermax, rtimercnt; 213static int periodicmax, periodiccnt;
160 214
161static void 215static void
162upheap (struct ev_timer **timers, int k) 216upheap (WT *timers, int k)
163{ 217{
164 struct ev_timer *w = timers [k]; 218 WT w = timers [k];
165 219
166 while (k && timers [k >> 1]->at > w->at) 220 while (k && timers [k >> 1]->at > w->at)
167 { 221 {
168 timers [k] = timers [k >> 1]; 222 timers [k] = timers [k >> 1];
169 timers [k]->active = k + 1; 223 timers [k]->active = k + 1;
… …
174 timers [k]->active = k + 1; 228 timers [k]->active = k + 1;
175 229
176} 230}
177 231
178static void 232static void
179downheap (struct ev_timer **timers, int N, int k) 233downheap (WT *timers, int N, int k)
180{ 234{
181 struct ev_timer *w = timers [k]; 235 WT w = timers [k];
182 236
183 while (k < (N >> 1)) 237 while (k < (N >> 1))
184 { 238 {
185 int j = k << 1; 239 int j = k << 1;
186 240
… …
250 if (signals [sig].gotsig) 304 if (signals [sig].gotsig)
251 { 305 {
252 signals [sig].gotsig = 0; 306 signals [sig].gotsig = 0;
253 307
254 for (w = signals [sig].head; w; w = w->next) 308 for (w = signals [sig].head; w; w = w->next)
255 event ((struct ev_watcher *)w, EV_SIGNAL); 309 event ((W)w, EV_SIGNAL);
256 } 310 }
257} 311}
258 312
259static void 313static void
260siginit (void) 314siginit (void)
… …
273/*****************************************************************************/ 327/*****************************************************************************/
274 328
275static struct ev_idle **idles; 329static struct ev_idle **idles;
276static int idlemax, idlecnt; 330static int idlemax, idlecnt;
277 331
332static struct ev_prepare **prepares;
333static int preparemax, preparecnt;
334
278static struct ev_check **checks; 335static struct ev_check **checks;
279static int checkmax, checkcnt; 336static int checkmax, checkcnt;
337
338/*****************************************************************************/
339
340static struct ev_child *childs [PID_HASHSIZE];
341static struct ev_signal childev;
342
343#ifndef WCONTINUED
344# define WCONTINUED 0
345#endif
346
347static void
348childcb (struct ev_signal *sw, int revents)
349{
350 struct ev_child *w;
351 int pid, status;
352
353 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
354 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
355 if (w->pid == pid || w->pid == -1)
356 {
357 w->status = status;
358 event ((W)w, EV_CHILD);
359 }
360}
280 361
281/*****************************************************************************/ 362/*****************************************************************************/
282 363
283#if HAVE_EPOLL 364#if HAVE_EPOLL
284# include "ev_epoll.c" 365# include "ev_epoll.c"
… …
312 if (ev_method == EVMETHOD_NONE) select_init (flags); 393 if (ev_method == EVMETHOD_NONE) select_init (flags);
313#endif 394#endif
314 395
315 if (ev_method) 396 if (ev_method)
316 { 397 {
317 evw_init (&sigev, sigcb, 0); 398 evw_init (&sigev, sigcb);
318 siginit (); 399 siginit ();
400
401 evsignal_init (&childev, childcb, SIGCHLD);
402 evsignal_start (&childev);
319 } 403 }
320 404
321 return ev_method; 405 return ev_method;
322} 406}
323 407
324/*****************************************************************************/ 408/*****************************************************************************/
325 409
326void ev_prefork (void) 410void ev_prefork (void)
327{ 411{
412 /* nop */
328} 413}
329 414
330void ev_postfork_parent (void) 415void ev_postfork_parent (void)
331{ 416{
417 /* nop */
332} 418}
333 419
334void ev_postfork_child (void) 420void ev_postfork_child (void)
335{ 421{
336#if HAVE_EPOLL 422#if HAVE_EPOLL
… …
374} 460}
375 461
376static void 462static void
377call_pending () 463call_pending ()
378{ 464{
379 int i; 465 while (pendingcnt)
380
381 for (i = 0; i < pendingcnt; ++i)
382 { 466 {
383 ANPENDING *p = pendings + i; 467 ANPENDING *p = pendings + --pendingcnt;
384 468
385 if (p->w) 469 if (p->w)
386 { 470 {
387 p->w->pending = 0; 471 p->w->pending = 0;
388 p->w->cb (p->w, p->events); 472 p->w->cb (p->w, p->events);
389 } 473 }
390 } 474 }
391
392 pendingcnt = 0;
393} 475}
394 476
395static void 477static void
396timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now) 478timers_reify ()
397{ 479{
398 while (timercnt && timers [0]->at <= now) 480 while (timercnt && timers [0]->at <= now)
399 { 481 {
400 struct ev_timer *w = timers [0]; 482 struct ev_timer *w = timers [0];
483
484 event ((W)w, EV_TIMEOUT);
401 485
402 /* first reschedule or stop timer */ 486 /* first reschedule or stop timer */
403 if (w->repeat) 487 if (w->repeat)
404 { 488 {
405 if (w->is_abs)
406 w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat;
407 else
408 w->at = now + w->repeat; 489 w->at = now + w->repeat;
409 490 assert (("timer timeout in the past, negative repeat?", w->at > now));
410 assert (w->at > now);
411
412 downheap (timers, timercnt, 0); 491 downheap ((WT *)timers, timercnt, 0);
413 } 492 }
414 else 493 else
415 {
416 evtimer_stop (w); /* nonrepeating: stop timer */ 494 evtimer_stop (w); /* nonrepeating: stop timer */
417 --timercnt; /* maybe pass by reference instead? */ 495 }
496}
497
498static void
499periodics_reify ()
500{
501 while (periodiccnt && periodics [0]->at <= ev_now)
502 {
503 struct ev_periodic *w = periodics [0];
504
505 /* first reschedule or stop timer */
506 if (w->interval)
418 } 507 {
508 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
509 assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
510 downheap ((WT *)periodics, periodiccnt, 0);
511 }
512 else
513 evperiodic_stop (w); /* nonrepeating: stop timer */
419 514
420 event ((struct ev_watcher *)w, EV_TIMEOUT); 515 event ((W)w, EV_TIMEOUT);
516 }
517}
518
519static void
520periodics_reschedule (ev_tstamp diff)
521{
522 int i;
523
524 /* adjust periodics after time jump */
525 for (i = 0; i < periodiccnt; ++i)
526 {
527 struct ev_periodic *w = periodics [i];
528
529 if (w->interval)
530 {
531 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
532
533 if (fabs (diff) >= 1e-4)
534 {
535 evperiodic_stop (w);
536 evperiodic_start (w);
537
538 i = 0; /* restart loop, inefficient, but time jumps should be rare */
539 }
540 }
421 } 541 }
422} 542}
423 543
424static void 544static void
425time_update () 545time_update ()
426{ 546{
427 int i; 547 int i;
548
428 ev_now = ev_time (); 549 ev_now = ev_time ();
429 550
430 if (have_monotonic) 551 if (have_monotonic)
431 { 552 {
432 ev_tstamp odiff = diff; 553 ev_tstamp odiff = diff;
433 554
434 /* detecting time jumps is much more difficult */
435 for (i = 2; --i; ) /* loop a few times, before making important decisions */ 555 for (i = 4; --i; ) /* loop a few times, before making important decisions */
436 { 556 {
437 now = get_clock (); 557 now = get_clock ();
438 diff = ev_now - now; 558 diff = ev_now - now;
439 559
440 if (fabs (odiff - diff) < MIN_TIMEJUMP) 560 if (fabs (odiff - diff) < MIN_TIMEJUMP)
441 return; /* all is well */ 561 return; /* all is well */
442 562
443 ev_now = ev_time (); 563 ev_now = ev_time ();
444 } 564 }
445 565
446 /* time jump detected, reschedule atimers */ 566 periodics_reschedule (diff - odiff);
447 for (i = 0; i < atimercnt; ++i) 567 /* no timer adjustment, as the monotonic clock doesn't jump */
448 {
449 struct ev_timer *w = atimers [i];
450 w->at += ceil ((ev_now - w->at) / w->repeat + 1.) * w->repeat;
451 }
452 } 568 }
453 else 569 else
454 { 570 {
455 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 571 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
456 /* time jump detected, adjust rtimers */ 572 {
573 periodics_reschedule (ev_now - now);
574
575 /* adjust timers. this is easy, as the offset is the same for all */
457 for (i = 0; i < rtimercnt; ++i) 576 for (i = 0; i < timercnt; ++i)
458 rtimers [i]->at += ev_now - now; 577 timers [i]->at += diff;
578 }
459 579
460 now = ev_now; 580 now = ev_now;
461 } 581 }
462} 582}
463 583
464int ev_loop_done; 584int ev_loop_done;
465 585
466void ev_loop (int flags) 586void ev_loop (int flags)
467{ 587{
468 double block; 588 double block;
469 ev_loop_done = flags & EVLOOP_ONESHOT; 589 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
470
471 if (checkcnt)
472 {
473 queue_events (checks, checkcnt, EV_CHECK);
474 call_pending ();
475 }
476 590
477 do 591 do
478 { 592 {
593 /* queue check watchers (and execute them) */
594 if (preparecnt)
595 {
596 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
597 call_pending ();
598 }
599
479 /* update fd-related kernel structures */ 600 /* update fd-related kernel structures */
480 fd_reify (); 601 fd_reify ();
481 602
482 /* calculate blocking time */ 603 /* calculate blocking time */
604
605 /* we only need this for !monotonic clockor timers, but as we basically
606 always have timers, we just calculate it always */
607 ev_now = ev_time ();
608
483 if (flags & EVLOOP_NONBLOCK || idlecnt) 609 if (flags & EVLOOP_NONBLOCK || idlecnt)
484 block = 0.; 610 block = 0.;
485 else 611 else
486 { 612 {
487 block = MAX_BLOCKTIME; 613 block = MAX_BLOCKTIME;
488 614
489 if (rtimercnt) 615 if (timercnt)
490 { 616 {
491 ev_tstamp to = rtimers [0]->at - get_clock () + method_fudge; 617 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;
492 if (block > to) block = to; 618 if (block > to) block = to;
493 } 619 }
494 620
495 if (atimercnt) 621 if (periodiccnt)
496 { 622 {
497 ev_tstamp to = atimers [0]->at - ev_time () + method_fudge; 623 ev_tstamp to = periodics [0]->at - ev_now + method_fudge;
498 if (block > to) block = to; 624 if (block > to) block = to;
499 } 625 }
500 626
501 if (block < 0.) block = 0.; 627 if (block < 0.) block = 0.;
502 } 628 }
… …
505 631
506 /* update ev_now, do magic */ 632 /* update ev_now, do magic */
507 time_update (); 633 time_update ();
508 634
509 /* queue pending timers and reschedule them */ 635 /* queue pending timers and reschedule them */
510 /* absolute timers first */ 636 timers_reify (); /* relative timers called last */
511 timers_reify (atimers, atimercnt, ev_now); 637 periodics_reify (); /* absolute timers called first */
512 /* relative timers second */
513 timers_reify (rtimers, rtimercnt, now);
514 638
515 /* queue idle watchers unless io or timers are pending */ 639 /* queue idle watchers unless io or timers are pending */
516 if (!pendingcnt) 640 if (!pendingcnt)
517 queue_events (idles, idlecnt, EV_IDLE); 641 queue_events ((W *)idles, idlecnt, EV_IDLE);
518 642
519 /* queue check and possibly idle watchers */ 643 /* queue check watchers, to be executed first */
644 if (checkcnt)
520 queue_events (checks, checkcnt, EV_CHECK); 645 queue_events ((W *)checks, checkcnt, EV_CHECK);
521 646
522 call_pending (); 647 call_pending ();
523 } 648 }
524 while (!ev_loop_done); 649 while (!ev_loop_done);
525}
526 650
527/*****************************************************************************/ 651 if (ev_loop_done != 2)
652 ev_loop_done = 0;
653}
528 654
655/*****************************************************************************/
656
529static void 657static void
530wlist_add (struct ev_watcher_list **head, struct ev_watcher_list *elem) 658wlist_add (WL *head, WL elem)
531{ 659{
532 elem->next = *head; 660 elem->next = *head;
533 *head = elem; 661 *head = elem;
534} 662}
535 663
536static void 664static void
537wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem) 665wlist_del (WL *head, WL elem)
538{ 666{
539 while (*head) 667 while (*head)
540 { 668 {
541 if (*head == elem) 669 if (*head == elem)
542 { 670 {
… …
547 head = &(*head)->next; 675 head = &(*head)->next;
548 } 676 }
549} 677}
550 678
551static void 679static void
552ev_start (struct ev_watcher *w, int active) 680ev_clear (W w)
553{ 681{
682 if (w->pending)
683 {
684 pendings [w->pending - 1].w = 0;
554 w->pending = 0; 685 w->pending = 0;
686 }
687}
688
689static void
690ev_start (W w, int active)
691{
555 w->active = active; 692 w->active = active;
556} 693}
557 694
558static void 695static void
559ev_stop (struct ev_watcher *w) 696ev_stop (W w)
560{ 697{
561 if (w->pending)
562 pendings [w->pending - 1].w = 0;
563
564 w->active = 0; 698 w->active = 0;
565 /* nop */
566} 699}
567 700
568/*****************************************************************************/ 701/*****************************************************************************/
569 702
570void 703void
… …
573 if (ev_is_active (w)) 706 if (ev_is_active (w))
574 return; 707 return;
575 708
576 int fd = w->fd; 709 int fd = w->fd;
577 710
578 ev_start ((struct ev_watcher *)w, 1); 711 ev_start ((W)w, 1);
579 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 712 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
580 wlist_add ((struct ev_watcher_list **)&anfds[fd].head, (struct ev_watcher_list *)w); 713 wlist_add ((WL *)&anfds[fd].head, (WL)w);
581 714
582 ++fdchangecnt; 715 ++fdchangecnt;
583 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 716 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
584 fdchanges [fdchangecnt - 1] = fd; 717 fdchanges [fdchangecnt - 1] = fd;
585} 718}
586 719
587void 720void
588evio_stop (struct ev_io *w) 721evio_stop (struct ev_io *w)
589{ 722{
723 ev_clear ((W)w);
590 if (!ev_is_active (w)) 724 if (!ev_is_active (w))
591 return; 725 return;
592 726
593 wlist_del ((struct ev_watcher_list **)&anfds[w->fd].head, (struct ev_watcher_list *)w); 727 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
594 ev_stop ((struct ev_watcher *)w); 728 ev_stop ((W)w);
595 729
596 ++fdchangecnt; 730 ++fdchangecnt;
597 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 731 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
598 fdchanges [fdchangecnt - 1] = w->fd; 732 fdchanges [fdchangecnt - 1] = w->fd;
599} 733}
… …
602evtimer_start (struct ev_timer *w) 736evtimer_start (struct ev_timer *w)
603{ 737{
604 if (ev_is_active (w)) 738 if (ev_is_active (w))
605 return; 739 return;
606 740
607 if (w->is_abs) 741 w->at += now;
608 {
609 /* this formula differs from the one in timer_reify becuse we do not round up */
610 if (w->repeat)
611 w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
612 742
613 ev_start ((struct ev_watcher *)w, ++atimercnt); 743 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));
744
745 ev_start ((W)w, ++timercnt);
614 array_needsize (atimers, atimermax, atimercnt, ); 746 array_needsize (timers, timermax, timercnt, );
615 atimers [atimercnt - 1] = w; 747 timers [timercnt - 1] = w;
616 upheap (atimers, atimercnt - 1); 748 upheap ((WT *)timers, timercnt - 1);
617 }
618 else
619 {
620 w->at += now;
621
622 ev_start ((struct ev_watcher *)w, ++rtimercnt);
623 array_needsize (rtimers, rtimermax, rtimercnt, );
624 rtimers [rtimercnt - 1] = w;
625 upheap (rtimers, rtimercnt - 1);
626 }
627
628} 749}
629 750
630void 751void
631evtimer_stop (struct ev_timer *w) 752evtimer_stop (struct ev_timer *w)
632{ 753{
754 ev_clear ((W)w);
633 if (!ev_is_active (w)) 755 if (!ev_is_active (w))
634 return; 756 return;
635 757
636 if (w->is_abs)
637 {
638 if (w->active < atimercnt--) 758 if (w->active < timercnt--)
639 { 759 {
640 atimers [w->active - 1] = atimers [atimercnt]; 760 timers [w->active - 1] = timers [timercnt];
761 downheap ((WT *)timers, timercnt, w->active - 1);
762 }
763
764 w->at = w->repeat;
765
766 ev_stop ((W)w);
767}
768
769void
770evtimer_again (struct ev_timer *w)
771{
772 if (ev_is_active (w))
773 {
774 if (w->repeat)
775 {
776 w->at = now + w->repeat;
641 downheap (atimers, atimercnt, w->active - 1); 777 downheap ((WT *)timers, timercnt, w->active - 1);
642 }
643 }
644 else
645 {
646 if (w->active < rtimercnt--)
647 { 778 }
648 rtimers [w->active - 1] = rtimers [rtimercnt]; 779 else
649 downheap (rtimers, rtimercnt, w->active - 1); 780 evtimer_stop (w);
650 } 781 }
782 else if (w->repeat)
783 evtimer_start (w);
784}
785
786void
787evperiodic_start (struct ev_periodic *w)
788{
789 if (ev_is_active (w))
790 return;
791
792 assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
793
794 /* this formula differs from the one in periodic_reify because we do not always round up */
795 if (w->interval)
796 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
797
798 ev_start ((W)w, ++periodiccnt);
799 array_needsize (periodics, periodicmax, periodiccnt, );
800 periodics [periodiccnt - 1] = w;
801 upheap ((WT *)periodics, periodiccnt - 1);
802}
803
804void
805evperiodic_stop (struct ev_periodic *w)
806{
807 ev_clear ((W)w);
808 if (!ev_is_active (w))
809 return;
810
811 if (w->active < periodiccnt--)
651 } 812 {
813 periodics [w->active - 1] = periodics [periodiccnt];
814 downheap ((WT *)periodics, periodiccnt, w->active - 1);
815 }
652 816
653 ev_stop ((struct ev_watcher *)w); 817 ev_stop ((W)w);
654} 818}
655 819
656void 820void
657evsignal_start (struct ev_signal *w) 821evsignal_start (struct ev_signal *w)
658{ 822{
659 if (ev_is_active (w)) 823 if (ev_is_active (w))
660 return; 824 return;
661 825
662 ev_start ((struct ev_watcher *)w, 1); 826 ev_start ((W)w, 1);
663 array_needsize (signals, signalmax, w->signum, signals_init); 827 array_needsize (signals, signalmax, w->signum, signals_init);
664 wlist_add ((struct ev_watcher_list **)&signals [w->signum - 1].head, (struct ev_watcher_list *)w); 828 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
665 829
666 if (!w->next) 830 if (!w->next)
667 { 831 {
668 struct sigaction sa; 832 struct sigaction sa;
669 sa.sa_handler = sighandler; 833 sa.sa_handler = sighandler;
… …
674} 838}
675 839
676void 840void
677evsignal_stop (struct ev_signal *w) 841evsignal_stop (struct ev_signal *w)
678{ 842{
843 ev_clear ((W)w);
679 if (!ev_is_active (w)) 844 if (!ev_is_active (w))
680 return; 845 return;
681 846
682 wlist_del ((struct ev_watcher_list **)&signals [w->signum - 1].head, (struct ev_watcher_list *)w); 847 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
683 ev_stop ((struct ev_watcher *)w); 848 ev_stop ((W)w);
684 849
685 if (!signals [w->signum - 1].head) 850 if (!signals [w->signum - 1].head)
686 signal (w->signum, SIG_DFL); 851 signal (w->signum, SIG_DFL);
687} 852}
688 853
689void evidle_start (struct ev_idle *w) 854void evidle_start (struct ev_idle *w)
690{ 855{
691 if (ev_is_active (w)) 856 if (ev_is_active (w))
692 return; 857 return;
693 858
694 ev_start ((struct ev_watcher *)w, ++idlecnt); 859 ev_start ((W)w, ++idlecnt);
695 array_needsize (idles, idlemax, idlecnt, ); 860 array_needsize (idles, idlemax, idlecnt, );
696 idles [idlecnt - 1] = w; 861 idles [idlecnt - 1] = w;
697} 862}
698 863
699void evidle_stop (struct ev_idle *w) 864void evidle_stop (struct ev_idle *w)
700{ 865{
866 ev_clear ((W)w);
867 if (ev_is_active (w))
868 return;
869
701 idles [w->active - 1] = idles [--idlecnt]; 870 idles [w->active - 1] = idles [--idlecnt];
702 ev_stop ((struct ev_watcher *)w); 871 ev_stop ((W)w);
872}
873
874void evprepare_start (struct ev_prepare *w)
875{
876 if (ev_is_active (w))
877 return;
878
879 ev_start ((W)w, ++preparecnt);
880 array_needsize (prepares, preparemax, preparecnt, );
881 prepares [preparecnt - 1] = w;
882}
883
884void evprepare_stop (struct ev_prepare *w)
885{
886 ev_clear ((W)w);
887 if (ev_is_active (w))
888 return;
889
890 prepares [w->active - 1] = prepares [--preparecnt];
891 ev_stop ((W)w);
703} 892}
704 893
705void evcheck_start (struct ev_check *w) 894void evcheck_start (struct ev_check *w)
706{ 895{
707 if (ev_is_active (w)) 896 if (ev_is_active (w))
708 return; 897 return;
709 898
710 ev_start ((struct ev_watcher *)w, ++checkcnt); 899 ev_start ((W)w, ++checkcnt);
711 array_needsize (checks, checkmax, checkcnt, ); 900 array_needsize (checks, checkmax, checkcnt, );
712 checks [checkcnt - 1] = w; 901 checks [checkcnt - 1] = w;
713} 902}
714 903
715void evcheck_stop (struct ev_check *w) 904void evcheck_stop (struct ev_check *w)
716{ 905{
906 ev_clear ((W)w);
907 if (ev_is_active (w))
908 return;
909
717 checks [w->active - 1] = checks [--checkcnt]; 910 checks [w->active - 1] = checks [--checkcnt];
718 ev_stop ((struct ev_watcher *)w); 911 ev_stop ((W)w);
719} 912}
720 913
914void evchild_start (struct ev_child *w)
915{
916 if (ev_is_active (w))
917 return;
918
919 ev_start ((W)w, 1);
920 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
921}
922
923void evchild_stop (struct ev_child *w)
924{
925 ev_clear ((W)w);
926 if (ev_is_active (w))
927 return;
928
929 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
930 ev_stop ((W)w);
931}
932
721/*****************************************************************************/ 933/*****************************************************************************/
934
935struct ev_once
936{
937 struct ev_io io;
938 struct ev_timer to;
939 void (*cb)(int revents, void *arg);
940 void *arg;
941};
942
943static void
944once_cb (struct ev_once *once, int revents)
945{
946 void (*cb)(int revents, void *arg) = once->cb;
947 void *arg = once->arg;
948
949 evio_stop (&once->io);
950 evtimer_stop (&once->to);
951 free (once);
952
953 cb (revents, arg);
954}
955
956static void
957once_cb_io (struct ev_io *w, int revents)
958{
959 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
960}
961
962static void
963once_cb_to (struct ev_timer *w, int revents)
964{
965 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
966}
967
968void
969ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
970{
971 struct ev_once *once = malloc (sizeof (struct ev_once));
972
973 if (!once)
974 cb (EV_ERROR, arg);
975 else
976 {
977 once->cb = cb;
978 once->arg = arg;
979
980 evw_init (&once->io, once_cb_io);
981
982 if (fd >= 0)
983 {
984 evio_set (&once->io, fd, events);
985 evio_start (&once->io);
986 }
987
988 evw_init (&once->to, once_cb_to);
989
990 if (timeout >= 0.)
991 {
992 evtimer_set (&once->to, timeout, 0.);
993 evtimer_start (&once->to);
994 }
995 }
996}
997
998/*****************************************************************************/
999
722#if 1 1000#if 0
1001
1002struct ev_io wio;
723 1003
724static void 1004static void
725sin_cb (struct ev_io *w, int revents) 1005sin_cb (struct ev_io *w, int revents)
726{ 1006{
727 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents); 1007 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
… …
737 1017
738static void 1018static void
739scb (struct ev_signal *w, int revents) 1019scb (struct ev_signal *w, int revents)
740{ 1020{
741 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1021 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1022 evio_stop (&wio);
1023 evio_start (&wio);
742} 1024}
743 1025
744static void 1026static void
745gcb (struct ev_signal *w, int revents) 1027gcb (struct ev_signal *w, int revents)
746{ 1028{
747 fprintf (stderr, "generic %x\n", revents); 1029 fprintf (stderr, "generic %x\n", revents);
1030
748} 1031}
749 1032
750int main (void) 1033int main (void)
751{ 1034{
752 struct ev_io sin;
753
754 ev_init (0); 1035 ev_init (0);
755 1036
756 evw_init (&sin, sin_cb, 55);
757 evio_set (&sin, 0, EV_READ); 1037 evio_init (&wio, sin_cb, 0, EV_READ);
758 evio_start (&sin); 1038 evio_start (&wio);
759 1039
760 struct ev_timer t[10000]; 1040 struct ev_timer t[10000];
761 1041
762#if 0 1042#if 0
763 int i; 1043 int i;
764 for (i = 0; i < 10000; ++i) 1044 for (i = 0; i < 10000; ++i)
765 { 1045 {
766 struct ev_timer *w = t + i; 1046 struct ev_timer *w = t + i;
767 evw_init (w, ocb, i); 1047 evw_init (w, ocb, i);
768 evtimer_set_abs (w, drand48 (), 0.99775533); 1048 evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
769 evtimer_start (w); 1049 evtimer_start (w);
770 if (drand48 () < 0.5) 1050 if (drand48 () < 0.5)
771 evtimer_stop (w); 1051 evtimer_stop (w);
772 } 1052 }
773#endif 1053#endif
774 1054
775 struct ev_timer t1; 1055 struct ev_timer t1;
776 evw_init (&t1, ocb, 0); 1056 evtimer_init (&t1, ocb, 5, 10);
777 evtimer_set_abs (&t1, 5, 10);
778 evtimer_start (&t1); 1057 evtimer_start (&t1);
779 1058
780 struct ev_signal sig; 1059 struct ev_signal sig;
781 evw_init (&sig, scb, 65535);
782 evsignal_set (&sig, SIGQUIT); 1060 evsignal_init (&sig, scb, SIGQUIT);
783 evsignal_start (&sig); 1061 evsignal_start (&sig);
784 1062
785 struct ev_check cw; 1063 struct ev_check cw;
786 evw_init (&cw, gcb, 0); 1064 evcheck_init (&cw, gcb);
787 evcheck_start (&cw); 1065 evcheck_start (&cw);
788 1066
789 struct ev_idle iw; 1067 struct ev_idle iw;
790 evw_init (&iw, gcb, 0); 1068 evidle_init (&iw, gcb);
791 evidle_start (&iw); 1069 evidle_start (&iw);
792 1070
793 ev_loop (0); 1071 ev_loop (0);
794 1072
795 return 0; 1073 return 0;

Diff Legend

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