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

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

Diff Legend

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