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

Comparing libev/ev.c (file contents):
Revision 1.7 by root, Wed Oct 31 00:24:16 2007 UTC vs.
Revision 1.18 by root, Wed Oct 31 16:29:52 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
39static int have_monotonic; /* runtime */ 77static int have_monotonic; /* runtime */
40 78
41static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */ 79static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
42static void (*method_modify)(int fd, int oev, int nev); 80static void (*method_modify)(int fd, int oev, int nev);
43static void (*method_poll)(ev_tstamp timeout); 81static void (*method_poll)(ev_tstamp timeout);
82
83/*****************************************************************************/
44 84
45ev_tstamp 85ev_tstamp
46ev_time (void) 86ev_time (void)
47{ 87{
48#if HAVE_REALTIME 88#if HAVE_REALTIME
… …
73 113
74#define array_needsize(base,cur,cnt,init) \ 114#define array_needsize(base,cur,cnt,init) \
75 if ((cnt) > cur) \ 115 if ((cnt) > cur) \
76 { \ 116 { \
77 int newcnt = cur ? cur << 1 : 16; \ 117 int newcnt = cur ? cur << 1 : 16; \
78 fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\
79 base = realloc (base, sizeof (*base) * (newcnt)); \ 118 base = realloc (base, sizeof (*base) * (newcnt)); \
80 init (base + cur, newcnt - cur); \ 119 init (base + cur, newcnt - cur); \
81 cur = newcnt; \ 120 cur = newcnt; \
82 } 121 }
83 122
123/*****************************************************************************/
124
84typedef struct 125typedef struct
85{ 126{
86 struct ev_io *head; 127 struct ev_io *head;
87 unsigned char wev, rev; /* want, received event set */ 128 unsigned char wev, rev; /* want, received event set */
88} ANFD; 129} ANFD;
… …
104 } 145 }
105} 146}
106 147
107typedef struct 148typedef struct
108{ 149{
109 struct ev_watcher *w; 150 W w;
110 int events; 151 int events;
111} ANPENDING; 152} ANPENDING;
112 153
113static ANPENDING *pendings; 154static ANPENDING *pendings;
114static int pendingmax, pendingcnt; 155static int pendingmax, pendingcnt;
115 156
116static void 157static void
117event (struct ev_watcher *w, int events) 158event (W w, int events)
118{ 159{
160 if (w->active)
161 {
119 w->pending = ++pendingcnt; 162 w->pending = ++pendingcnt;
120 array_needsize (pendings, pendingmax, pendingcnt, ); 163 array_needsize (pendings, pendingmax, pendingcnt, );
121 pendings [pendingcnt - 1].w = w; 164 pendings [pendingcnt - 1].w = w;
122 pendings [pendingcnt - 1].events = events; 165 pendings [pendingcnt - 1].events = events;
166 }
123} 167}
124 168
125static void 169static void
126fd_event (int fd, int events) 170fd_event (int fd, int events)
127{ 171{
… …
131 for (w = anfd->head; w; w = w->next) 175 for (w = anfd->head; w; w = w->next)
132 { 176 {
133 int ev = w->events & events; 177 int ev = w->events & events;
134 178
135 if (ev) 179 if (ev)
136 event ((struct ev_watcher *)w, ev); 180 event ((W)w, ev);
137 } 181 }
138} 182}
139 183
184static void
185queue_events (W *events, int eventcnt, int type)
186{
187 int i;
188
189 for (i = 0; i < eventcnt; ++i)
190 event (events [i], type);
191}
192
193/*****************************************************************************/
194
140static struct ev_timer **atimers; 195static struct ev_timer **timers;
141static int atimermax, atimercnt; 196static int timermax, timercnt;
142 197
143static struct ev_timer **rtimers; 198static struct ev_periodic **periodics;
144static int rtimermax, rtimercnt; 199static int periodicmax, periodiccnt;
145 200
146static void 201static void
147upheap (struct ev_timer **timers, int k) 202upheap (WT *timers, int k)
148{ 203{
149 struct ev_timer *w = timers [k]; 204 WT w = timers [k];
150 205
151 while (k && timers [k >> 1]->at > w->at) 206 while (k && timers [k >> 1]->at > w->at)
152 { 207 {
153 timers [k] = timers [k >> 1]; 208 timers [k] = timers [k >> 1];
154 timers [k]->active = k + 1; 209 timers [k]->active = k + 1;
… …
159 timers [k]->active = k + 1; 214 timers [k]->active = k + 1;
160 215
161} 216}
162 217
163static void 218static void
164downheap (struct ev_timer **timers, int N, int k) 219downheap (WT *timers, int N, int k)
165{ 220{
166 struct ev_timer *w = timers [k]; 221 WT w = timers [k];
167 222
168 while (k < (N >> 1)) 223 while (k < (N >> 1))
169 { 224 {
170 int j = k << 1; 225 int j = k << 1;
171 226
… …
181 } 236 }
182 237
183 timers [k] = w; 238 timers [k] = w;
184 timers [k]->active = k + 1; 239 timers [k]->active = k + 1;
185} 240}
241
242/*****************************************************************************/
186 243
187typedef struct 244typedef struct
188{ 245{
189 struct ev_signal *head; 246 struct ev_signal *head;
190 sig_atomic_t gotsig; 247 sig_atomic_t gotsig;
… …
233 if (signals [sig].gotsig) 290 if (signals [sig].gotsig)
234 { 291 {
235 signals [sig].gotsig = 0; 292 signals [sig].gotsig = 0;
236 293
237 for (w = signals [sig].head; w; w = w->next) 294 for (w = signals [sig].head; w; w = w->next)
238 event ((struct ev_watcher *)w, EV_SIGNAL); 295 event ((W)w, EV_SIGNAL);
239 } 296 }
240} 297}
241 298
242static void 299static void
243siginit (void) 300siginit (void)
… …
250 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 307 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
251 308
252 evio_set (&sigev, sigpipe [0], EV_READ); 309 evio_set (&sigev, sigpipe [0], EV_READ);
253 evio_start (&sigev); 310 evio_start (&sigev);
254} 311}
312
313/*****************************************************************************/
314
315static struct ev_idle **idles;
316static int idlemax, idlecnt;
317
318static struct ev_check **checks;
319static int checkmax, checkcnt;
320
321/*****************************************************************************/
255 322
256#if HAVE_EPOLL 323#if HAVE_EPOLL
257# include "ev_epoll.c" 324# include "ev_epoll.c"
258#endif 325#endif
259#if HAVE_SELECT 326#if HAVE_SELECT
… …
285 if (ev_method == EVMETHOD_NONE) select_init (flags); 352 if (ev_method == EVMETHOD_NONE) select_init (flags);
286#endif 353#endif
287 354
288 if (ev_method) 355 if (ev_method)
289 { 356 {
290 evw_init (&sigev, sigcb, 0); 357 evw_init (&sigev, sigcb);
291 siginit (); 358 siginit ();
292 } 359 }
293 360
294 return ev_method; 361 return ev_method;
295} 362}
296 363
364/*****************************************************************************/
365
297void ev_prefork (void) 366void ev_prefork (void)
298{ 367{
368 /* nop */
299} 369}
300 370
301void ev_postfork_parent (void) 371void ev_postfork_parent (void)
302{ 372{
373 /* nop */
303} 374}
304 375
305void ev_postfork_child (void) 376void ev_postfork_child (void)
306{ 377{
307#if HAVE_EPOLL 378#if HAVE_EPOLL
… …
314 close (sigpipe [1]); 385 close (sigpipe [1]);
315 pipe (sigpipe); 386 pipe (sigpipe);
316 siginit (); 387 siginit ();
317} 388}
318 389
390/*****************************************************************************/
391
319static void 392static void
320fd_reify (void) 393fd_reify (void)
321{ 394{
322 int i; 395 int i;
323 396
… …
343} 416}
344 417
345static void 418static void
346call_pending () 419call_pending ()
347{ 420{
348 int i; 421 while (pendingcnt)
349
350 for (i = 0; i < pendingcnt; ++i)
351 { 422 {
352 ANPENDING *p = pendings + i; 423 ANPENDING *p = pendings + --pendingcnt;
353 424
354 if (p->w) 425 if (p->w)
355 { 426 {
356 p->w->pending = 0; 427 p->w->pending = 0;
357 p->w->cb (p->w, p->events); 428 p->w->cb (p->w, p->events);
358 } 429 }
359 } 430 }
360
361 pendingcnt = 0;
362} 431}
363 432
364static void 433static void
365timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now) 434timers_reify ()
366{ 435{
367 while (timercnt && timers [0]->at <= now) 436 while (timercnt && timers [0]->at <= now)
368 { 437 {
369 struct ev_timer *w = timers [0]; 438 struct ev_timer *w = timers [0];
439
440 event ((W)w, EV_TIMEOUT);
370 441
371 /* first reschedule or stop timer */ 442 /* first reschedule or stop timer */
372 if (w->repeat) 443 if (w->repeat)
373 { 444 {
374 if (w->is_abs)
375 w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat;
376 else
377 w->at = now + w->repeat; 445 w->at = now + w->repeat;
378 446 assert (("timer timeout in the past, negative repeat?", w->at > now));
379 assert (w->at > now);
380
381 downheap (timers, timercnt, 0); 447 downheap ((WT *)timers, timercnt, 0);
382 } 448 }
383 else 449 else
384 {
385 evtimer_stop (w); /* nonrepeating: stop timer */ 450 evtimer_stop (w); /* nonrepeating: stop timer */
386 --timercnt; /* maybe pass by reference instead? */ 451 }
452}
453
454static void
455periodics_reify ()
456{
457 while (periodiccnt && periodics [0]->at <= ev_now)
458 {
459 struct ev_periodic *w = periodics [0];
460
461 /* first reschedule or stop timer */
462 if (w->interval)
387 } 463 {
464 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));
466 downheap ((WT *)periodics, periodiccnt, 0);
467 }
468 else
469 evperiodic_stop (w); /* nonrepeating: stop timer */
388 470
389 event ((struct ev_watcher *)w, EV_TIMEOUT); 471 event ((W)w, EV_TIMEOUT);
472 }
473}
474
475static void
476periodics_reschedule (ev_tstamp diff)
477{
478 int i;
479
480 /* adjust periodics after time jump */
481 for (i = 0; i < periodiccnt; ++i)
482 {
483 struct ev_periodic *w = periodics [i];
484
485 if (w->interval)
486 {
487 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
488
489 if (fabs (diff) >= 1e-4)
490 {
491 evperiodic_stop (w);
492 evperiodic_start (w);
493
494 i = 0; /* restart loop, inefficient, but time jumps should be rare */
495 }
496 }
390 } 497 }
391} 498}
392 499
393static void 500static void
394time_update () 501time_update ()
395{ 502{
396 int i; 503 int i;
504
397 ev_now = ev_time (); 505 ev_now = ev_time ();
398 506
399 if (have_monotonic) 507 if (have_monotonic)
400 { 508 {
401 ev_tstamp odiff = diff; 509 ev_tstamp odiff = diff;
402 510
403 /* detecting time jumps is much more difficult */
404 for (i = 2; --i; ) /* loop a few times, before making important decisions */ 511 for (i = 4; --i; ) /* loop a few times, before making important decisions */
405 { 512 {
406 now = get_clock (); 513 now = get_clock ();
407 diff = ev_now - now; 514 diff = ev_now - now;
408 515
409 if (fabs (odiff - diff) < MIN_TIMEJUMP) 516 if (fabs (odiff - diff) < MIN_TIMEJUMP)
410 return; /* all is well */ 517 return; /* all is well */
411 518
412 ev_now = ev_time (); 519 ev_now = ev_time ();
413 } 520 }
414 521
415 /* time jump detected, reschedule atimers */ 522 periodics_reschedule (diff - odiff);
416 for (i = 0; i < atimercnt; ++i) 523 /* no timer adjustment, as the monotonic clock doesn't jump */
417 {
418 struct ev_timer *w = atimers [i];
419 w->at += ceil ((ev_now - w->at) / w->repeat + 1.) * w->repeat;
420 }
421 } 524 }
422 else 525 else
423 { 526 {
424 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 527 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
425 /* time jump detected, adjust rtimers */ 528 {
529 periodics_reschedule (ev_now - now);
530
531 /* adjust timers. this is easy, as the offset is the same for all */
426 for (i = 0; i < rtimercnt; ++i) 532 for (i = 0; i < timercnt; ++i)
427 rtimers [i]->at += ev_now - now; 533 timers [i]->at += diff;
534 }
428 535
429 now = ev_now; 536 now = ev_now;
430 } 537 }
431} 538}
432 539
433int ev_loop_done; 540int ev_loop_done;
434 541
435void ev_loop (int flags) 542void ev_loop (int flags)
436{ 543{
437 double block; 544 double block;
438 ev_loop_done = flags & EVLOOP_ONESHOT; 545 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
546
547 if (checkcnt)
548 {
549 queue_events ((W *)checks, checkcnt, EV_CHECK);
550 call_pending ();
551 }
439 552
440 do 553 do
441 { 554 {
442 /* update fd-related kernel structures */ 555 /* update fd-related kernel structures */
443 fd_reify (); 556 fd_reify ();
444 557
445 /* calculate blocking time */ 558 /* calculate blocking time */
559
560 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */
561 ev_now = ev_time ();
562
446 if (flags & EVLOOP_NONBLOCK) 563 if (flags & EVLOOP_NONBLOCK || idlecnt)
447 block = 0.; 564 block = 0.;
448 else 565 else
449 { 566 {
450 block = MAX_BLOCKTIME; 567 block = MAX_BLOCKTIME;
451 568
452 if (rtimercnt) 569 if (timercnt)
453 { 570 {
454 ev_tstamp to = rtimers [0]->at - get_clock () + method_fudge; 571 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;
455 if (block > to) block = to; 572 if (block > to) block = to;
456 } 573 }
457 574
458 if (atimercnt) 575 if (periodiccnt)
459 { 576 {
460 ev_tstamp to = atimers [0]->at - ev_time () + method_fudge; 577 ev_tstamp to = periodics [0]->at - ev_now + method_fudge;
461 if (block > to) block = to; 578 if (block > to) block = to;
462 } 579 }
463 580
464 if (block < 0.) block = 0.; 581 if (block < 0.) block = 0.;
465 } 582 }
… …
467 method_poll (block); 584 method_poll (block);
468 585
469 /* update ev_now, do magic */ 586 /* update ev_now, do magic */
470 time_update (); 587 time_update ();
471 588
472 /* put pending timers into pendign queue and reschedule them */ 589 /* queue pending timers and reschedule them */
473 /* absolute timers first */ 590 periodics_reify (); /* absolute timers first */
474 timers_reify (atimers, atimercnt, ev_now);
475 /* relative timers second */ 591 timers_reify (); /* relative timers second */
476 timers_reify (rtimers, rtimercnt, now); 592
593 /* queue idle watchers unless io or timers are pending */
594 if (!pendingcnt)
595 queue_events ((W *)idles, idlecnt, EV_IDLE);
596
597 /* queue check and possibly idle watchers */
598 queue_events ((W *)checks, checkcnt, EV_CHECK);
477 599
478 call_pending (); 600 call_pending ();
479 } 601 }
480 while (!ev_loop_done); 602 while (!ev_loop_done);
481}
482 603
604 if (ev_loop_done != 2)
605 ev_loop_done = 0;
606}
607
608/*****************************************************************************/
609
483static void 610static void
484wlist_add (struct ev_watcher_list **head, struct ev_watcher_list *elem) 611wlist_add (WL *head, WL elem)
485{ 612{
486 elem->next = *head; 613 elem->next = *head;
487 *head = elem; 614 *head = elem;
488} 615}
489 616
490static void 617static void
491wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem) 618wlist_del (WL *head, WL elem)
492{ 619{
493 while (*head) 620 while (*head)
494 { 621 {
495 if (*head == elem) 622 if (*head == elem)
496 { 623 {
… …
501 head = &(*head)->next; 628 head = &(*head)->next;
502 } 629 }
503} 630}
504 631
505static void 632static void
506ev_start (struct ev_watcher *w, int active) 633ev_clear (W w)
507{ 634{
635 if (w->pending)
636 {
637 pendings [w->pending - 1].w = 0;
508 w->pending = 0; 638 w->pending = 0;
639 }
640}
641
642static void
643ev_start (W w, int active)
644{
509 w->active = active; 645 w->active = active;
510} 646}
511 647
512static void 648static void
513ev_stop (struct ev_watcher *w) 649ev_stop (W w)
514{ 650{
515 if (w->pending)
516 pendings [w->pending - 1].w = 0;
517
518 w->active = 0; 651 w->active = 0;
519 /* nop */
520} 652}
653
654/*****************************************************************************/
521 655
522void 656void
523evio_start (struct ev_io *w) 657evio_start (struct ev_io *w)
524{ 658{
525 if (ev_is_active (w)) 659 if (ev_is_active (w))
526 return; 660 return;
527 661
528 int fd = w->fd; 662 int fd = w->fd;
529 663
530 ev_start ((struct ev_watcher *)w, 1); 664 ev_start ((W)w, 1);
531 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 665 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
532 wlist_add ((struct ev_watcher_list **)&anfds[fd].head, (struct ev_watcher_list *)w); 666 wlist_add ((WL *)&anfds[fd].head, (WL)w);
533 667
534 ++fdchangecnt; 668 ++fdchangecnt;
535 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 669 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
536 fdchanges [fdchangecnt - 1] = fd; 670 fdchanges [fdchangecnt - 1] = fd;
537} 671}
538 672
539void 673void
540evio_stop (struct ev_io *w) 674evio_stop (struct ev_io *w)
541{ 675{
676 ev_clear ((W)w);
542 if (!ev_is_active (w)) 677 if (!ev_is_active (w))
543 return; 678 return;
544 679
545 wlist_del ((struct ev_watcher_list **)&anfds[w->fd].head, (struct ev_watcher_list *)w); 680 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
546 ev_stop ((struct ev_watcher *)w); 681 ev_stop ((W)w);
547 682
548 ++fdchangecnt; 683 ++fdchangecnt;
549 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 684 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
550 fdchanges [fdchangecnt - 1] = w->fd; 685 fdchanges [fdchangecnt - 1] = w->fd;
551} 686}
… …
554evtimer_start (struct ev_timer *w) 689evtimer_start (struct ev_timer *w)
555{ 690{
556 if (ev_is_active (w)) 691 if (ev_is_active (w))
557 return; 692 return;
558 693
559 if (w->is_abs) 694 w->at += now;
560 {
561 /* this formula differs from the one in timer_reify becuse we do not round up */
562 if (w->repeat)
563 w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
564 695
565 ev_start ((struct ev_watcher *)w, ++atimercnt); 696 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));
697
698 ev_start ((W)w, ++timercnt);
566 array_needsize (atimers, atimermax, atimercnt, ); 699 array_needsize (timers, timermax, timercnt, );
567 atimers [atimercnt - 1] = w; 700 timers [timercnt - 1] = w;
568 upheap (atimers, atimercnt - 1); 701 upheap ((WT *)timers, timercnt - 1);
569 }
570 else
571 {
572 w->at += now;
573
574 ev_start ((struct ev_watcher *)w, ++rtimercnt);
575 array_needsize (rtimers, rtimermax, rtimercnt, );
576 rtimers [rtimercnt - 1] = w;
577 upheap (rtimers, rtimercnt - 1);
578 }
579
580} 702}
581 703
582void 704void
583evtimer_stop (struct ev_timer *w) 705evtimer_stop (struct ev_timer *w)
584{ 706{
707 ev_clear ((W)w);
585 if (!ev_is_active (w)) 708 if (!ev_is_active (w))
586 return; 709 return;
587 710
588 if (w->is_abs)
589 {
590 if (w->active < atimercnt--) 711 if (w->active < timercnt--)
591 { 712 {
592 atimers [w->active - 1] = atimers [atimercnt]; 713 timers [w->active - 1] = timers [timercnt];
714 downheap ((WT *)timers, timercnt, w->active - 1);
715 }
716
717 w->at = w->repeat;
718
719 ev_stop ((W)w);
720}
721
722void
723evtimer_again (struct ev_timer *w)
724{
725 if (ev_is_active (w))
726 {
727 if (w->repeat)
728 {
729 w->at = now + w->repeat;
593 downheap (atimers, atimercnt, w->active - 1); 730 downheap ((WT *)timers, timercnt, w->active - 1);
594 }
595 }
596 else
597 {
598 if (w->active < rtimercnt--)
599 { 731 }
600 rtimers [w->active - 1] = rtimers [rtimercnt]; 732 else
601 downheap (rtimers, rtimercnt, w->active - 1); 733 evtimer_stop (w);
602 } 734 }
735 else if (w->repeat)
736 evtimer_start (w);
737}
738
739void
740evperiodic_start (struct ev_periodic *w)
741{
742 if (ev_is_active (w))
743 return;
744
745 assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
746
747 /* this formula differs from the one in periodic_reify because we do not always round up */
748 if (w->interval)
749 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
750
751 ev_start ((W)w, ++periodiccnt);
752 array_needsize (periodics, periodicmax, periodiccnt, );
753 periodics [periodiccnt - 1] = w;
754 upheap ((WT *)periodics, periodiccnt - 1);
755}
756
757void
758evperiodic_stop (struct ev_periodic *w)
759{
760 ev_clear ((W)w);
761 if (!ev_is_active (w))
762 return;
763
764 if (w->active < periodiccnt--)
603 } 765 {
766 periodics [w->active - 1] = periodics [periodiccnt];
767 downheap ((WT *)periodics, periodiccnt, w->active - 1);
768 }
604 769
605 ev_stop ((struct ev_watcher *)w); 770 ev_stop ((W)w);
606} 771}
607 772
608void 773void
609evsignal_start (struct ev_signal *w) 774evsignal_start (struct ev_signal *w)
610{ 775{
611 if (ev_is_active (w)) 776 if (ev_is_active (w))
612 return; 777 return;
613 778
614 ev_start ((struct ev_watcher *)w, 1); 779 ev_start ((W)w, 1);
615 array_needsize (signals, signalmax, w->signum, signals_init); 780 array_needsize (signals, signalmax, w->signum, signals_init);
616 wlist_add ((struct ev_watcher_list **)&signals [w->signum - 1].head, (struct ev_watcher_list *)w); 781 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
617 782
618 if (!w->next) 783 if (!w->next)
619 { 784 {
620 struct sigaction sa; 785 struct sigaction sa;
621 sa.sa_handler = sighandler; 786 sa.sa_handler = sighandler;
… …
626} 791}
627 792
628void 793void
629evsignal_stop (struct ev_signal *w) 794evsignal_stop (struct ev_signal *w)
630{ 795{
796 ev_clear ((W)w);
631 if (!ev_is_active (w)) 797 if (!ev_is_active (w))
632 return; 798 return;
633 799
634 wlist_del ((struct ev_watcher_list **)&signals [w->signum - 1].head, (struct ev_watcher_list *)w); 800 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
635 ev_stop ((struct ev_watcher *)w); 801 ev_stop ((W)w);
636 802
637 if (!signals [w->signum - 1].head) 803 if (!signals [w->signum - 1].head)
638 signal (w->signum, SIG_DFL); 804 signal (w->signum, SIG_DFL);
639} 805}
640 806
807void evidle_start (struct ev_idle *w)
808{
809 if (ev_is_active (w))
810 return;
811
812 ev_start ((W)w, ++idlecnt);
813 array_needsize (idles, idlemax, idlecnt, );
814 idles [idlecnt - 1] = w;
815}
816
817void evidle_stop (struct ev_idle *w)
818{
819 ev_clear ((W)w);
820 if (ev_is_active (w))
821 return;
822
823 idles [w->active - 1] = idles [--idlecnt];
824 ev_stop ((W)w);
825}
826
827void evcheck_start (struct ev_check *w)
828{
829 if (ev_is_active (w))
830 return;
831
832 ev_start ((W)w, ++checkcnt);
833 array_needsize (checks, checkmax, checkcnt, );
834 checks [checkcnt - 1] = w;
835}
836
837void evcheck_stop (struct ev_check *w)
838{
839 ev_clear ((W)w);
840 if (ev_is_active (w))
841 return;
842
843 checks [w->active - 1] = checks [--checkcnt];
844 ev_stop ((W)w);
845}
846
641/*****************************************************************************/ 847/*****************************************************************************/
848
849struct ev_once
850{
851 struct ev_io io;
852 struct ev_timer to;
853 void (*cb)(int revents, void *arg);
854 void *arg;
855};
856
857static void
858once_cb (struct ev_once *once, int revents)
859{
860 void (*cb)(int revents, void *arg) = once->cb;
861 void *arg = once->arg;
862
863 evio_stop (&once->io);
864 evtimer_stop (&once->to);
865 free (once);
866
867 cb (revents, arg);
868}
869
870static void
871once_cb_io (struct ev_io *w, int revents)
872{
873 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
874}
875
876static void
877once_cb_to (struct ev_timer *w, int revents)
878{
879 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
880}
881
882void
883ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
884{
885 struct ev_once *once = malloc (sizeof (struct ev_once));
886
887 if (!once)
888 cb (EV_ERROR, arg);
889 else
890 {
891 once->cb = cb;
892 once->arg = arg;
893
894 evw_init (&once->io, once_cb_io);
895
896 if (fd >= 0)
897 {
898 evio_set (&once->io, fd, events);
899 evio_start (&once->io);
900 }
901
902 evw_init (&once->to, once_cb_to);
903
904 if (timeout >= 0.)
905 {
906 evtimer_set (&once->to, timeout, 0.);
907 evtimer_start (&once->to);
908 }
909 }
910}
911
912/*****************************************************************************/
913
642#if 1 914#if 0
915
916struct ev_io wio;
643 917
644static void 918static void
645sin_cb (struct ev_io *w, int revents) 919sin_cb (struct ev_io *w, int revents)
646{ 920{
647 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents); 921 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
… …
657 931
658static void 932static void
659scb (struct ev_signal *w, int revents) 933scb (struct ev_signal *w, int revents)
660{ 934{
661 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 935 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
936 evio_stop (&wio);
937 evio_start (&wio);
938}
939
940static void
941gcb (struct ev_signal *w, int revents)
942{
943 fprintf (stderr, "generic %x\n", revents);
944
662} 945}
663 946
664int main (void) 947int main (void)
665{ 948{
666 struct ev_io sin;
667
668 ev_init (0); 949 ev_init (0);
669 950
670 evw_init (&sin, sin_cb, 55);
671 evio_set (&sin, 0, EV_READ); 951 evio_init (&wio, sin_cb, 0, EV_READ);
672 evio_start (&sin); 952 evio_start (&wio);
673 953
674 struct ev_timer t[10000]; 954 struct ev_timer t[10000];
675 955
676#if 0 956#if 0
677 int i; 957 int i;
678 for (i = 0; i < 10000; ++i) 958 for (i = 0; i < 10000; ++i)
679 { 959 {
680 struct ev_timer *w = t + i; 960 struct ev_timer *w = t + i;
681 evw_init (w, ocb, i); 961 evw_init (w, ocb, i);
682 evtimer_set_abs (w, drand48 (), 0.99775533); 962 evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
683 evtimer_start (w); 963 evtimer_start (w);
684 if (drand48 () < 0.5) 964 if (drand48 () < 0.5)
685 evtimer_stop (w); 965 evtimer_stop (w);
686 } 966 }
687#endif 967#endif
688 968
689 struct ev_timer t1; 969 struct ev_timer t1;
690 evw_init (&t1, ocb, 0); 970 evtimer_init (&t1, ocb, 5, 10);
691 evtimer_set_abs (&t1, 5, 10);
692 evtimer_start (&t1); 971 evtimer_start (&t1);
693 972
694 struct ev_signal sig; 973 struct ev_signal sig;
695 evw_init (&sig, scb, 65535);
696 evsignal_set (&sig, SIGQUIT); 974 evsignal_init (&sig, scb, SIGQUIT);
697 evsignal_start (&sig); 975 evsignal_start (&sig);
698 976
977 struct ev_check cw;
978 evcheck_init (&cw, gcb);
979 evcheck_start (&cw);
980
981 struct ev_idle iw;
982 evidle_init (&iw, gcb);
983 evidle_start (&iw);
984
699 ev_loop (0); 985 ev_loop (0);
700 986
701 return 0; 987 return 0;
702} 988}
703 989

Diff Legend

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