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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines