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

Comparing libev/ev.c (file contents):
Revision 1.15 by root, Wed Oct 31 11:56:34 2007 UTC vs.
Revision 1.36 by root, Thu Nov 1 13:11:11 2007 UTC

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

Diff Legend

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