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

Comparing libev/ev.c (file contents):
Revision 1.331 by root, Tue Mar 9 08:55:03 2010 UTC vs.
Revision 1.343 by root, Fri Apr 2 21:03:46 2010 UTC

… …
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
88# endif
89
90# ifndef EV_USE_SELECT
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT 1
93# else 95# else
96# undef EV_USE_SELECT
94# define EV_USE_SELECT 0 97# define EV_USE_SELECT 0
98# endif
99
100# if HAVE_POLL && HAVE_POLL_H
101# ifndef EV_USE_POLL
102# define EV_USE_POLL EV_FEATURE_BACKENDS
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
107# endif
108
109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
110# ifndef EV_USE_EPOLL
111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
103# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
104# endif 116# endif
105 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
106# ifndef EV_USE_EPOLL 119# ifndef EV_USE_KQUEUE
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 1
109# else
110# define EV_USE_EPOLL 0
111# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
112# endif 125# endif
113 126
114# ifndef EV_USE_KQUEUE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 128# ifndef EV_USE_PORT
116# define EV_USE_KQUEUE 1 129# define EV_USE_PORT EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 130# endif
120# endif
121
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1
125# else 131# else
132# undef EV_USE_PORT
126# define EV_USE_PORT 0 133# define EV_USE_PORT 0
134# endif
135
136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
137# ifndef EV_USE_INOTIFY
138# define EV_USE_INOTIFY EV_FEATURE_OS
127# endif 139# endif
128# endif
129
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1
133# else 140# else
141# undef EV_USE_INOTIFY
134# define EV_USE_INOTIFY 0 142# define EV_USE_INOTIFY 0
143# endif
144
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
146# ifndef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD EV_FEATURE_OS
135# endif 148# endif
136# endif
137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else 149# else
150# undef EV_USE_SIGNALFD
142# define EV_USE_SIGNALFD 0 151# define EV_USE_SIGNALFD 0
152# endif
153
154# if HAVE_EVENTFD
155# ifndef EV_USE_EVENTFD
156# define EV_USE_EVENTFD EV_FEATURE_OS
143# endif 157# endif
144# endif
145
146# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1
149# else 158# else
159# undef EV_USE_EVENTFD
150# define EV_USE_EVENTFD 0 160# define EV_USE_EVENTFD 0
151# endif
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
… …
207#elif defined (MAXSIG) 216#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1) 217# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG) 218#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1) 219# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE) 220#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 221# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig) 222#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 223# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else 224#else
216# error "unable to find value for NSIG, please report" 225# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */ 226/* to make it compile regardless, just remove the above line, */
227/* but consider reporting it, too! :) */
218# define EV_NSIG 65 228# define EV_NSIG 65
219#endif 229#endif
220 230
221#ifndef EV_USE_CLOCK_SYSCALL 231#ifndef EV_USE_CLOCK_SYSCALL
222# if __linux && __GLIBC__ >= 2 232# if __linux && __GLIBC__ >= 2
223# define EV_USE_CLOCK_SYSCALL 1 233# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
224# else 234# else
225# define EV_USE_CLOCK_SYSCALL 0 235# define EV_USE_CLOCK_SYSCALL 0
226# endif 236# endif
227#endif 237#endif
228 238
229#ifndef EV_USE_MONOTONIC 239#ifndef EV_USE_MONOTONIC
230# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 240# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
231# define EV_USE_MONOTONIC 1 241# define EV_USE_MONOTONIC EV_FEATURE_OS
232# else 242# else
233# define EV_USE_MONOTONIC 0 243# define EV_USE_MONOTONIC 0
234# endif 244# endif
235#endif 245#endif
236 246
… …
238# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 248# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
239#endif 249#endif
240 250
241#ifndef EV_USE_NANOSLEEP 251#ifndef EV_USE_NANOSLEEP
242# if _POSIX_C_SOURCE >= 199309L 252# if _POSIX_C_SOURCE >= 199309L
243# define EV_USE_NANOSLEEP 1 253# define EV_USE_NANOSLEEP EV_FEATURE_OS
244# else 254# else
245# define EV_USE_NANOSLEEP 0 255# define EV_USE_NANOSLEEP 0
246# endif 256# endif
247#endif 257#endif
248 258
249#ifndef EV_USE_SELECT 259#ifndef EV_USE_SELECT
250# define EV_USE_SELECT 1 260# define EV_USE_SELECT EV_FEATURE_BACKENDS
251#endif 261#endif
252 262
253#ifndef EV_USE_POLL 263#ifndef EV_USE_POLL
254# ifdef _WIN32 264# ifdef _WIN32
255# define EV_USE_POLL 0 265# define EV_USE_POLL 0
256# else 266# else
257# define EV_USE_POLL 1 267# define EV_USE_POLL EV_FEATURE_BACKENDS
258# endif 268# endif
259#endif 269#endif
260 270
261#ifndef EV_USE_EPOLL 271#ifndef EV_USE_EPOLL
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
263# define EV_USE_EPOLL 1 273# define EV_USE_EPOLL EV_FEATURE_BACKENDS
264# else 274# else
265# define EV_USE_EPOLL 0 275# define EV_USE_EPOLL 0
266# endif 276# endif
267#endif 277#endif
268 278
… …
274# define EV_USE_PORT 0 284# define EV_USE_PORT 0
275#endif 285#endif
276 286
277#ifndef EV_USE_INOTIFY 287#ifndef EV_USE_INOTIFY
278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 288# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
279# define EV_USE_INOTIFY 1 289# define EV_USE_INOTIFY EV_FEATURE_OS
280# else 290# else
281# define EV_USE_INOTIFY 0 291# define EV_USE_INOTIFY 0
282# endif 292# endif
283#endif 293#endif
284 294
285#ifndef EV_PID_HASHSIZE 295#ifndef EV_PID_HASHSIZE
286# if EV_MINIMAL 296# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
287# define EV_PID_HASHSIZE 1
288# else
289# define EV_PID_HASHSIZE 16
290# endif
291#endif 297#endif
292 298
293#ifndef EV_INOTIFY_HASHSIZE 299#ifndef EV_INOTIFY_HASHSIZE
294# if EV_MINIMAL 300# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
295# define EV_INOTIFY_HASHSIZE 1
296# else
297# define EV_INOTIFY_HASHSIZE 16
298# endif
299#endif 301#endif
300 302
301#ifndef EV_USE_EVENTFD 303#ifndef EV_USE_EVENTFD
302# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 304# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
303# define EV_USE_EVENTFD 1 305# define EV_USE_EVENTFD EV_FEATURE_OS
304# else 306# else
305# define EV_USE_EVENTFD 0 307# define EV_USE_EVENTFD 0
306# endif 308# endif
307#endif 309#endif
308 310
309#ifndef EV_USE_SIGNALFD 311#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1 313# define EV_USE_SIGNALFD EV_FEATURE_OS
312# else 314# else
313# define EV_USE_SIGNALFD 0 315# define EV_USE_SIGNALFD 0
314# endif 316# endif
315#endif 317#endif
316 318
… …
319# define EV_USE_4HEAP 1 321# define EV_USE_4HEAP 1
320# define EV_HEAP_CACHE_AT 1 322# define EV_HEAP_CACHE_AT 1
321#endif 323#endif
322 324
323#ifndef EV_VERIFY 325#ifndef EV_VERIFY
324# define EV_VERIFY !EV_MINIMAL 326# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
325#endif 327#endif
326 328
327#ifndef EV_USE_4HEAP 329#ifndef EV_USE_4HEAP
328# define EV_USE_4HEAP !EV_MINIMAL 330# define EV_USE_4HEAP EV_FEATURE_DATA
329#endif 331#endif
330 332
331#ifndef EV_HEAP_CACHE_AT 333#ifndef EV_HEAP_CACHE_AT
332# define EV_HEAP_CACHE_AT !EV_MINIMAL 334# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
333#endif 335#endif
334 336
335/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 337/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
336/* which makes programs even slower. might work on other unices, too. */ 338/* which makes programs even slower. might work on other unices, too. */
337#if EV_USE_CLOCK_SYSCALL 339#if EV_USE_CLOCK_SYSCALL
… …
442 444
443 445
444/**/ 446/**/
445 447
446#if EV_VERIFY >= 3 448#if EV_VERIFY >= 3
447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 449# define EV_FREQUENT_CHECK ev_verify (EV_A)
448#else 450#else
449# define EV_FREQUENT_CHECK do { } while (0) 451# define EV_FREQUENT_CHECK do { } while (0)
450#endif 452#endif
451 453
452/* 454/*
… …
475 477
476#define expect_false(expr) expect ((expr) != 0, 0) 478#define expect_false(expr) expect ((expr) != 0, 0)
477#define expect_true(expr) expect ((expr) != 0, 1) 479#define expect_true(expr) expect ((expr) != 0, 1)
478#define inline_size static inline 480#define inline_size static inline
479 481
480#if EV_MINIMAL 482#if EV_FEATURE_CODE
483# define inline_speed static inline
484#else
481# define inline_speed static noinline 485# define inline_speed static noinline
482#else
483# define inline_speed static inline
484#endif 486#endif
485 487
486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 488#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487 489
488#if EV_MINPRI == EV_MAXPRI 490#if EV_MINPRI == EV_MAXPRI
… …
568} 570}
569 571
570static void * 572static void *
571ev_realloc_emul (void *ptr, long size) 573ev_realloc_emul (void *ptr, long size)
572{ 574{
575#if __GLIBC__
576 return realloc (ptr, size);
577#else
573 /* some systems, notably openbsd and darwin, fail to properly 578 /* some systems, notably openbsd and darwin, fail to properly
574 * implement realloc (x, 0) (as required by both ansi c-98 and 579 * implement realloc (x, 0) (as required by both ansi c-89 and
575 * the single unix specification, so work around them here. 580 * the single unix specification, so work around them here.
576 */ 581 */
577 582
578 if (size) 583 if (size)
579 return realloc (ptr, size); 584 return realloc (ptr, size);
580 585
581 free (ptr); 586 free (ptr);
582 return 0; 587 return 0;
588#endif
583} 589}
584 590
585static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 591static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
586 592
587void 593void
… …
691 697
692 static int ev_default_loop_ptr; 698 static int ev_default_loop_ptr;
693 699
694#endif 700#endif
695 701
696#if EV_MINIMAL < 2 702#if EV_FEATURE_API
697# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 703# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
698# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 704# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
699# define EV_INVOKE_PENDING invoke_cb (EV_A) 705# define EV_INVOKE_PENDING invoke_cb (EV_A)
700#else 706#else
701# define EV_RELEASE_CB (void)0 707# define EV_RELEASE_CB (void)0
… …
886} 892}
887 893
888/*****************************************************************************/ 894/*****************************************************************************/
889 895
890inline_speed void 896inline_speed void
891fd_event_nc (EV_P_ int fd, int revents) 897fd_event_nocheck (EV_P_ int fd, int revents)
892{ 898{
893 ANFD *anfd = anfds + fd; 899 ANFD *anfd = anfds + fd;
894 ev_io *w; 900 ev_io *w;
895 901
896 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 902 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
908fd_event (EV_P_ int fd, int revents) 914fd_event (EV_P_ int fd, int revents)
909{ 915{
910 ANFD *anfd = anfds + fd; 916 ANFD *anfd = anfds + fd;
911 917
912 if (expect_true (!anfd->reify)) 918 if (expect_true (!anfd->reify))
913 fd_event_nc (EV_A_ fd, revents); 919 fd_event_nocheck (EV_A_ fd, revents);
914} 920}
915 921
916void 922void
917ev_feed_fd_event (EV_P_ int fd, int revents) 923ev_feed_fd_event (EV_P_ int fd, int revents)
918{ 924{
919 if (fd >= 0 && fd < anfdmax) 925 if (fd >= 0 && fd < anfdmax)
920 fd_event_nc (EV_A_ fd, revents); 926 fd_event_nocheck (EV_A_ fd, revents);
921} 927}
922 928
923/* make sure the external fd watch events are in-sync */ 929/* make sure the external fd watch events are in-sync */
924/* with the kernel/libev internal state */ 930/* with the kernel/libev internal state */
925inline_size void 931inline_size void
… …
988 ev_io_stop (EV_A_ w); 994 ev_io_stop (EV_A_ w);
989 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 995 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
990 } 996 }
991} 997}
992 998
993/* check whether the given fd is atcually valid, for error recovery */ 999/* check whether the given fd is actually valid, for error recovery */
994inline_size int 1000inline_size int
995fd_valid (int fd) 1001fd_valid (int fd)
996{ 1002{
997#ifdef _WIN32 1003#ifdef _WIN32
998 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1004 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1038 { 1044 {
1039 anfds [fd].events = 0; 1045 anfds [fd].events = 0;
1040 anfds [fd].emask = 0; 1046 anfds [fd].emask = 0;
1041 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1047 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1042 } 1048 }
1049}
1050
1051/* used to prepare libev internal fd's */
1052/* this is not fork-safe */
1053inline_speed void
1054fd_intern (int fd)
1055{
1056#ifdef _WIN32
1057 unsigned long arg = 1;
1058 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1059#else
1060 fcntl (fd, F_SETFD, FD_CLOEXEC);
1061 fcntl (fd, F_SETFL, O_NONBLOCK);
1062#endif
1043} 1063}
1044 1064
1045/*****************************************************************************/ 1065/*****************************************************************************/
1046 1066
1047/* 1067/*
… …
1201 1221
1202static ANSIG signals [EV_NSIG - 1]; 1222static ANSIG signals [EV_NSIG - 1];
1203 1223
1204/*****************************************************************************/ 1224/*****************************************************************************/
1205 1225
1206/* used to prepare libev internal fd's */ 1226#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1207/* this is not fork-safe */
1208inline_speed void
1209fd_intern (int fd)
1210{
1211#ifdef _WIN32
1212 unsigned long arg = 1;
1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1214#else
1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1217#endif
1218}
1219 1227
1220static void noinline 1228static void noinline
1221evpipe_init (EV_P) 1229evpipe_init (EV_P)
1222{ 1230{
1223 if (!ev_is_active (&pipe_w)) 1231 if (!ev_is_active (&pipe_w))
1224 { 1232 {
1225#if EV_USE_EVENTFD 1233# if EV_USE_EVENTFD
1226 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1234 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1227 if (evfd < 0 && errno == EINVAL) 1235 if (evfd < 0 && errno == EINVAL)
1228 evfd = eventfd (0, 0); 1236 evfd = eventfd (0, 0);
1229 1237
1230 if (evfd >= 0) 1238 if (evfd >= 0)
… …
1232 evpipe [0] = -1; 1240 evpipe [0] = -1;
1233 fd_intern (evfd); /* doing it twice doesn't hurt */ 1241 fd_intern (evfd); /* doing it twice doesn't hurt */
1234 ev_io_set (&pipe_w, evfd, EV_READ); 1242 ev_io_set (&pipe_w, evfd, EV_READ);
1235 } 1243 }
1236 else 1244 else
1237#endif 1245# endif
1238 { 1246 {
1239 while (pipe (evpipe)) 1247 while (pipe (evpipe))
1240 ev_syserr ("(libev) error creating signal/async pipe"); 1248 ev_syserr ("(libev) error creating signal/async pipe");
1241 1249
1242 fd_intern (evpipe [0]); 1250 fd_intern (evpipe [0]);
… …
1253evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1261evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1254{ 1262{
1255 if (!*flag) 1263 if (!*flag)
1256 { 1264 {
1257 int old_errno = errno; /* save errno because write might clobber it */ 1265 int old_errno = errno; /* save errno because write might clobber it */
1266 char dummy;
1258 1267
1259 *flag = 1; 1268 *flag = 1;
1260 1269
1261#if EV_USE_EVENTFD 1270#if EV_USE_EVENTFD
1262 if (evfd >= 0) 1271 if (evfd >= 0)
… …
1264 uint64_t counter = 1; 1273 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t)); 1274 write (evfd, &counter, sizeof (uint64_t));
1266 } 1275 }
1267 else 1276 else
1268#endif 1277#endif
1269 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1270 1279
1271 errno = old_errno; 1280 errno = old_errno;
1272 } 1281 }
1273} 1282}
1274 1283
… …
1375 break; 1384 break;
1376 } 1385 }
1377} 1386}
1378#endif 1387#endif
1379 1388
1389#endif
1390
1380/*****************************************************************************/ 1391/*****************************************************************************/
1381 1392
1393#if EV_CHILD_ENABLE
1382static WL childs [EV_PID_HASHSIZE]; 1394static WL childs [EV_PID_HASHSIZE];
1383
1384#ifndef _WIN32
1385 1395
1386static ev_signal childev; 1396static ev_signal childev;
1387 1397
1388#ifndef WIFCONTINUED 1398#ifndef WIFCONTINUED
1389# define WIFCONTINUED(status) 0 1399# define WIFCONTINUED(status) 0
… …
1394child_reap (EV_P_ int chain, int pid, int status) 1404child_reap (EV_P_ int chain, int pid, int status)
1395{ 1405{
1396 ev_child *w; 1406 ev_child *w;
1397 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1407 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1398 1408
1399 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1409 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1400 { 1410 {
1401 if ((w->pid == pid || !w->pid) 1411 if ((w->pid == pid || !w->pid)
1402 && (!traced || (w->flags & 1))) 1412 && (!traced || (w->flags & 1)))
1403 { 1413 {
1404 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1414 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1429 /* make sure we are called again until all children have been reaped */ 1439 /* make sure we are called again until all children have been reaped */
1430 /* we need to do it this way so that the callback gets called before we continue */ 1440 /* we need to do it this way so that the callback gets called before we continue */
1431 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1441 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1432 1442
1433 child_reap (EV_A_ pid, pid, status); 1443 child_reap (EV_A_ pid, pid, status);
1434 if (EV_PID_HASHSIZE > 1) 1444 if ((EV_PID_HASHSIZE) > 1)
1435 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1445 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1436} 1446}
1437 1447
1438#endif 1448#endif
1439 1449
… …
1506#ifdef __APPLE__ 1516#ifdef __APPLE__
1507 /* only select works correctly on that "unix-certified" platform */ 1517 /* only select works correctly on that "unix-certified" platform */
1508 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1518 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1509 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1519 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1510#endif 1520#endif
1521#ifdef __FreeBSD__
1522 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1523#endif
1511 1524
1512 return flags; 1525 return flags;
1513} 1526}
1514 1527
1515unsigned int 1528unsigned int
… …
1528ev_backend (EV_P) 1541ev_backend (EV_P)
1529{ 1542{
1530 return backend; 1543 return backend;
1531} 1544}
1532 1545
1533#if EV_MINIMAL < 2 1546#if EV_FEATURE_API
1534unsigned int 1547unsigned int
1535ev_loop_count (EV_P) 1548ev_iteration (EV_P)
1536{ 1549{
1537 return loop_count; 1550 return loop_count;
1538} 1551}
1539 1552
1540unsigned int 1553unsigned int
1541ev_loop_depth (EV_P) 1554ev_depth (EV_P)
1542{ 1555{
1543 return loop_depth; 1556 return loop_depth;
1544} 1557}
1545 1558
1546void 1559void
… …
1618 1631
1619 ev_rt_now = ev_time (); 1632 ev_rt_now = ev_time ();
1620 mn_now = get_clock (); 1633 mn_now = get_clock ();
1621 now_floor = mn_now; 1634 now_floor = mn_now;
1622 rtmn_diff = ev_rt_now - mn_now; 1635 rtmn_diff = ev_rt_now - mn_now;
1623#if EV_MINIMAL < 2 1636#if EV_FEATURE_API
1624 invoke_cb = ev_invoke_pending; 1637 invoke_cb = ev_invoke_pending;
1625#endif 1638#endif
1626 1639
1627 io_blocktime = 0.; 1640 io_blocktime = 0.;
1628 timeout_blocktime = 0.; 1641 timeout_blocktime = 0.;
… …
1658 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1671 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1659#endif 1672#endif
1660 1673
1661 ev_prepare_init (&pending_w, pendingcb); 1674 ev_prepare_init (&pending_w, pendingcb);
1662 1675
1676#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1663 ev_init (&pipe_w, pipecb); 1677 ev_init (&pipe_w, pipecb);
1664 ev_set_priority (&pipe_w, EV_MAXPRI); 1678 ev_set_priority (&pipe_w, EV_MAXPRI);
1679#endif
1665 } 1680 }
1666} 1681}
1667 1682
1668/* free up a loop structure */ 1683/* free up a loop structure */
1669static void noinline 1684static void noinline
… …
1787 { 1802 {
1788 EV_WIN32_CLOSE_FD (evpipe [0]); 1803 EV_WIN32_CLOSE_FD (evpipe [0]);
1789 EV_WIN32_CLOSE_FD (evpipe [1]); 1804 EV_WIN32_CLOSE_FD (evpipe [1]);
1790 } 1805 }
1791 1806
1807#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1792 evpipe_init (EV_A); 1808 evpipe_init (EV_A);
1793 /* now iterate over everything, in case we missed something */ 1809 /* now iterate over everything, in case we missed something */
1794 pipecb (EV_A_ &pipe_w, EV_READ); 1810 pipecb (EV_A_ &pipe_w, EV_READ);
1811#endif
1795 } 1812 }
1796 1813
1797 postfork = 0; 1814 postfork = 0;
1798} 1815}
1799 1816
… …
1861 verify_watcher (EV_A_ ws [cnt]); 1878 verify_watcher (EV_A_ ws [cnt]);
1862 } 1879 }
1863} 1880}
1864#endif 1881#endif
1865 1882
1866#if EV_MINIMAL < 2 1883#if EV_FEATURE_API
1867void 1884void
1868ev_loop_verify (EV_P) 1885ev_verify (EV_P)
1869{ 1886{
1870#if EV_VERIFY 1887#if EV_VERIFY
1871 int i; 1888 int i;
1872 WL w; 1889 WL w;
1873 1890
… …
1912#if EV_ASYNC_ENABLE 1929#if EV_ASYNC_ENABLE
1913 assert (asyncmax >= asynccnt); 1930 assert (asyncmax >= asynccnt);
1914 array_verify (EV_A_ (W *)asyncs, asynccnt); 1931 array_verify (EV_A_ (W *)asyncs, asynccnt);
1915#endif 1932#endif
1916 1933
1934#if EV_PREPARE_ENABLE
1917 assert (preparemax >= preparecnt); 1935 assert (preparemax >= preparecnt);
1918 array_verify (EV_A_ (W *)prepares, preparecnt); 1936 array_verify (EV_A_ (W *)prepares, preparecnt);
1937#endif
1919 1938
1939#if EV_CHECK_ENABLE
1920 assert (checkmax >= checkcnt); 1940 assert (checkmax >= checkcnt);
1921 array_verify (EV_A_ (W *)checks, checkcnt); 1941 array_verify (EV_A_ (W *)checks, checkcnt);
1942#endif
1922 1943
1923# if 0 1944# if 0
1945#if EV_CHILD_ENABLE
1924 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1946 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1925 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1947 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1948#endif
1926# endif 1949# endif
1927#endif 1950#endif
1928} 1951}
1929#endif 1952#endif
1930 1953
… …
1946 1969
1947 loop_init (EV_A_ flags); 1970 loop_init (EV_A_ flags);
1948 1971
1949 if (ev_backend (EV_A)) 1972 if (ev_backend (EV_A))
1950 { 1973 {
1951#ifndef _WIN32 1974#if EV_CHILD_ENABLE
1952 ev_signal_init (&childev, childcb, SIGCHLD); 1975 ev_signal_init (&childev, childcb, SIGCHLD);
1953 ev_set_priority (&childev, EV_MAXPRI); 1976 ev_set_priority (&childev, EV_MAXPRI);
1954 ev_signal_start (EV_A_ &childev); 1977 ev_signal_start (EV_A_ &childev);
1955 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1978 ev_unref (EV_A); /* child watcher should not keep loop alive */
1956#endif 1979#endif
… …
1969 EV_P = ev_default_loop_ptr; 1992 EV_P = ev_default_loop_ptr;
1970#endif 1993#endif
1971 1994
1972 ev_default_loop_ptr = 0; 1995 ev_default_loop_ptr = 0;
1973 1996
1974#ifndef _WIN32 1997#if EV_CHILD_ENABLE
1975 ev_ref (EV_A); /* child watcher */ 1998 ev_ref (EV_A); /* child watcher */
1976 ev_signal_stop (EV_A_ &childev); 1999 ev_signal_stop (EV_A_ &childev);
1977#endif 2000#endif
1978 2001
1979 loop_destroy (EV_A); 2002 loop_destroy (EV_A);
… …
2085 EV_FREQUENT_CHECK; 2108 EV_FREQUENT_CHECK;
2086 feed_reverse (EV_A_ (W)w); 2109 feed_reverse (EV_A_ (W)w);
2087 } 2110 }
2088 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2111 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2089 2112
2090 feed_reverse_done (EV_A_ EV_TIMEOUT); 2113 feed_reverse_done (EV_A_ EV_TIMER);
2091 } 2114 }
2092} 2115}
2093 2116
2094#if EV_PERIODIC_ENABLE 2117#if EV_PERIODIC_ENABLE
2095/* make periodics pending */ 2118/* make periodics pending */
… …
2256} 2279}
2257 2280
2258void 2281void
2259ev_loop (EV_P_ int flags) 2282ev_loop (EV_P_ int flags)
2260{ 2283{
2261#if EV_MINIMAL < 2 2284#if EV_FEATURE_API
2262 ++loop_depth; 2285 ++loop_depth;
2263#endif 2286#endif
2264 2287
2265 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2266 2289
… …
2269 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2270 2293
2271 do 2294 do
2272 { 2295 {
2273#if EV_VERIFY >= 2 2296#if EV_VERIFY >= 2
2274 ev_loop_verify (EV_A); 2297 ev_verify (EV_A);
2275#endif 2298#endif
2276 2299
2277#ifndef _WIN32 2300#ifndef _WIN32
2278 if (expect_false (curpid)) /* penalise the forking check even more */ 2301 if (expect_false (curpid)) /* penalise the forking check even more */
2279 if (expect_false (getpid () != curpid)) 2302 if (expect_false (getpid () != curpid))
… …
2291 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2314 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2292 EV_INVOKE_PENDING; 2315 EV_INVOKE_PENDING;
2293 } 2316 }
2294#endif 2317#endif
2295 2318
2319#if EV_PREPARE_ENABLE
2296 /* queue prepare watchers (and execute them) */ 2320 /* queue prepare watchers (and execute them) */
2297 if (expect_false (preparecnt)) 2321 if (expect_false (preparecnt))
2298 { 2322 {
2299 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2323 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2300 EV_INVOKE_PENDING; 2324 EV_INVOKE_PENDING;
2301 } 2325 }
2326#endif
2302 2327
2303 if (expect_false (loop_done)) 2328 if (expect_false (loop_done))
2304 break; 2329 break;
2305 2330
2306 /* we might have forked, so reify kernel state if necessary */ 2331 /* we might have forked, so reify kernel state if necessary */
… …
2357 waittime -= sleeptime; 2382 waittime -= sleeptime;
2358 } 2383 }
2359 } 2384 }
2360 } 2385 }
2361 2386
2362#if EV_MINIMAL < 2 2387#if EV_FEATURE_API
2363 ++loop_count; 2388 ++loop_count;
2364#endif 2389#endif
2365 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2366 backend_poll (EV_A_ waittime); 2391 backend_poll (EV_A_ waittime);
2367 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2379#if EV_IDLE_ENABLE 2404#if EV_IDLE_ENABLE
2380 /* queue idle watchers unless other events are pending */ 2405 /* queue idle watchers unless other events are pending */
2381 idle_reify (EV_A); 2406 idle_reify (EV_A);
2382#endif 2407#endif
2383 2408
2409#if EV_CHECK_ENABLE
2384 /* queue check watchers, to be executed first */ 2410 /* queue check watchers, to be executed first */
2385 if (expect_false (checkcnt)) 2411 if (expect_false (checkcnt))
2386 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2412 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2413#endif
2387 2414
2388 EV_INVOKE_PENDING; 2415 EV_INVOKE_PENDING;
2389 } 2416 }
2390 while (expect_true ( 2417 while (expect_true (
2391 activecnt 2418 activecnt
… …
2394 )); 2421 ));
2395 2422
2396 if (loop_done == EVUNLOOP_ONE) 2423 if (loop_done == EVUNLOOP_ONE)
2397 loop_done = EVUNLOOP_CANCEL; 2424 loop_done = EVUNLOOP_CANCEL;
2398 2425
2399#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2400 --loop_depth; 2427 --loop_depth;
2401#endif 2428#endif
2402} 2429}
2403 2430
2404void 2431void
… …
2721 2748
2722#ifndef SA_RESTART 2749#ifndef SA_RESTART
2723# define SA_RESTART 0 2750# define SA_RESTART 0
2724#endif 2751#endif
2725 2752
2753#if EV_SIGNAL_ENABLE
2754
2726void noinline 2755void noinline
2727ev_signal_start (EV_P_ ev_signal *w) 2756ev_signal_start (EV_P_ ev_signal *w)
2728{ 2757{
2729 if (expect_false (ev_is_active (w))) 2758 if (expect_false (ev_is_active (w)))
2730 return; 2759 return;
… …
2836 } 2865 }
2837 2866
2838 EV_FREQUENT_CHECK; 2867 EV_FREQUENT_CHECK;
2839} 2868}
2840 2869
2870#endif
2871
2872#if EV_CHILD_ENABLE
2873
2841void 2874void
2842ev_child_start (EV_P_ ev_child *w) 2875ev_child_start (EV_P_ ev_child *w)
2843{ 2876{
2844#if EV_MULTIPLICITY 2877#if EV_MULTIPLICITY
2845 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2878 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2848 return; 2881 return;
2849 2882
2850 EV_FREQUENT_CHECK; 2883 EV_FREQUENT_CHECK;
2851 2884
2852 ev_start (EV_A_ (W)w, 1); 2885 ev_start (EV_A_ (W)w, 1);
2853 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2886 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2854 2887
2855 EV_FREQUENT_CHECK; 2888 EV_FREQUENT_CHECK;
2856} 2889}
2857 2890
2858void 2891void
… …
2862 if (expect_false (!ev_is_active (w))) 2895 if (expect_false (!ev_is_active (w)))
2863 return; 2896 return;
2864 2897
2865 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2866 2899
2867 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2868 ev_stop (EV_A_ (W)w); 2901 ev_stop (EV_A_ (W)w);
2869 2902
2870 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2871} 2904}
2905
2906#endif
2872 2907
2873#if EV_STAT_ENABLE 2908#if EV_STAT_ENABLE
2874 2909
2875# ifdef _WIN32 2910# ifdef _WIN32
2876# undef lstat 2911# undef lstat
… …
2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2978 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2944 } 2979 }
2945 } 2980 }
2946 2981
2947 if (w->wd >= 0) 2982 if (w->wd >= 0)
2948 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2983 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2949 2984
2950 /* now re-arm timer, if required */ 2985 /* now re-arm timer, if required */
2951 if (ev_is_active (&w->timer)) ev_ref (EV_A); 2986 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2952 ev_timer_again (EV_A_ &w->timer); 2987 ev_timer_again (EV_A_ &w->timer);
2953 if (ev_is_active (&w->timer)) ev_unref (EV_A); 2988 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2961 2996
2962 if (wd < 0) 2997 if (wd < 0)
2963 return; 2998 return;
2964 2999
2965 w->wd = -2; 3000 w->wd = -2;
2966 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3001 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2967 wlist_del (&fs_hash [slot].head, (WL)w); 3002 wlist_del (&fs_hash [slot].head, (WL)w);
2968 3003
2969 /* remove this watcher, if others are watching it, they will rearm */ 3004 /* remove this watcher, if others are watching it, they will rearm */
2970 inotify_rm_watch (fs_fd, wd); 3005 inotify_rm_watch (fs_fd, wd);
2971} 3006}
… …
2973static void noinline 3008static void noinline
2974infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3009infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2975{ 3010{
2976 if (slot < 0) 3011 if (slot < 0)
2977 /* overflow, need to check for all hash slots */ 3012 /* overflow, need to check for all hash slots */
2978 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3013 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2979 infy_wd (EV_A_ slot, wd, ev); 3014 infy_wd (EV_A_ slot, wd, ev);
2980 else 3015 else
2981 { 3016 {
2982 WL w_; 3017 WL w_;
2983 3018
2984 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3019 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2985 { 3020 {
2986 ev_stat *w = (ev_stat *)w_; 3021 ev_stat *w = (ev_stat *)w_;
2987 w_ = w_->next; /* lets us remove this watcher and all before it */ 3022 w_ = w_->next; /* lets us remove this watcher and all before it */
2988 3023
2989 if (w->wd == wd || wd == -1) 3024 if (w->wd == wd || wd == -1)
2990 { 3025 {
2991 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3026 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2992 { 3027 {
2993 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3028 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2994 w->wd = -1; 3029 w->wd = -1;
2995 infy_add (EV_A_ w); /* re-add, no matter what */ 3030 infy_add (EV_A_ w); /* re-add, no matter what */
2996 } 3031 }
2997 3032
2998 stat_timer_cb (EV_A_ &w->timer, 0); 3033 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3112 ev_io_set (&fs_w, fs_fd, EV_READ); 3147 ev_io_set (&fs_w, fs_fd, EV_READ);
3113 ev_io_start (EV_A_ &fs_w); 3148 ev_io_start (EV_A_ &fs_w);
3114 ev_unref (EV_A); 3149 ev_unref (EV_A);
3115 } 3150 }
3116 3151
3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3152 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3118 { 3153 {
3119 WL w_ = fs_hash [slot].head; 3154 WL w_ = fs_hash [slot].head;
3120 fs_hash [slot].head = 0; 3155 fs_hash [slot].head = 0;
3121 3156
3122 while (w_) 3157 while (w_)
… …
3297 3332
3298 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
3299} 3334}
3300#endif 3335#endif
3301 3336
3337#if EV_PREPARE_ENABLE
3302void 3338void
3303ev_prepare_start (EV_P_ ev_prepare *w) 3339ev_prepare_start (EV_P_ ev_prepare *w)
3304{ 3340{
3305 if (expect_false (ev_is_active (w))) 3341 if (expect_false (ev_is_active (w)))
3306 return; 3342 return;
… …
3332 3368
3333 ev_stop (EV_A_ (W)w); 3369 ev_stop (EV_A_ (W)w);
3334 3370
3335 EV_FREQUENT_CHECK; 3371 EV_FREQUENT_CHECK;
3336} 3372}
3373#endif
3337 3374
3375#if EV_CHECK_ENABLE
3338void 3376void
3339ev_check_start (EV_P_ ev_check *w) 3377ev_check_start (EV_P_ ev_check *w)
3340{ 3378{
3341 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
3342 return; 3380 return;
… …
3368 3406
3369 ev_stop (EV_A_ (W)w); 3407 ev_stop (EV_A_ (W)w);
3370 3408
3371 EV_FREQUENT_CHECK; 3409 EV_FREQUENT_CHECK;
3372} 3410}
3411#endif
3373 3412
3374#if EV_EMBED_ENABLE 3413#if EV_EMBED_ENABLE
3375void noinline 3414void noinline
3376ev_embed_sweep (EV_P_ ev_embed *w) 3415ev_embed_sweep (EV_P_ ev_embed *w)
3377{ 3416{
… …
3609{ 3648{
3610 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3649 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3611 3650
3612 if (expect_false (!once)) 3651 if (expect_false (!once))
3613 { 3652 {
3614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3653 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3615 return; 3654 return;
3616 } 3655 }
3617 3656
3618 once->cb = cb; 3657 once->cb = cb;
3619 once->arg = arg; 3658 once->arg = arg;
… …
3706 if (types & EV_ASYNC) 3745 if (types & EV_ASYNC)
3707 for (i = asynccnt; i--; ) 3746 for (i = asynccnt; i--; )
3708 cb (EV_A_ EV_ASYNC, asyncs [i]); 3747 cb (EV_A_ EV_ASYNC, asyncs [i]);
3709#endif 3748#endif
3710 3749
3750#if EV_PREPARE_ENABLE
3711 if (types & EV_PREPARE) 3751 if (types & EV_PREPARE)
3712 for (i = preparecnt; i--; ) 3752 for (i = preparecnt; i--; )
3713#if EV_EMBED_ENABLE 3753# if EV_EMBED_ENABLE
3714 if (ev_cb (prepares [i]) != embed_prepare_cb) 3754 if (ev_cb (prepares [i]) != embed_prepare_cb)
3715#endif 3755# endif
3716 cb (EV_A_ EV_PREPARE, prepares [i]); 3756 cb (EV_A_ EV_PREPARE, prepares [i]);
3757#endif
3717 3758
3759#if EV_CHECK_ENABLE
3718 if (types & EV_CHECK) 3760 if (types & EV_CHECK)
3719 for (i = checkcnt; i--; ) 3761 for (i = checkcnt; i--; )
3720 cb (EV_A_ EV_CHECK, checks [i]); 3762 cb (EV_A_ EV_CHECK, checks [i]);
3763#endif
3721 3764
3765#if EV_SIGNAL_ENABLE
3722 if (types & EV_SIGNAL) 3766 if (types & EV_SIGNAL)
3723 for (i = 0; i < EV_NSIG - 1; ++i) 3767 for (i = 0; i < EV_NSIG - 1; ++i)
3724 for (wl = signals [i].head; wl; ) 3768 for (wl = signals [i].head; wl; )
3725 { 3769 {
3726 wn = wl->next; 3770 wn = wl->next;
3727 cb (EV_A_ EV_SIGNAL, wl); 3771 cb (EV_A_ EV_SIGNAL, wl);
3728 wl = wn; 3772 wl = wn;
3729 } 3773 }
3774#endif
3730 3775
3776#if EV_CHILD_ENABLE
3731 if (types & EV_CHILD) 3777 if (types & EV_CHILD)
3732 for (i = EV_PID_HASHSIZE; i--; ) 3778 for (i = (EV_PID_HASHSIZE); i--; )
3733 for (wl = childs [i]; wl; ) 3779 for (wl = childs [i]; wl; )
3734 { 3780 {
3735 wn = wl->next; 3781 wn = wl->next;
3736 cb (EV_A_ EV_CHILD, wl); 3782 cb (EV_A_ EV_CHILD, wl);
3737 wl = wn; 3783 wl = wn;
3738 } 3784 }
3785#endif
3739/* EV_STAT 0x00001000 /* stat data changed */ 3786/* EV_STAT 0x00001000 /* stat data changed */
3740/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3787/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3741} 3788}
3742#endif 3789#endif
3743 3790

Diff Legend

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