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

Comparing libev/ev.c (file contents):
Revision 1.19 by root, Wed Oct 31 17:55:55 2007 UTC vs.
Revision 1.22 by root, Wed Oct 31 19:07:43 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 45
44#ifndef HAVE_MONOTONIC 46#ifndef HAVE_MONOTONIC
45# ifdef CLOCK_MONOTONIC 47# ifdef CLOCK_MONOTONIC
… …
59# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
60#endif 62#endif
61 63
62#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) */
63#define MAX_BLOCKTIME 60. 65#define MAX_BLOCKTIME 60.
66#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */
64 67
65#include "ev.h" 68#include "ev.h"
66 69
67typedef struct ev_watcher *W; 70typedef struct ev_watcher *W;
68typedef struct ev_watcher_list *WL; 71typedef struct ev_watcher_list *WL;
… …
324/*****************************************************************************/ 327/*****************************************************************************/
325 328
326static struct ev_idle **idles; 329static struct ev_idle **idles;
327static int idlemax, idlecnt; 330static int idlemax, idlecnt;
328 331
332static struct ev_prepare **prepares;
333static int preparemax, preparecnt;
334
329static struct ev_check **checks; 335static struct ev_check **checks;
330static int checkmax, checkcnt; 336static int checkmax, checkcnt;
337
338/*****************************************************************************/
339
340static struct ev_child *childs [PID_HASHSIZE];
341static struct ev_signal childev;
342
343#ifndef WCONTINUED
344# define WCONTINUED 0
345#endif
346
347static void
348childcb (struct ev_signal *sw, int revents)
349{
350 struct ev_child *w;
351 int pid, status;
352
353 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
354 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
355 if (w->pid == pid || w->pid == -1)
356 {
357 w->status = status;
358 event ((W)w, EV_CHILD);
359 }
360}
331 361
332/*****************************************************************************/ 362/*****************************************************************************/
333 363
334#if HAVE_EPOLL 364#if HAVE_EPOLL
335# include "ev_epoll.c" 365# include "ev_epoll.c"
… …
365 395
366 if (ev_method) 396 if (ev_method)
367 { 397 {
368 evw_init (&sigev, sigcb); 398 evw_init (&sigev, sigcb);
369 siginit (); 399 siginit ();
400
401 evsignal_init (&childev, childcb, SIGCHLD);
402 evsignal_start (&childev);
370 } 403 }
371 404
372 return ev_method; 405 return ev_method;
373} 406}
374 407
… …
553void ev_loop (int flags) 586void ev_loop (int flags)
554{ 587{
555 double block; 588 double block;
556 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 589 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
557 590
558 if (checkcnt)
559 {
560 queue_events ((W *)checks, checkcnt, EV_CHECK);
561 call_pending ();
562 }
563
564 do 591 do
565 { 592 {
593 /* queue check watchers (and execute them) */
594 if (preparecnt)
595 {
596 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
597 call_pending ();
598 }
599
566 /* update fd-related kernel structures */ 600 /* update fd-related kernel structures */
567 fd_reify (); 601 fd_reify ();
568 602
569 /* calculate blocking time */ 603 /* calculate blocking time */
570 604
571 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 605 /* we only need this for !monotonic clockor timers, but as we basically
606 always have timers, we just calculate it always */
572 ev_now = ev_time (); 607 ev_now = ev_time ();
573 608
574 if (flags & EVLOOP_NONBLOCK || idlecnt) 609 if (flags & EVLOOP_NONBLOCK || idlecnt)
575 block = 0.; 610 block = 0.;
576 else 611 else
… …
596 631
597 /* update ev_now, do magic */ 632 /* update ev_now, do magic */
598 time_update (); 633 time_update ();
599 634
600 /* queue pending timers and reschedule them */ 635 /* queue pending timers and reschedule them */
636 timers_reify (); /* relative timers called last */
601 periodics_reify (); /* absolute timers first */ 637 periodics_reify (); /* absolute timers called first */
602 timers_reify (); /* relative timers second */
603 638
604 /* queue idle watchers unless io or timers are pending */ 639 /* queue idle watchers unless io or timers are pending */
605 if (!pendingcnt) 640 if (!pendingcnt)
606 queue_events ((W *)idles, idlecnt, EV_IDLE); 641 queue_events ((W *)idles, idlecnt, EV_IDLE);
607 642
608 /* queue check and possibly idle watchers */ 643 /* queue check watchers, to be executed first */
644 if (checkcnt)
609 queue_events ((W *)checks, checkcnt, EV_CHECK); 645 queue_events ((W *)checks, checkcnt, EV_CHECK);
610 646
611 call_pending (); 647 call_pending ();
612 } 648 }
613 while (!ev_loop_done); 649 while (!ev_loop_done);
614 650
… …
833 869
834 idles [w->active - 1] = idles [--idlecnt]; 870 idles [w->active - 1] = idles [--idlecnt];
835 ev_stop ((W)w); 871 ev_stop ((W)w);
836} 872}
837 873
874void evprepare_start (struct ev_prepare *w)
875{
876 if (ev_is_active (w))
877 return;
878
879 ev_start ((W)w, ++preparecnt);
880 array_needsize (prepares, preparemax, preparecnt, );
881 prepares [preparecnt - 1] = w;
882}
883
884void evprepare_stop (struct ev_prepare *w)
885{
886 ev_clear ((W)w);
887 if (ev_is_active (w))
888 return;
889
890 prepares [w->active - 1] = prepares [--preparecnt];
891 ev_stop ((W)w);
892}
893
838void evcheck_start (struct ev_check *w) 894void evcheck_start (struct ev_check *w)
839{ 895{
840 if (ev_is_active (w)) 896 if (ev_is_active (w))
841 return; 897 return;
842 898
… …
850 ev_clear ((W)w); 906 ev_clear ((W)w);
851 if (ev_is_active (w)) 907 if (ev_is_active (w))
852 return; 908 return;
853 909
854 checks [w->active - 1] = checks [--checkcnt]; 910 checks [w->active - 1] = checks [--checkcnt];
911 ev_stop ((W)w);
912}
913
914void evchild_start (struct ev_child *w)
915{
916 if (ev_is_active (w))
917 return;
918
919 ev_start ((W)w, 1);
920 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
921}
922
923void evchild_stop (struct ev_child *w)
924{
925 ev_clear ((W)w);
926 if (ev_is_active (w))
927 return;
928
929 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
855 ev_stop ((W)w); 930 ev_stop ((W)w);
856} 931}
857 932
858/*****************************************************************************/ 933/*****************************************************************************/
859 934

Diff Legend

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