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.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;
… …
332static struct ev_check **checks; 335static struct ev_check **checks;
333static int checkmax, checkcnt; 336static int checkmax, checkcnt;
334 337
335/*****************************************************************************/ 338/*****************************************************************************/
336 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}
361
362/*****************************************************************************/
363
337#if HAVE_EPOLL 364#if HAVE_EPOLL
338# include "ev_epoll.c" 365# include "ev_epoll.c"
339#endif 366#endif
340#if HAVE_SELECT 367#if HAVE_SELECT
341# include "ev_select.c" 368# include "ev_select.c"
… …
368 395
369 if (ev_method) 396 if (ev_method)
370 { 397 {
371 evw_init (&sigev, sigcb); 398 evw_init (&sigev, sigcb);
372 siginit (); 399 siginit ();
400
401 evsignal_init (&childev, childcb, SIGCHLD);
402 evsignal_start (&childev);
373 } 403 }
374 404
375 return ev_method; 405 return ev_method;
376} 406}
377 407
… …
559 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 589 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
560 590
561 do 591 do
562 { 592 {
563 /* queue check watchers (and execute them) */ 593 /* queue check watchers (and execute them) */
564 if (checkcnt) 594 if (preparecnt)
565 { 595 {
566 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 596 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
567 call_pending (); 597 call_pending ();
568 } 598 }
569 599
570 /* update fd-related kernel structures */ 600 /* update fd-related kernel structures */
571 fd_reify (); 601 fd_reify ();
572 602
573 /* calculate blocking time */ 603 /* calculate blocking time */
574 604
575 /* 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 */
576 ev_now = ev_time (); 607 ev_now = ev_time ();
577 608
578 if (flags & EVLOOP_NONBLOCK || idlecnt) 609 if (flags & EVLOOP_NONBLOCK || idlecnt)
579 block = 0.; 610 block = 0.;
580 else 611 else
… …
875 ev_clear ((W)w); 906 ev_clear ((W)w);
876 if (ev_is_active (w)) 907 if (ev_is_active (w))
877 return; 908 return;
878 909
879 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);
880 ev_stop ((W)w); 930 ev_stop ((W)w);
881} 931}
882 932
883/*****************************************************************************/ 933/*****************************************************************************/
884 934

Diff Legend

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