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

Comparing libev/ev.c (file contents):
Revision 1.219 by root, Wed Apr 2 10:55:39 2008 UTC vs.
Revision 1.220 by root, Sun Apr 6 09:53:17 2008 UTC

… …
39 39
40#ifdef __cplusplus 40#ifdef __cplusplus
41extern "C" { 41extern "C" {
42#endif 42#endif
43 43
44/* this big block deduces configuration from config.h */
44#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
45# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
46# include EV_CONFIG_H 47# include EV_CONFIG_H
47# else 48# else
48# include "config.h" 49# include "config.h"
… …
118# else 119# else
119# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
120# endif 121# endif
121# endif 122# endif
122 123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
123#endif 132#endif
124 133
125#include <math.h> 134#include <math.h>
126#include <stdlib.h> 135#include <stdlib.h>
127#include <fcntl.h> 136#include <fcntl.h>
… …
152# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
153# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
154# endif 163# endif
155#endif 164#endif
156 165
157/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
158 167
159#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
160# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
161#endif 170#endif
162 171
… …
179# define EV_USE_POLL 1 188# define EV_USE_POLL 1
180# endif 189# endif
181#endif 190#endif
182 191
183#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
184# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
185#endif 198#endif
186 199
187#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
188# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
189#endif 202#endif
… …
191#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
192# define EV_USE_PORT 0 205# define EV_USE_PORT 0
193#endif 206#endif
194 207
195#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
196# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
197#endif 214#endif
198 215
199#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
200# if EV_MINIMAL 217# if EV_MINIMAL
201# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
210# else 227# else
211# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
212# endif 229# endif
213#endif 230#endif
214 231
215/**/ 232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
216 241
217#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
218# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
219# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
220#endif 245#endif
… …
239# include <sys/inotify.h> 264# include <sys/inotify.h>
240#endif 265#endif
241 266
242#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
243# include <winsock.h> 268# include <winsock.h>
269#endif
270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273int eventfd (unsigned int initval, int flags);
244#endif 274#endif
245 275
246/**/ 276/**/
247 277
248/* 278/*
… …
802static void noinline 832static void noinline
803evpipe_init (EV_P) 833evpipe_init (EV_P)
804{ 834{
805 if (!ev_is_active (&pipeev)) 835 if (!ev_is_active (&pipeev))
806 { 836 {
837#if EV_USE_EVENTFD
838 if ((evfd = eventfd (0, 0)) >= 0)
839 {
840 evpipe [0] = -1;
841 fd_intern (evfd);
842 ev_io_set (&pipeev, evfd, EV_READ);
843 }
844 else
845#endif
846 {
807 while (pipe (evpipe)) 847 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 848 syserr ("(libev) error creating signal/async pipe");
809 849
810 fd_intern (evpipe [0]); 850 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 851 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 852 ev_io_set (&pipeev, evpipe [0], EV_READ);
853 }
854
814 ev_io_start (EV_A_ &pipeev); 855 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* watcher should not keep loop alive */ 856 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 857 }
817} 858}
818 859
… …
822 if (!*flag) 863 if (!*flag)
823 { 864 {
824 int old_errno = errno; /* save errno because write might clobber it */ 865 int old_errno = errno; /* save errno because write might clobber it */
825 866
826 *flag = 1; 867 *flag = 1;
868
869#if EV_USE_EVENTFD
870 if (evfd >= 0)
871 {
872 uint64_t counter = 1;
873 write (evfd, &counter, sizeof (uint64_t));
874 }
875 else
876#endif
827 write (evpipe [1], &old_errno, 1); 877 write (evpipe [1], &old_errno, 1);
828 878
829 errno = old_errno; 879 errno = old_errno;
830 } 880 }
831} 881}
832 882
833static void 883static void
834pipecb (EV_P_ ev_io *iow, int revents) 884pipecb (EV_P_ ev_io *iow, int revents)
835{ 885{
886#if EV_USE_EVENTFD
887 if (evfd >= 0)
836 { 888 {
837 int dummy; 889 uint64_t counter = 1;
890 read (evfd, &counter, sizeof (uint64_t));
891 }
892 else
893#endif
894 {
895 char dummy;
838 read (evpipe [0], &dummy, 1); 896 read (evpipe [0], &dummy, 1);
839 } 897 }
840 898
841 if (gotsig && ev_is_default_loop (EV_A)) 899 if (gotsig && ev_is_default_loop (EV_A))
842 { 900 {
843 int signum; 901 int signum;
844 gotsig = 0; 902 gotsig = 0;
… …
1139 if (ev_is_active (&pipeev)) 1197 if (ev_is_active (&pipeev))
1140 { 1198 {
1141 ev_ref (EV_A); /* signal watcher */ 1199 ev_ref (EV_A); /* signal watcher */
1142 ev_io_stop (EV_A_ &pipeev); 1200 ev_io_stop (EV_A_ &pipeev);
1143 1201
1144 close (evpipe [0]); evpipe [0] = 0; 1202#if EV_USE_EVENTFD
1145 close (evpipe [1]); evpipe [1] = 0; 1203 if (evfd >= 0)
1204 close (evfd);
1205#endif
1206
1207 if (evpipe [0] >= 0)
1208 {
1209 close (evpipe [0]);
1210 close (evpipe [1]);
1211 }
1146 } 1212 }
1147 1213
1148#if EV_USE_INOTIFY 1214#if EV_USE_INOTIFY
1149 if (fs_fd >= 0) 1215 if (fs_fd >= 0)
1150 close (fs_fd); 1216 close (fs_fd);
… …
1224 gotasync = 1; 1290 gotasync = 1;
1225#endif 1291#endif
1226 1292
1227 ev_ref (EV_A); 1293 ev_ref (EV_A);
1228 ev_io_stop (EV_A_ &pipeev); 1294 ev_io_stop (EV_A_ &pipeev);
1295
1296#if EV_USE_EVENTFD
1297 if (evfd >= 0)
1298 close (evfd);
1299#endif
1300
1301 if (evpipe [0] >= 0)
1302 {
1229 close (evpipe [0]); 1303 close (evpipe [0]);
1230 close (evpipe [1]); 1304 close (evpipe [1]);
1305 }
1231 1306
1232 evpipe_init (EV_A); 1307 evpipe_init (EV_A);
1233 /* now iterate over everything, in case we missed something */ 1308 /* now iterate over everything, in case we missed something */
1234 pipecb (EV_A_ &pipeev, EV_READ); 1309 pipecb (EV_A_ &pipeev, EV_READ);
1235 } 1310 }

Diff Legend

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