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

Comparing libev/ev.c (file contents):
Revision 1.318 by root, Tue Nov 17 00:22:28 2009 UTC vs.
Revision 1.327 by root, Sun Feb 14 19:09:04 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
… …
343# endif 345# endif
344#endif 346#endif
345 347
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
355
348#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
351#endif 359#endif
352 360
… …
504 512
505#ifndef EV_FD_TO_WIN32_HANDLE 513#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif 515#endif
508#ifndef EV_WIN32_HANDLE_TO_FD 516#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510#endif 518#endif
511#ifndef EV_WIN32_CLOSE_FD 519#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd) 520# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif 521#endif
514 522
… …
963/* check whether the given fd is atcually valid, for error recovery */ 971/* check whether the given fd is atcually valid, for error recovery */
964inline_size int 972inline_size int
965fd_valid (int fd) 973fd_valid (int fd)
966{ 974{
967#ifdef _WIN32 975#ifdef _WIN32
968 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969#else 977#else
970 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
971#endif 979#endif
972} 980}
973 981
… …
1178inline_speed void 1186inline_speed void
1179fd_intern (int fd) 1187fd_intern (int fd)
1180{ 1188{
1181#ifdef _WIN32 1189#ifdef _WIN32
1182 unsigned long arg = 1; 1190 unsigned long arg = 1;
1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1184#else 1192#else
1185 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1186 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1187#endif 1195#endif
1188} 1196}
… …
1293{ 1301{
1294#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1295 EV_P = signals [signum - 1].loop; 1303 EV_P = signals [signum - 1].loop;
1296#endif 1304#endif
1297 1305
1298#if _WIN32 1306#ifdef _WIN32
1299 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1300#endif 1308#endif
1301 1309
1302 signals [signum - 1].pending = 1; 1310 signals [signum - 1].pending = 1;
1303 evpipe_write (EV_A_ &sig_pending); 1311 evpipe_write (EV_A_ &sig_pending);
… …
1604#endif 1612#endif
1605#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607#endif 1615#endif
1608#if EV_USE_SIGNALFD 1616#if EV_USE_SIGNALFD
1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610#endif 1618#endif
1611 1619
1612 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1613 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1614 1622
… …
2156 ANHE_at_cache (*he); 2164 ANHE_at_cache (*he);
2157 } 2165 }
2158} 2166}
2159 2167
2160/* fetch new monotonic and realtime times from the kernel */ 2168/* fetch new monotonic and realtime times from the kernel */
2161/* also detetc if there was a timejump, and act accordingly */ 2169/* also detect if there was a timejump, and act accordingly */
2162inline_speed void 2170inline_speed void
2163time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
2164{ 2172{
2165#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
2166 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
… …
2500 2508
2501 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2502 return; 2510 return;
2503 2511
2504 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2512 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2505 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2513 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2506 2514
2507 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2508 2516
2509 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2510 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2746 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2747# if EV_USE_SIGNALFD 2755# if EV_USE_SIGNALFD
2748 if (sigfd < 0) /*TODO*/ 2756 if (sigfd < 0) /*TODO*/
2749# endif 2757# endif
2750 { 2758 {
2751# if _WIN32 2759# ifdef _WIN32
2752 evpipe_init (EV_A); 2760 evpipe_init (EV_A);
2753 2761
2754 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2755# else 2763# else
2756 struct sigaction sa; 2764 struct sigaction sa;
… …
2789 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2797 signals [w->signum - 1].loop = 0; /* unattach from signal */
2790#endif 2798#endif
2791#if EV_USE_SIGNALFD 2799#if EV_USE_SIGNALFD
2792 if (sigfd >= 0) 2800 if (sigfd >= 0)
2793 { 2801 {
2794 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2802 sigset_t ss;
2803
2804 sigemptyset (&ss);
2805 sigaddset (&ss, w->signum);
2795 sigdelset (&sigfd_set, w->signum); 2806 sigdelset (&sigfd_set, w->signum);
2807
2796 signalfd (sigfd, &sigfd_set, 0); 2808 signalfd (sigfd, &sigfd_set, 0);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2809 sigprocmask (SIG_UNBLOCK, &ss, 0);
2798 /*TODO: maybe unblock signal? */
2799 } 2810 }
2800 else 2811 else
2801#endif 2812#endif
2802 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2803 } 2814 }
… …
2849#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2850 2861
2851static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2862static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2852 2863
2853#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2854# define EV_INOTIFY_BUFSIZE 8192 2865
2866/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2867# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2855 2868
2856static void noinline 2869static void noinline
2857infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2858{ 2871{
2859 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2872 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
… …
2968 2981
2969static void 2982static void
2970infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2971{ 2984{
2972 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2973 struct inotify_event *ev = (struct inotify_event *)buf;
2974 int ofs; 2986 int ofs;
2975 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2976 2988
2977 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2989 for (ofs = 0; ofs < len; )
2990 {
2991 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2978 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2992 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len;
2994 }
2979} 2995}
2980 2996
2981inline_size void 2997inline_size void
2982check_2625 (EV_P) 2998check_2625 (EV_P)
2983{ 2999{
… …
3100static void noinline 3116static void noinline
3101stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3102{ 3118{
3103 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3104 3120
3105 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
3106 /* prev has the old value when the callback gets invoked */
3107 w->prev = w->attr;
3108 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
3109 3123
3110 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3124 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3111 if ( 3125 if (
3112 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
3113 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
3114 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
3115 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
3116 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
3117 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
3118 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
3119 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
3120 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
3121 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
3122 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
3123 ) { 3137 ) {
3138 /* we only update w->prev on actual differences */
3139 /* in case we test more often than invoke the callback, */
3140 /* to ensure that prev is always different to attr */
3141 w->prev = prev;
3142
3124 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
3125 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
3126 { 3145 {
3127 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
3128 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);

Diff Legend

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