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

Comparing libev/ev.c (file contents):
Revision 1.18 by root, Wed Oct 31 16:29:52 2007 UTC vs.
Revision 1.27 by root, Wed Oct 31 22:16:36 2007 UTC

… …
36 36
37#include <stdio.h> 37#include <stdio.h>
38 38
39#include <assert.h> 39#include <assert.h>
40#include <errno.h> 40#include <errno.h>
41#include <sys/types.h>
42#include <sys/wait.h>
41#include <sys/time.h> 43#include <sys/time.h>
42#include <time.h> 44#include <time.h>
43
44#define HAVE_EPOLL 1
45 45
46#ifndef HAVE_MONOTONIC 46#ifndef HAVE_MONOTONIC
47# ifdef CLOCK_MONOTONIC 47# ifdef CLOCK_MONOTONIC
48# define HAVE_MONOTONIC 1 48# define HAVE_MONOTONIC 1
49# endif 49# endif
… …
61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
62#endif 62#endif
63 63
64#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 64#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
65#define MAX_BLOCKTIME 60. 65#define MAX_BLOCKTIME 60.
66#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */
66 67
67#include "ev.h" 68#include "ev.h"
68 69
69typedef struct ev_watcher *W; 70typedef struct ev_watcher *W;
70typedef struct ev_watcher_list *WL; 71typedef struct ev_watcher_list *WL;
… …
112} 113}
113 114
114#define array_needsize(base,cur,cnt,init) \ 115#define array_needsize(base,cur,cnt,init) \
115 if ((cnt) > cur) \ 116 if ((cnt) > cur) \
116 { \ 117 { \
117 int newcnt = cur ? cur << 1 : 16; \ 118 int newcnt = cur; \
119 do \
120 { \
121 newcnt = (newcnt << 1) | 4 & ~3; \
122 } \
123 while ((cnt) > newcnt); \
124 \
118 base = realloc (base, sizeof (*base) * (newcnt)); \ 125 base = realloc (base, sizeof (*base) * (newcnt)); \
119 init (base + cur, newcnt - cur); \ 126 init (base + cur, newcnt - cur); \
120 cur = newcnt; \ 127 cur = newcnt; \
121 } 128 }
122 129
123/*****************************************************************************/ 130/*****************************************************************************/
124 131
125typedef struct 132typedef struct
126{ 133{
127 struct ev_io *head; 134 struct ev_io *head;
128 unsigned char wev, rev; /* want, received event set */ 135 int events;
129} ANFD; 136} ANFD;
130 137
131static ANFD *anfds; 138static ANFD *anfds;
132static int anfdmax; 139static int anfdmax;
133 140
134static int *fdchanges;
135static int fdchangemax, fdchangecnt;
136
137static void 141static void
138anfds_init (ANFD *base, int count) 142anfds_init (ANFD *base, int count)
139{ 143{
140 while (count--) 144 while (count--)
141 { 145 {
142 base->head = 0; 146 base->head = 0;
143 base->wev = base->rev = EV_NONE; 147 base->events = EV_NONE;
144 ++base; 148 ++base;
145 } 149 }
146} 150}
147 151
148typedef struct 152typedef struct
… …
165 pendings [pendingcnt - 1].events = events; 169 pendings [pendingcnt - 1].events = events;
166 } 170 }
167} 171}
168 172
169static void 173static void
174queue_events (W *events, int eventcnt, int type)
175{
176 int i;
177
178 for (i = 0; i < eventcnt; ++i)
179 event (events [i], type);
180}
181
182static void
170fd_event (int fd, int events) 183fd_event (int fd, int events)
171{ 184{
172 ANFD *anfd = anfds + fd; 185 ANFD *anfd = anfds + fd;
173 struct ev_io *w; 186 struct ev_io *w;
174 187
… …
179 if (ev) 192 if (ev)
180 event ((W)w, ev); 193 event ((W)w, ev);
181 } 194 }
182} 195}
183 196
197/*****************************************************************************/
198
199static int *fdchanges;
200static int fdchangemax, fdchangecnt;
201
184static void 202static void
185queue_events (W *events, int eventcnt, int type) 203fd_reify (void)
186{ 204{
187 int i; 205 int i;
188 206
189 for (i = 0; i < eventcnt; ++i) 207 for (i = 0; i < fdchangecnt; ++i)
190 event (events [i], type); 208 {
209 int fd = fdchanges [i];
210 ANFD *anfd = anfds + fd;
211 struct ev_io *w;
212
213 int events = 0;
214
215 for (w = anfd->head; w; w = w->next)
216 events |= w->events;
217
218 anfd->events &= ~EV_REIFY;
219
220 if (anfd->events != events)
221 {
222 method_modify (fd, anfd->events, events);
223 anfd->events = events;
224 }
225 }
226
227 fdchangecnt = 0;
228}
229
230static void
231fd_change (int fd)
232{
233 if (anfds [fd].events & EV_REIFY)
234 return;
235
236 anfds [fd].events |= EV_REIFY;
237
238 ++fdchangecnt;
239 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
240 fdchanges [fdchangecnt - 1] = fd;
241}
242
243/* called on EBADF to verify fds */
244static void
245fd_recheck (void)
246{
247 int fd;
248
249 for (fd = 0; fd < anfdmax; ++fd)
250 if (anfds [fd].events)
251 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
252 while (anfds [fd].head)
253 {
254 event ((W)anfds [fd].head, EV_ERROR);
255 evio_stop (anfds [fd].head);
256 }
191} 257}
192 258
193/*****************************************************************************/ 259/*****************************************************************************/
194 260
195static struct ev_timer **timers; 261static struct ev_timer **timers;
… …
313/*****************************************************************************/ 379/*****************************************************************************/
314 380
315static struct ev_idle **idles; 381static struct ev_idle **idles;
316static int idlemax, idlecnt; 382static int idlemax, idlecnt;
317 383
384static struct ev_prepare **prepares;
385static int preparemax, preparecnt;
386
318static struct ev_check **checks; 387static struct ev_check **checks;
319static int checkmax, checkcnt; 388static int checkmax, checkcnt;
320 389
321/*****************************************************************************/ 390/*****************************************************************************/
322 391
392static struct ev_child *childs [PID_HASHSIZE];
393static struct ev_signal childev;
394
395#ifndef WCONTINUED
396# define WCONTINUED 0
397#endif
398
399static void
400childcb (struct ev_signal *sw, int revents)
401{
402 struct ev_child *w;
403 int pid, status;
404
405 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
406 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
407 if (w->pid == pid || w->pid == -1)
408 {
409 w->status = status;
410 event ((W)w, EV_CHILD);
411 }
412}
413
414/*****************************************************************************/
415
323#if HAVE_EPOLL 416#if HAVE_EPOLL
324# include "ev_epoll.c" 417# include "ev_epoll.c"
325#endif 418#endif
326#if HAVE_SELECT 419#if HAVE_SELECT
327# include "ev_select.c" 420# include "ev_select.c"
328#endif 421#endif
329 422
423int
424ev_version_major (void)
425{
426 return EV_VERSION_MAJOR;
427}
428
429int
430ev_version_minor (void)
431{
432 return EV_VERSION_MINOR;
433}
434
330int ev_init (int flags) 435int ev_init (int flags)
331{ 436{
437 if (!ev_method)
438 {
332#if HAVE_MONOTONIC 439#if HAVE_MONOTONIC
333 { 440 {
334 struct timespec ts; 441 struct timespec ts;
335 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 442 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
336 have_monotonic = 1; 443 have_monotonic = 1;
337 } 444 }
338#endif 445#endif
339 446
340 ev_now = ev_time (); 447 ev_now = ev_time ();
341 now = get_clock (); 448 now = get_clock ();
342 diff = ev_now - now; 449 diff = ev_now - now;
343 450
344 if (pipe (sigpipe)) 451 if (pipe (sigpipe))
345 return 0; 452 return 0;
346 453
347 ev_method = EVMETHOD_NONE; 454 ev_method = EVMETHOD_NONE;
348#if HAVE_EPOLL 455#if HAVE_EPOLL
349 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 456 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
350#endif 457#endif
351#if HAVE_SELECT 458#if HAVE_SELECT
352 if (ev_method == EVMETHOD_NONE) select_init (flags); 459 if (ev_method == EVMETHOD_NONE) select_init (flags);
353#endif 460#endif
354 461
355 if (ev_method) 462 if (ev_method)
356 { 463 {
357 evw_init (&sigev, sigcb); 464 evw_init (&sigev, sigcb);
358 siginit (); 465 siginit ();
466
467 evsignal_init (&childev, childcb, SIGCHLD);
468 evsignal_start (&childev);
469 }
359 } 470 }
360 471
361 return ev_method; 472 return ev_method;
362} 473}
363 474
364/*****************************************************************************/ 475/*****************************************************************************/
365 476
477void
366void ev_prefork (void) 478ev_prefork (void)
367{ 479{
368 /* nop */ 480 /* nop */
369} 481}
370 482
483void
371void ev_postfork_parent (void) 484ev_postfork_parent (void)
372{ 485{
373 /* nop */ 486 /* nop */
374} 487}
375 488
489void
376void ev_postfork_child (void) 490ev_postfork_child (void)
377{ 491{
378#if HAVE_EPOLL 492#if HAVE_EPOLL
379 if (ev_method == EVMETHOD_EPOLL) 493 if (ev_method == EVMETHOD_EPOLL)
380 epoll_postfork_child (); 494 epoll_postfork_child ();
381#endif 495#endif
… …
388} 502}
389 503
390/*****************************************************************************/ 504/*****************************************************************************/
391 505
392static void 506static 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 () 507call_pending (void)
420{ 508{
421 while (pendingcnt) 509 while (pendingcnt)
422 { 510 {
423 ANPENDING *p = pendings + --pendingcnt; 511 ANPENDING *p = pendings + --pendingcnt;
424 512
… …
429 } 517 }
430 } 518 }
431} 519}
432 520
433static void 521static void
434timers_reify () 522timers_reify (void)
435{ 523{
436 while (timercnt && timers [0]->at <= now) 524 while (timercnt && timers [0]->at <= now)
437 { 525 {
438 struct ev_timer *w = timers [0]; 526 struct ev_timer *w = timers [0];
439 527
… …
450 evtimer_stop (w); /* nonrepeating: stop timer */ 538 evtimer_stop (w); /* nonrepeating: stop timer */
451 } 539 }
452} 540}
453 541
454static void 542static void
455periodics_reify () 543periodics_reify (void)
456{ 544{
457 while (periodiccnt && periodics [0]->at <= ev_now) 545 while (periodiccnt && periodics [0]->at <= ev_now)
458 { 546 {
459 struct ev_periodic *w = periodics [0]; 547 struct ev_periodic *w = periodics [0];
460 548
… …
496 } 584 }
497 } 585 }
498} 586}
499 587
500static void 588static void
501time_update () 589time_update (void)
502{ 590{
503 int i; 591 int i;
504 592
505 ev_now = ev_time (); 593 ev_now = ev_time ();
506 594
… …
540int ev_loop_done; 628int ev_loop_done;
541 629
542void ev_loop (int flags) 630void ev_loop (int flags)
543{ 631{
544 double block; 632 double block;
545 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 633 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
546
547 if (checkcnt)
548 {
549 queue_events ((W *)checks, checkcnt, EV_CHECK);
550 call_pending ();
551 }
552 634
553 do 635 do
554 { 636 {
637 /* queue check watchers (and execute them) */
638 if (preparecnt)
639 {
640 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
641 call_pending ();
642 }
643
555 /* update fd-related kernel structures */ 644 /* update fd-related kernel structures */
556 fd_reify (); 645 fd_reify ();
557 646
558 /* calculate blocking time */ 647 /* calculate blocking time */
559 648
560 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 649 /* we only need this for !monotonic clockor timers, but as we basically
650 always have timers, we just calculate it always */
561 ev_now = ev_time (); 651 ev_now = ev_time ();
562 652
563 if (flags & EVLOOP_NONBLOCK || idlecnt) 653 if (flags & EVLOOP_NONBLOCK || idlecnt)
564 block = 0.; 654 block = 0.;
565 else 655 else
… …
585 675
586 /* update ev_now, do magic */ 676 /* update ev_now, do magic */
587 time_update (); 677 time_update ();
588 678
589 /* queue pending timers and reschedule them */ 679 /* queue pending timers and reschedule them */
680 timers_reify (); /* relative timers called last */
590 periodics_reify (); /* absolute timers first */ 681 periodics_reify (); /* absolute timers called first */
591 timers_reify (); /* relative timers second */
592 682
593 /* queue idle watchers unless io or timers are pending */ 683 /* queue idle watchers unless io or timers are pending */
594 if (!pendingcnt) 684 if (!pendingcnt)
595 queue_events ((W *)idles, idlecnt, EV_IDLE); 685 queue_events ((W *)idles, idlecnt, EV_IDLE);
596 686
597 /* queue check and possibly idle watchers */ 687 /* queue check watchers, to be executed first */
688 if (checkcnt)
598 queue_events ((W *)checks, checkcnt, EV_CHECK); 689 queue_events ((W *)checks, checkcnt, EV_CHECK);
599 690
600 call_pending (); 691 call_pending ();
601 } 692 }
602 while (!ev_loop_done); 693 while (!ev_loop_done);
603 694
… …
663 754
664 ev_start ((W)w, 1); 755 ev_start ((W)w, 1);
665 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 756 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
666 wlist_add ((WL *)&anfds[fd].head, (WL)w); 757 wlist_add ((WL *)&anfds[fd].head, (WL)w);
667 758
668 ++fdchangecnt; 759 fd_change (fd);
669 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
670 fdchanges [fdchangecnt - 1] = fd;
671} 760}
672 761
673void 762void
674evio_stop (struct ev_io *w) 763evio_stop (struct ev_io *w)
675{ 764{
… …
678 return; 767 return;
679 768
680 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 769 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
681 ev_stop ((W)w); 770 ev_stop ((W)w);
682 771
683 ++fdchangecnt; 772 fd_change (w->fd);
684 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
685 fdchanges [fdchangecnt - 1] = w->fd;
686} 773}
687 774
688void 775void
689evtimer_start (struct ev_timer *w) 776evtimer_start (struct ev_timer *w)
690{ 777{
… …
822 909
823 idles [w->active - 1] = idles [--idlecnt]; 910 idles [w->active - 1] = idles [--idlecnt];
824 ev_stop ((W)w); 911 ev_stop ((W)w);
825} 912}
826 913
914void evprepare_start (struct ev_prepare *w)
915{
916 if (ev_is_active (w))
917 return;
918
919 ev_start ((W)w, ++preparecnt);
920 array_needsize (prepares, preparemax, preparecnt, );
921 prepares [preparecnt - 1] = w;
922}
923
924void evprepare_stop (struct ev_prepare *w)
925{
926 ev_clear ((W)w);
927 if (ev_is_active (w))
928 return;
929
930 prepares [w->active - 1] = prepares [--preparecnt];
931 ev_stop ((W)w);
932}
933
827void evcheck_start (struct ev_check *w) 934void evcheck_start (struct ev_check *w)
828{ 935{
829 if (ev_is_active (w)) 936 if (ev_is_active (w))
830 return; 937 return;
831 938
… …
839 ev_clear ((W)w); 946 ev_clear ((W)w);
840 if (ev_is_active (w)) 947 if (ev_is_active (w))
841 return; 948 return;
842 949
843 checks [w->active - 1] = checks [--checkcnt]; 950 checks [w->active - 1] = checks [--checkcnt];
951 ev_stop ((W)w);
952}
953
954void evchild_start (struct ev_child *w)
955{
956 if (ev_is_active (w))
957 return;
958
959 ev_start ((W)w, 1);
960 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
961}
962
963void evchild_stop (struct ev_child *w)
964{
965 ev_clear ((W)w);
966 if (ev_is_active (w))
967 return;
968
969 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
844 ev_stop ((W)w); 970 ev_stop ((W)w);
845} 971}
846 972
847/*****************************************************************************/ 973/*****************************************************************************/
848 974

Diff Legend

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