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

Comparing libev/ev.c (file contents):
Revision 1.20 by root, Wed Oct 31 18:28:00 2007 UTC vs.
Revision 1.36 by root, Thu Nov 1 13:11:11 2007 UTC

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

Diff Legend

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