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

Comparing libev/ev.c (file contents):
Revision 1.319 by root, Wed Nov 18 10:25:22 2009 UTC vs.
Revision 1.326 by root, Tue Jan 26 04:19:37 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
… …
163 163
164#include <assert.h> 164#include <assert.h>
165#include <errno.h> 165#include <errno.h>
166#include <sys/types.h> 166#include <sys/types.h>
167#include <time.h> 167#include <time.h>
168#include <limits.h>
168 169
169#include <signal.h> 170#include <signal.h>
170 171
171#ifdef EV_H 172#ifdef EV_H
172# include EV_H 173# include EV_H
… …
344# endif 345# endif
345#endif 346#endif
346 347
347/* 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 */
348 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
349#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
352#endif 359#endif
353 360
… …
505 512
506#ifndef EV_FD_TO_WIN32_HANDLE 513#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 515#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 516#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 518#endif
512#ifndef EV_WIN32_CLOSE_FD 519#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 520# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 521#endif
515 522
… …
964/* check whether the given fd is atcually valid, for error recovery */ 971/* check whether the given fd is atcually valid, for error recovery */
965inline_size int 972inline_size int
966fd_valid (int fd) 973fd_valid (int fd)
967{ 974{
968#ifdef _WIN32 975#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 977#else
971 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
972#endif 979#endif
973} 980}
974 981
… …
1179inline_speed void 1186inline_speed void
1180fd_intern (int fd) 1187fd_intern (int fd)
1181{ 1188{
1182#ifdef _WIN32 1189#ifdef _WIN32
1183 unsigned long arg = 1; 1190 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185#else 1192#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif 1195#endif
1189} 1196}
… …
1294{ 1301{
1295#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1303 EV_P = signals [signum - 1].loop;
1297#endif 1304#endif
1298 1305
1299#if _WIN32 1306#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1301#endif 1308#endif
1302 1309
1303 signals [signum - 1].pending = 1; 1310 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1311 evpipe_write (EV_A_ &sig_pending);
… …
1605#endif 1612#endif
1606#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1615#endif
1609#if EV_USE_SIGNALFD 1616#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1618#endif
1612 1619
1613 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1615 1622
… …
2157 ANHE_at_cache (*he); 2164 ANHE_at_cache (*he);
2158 } 2165 }
2159} 2166}
2160 2167
2161/* fetch new monotonic and realtime times from the kernel */ 2168/* fetch new monotonic and realtime times from the kernel */
2162/* also detetc if there was a timejump, and act accordingly */ 2169/* also detect if there was a timejump, and act accordingly */
2163inline_speed void 2170inline_speed void
2164time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
2165{ 2172{
2166#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
2167 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
… …
2747 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD 2755# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/ 2756 if (sigfd < 0) /*TODO*/
2750# endif 2757# endif
2751 { 2758 {
2752# if _WIN32 2759# ifdef _WIN32
2753 evpipe_init (EV_A); 2760 evpipe_init (EV_A);
2754 2761
2755 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2756# else 2763# else
2757 struct sigaction sa; 2764 struct sigaction sa;
… …
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2797 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif 2798#endif
2792#if EV_USE_SIGNALFD 2799#if EV_USE_SIGNALFD
2793 if (sigfd >= 0) 2800 if (sigfd >= 0)
2794 { 2801 {
2795 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2802 sigset_t ss;
2803
2804 sigemptyset (&ss);
2805 sigaddset (&ss, w->signum);
2796 sigdelset (&sigfd_set, w->signum); 2806 sigdelset (&sigfd_set, w->signum);
2807
2797 signalfd (sigfd, &sigfd_set, 0); 2808 signalfd (sigfd, &sigfd_set, 0);
2798 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2809 sigprocmask (SIG_UNBLOCK, &ss, 0);
2799 /*TODO: maybe unblock signal? */
2800 } 2810 }
2801 else 2811 else
2802#endif 2812#endif
2803 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2804 } 2814 }
… …
2850#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2851 2861
2852static 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);
2853 2863
2854#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2855# 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)
2856 2868
2857static void noinline 2869static void noinline
2858infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2859{ 2871{
2860 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);
… …
2969 2981
2970static void 2982static void
2971infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2972{ 2984{
2973 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2974 struct inotify_event *ev = (struct inotify_event *)buf;
2975 int ofs; 2986 int ofs;
2976 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2977 2988
2978 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);
2979 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 }
2980} 2995}
2981 2996
2982inline_size void 2997inline_size void
2983check_2625 (EV_P) 2998check_2625 (EV_P)
2984{ 2999{
… …
3101static void noinline 3116static void noinline
3102stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3103{ 3118{
3104 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3105 3120
3106 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
3107 /* prev has the old value when the callback gets invoked */
3108 w->prev = w->attr;
3109 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
3110 3123
3111 /* 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 */
3112 if ( 3125 if (
3113 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
3114 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
3115 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
3116 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
3117 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
3118 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
3119 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
3120 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
3121 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
3122 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
3123 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
3124 ) { 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
3125 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
3126 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
3127 { 3145 {
3128 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
3129 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);

Diff Legend

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