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

Comparing libev/ev.c (file contents):
Revision 1.324 by root, Sat Jan 23 20:15:57 2010 UTC vs.
Revision 1.338 by root, Tue Mar 16 00:20:17 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 *
… …
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
… …
183# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
184# include <windows.h> 185# include <windows.h>
185# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
186# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
187# endif 188# endif
189# undef EV_AVOID_STDIO
188#endif 190#endif
189 191
190/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
191 193
192/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
… …
205#elif defined (MAXSIG) 207#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 215#else
214# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
216# define EV_NSIG 65 219# define EV_NSIG 65
217#endif 220#endif
218 221
219#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 225# else
223# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
224# endif 227# endif
225#endif 228#endif
226 229
227#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 233# else
231# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
232# endif 235# endif
233#endif 236#endif
234 237
… …
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 240#endif
238 241
239#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 245# else
243# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
244# endif 247# endif
245#endif 248#endif
246 249
247#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 252#endif
250 253
251#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
252# ifdef _WIN32 255# ifdef _WIN32
253# define EV_USE_POLL 0 256# define EV_USE_POLL 0
254# else 257# else
255# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 259# endif
257#endif 260#endif
258 261
259#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 265# else
263# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
264# endif 267# endif
265#endif 268#endif
266 269
… …
272# define EV_USE_PORT 0 275# define EV_USE_PORT 0
273#endif 276#endif
274 277
275#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 281# else
279# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
280# endif 283# endif
281#endif 284#endif
282 285
283#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 288#endif
290 289
291#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 292#endif
298 293
299#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 297# else
303# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
304# endif 299# endif
305#endif 300#endif
306 301
307#ifndef EV_USE_SIGNALFD 302#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 304# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 305# else
311# define EV_USE_SIGNALFD 0 306# define EV_USE_SIGNALFD 0
312# endif 307# endif
313#endif 308#endif
314 309
… …
317# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
319#endif 314#endif
320 315
321#ifndef EV_VERIFY 316#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 318#endif
324 319
325#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 322#endif
328 323
329#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 326#endif
332 327
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 328/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
… …
344# endif 339# endif
345#endif 340#endif
346 341
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 342/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 343
344#ifdef _AIX
345/* AIX has a completely broken poll.h header */
346# undef EV_USE_POLL
347# define EV_USE_POLL 0
348#endif
349
349#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
352#endif 353#endif
353 354
… …
396# endif 397# endif
397# endif 398# endif
398# ifdef __cplusplus 399# ifdef __cplusplus
399extern "C" { 400extern "C" {
400# endif 401# endif
401int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
402# ifdef __cplusplus 403# ifdef __cplusplus
403} 404}
404# endif 405# endif
405#endif 406#endif
406 407
… …
467 468
468#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
469#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
470#define inline_size static inline 471#define inline_size static inline
471 472
472#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
473# define inline_speed static noinline 476# define inline_speed static noinline
474#else
475# define inline_speed static inline
476#endif 477#endif
477 478
478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479 480
480#if EV_MINPRI == EV_MAXPRI 481#if EV_MINPRI == EV_MAXPRI
… …
517# include "ev_win32.c" 518# include "ev_win32.c"
518#endif 519#endif
519 520
520/*****************************************************************************/ 521/*****************************************************************************/
521 522
523#if EV_AVOID_STDIO
524static void noinline
525ev_printerr (const char *msg)
526{
527 write (STDERR_FILENO, msg, strlen (msg));
528}
529#endif
530
522static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
523 532
524void 533void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
526{ 535{
… …
535 544
536 if (syserr_cb) 545 if (syserr_cb)
537 syserr_cb (msg); 546 syserr_cb (msg);
538 else 547 else
539 { 548 {
549#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg);
553 ev_printerr (": ");
554 ev_printerr (err);
555 ev_printerr ("\n");
556#else
540 perror (msg); 557 perror (msg);
558#endif
541 abort (); 559 abort ();
542 } 560 }
543} 561}
544 562
545static void * 563static void *
546ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
547{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
548 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
549 * implement realloc (x, 0) (as required by both ansi c-98 and 570 * implement realloc (x, 0) (as required by both ansi c-89 and
550 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
551 */ 572 */
552 573
553 if (size) 574 if (size)
554 return realloc (ptr, size); 575 return realloc (ptr, size);
555 576
556 free (ptr); 577 free (ptr);
557 return 0; 578 return 0;
579#endif
558} 580}
559 581
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 583
562void 584void
… …
570{ 592{
571 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
572 594
573 if (!ptr && size) 595 if (!ptr && size)
574 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
576 abort (); 602 abort ();
577 } 603 }
578 604
579 return ptr; 605 return ptr;
580} 606}
… …
662 688
663 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
664 690
665#endif 691#endif
666 692
667#if EV_MINIMAL < 2 693#if EV_FEATURE_API
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 694# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 695# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A) 696# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else 697#else
672# define EV_RELEASE_CB (void)0 698# define EV_RELEASE_CB (void)0
… …
857} 883}
858 884
859/*****************************************************************************/ 885/*****************************************************************************/
860 886
861inline_speed void 887inline_speed void
862fd_event_nc (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
863{ 889{
864 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
865 ev_io *w; 891 ev_io *w;
866 892
867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 893 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
879fd_event (EV_P_ int fd, int revents) 905fd_event (EV_P_ int fd, int revents)
880{ 906{
881 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
882 908
883 if (expect_true (!anfd->reify)) 909 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents); 910 fd_event_nocheck (EV_A_ fd, revents);
885} 911}
886 912
887void 913void
888ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
889{ 915{
890 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
891 fd_event_nc (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
892} 918}
893 919
894/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
896inline_size void 922inline_size void
… …
959 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 986 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
961 } 987 }
962} 988}
963 989
964/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
965inline_size int 991inline_size int
966fd_valid (int fd) 992fd_valid (int fd)
967{ 993{
968#ifdef _WIN32 994#ifdef _WIN32
969 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1009 { 1035 {
1010 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
1011 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1013 } 1039 }
1040}
1041
1042/* used to prepare libev internal fd's */
1043/* this is not fork-safe */
1044inline_speed void
1045fd_intern (int fd)
1046{
1047#ifdef _WIN32
1048 unsigned long arg = 1;
1049 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1050#else
1051 fcntl (fd, F_SETFD, FD_CLOEXEC);
1052 fcntl (fd, F_SETFL, O_NONBLOCK);
1053#endif
1014} 1054}
1015 1055
1016/*****************************************************************************/ 1056/*****************************************************************************/
1017 1057
1018/* 1058/*
… …
1172 1212
1173static ANSIG signals [EV_NSIG - 1]; 1213static ANSIG signals [EV_NSIG - 1];
1174 1214
1175/*****************************************************************************/ 1215/*****************************************************************************/
1176 1216
1177/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1178/* this is not fork-safe */
1179inline_speed void
1180fd_intern (int fd)
1181{
1182#ifdef _WIN32
1183 unsigned long arg = 1;
1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif
1189}
1190 1218
1191static void noinline 1219static void noinline
1192evpipe_init (EV_P) 1220evpipe_init (EV_P)
1193{ 1221{
1194 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1195 { 1223 {
1196#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL) 1226 if (evfd < 0 && errno == EINVAL)
1199 evfd = eventfd (0, 0); 1227 evfd = eventfd (0, 0);
1200 1228
1201 if (evfd >= 0) 1229 if (evfd >= 0)
… …
1203 evpipe [0] = -1; 1231 evpipe [0] = -1;
1204 fd_intern (evfd); /* doing it twice doesn't hurt */ 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1205 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1206 } 1234 }
1207 else 1235 else
1208#endif 1236# endif
1209 { 1237 {
1210 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1211 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1212 1240
1213 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
… …
1224evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1225{ 1253{
1226 if (!*flag) 1254 if (!*flag)
1227 { 1255 {
1228 int old_errno = errno; /* save errno because write might clobber it */ 1256 int old_errno = errno; /* save errno because write might clobber it */
1257 char dummy;
1229 1258
1230 *flag = 1; 1259 *flag = 1;
1231 1260
1232#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1233 if (evfd >= 0) 1262 if (evfd >= 0)
… …
1235 uint64_t counter = 1; 1264 uint64_t counter = 1;
1236 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1237 } 1266 }
1238 else 1267 else
1239#endif 1268#endif
1240 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1241 1270
1242 errno = old_errno; 1271 errno = old_errno;
1243 } 1272 }
1244} 1273}
1245 1274
… …
1346 break; 1375 break;
1347 } 1376 }
1348} 1377}
1349#endif 1378#endif
1350 1379
1380#endif
1381
1351/*****************************************************************************/ 1382/*****************************************************************************/
1352 1383
1384#if EV_CHILD_ENABLE
1353static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1354
1355#ifndef _WIN32
1356 1386
1357static ev_signal childev; 1387static ev_signal childev;
1358 1388
1359#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1360# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
… …
1365child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1366{ 1396{
1367 ev_child *w; 1397 ev_child *w;
1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1369 1399
1370 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1400 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1371 { 1401 {
1372 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1373 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1374 { 1404 {
1375 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1405 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1400 /* make sure we are called again until all children have been reaped */ 1430 /* make sure we are called again until all children have been reaped */
1401 /* we need to do it this way so that the callback gets called before we continue */ 1431 /* we need to do it this way so that the callback gets called before we continue */
1402 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1403 1433
1404 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1405 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1406 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1436 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1407} 1437}
1408 1438
1409#endif 1439#endif
1410 1440
… …
1499ev_backend (EV_P) 1529ev_backend (EV_P)
1500{ 1530{
1501 return backend; 1531 return backend;
1502} 1532}
1503 1533
1504#if EV_MINIMAL < 2 1534#if EV_FEATURE_API
1505unsigned int 1535unsigned int
1506ev_loop_count (EV_P) 1536ev_loop_count (EV_P)
1507{ 1537{
1508 return loop_count; 1538 return loop_count;
1509} 1539}
… …
1589 1619
1590 ev_rt_now = ev_time (); 1620 ev_rt_now = ev_time ();
1591 mn_now = get_clock (); 1621 mn_now = get_clock ();
1592 now_floor = mn_now; 1622 now_floor = mn_now;
1593 rtmn_diff = ev_rt_now - mn_now; 1623 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2 1624#if EV_FEATURE_API
1595 invoke_cb = ev_invoke_pending; 1625 invoke_cb = ev_invoke_pending;
1596#endif 1626#endif
1597 1627
1598 io_blocktime = 0.; 1628 io_blocktime = 0.;
1599 timeout_blocktime = 0.; 1629 timeout_blocktime = 0.;
… …
1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1659 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1630#endif 1660#endif
1631 1661
1632 ev_prepare_init (&pending_w, pendingcb); 1662 ev_prepare_init (&pending_w, pendingcb);
1633 1663
1664#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1634 ev_init (&pipe_w, pipecb); 1665 ev_init (&pipe_w, pipecb);
1635 ev_set_priority (&pipe_w, EV_MAXPRI); 1666 ev_set_priority (&pipe_w, EV_MAXPRI);
1667#endif
1636 } 1668 }
1637} 1669}
1638 1670
1639/* free up a loop structure */ 1671/* free up a loop structure */
1640static void noinline 1672static void noinline
… …
1758 { 1790 {
1759 EV_WIN32_CLOSE_FD (evpipe [0]); 1791 EV_WIN32_CLOSE_FD (evpipe [0]);
1760 EV_WIN32_CLOSE_FD (evpipe [1]); 1792 EV_WIN32_CLOSE_FD (evpipe [1]);
1761 } 1793 }
1762 1794
1795#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1763 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1764 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1765 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1799#endif
1766 } 1800 }
1767 1801
1768 postfork = 0; 1802 postfork = 0;
1769} 1803}
1770 1804
… …
1832 verify_watcher (EV_A_ ws [cnt]); 1866 verify_watcher (EV_A_ ws [cnt]);
1833 } 1867 }
1834} 1868}
1835#endif 1869#endif
1836 1870
1837#if EV_MINIMAL < 2 1871#if EV_FEATURE_API
1838void 1872void
1839ev_loop_verify (EV_P) 1873ev_loop_verify (EV_P)
1840{ 1874{
1841#if EV_VERIFY 1875#if EV_VERIFY
1842 int i; 1876 int i;
… …
1883#if EV_ASYNC_ENABLE 1917#if EV_ASYNC_ENABLE
1884 assert (asyncmax >= asynccnt); 1918 assert (asyncmax >= asynccnt);
1885 array_verify (EV_A_ (W *)asyncs, asynccnt); 1919 array_verify (EV_A_ (W *)asyncs, asynccnt);
1886#endif 1920#endif
1887 1921
1922#if EV_PREPARE_ENABLE
1888 assert (preparemax >= preparecnt); 1923 assert (preparemax >= preparecnt);
1889 array_verify (EV_A_ (W *)prepares, preparecnt); 1924 array_verify (EV_A_ (W *)prepares, preparecnt);
1925#endif
1890 1926
1927#if EV_CHECK_ENABLE
1891 assert (checkmax >= checkcnt); 1928 assert (checkmax >= checkcnt);
1892 array_verify (EV_A_ (W *)checks, checkcnt); 1929 array_verify (EV_A_ (W *)checks, checkcnt);
1930#endif
1893 1931
1894# if 0 1932# if 0
1933#if EV_CHILD_ENABLE
1895 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1934 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1935 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1936#endif
1897# endif 1937# endif
1898#endif 1938#endif
1899} 1939}
1900#endif 1940#endif
1901 1941
… …
1917 1957
1918 loop_init (EV_A_ flags); 1958 loop_init (EV_A_ flags);
1919 1959
1920 if (ev_backend (EV_A)) 1960 if (ev_backend (EV_A))
1921 { 1961 {
1922#ifndef _WIN32 1962#if EV_CHILD_ENABLE
1923 ev_signal_init (&childev, childcb, SIGCHLD); 1963 ev_signal_init (&childev, childcb, SIGCHLD);
1924 ev_set_priority (&childev, EV_MAXPRI); 1964 ev_set_priority (&childev, EV_MAXPRI);
1925 ev_signal_start (EV_A_ &childev); 1965 ev_signal_start (EV_A_ &childev);
1926 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1966 ev_unref (EV_A); /* child watcher should not keep loop alive */
1927#endif 1967#endif
… …
1940 EV_P = ev_default_loop_ptr; 1980 EV_P = ev_default_loop_ptr;
1941#endif 1981#endif
1942 1982
1943 ev_default_loop_ptr = 0; 1983 ev_default_loop_ptr = 0;
1944 1984
1945#ifndef _WIN32 1985#if EV_CHILD_ENABLE
1946 ev_ref (EV_A); /* child watcher */ 1986 ev_ref (EV_A); /* child watcher */
1947 ev_signal_stop (EV_A_ &childev); 1987 ev_signal_stop (EV_A_ &childev);
1948#endif 1988#endif
1949 1989
1950 loop_destroy (EV_A); 1990 loop_destroy (EV_A);
… …
2227} 2267}
2228 2268
2229void 2269void
2230ev_loop (EV_P_ int flags) 2270ev_loop (EV_P_ int flags)
2231{ 2271{
2232#if EV_MINIMAL < 2 2272#if EV_FEATURE_API
2233 ++loop_depth; 2273 ++loop_depth;
2234#endif 2274#endif
2235 2275
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2237 2277
… …
2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2302 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2263 EV_INVOKE_PENDING; 2303 EV_INVOKE_PENDING;
2264 } 2304 }
2265#endif 2305#endif
2266 2306
2307#if EV_PREPARE_ENABLE
2267 /* queue prepare watchers (and execute them) */ 2308 /* queue prepare watchers (and execute them) */
2268 if (expect_false (preparecnt)) 2309 if (expect_false (preparecnt))
2269 { 2310 {
2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2311 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2271 EV_INVOKE_PENDING; 2312 EV_INVOKE_PENDING;
2272 } 2313 }
2314#endif
2273 2315
2274 if (expect_false (loop_done)) 2316 if (expect_false (loop_done))
2275 break; 2317 break;
2276 2318
2277 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
… …
2328 waittime -= sleeptime; 2370 waittime -= sleeptime;
2329 } 2371 }
2330 } 2372 }
2331 } 2373 }
2332 2374
2333#if EV_MINIMAL < 2 2375#if EV_FEATURE_API
2334 ++loop_count; 2376 ++loop_count;
2335#endif 2377#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2337 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2350#if EV_IDLE_ENABLE 2392#if EV_IDLE_ENABLE
2351 /* queue idle watchers unless other events are pending */ 2393 /* queue idle watchers unless other events are pending */
2352 idle_reify (EV_A); 2394 idle_reify (EV_A);
2353#endif 2395#endif
2354 2396
2397#if EV_CHECK_ENABLE
2355 /* queue check watchers, to be executed first */ 2398 /* queue check watchers, to be executed first */
2356 if (expect_false (checkcnt)) 2399 if (expect_false (checkcnt))
2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2400 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2401#endif
2358 2402
2359 EV_INVOKE_PENDING; 2403 EV_INVOKE_PENDING;
2360 } 2404 }
2361 while (expect_true ( 2405 while (expect_true (
2362 activecnt 2406 activecnt
… …
2365 )); 2409 ));
2366 2410
2367 if (loop_done == EVUNLOOP_ONE) 2411 if (loop_done == EVUNLOOP_ONE)
2368 loop_done = EVUNLOOP_CANCEL; 2412 loop_done = EVUNLOOP_CANCEL;
2369 2413
2370#if EV_MINIMAL < 2 2414#if EV_FEATURE_API
2371 --loop_depth; 2415 --loop_depth;
2372#endif 2416#endif
2373} 2417}
2374 2418
2375void 2419void
… …
2501 2545
2502 if (expect_false (ev_is_active (w))) 2546 if (expect_false (ev_is_active (w)))
2503 return; 2547 return;
2504 2548
2505 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2549 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2506 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2550 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2507 2551
2508 EV_FREQUENT_CHECK; 2552 EV_FREQUENT_CHECK;
2509 2553
2510 ev_start (EV_A_ (W)w, 1); 2554 ev_start (EV_A_ (W)w, 1);
2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2555 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2581 timers [active] = timers [timercnt + HEAP0]; 2625 timers [active] = timers [timercnt + HEAP0];
2582 adjustheap (timers, timercnt, active); 2626 adjustheap (timers, timercnt, active);
2583 } 2627 }
2584 } 2628 }
2585 2629
2586 EV_FREQUENT_CHECK;
2587
2588 ev_at (w) -= mn_now; 2630 ev_at (w) -= mn_now;
2589 2631
2590 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633
2634 EV_FREQUENT_CHECK;
2591} 2635}
2592 2636
2593void noinline 2637void noinline
2594ev_timer_again (EV_P_ ev_timer *w) 2638ev_timer_again (EV_P_ ev_timer *w)
2595{ 2639{
… …
2674 periodics [active] = periodics [periodiccnt + HEAP0]; 2718 periodics [active] = periodics [periodiccnt + HEAP0];
2675 adjustheap (periodics, periodiccnt, active); 2719 adjustheap (periodics, periodiccnt, active);
2676 } 2720 }
2677 } 2721 }
2678 2722
2679 EV_FREQUENT_CHECK;
2680
2681 ev_stop (EV_A_ (W)w); 2723 ev_stop (EV_A_ (W)w);
2724
2725 EV_FREQUENT_CHECK;
2682} 2726}
2683 2727
2684void noinline 2728void noinline
2685ev_periodic_again (EV_P_ ev_periodic *w) 2729ev_periodic_again (EV_P_ ev_periodic *w)
2686{ 2730{
… …
2691#endif 2735#endif
2692 2736
2693#ifndef SA_RESTART 2737#ifndef SA_RESTART
2694# define SA_RESTART 0 2738# define SA_RESTART 0
2695#endif 2739#endif
2740
2741#if EV_SIGNAL_ENABLE
2696 2742
2697void noinline 2743void noinline
2698ev_signal_start (EV_P_ ev_signal *w) 2744ev_signal_start (EV_P_ ev_signal *w)
2699{ 2745{
2700 if (expect_false (ev_is_active (w))) 2746 if (expect_false (ev_is_active (w)))
… …
2807 } 2853 }
2808 2854
2809 EV_FREQUENT_CHECK; 2855 EV_FREQUENT_CHECK;
2810} 2856}
2811 2857
2858#endif
2859
2860#if EV_CHILD_ENABLE
2861
2812void 2862void
2813ev_child_start (EV_P_ ev_child *w) 2863ev_child_start (EV_P_ ev_child *w)
2814{ 2864{
2815#if EV_MULTIPLICITY 2865#if EV_MULTIPLICITY
2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2866 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2819 return; 2869 return;
2820 2870
2821 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2822 2872
2823 ev_start (EV_A_ (W)w, 1); 2873 ev_start (EV_A_ (W)w, 1);
2824 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2874 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2825 2875
2826 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2827} 2877}
2828 2878
2829void 2879void
… …
2833 if (expect_false (!ev_is_active (w))) 2883 if (expect_false (!ev_is_active (w)))
2834 return; 2884 return;
2835 2885
2836 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2837 2887
2838 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2888 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2839 ev_stop (EV_A_ (W)w); 2889 ev_stop (EV_A_ (W)w);
2840 2890
2841 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2842} 2892}
2893
2894#endif
2843 2895
2844#if EV_STAT_ENABLE 2896#if EV_STAT_ENABLE
2845 2897
2846# ifdef _WIN32 2898# ifdef _WIN32
2847# undef lstat 2899# undef lstat
… …
2853#define MIN_STAT_INTERVAL 0.1074891 2905#define MIN_STAT_INTERVAL 0.1074891
2854 2906
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2907static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 2908
2857#if EV_USE_INOTIFY 2909#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 2910
2911/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2912# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 2913
2860static void noinline 2914static void noinline
2861infy_add (EV_P_ ev_stat *w) 2915infy_add (EV_P_ ev_stat *w)
2862{ 2916{
2863 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); 2917 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);
… …
2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2966 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2913 } 2967 }
2914 } 2968 }
2915 2969
2916 if (w->wd >= 0) 2970 if (w->wd >= 0)
2917 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2971 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2918 2972
2919 /* now re-arm timer, if required */ 2973 /* now re-arm timer, if required */
2920 if (ev_is_active (&w->timer)) ev_ref (EV_A); 2974 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2921 ev_timer_again (EV_A_ &w->timer); 2975 ev_timer_again (EV_A_ &w->timer);
2922 if (ev_is_active (&w->timer)) ev_unref (EV_A); 2976 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2930 2984
2931 if (wd < 0) 2985 if (wd < 0)
2932 return; 2986 return;
2933 2987
2934 w->wd = -2; 2988 w->wd = -2;
2935 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2989 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2936 wlist_del (&fs_hash [slot].head, (WL)w); 2990 wlist_del (&fs_hash [slot].head, (WL)w);
2937 2991
2938 /* remove this watcher, if others are watching it, they will rearm */ 2992 /* remove this watcher, if others are watching it, they will rearm */
2939 inotify_rm_watch (fs_fd, wd); 2993 inotify_rm_watch (fs_fd, wd);
2940} 2994}
… …
2942static void noinline 2996static void noinline
2943infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2997infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2944{ 2998{
2945 if (slot < 0) 2999 if (slot < 0)
2946 /* overflow, need to check for all hash slots */ 3000 /* overflow, need to check for all hash slots */
2947 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3001 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2948 infy_wd (EV_A_ slot, wd, ev); 3002 infy_wd (EV_A_ slot, wd, ev);
2949 else 3003 else
2950 { 3004 {
2951 WL w_; 3005 WL w_;
2952 3006
2953 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3007 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2954 { 3008 {
2955 ev_stat *w = (ev_stat *)w_; 3009 ev_stat *w = (ev_stat *)w_;
2956 w_ = w_->next; /* lets us remove this watcher and all before it */ 3010 w_ = w_->next; /* lets us remove this watcher and all before it */
2957 3011
2958 if (w->wd == wd || wd == -1) 3012 if (w->wd == wd || wd == -1)
2959 { 3013 {
2960 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3014 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2961 { 3015 {
2962 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3016 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2963 w->wd = -1; 3017 w->wd = -1;
2964 infy_add (EV_A_ w); /* re-add, no matter what */ 3018 infy_add (EV_A_ w); /* re-add, no matter what */
2965 } 3019 }
2966 3020
2967 stat_timer_cb (EV_A_ &w->timer, 0); 3021 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2972 3026
2973static void 3027static void
2974infy_cb (EV_P_ ev_io *w, int revents) 3028infy_cb (EV_P_ ev_io *w, int revents)
2975{ 3029{
2976 char buf [EV_INOTIFY_BUFSIZE]; 3030 char buf [EV_INOTIFY_BUFSIZE];
2977 struct inotify_event *ev = (struct inotify_event *)buf;
2978 int ofs; 3031 int ofs;
2979 int len = read (fs_fd, buf, sizeof (buf)); 3032 int len = read (fs_fd, buf, sizeof (buf));
2980 3033
2981 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3034 for (ofs = 0; ofs < len; )
3035 {
3036 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2982 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3037 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3038 ofs += sizeof (struct inotify_event) + ev->len;
3039 }
3040}
3041
3042inline_size unsigned int
3043ev_linux_version (void)
3044{
3045 struct utsname buf;
3046 unsigned int v;
3047 int i;
3048 char *p = buf.release;
3049
3050 if (uname (&buf))
3051 return 0;
3052
3053 for (i = 3+1; --i; )
3054 {
3055 unsigned int c = 0;
3056
3057 for (;;)
3058 {
3059 if (*p >= '0' && *p <= '9')
3060 c = c * 10 + *p++ - '0';
3061 else
3062 {
3063 p += *p == '.';
3064 break;
3065 }
3066 }
3067
3068 v = (v << 8) | c;
3069 }
3070
3071 return v;
2983} 3072}
2984 3073
2985inline_size void 3074inline_size void
2986check_2625 (EV_P) 3075ev_check_2625 (EV_P)
2987{ 3076{
2988 /* kernels < 2.6.25 are borked 3077 /* kernels < 2.6.25 are borked
2989 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3078 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2990 */ 3079 */
2991 struct utsname buf; 3080 if (ev_linux_version () < 0x020619)
2992 int major, minor, micro;
2993
2994 if (uname (&buf))
2995 return;
2996
2997 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2998 return;
2999
3000 if (major < 2
3001 || (major == 2 && minor < 6)
3002 || (major == 2 && minor == 6 && micro < 25))
3003 return; 3081 return;
3004 3082
3005 fs_2625 = 1; 3083 fs_2625 = 1;
3006} 3084}
3007 3085
… …
3022 if (fs_fd != -2) 3100 if (fs_fd != -2)
3023 return; 3101 return;
3024 3102
3025 fs_fd = -1; 3103 fs_fd = -1;
3026 3104
3027 check_2625 (EV_A); 3105 ev_check_2625 (EV_A);
3028 3106
3029 fs_fd = infy_newfd (); 3107 fs_fd = infy_newfd ();
3030 3108
3031 if (fs_fd >= 0) 3109 if (fs_fd >= 0)
3032 { 3110 {
… …
3057 ev_io_set (&fs_w, fs_fd, EV_READ); 3135 ev_io_set (&fs_w, fs_fd, EV_READ);
3058 ev_io_start (EV_A_ &fs_w); 3136 ev_io_start (EV_A_ &fs_w);
3059 ev_unref (EV_A); 3137 ev_unref (EV_A);
3060 } 3138 }
3061 3139
3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3140 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3063 { 3141 {
3064 WL w_ = fs_hash [slot].head; 3142 WL w_ = fs_hash [slot].head;
3065 fs_hash [slot].head = 0; 3143 fs_hash [slot].head = 0;
3066 3144
3067 while (w_) 3145 while (w_)
… …
3242 3320
3243 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
3244} 3322}
3245#endif 3323#endif
3246 3324
3325#if EV_PREPARE_ENABLE
3247void 3326void
3248ev_prepare_start (EV_P_ ev_prepare *w) 3327ev_prepare_start (EV_P_ ev_prepare *w)
3249{ 3328{
3250 if (expect_false (ev_is_active (w))) 3329 if (expect_false (ev_is_active (w)))
3251 return; 3330 return;
… …
3277 3356
3278 ev_stop (EV_A_ (W)w); 3357 ev_stop (EV_A_ (W)w);
3279 3358
3280 EV_FREQUENT_CHECK; 3359 EV_FREQUENT_CHECK;
3281} 3360}
3361#endif
3282 3362
3363#if EV_CHECK_ENABLE
3283void 3364void
3284ev_check_start (EV_P_ ev_check *w) 3365ev_check_start (EV_P_ ev_check *w)
3285{ 3366{
3286 if (expect_false (ev_is_active (w))) 3367 if (expect_false (ev_is_active (w)))
3287 return; 3368 return;
… …
3313 3394
3314 ev_stop (EV_A_ (W)w); 3395 ev_stop (EV_A_ (W)w);
3315 3396
3316 EV_FREQUENT_CHECK; 3397 EV_FREQUENT_CHECK;
3317} 3398}
3399#endif
3318 3400
3319#if EV_EMBED_ENABLE 3401#if EV_EMBED_ENABLE
3320void noinline 3402void noinline
3321ev_embed_sweep (EV_P_ ev_embed *w) 3403ev_embed_sweep (EV_P_ ev_embed *w)
3322{ 3404{
… …
3416 EV_FREQUENT_CHECK; 3498 EV_FREQUENT_CHECK;
3417 3499
3418 ev_io_stop (EV_A_ &w->io); 3500 ev_io_stop (EV_A_ &w->io);
3419 ev_prepare_stop (EV_A_ &w->prepare); 3501 ev_prepare_stop (EV_A_ &w->prepare);
3420 ev_fork_stop (EV_A_ &w->fork); 3502 ev_fork_stop (EV_A_ &w->fork);
3503
3504 ev_stop (EV_A_ (W)w);
3421 3505
3422 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3423} 3507}
3424#endif 3508#endif
3425 3509
… …
3649 if (types & EV_ASYNC) 3733 if (types & EV_ASYNC)
3650 for (i = asynccnt; i--; ) 3734 for (i = asynccnt; i--; )
3651 cb (EV_A_ EV_ASYNC, asyncs [i]); 3735 cb (EV_A_ EV_ASYNC, asyncs [i]);
3652#endif 3736#endif
3653 3737
3738#if EV_PREPARE_ENABLE
3654 if (types & EV_PREPARE) 3739 if (types & EV_PREPARE)
3655 for (i = preparecnt; i--; ) 3740 for (i = preparecnt; i--; )
3656#if EV_EMBED_ENABLE 3741# if EV_EMBED_ENABLE
3657 if (ev_cb (prepares [i]) != embed_prepare_cb) 3742 if (ev_cb (prepares [i]) != embed_prepare_cb)
3658#endif 3743# endif
3659 cb (EV_A_ EV_PREPARE, prepares [i]); 3744 cb (EV_A_ EV_PREPARE, prepares [i]);
3745#endif
3660 3746
3747#if EV_CHECK_ENABLE
3661 if (types & EV_CHECK) 3748 if (types & EV_CHECK)
3662 for (i = checkcnt; i--; ) 3749 for (i = checkcnt; i--; )
3663 cb (EV_A_ EV_CHECK, checks [i]); 3750 cb (EV_A_ EV_CHECK, checks [i]);
3751#endif
3664 3752
3753#if EV_SIGNAL_ENABLE
3665 if (types & EV_SIGNAL) 3754 if (types & EV_SIGNAL)
3666 for (i = 0; i < EV_NSIG - 1; ++i) 3755 for (i = 0; i < EV_NSIG - 1; ++i)
3667 for (wl = signals [i].head; wl; ) 3756 for (wl = signals [i].head; wl; )
3668 { 3757 {
3669 wn = wl->next; 3758 wn = wl->next;
3670 cb (EV_A_ EV_SIGNAL, wl); 3759 cb (EV_A_ EV_SIGNAL, wl);
3671 wl = wn; 3760 wl = wn;
3672 } 3761 }
3762#endif
3673 3763
3764#if EV_CHILD_ENABLE
3674 if (types & EV_CHILD) 3765 if (types & EV_CHILD)
3675 for (i = EV_PID_HASHSIZE; i--; ) 3766 for (i = (EV_PID_HASHSIZE); i--; )
3676 for (wl = childs [i]; wl; ) 3767 for (wl = childs [i]; wl; )
3677 { 3768 {
3678 wn = wl->next; 3769 wn = wl->next;
3679 cb (EV_A_ EV_CHILD, wl); 3770 cb (EV_A_ EV_CHILD, wl);
3680 wl = wn; 3771 wl = wn;
3681 } 3772 }
3773#endif
3682/* EV_STAT 0x00001000 /* stat data changed */ 3774/* EV_STAT 0x00001000 /* stat data changed */
3683/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3775/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3684} 3776}
3685#endif 3777#endif
3686 3778

Diff Legend

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