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

Comparing libev/ev.c (file contents):
Revision 1.17 by root, Wed Oct 31 14:44:15 2007 UTC vs.
Revision 1.31 by root, Thu Nov 1 09:05:33 2007 UTC

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

Diff Legend

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