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

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

Diff Legend

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