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

Comparing libev/ev.c (file contents):
Revision 1.325 by root, Sun Jan 24 12:31:55 2010 UTC vs.
Revision 1.336 by root, Wed Mar 10 08:19:38 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
… …
402# endif 405# endif
403# endif 406# endif
404# ifdef __cplusplus 407# ifdef __cplusplus
405extern "C" { 408extern "C" {
406# endif 409# endif
407int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
408# ifdef __cplusplus 411# ifdef __cplusplus
409} 412}
410# endif 413# endif
411#endif 414#endif
412 415
… …
523# include "ev_win32.c" 526# include "ev_win32.c"
524#endif 527#endif
525 528
526/*****************************************************************************/ 529/*****************************************************************************/
527 530
531#if EV_AVOID_STDIO
532static void noinline
533ev_printerr (const char *msg)
534{
535 write (STDERR_FILENO, msg, strlen (msg));
536}
537#endif
538
528static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
529 540
530void 541void
531ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
532{ 543{
… …
541 552
542 if (syserr_cb) 553 if (syserr_cb)
543 syserr_cb (msg); 554 syserr_cb (msg);
544 else 555 else
545 { 556 {
557#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg);
561 ev_printerr (": ");
562 ev_printerr (err);
563 ev_printerr ("\n");
564#else
546 perror (msg); 565 perror (msg);
566#endif
547 abort (); 567 abort ();
548 } 568 }
549} 569}
550 570
551static void * 571static void *
552ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
553{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
554 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
555 * implement realloc (x, 0) (as required by both ansi c-98 and 578 * implement realloc (x, 0) (as required by both ansi c-89 and
556 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
557 */ 580 */
558 581
559 if (size) 582 if (size)
560 return realloc (ptr, size); 583 return realloc (ptr, size);
561 584
562 free (ptr); 585 free (ptr);
563 return 0; 586 return 0;
587#endif
564} 588}
565 589
566static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
567 591
568void 592void
… …
576{ 600{
577 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
578 602
579 if (!ptr && size) 603 if (!ptr && size)
580 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
581 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
582 abort (); 610 abort ();
583 } 611 }
584 612
585 return ptr; 613 return ptr;
586} 614}
… …
965 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
966 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
967 } 995 }
968} 996}
969 997
970/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
971inline_size int 999inline_size int
972fd_valid (int fd) 1000fd_valid (int fd)
973{ 1001{
974#ifdef _WIN32 1002#ifdef _WIN32
975 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1015 { 1043 {
1016 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
1017 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1019 } 1047 }
1048}
1049
1050/* used to prepare libev internal fd's */
1051/* this is not fork-safe */
1052inline_speed void
1053fd_intern (int fd)
1054{
1055#ifdef _WIN32
1056 unsigned long arg = 1;
1057 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1058#else
1059 fcntl (fd, F_SETFD, FD_CLOEXEC);
1060 fcntl (fd, F_SETFL, O_NONBLOCK);
1061#endif
1020} 1062}
1021 1063
1022/*****************************************************************************/ 1064/*****************************************************************************/
1023 1065
1024/* 1066/*
… …
1178 1220
1179static ANSIG signals [EV_NSIG - 1]; 1221static ANSIG signals [EV_NSIG - 1];
1180 1222
1181/*****************************************************************************/ 1223/*****************************************************************************/
1182 1224
1183/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1184/* this is not fork-safe */
1185inline_speed void
1186fd_intern (int fd)
1187{
1188#ifdef _WIN32
1189 unsigned long arg = 1;
1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1191#else
1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1194#endif
1195}
1196 1226
1197static void noinline 1227static void noinline
1198evpipe_init (EV_P) 1228evpipe_init (EV_P)
1199{ 1229{
1200 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1201 { 1231 {
1202#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL) 1234 if (evfd < 0 && errno == EINVAL)
1205 evfd = eventfd (0, 0); 1235 evfd = eventfd (0, 0);
1206 1236
1207 if (evfd >= 0) 1237 if (evfd >= 0)
… …
1209 evpipe [0] = -1; 1239 evpipe [0] = -1;
1210 fd_intern (evfd); /* doing it twice doesn't hurt */ 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1211 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1212 } 1242 }
1213 else 1243 else
1214#endif 1244# endif
1215 { 1245 {
1216 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1217 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1218 1248
1219 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
… …
1230evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1231{ 1261{
1232 if (!*flag) 1262 if (!*flag)
1233 { 1263 {
1234 int old_errno = errno; /* save errno because write might clobber it */ 1264 int old_errno = errno; /* save errno because write might clobber it */
1265 char dummy;
1235 1266
1236 *flag = 1; 1267 *flag = 1;
1237 1268
1238#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1239 if (evfd >= 0) 1270 if (evfd >= 0)
… …
1241 uint64_t counter = 1; 1272 uint64_t counter = 1;
1242 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1243 } 1274 }
1244 else 1275 else
1245#endif 1276#endif
1246 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1247 1278
1248 errno = old_errno; 1279 errno = old_errno;
1249 } 1280 }
1250} 1281}
1251 1282
… …
1352 break; 1383 break;
1353 } 1384 }
1354} 1385}
1355#endif 1386#endif
1356 1387
1388#endif
1389
1357/*****************************************************************************/ 1390/*****************************************************************************/
1358 1391
1392#if EV_CHILD_ENABLE
1359static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1360
1361#ifndef _WIN32
1362 1394
1363static ev_signal childev; 1395static ev_signal childev;
1364 1396
1365#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1366# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
… …
1635 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1636#endif 1668#endif
1637 1669
1638 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1639 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1640 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1641 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1642 } 1676 }
1643} 1677}
1644 1678
1645/* free up a loop structure */ 1679/* free up a loop structure */
1646static void noinline 1680static void noinline
… …
1896 1930
1897 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1898 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1899 1933
1900# if 0 1934# if 0
1935#if EV_CHILD_ENABLE
1901 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1936 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1937 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1938#endif
1903# endif 1939# endif
1904#endif 1940#endif
1905} 1941}
1906#endif 1942#endif
1907 1943
… …
1923 1959
1924 loop_init (EV_A_ flags); 1960 loop_init (EV_A_ flags);
1925 1961
1926 if (ev_backend (EV_A)) 1962 if (ev_backend (EV_A))
1927 { 1963 {
1928#ifndef _WIN32 1964#if EV_CHILD_ENABLE
1929 ev_signal_init (&childev, childcb, SIGCHLD); 1965 ev_signal_init (&childev, childcb, SIGCHLD);
1930 ev_set_priority (&childev, EV_MAXPRI); 1966 ev_set_priority (&childev, EV_MAXPRI);
1931 ev_signal_start (EV_A_ &childev); 1967 ev_signal_start (EV_A_ &childev);
1932 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1968 ev_unref (EV_A); /* child watcher should not keep loop alive */
1933#endif 1969#endif
… …
1946 EV_P = ev_default_loop_ptr; 1982 EV_P = ev_default_loop_ptr;
1947#endif 1983#endif
1948 1984
1949 ev_default_loop_ptr = 0; 1985 ev_default_loop_ptr = 0;
1950 1986
1951#ifndef _WIN32 1987#if EV_CHILD_ENABLE
1952 ev_ref (EV_A); /* child watcher */ 1988 ev_ref (EV_A); /* child watcher */
1953 ev_signal_stop (EV_A_ &childev); 1989 ev_signal_stop (EV_A_ &childev);
1954#endif 1990#endif
1955 1991
1956 loop_destroy (EV_A); 1992 loop_destroy (EV_A);
… …
2507 2543
2508 if (expect_false (ev_is_active (w))) 2544 if (expect_false (ev_is_active (w)))
2509 return; 2545 return;
2510 2546
2511 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2547 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2512 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2548 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2513 2549
2514 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2515 2551
2516 ev_start (EV_A_ (W)w, 1); 2552 ev_start (EV_A_ (W)w, 1);
2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2553 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2587 timers [active] = timers [timercnt + HEAP0]; 2623 timers [active] = timers [timercnt + HEAP0];
2588 adjustheap (timers, timercnt, active); 2624 adjustheap (timers, timercnt, active);
2589 } 2625 }
2590 } 2626 }
2591 2627
2592 EV_FREQUENT_CHECK;
2593
2594 ev_at (w) -= mn_now; 2628 ev_at (w) -= mn_now;
2595 2629
2596 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2631
2632 EV_FREQUENT_CHECK;
2597} 2633}
2598 2634
2599void noinline 2635void noinline
2600ev_timer_again (EV_P_ ev_timer *w) 2636ev_timer_again (EV_P_ ev_timer *w)
2601{ 2637{
… …
2680 periodics [active] = periodics [periodiccnt + HEAP0]; 2716 periodics [active] = periodics [periodiccnt + HEAP0];
2681 adjustheap (periodics, periodiccnt, active); 2717 adjustheap (periodics, periodiccnt, active);
2682 } 2718 }
2683 } 2719 }
2684 2720
2685 EV_FREQUENT_CHECK;
2686
2687 ev_stop (EV_A_ (W)w); 2721 ev_stop (EV_A_ (W)w);
2722
2723 EV_FREQUENT_CHECK;
2688} 2724}
2689 2725
2690void noinline 2726void noinline
2691ev_periodic_again (EV_P_ ev_periodic *w) 2727ev_periodic_again (EV_P_ ev_periodic *w)
2692{ 2728{
… …
2697#endif 2733#endif
2698 2734
2699#ifndef SA_RESTART 2735#ifndef SA_RESTART
2700# define SA_RESTART 0 2736# define SA_RESTART 0
2701#endif 2737#endif
2738
2739#if EV_SIGNAL_ENABLE
2702 2740
2703void noinline 2741void noinline
2704ev_signal_start (EV_P_ ev_signal *w) 2742ev_signal_start (EV_P_ ev_signal *w)
2705{ 2743{
2706 if (expect_false (ev_is_active (w))) 2744 if (expect_false (ev_is_active (w)))
… …
2813 } 2851 }
2814 2852
2815 EV_FREQUENT_CHECK; 2853 EV_FREQUENT_CHECK;
2816} 2854}
2817 2855
2856#endif
2857
2858#if EV_CHILD_ENABLE
2859
2818void 2860void
2819ev_child_start (EV_P_ ev_child *w) 2861ev_child_start (EV_P_ ev_child *w)
2820{ 2862{
2821#if EV_MULTIPLICITY 2863#if EV_MULTIPLICITY
2822 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2864 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2845 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2846 2888
2847 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2848} 2890}
2849 2891
2892#endif
2893
2850#if EV_STAT_ENABLE 2894#if EV_STAT_ENABLE
2851 2895
2852# ifdef _WIN32 2896# ifdef _WIN32
2853# undef lstat 2897# undef lstat
2854# define lstat(a,b) _stati64 (a,b) 2898# define lstat(a,b) _stati64 (a,b)
… …
2859#define MIN_STAT_INTERVAL 0.1074891 2903#define MIN_STAT_INTERVAL 0.1074891
2860 2904
2861static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2905static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2862 2906
2863#if EV_USE_INOTIFY 2907#if EV_USE_INOTIFY
2864# define EV_INOTIFY_BUFSIZE 8192 2908
2909/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2910# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2865 2911
2866static void noinline 2912static void noinline
2867infy_add (EV_P_ ev_stat *w) 2913infy_add (EV_P_ ev_stat *w)
2868{ 2914{
2869 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); 2915 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);
… …
2978 3024
2979static void 3025static void
2980infy_cb (EV_P_ ev_io *w, int revents) 3026infy_cb (EV_P_ ev_io *w, int revents)
2981{ 3027{
2982 char buf [EV_INOTIFY_BUFSIZE]; 3028 char buf [EV_INOTIFY_BUFSIZE];
2983 struct inotify_event *ev = (struct inotify_event *)buf;
2984 int ofs; 3029 int ofs;
2985 int len = read (fs_fd, buf, sizeof (buf)); 3030 int len = read (fs_fd, buf, sizeof (buf));
2986 3031
2987 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3032 for (ofs = 0; ofs < len; )
3033 {
3034 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2988 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3035 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3036 ofs += sizeof (struct inotify_event) + ev->len;
3037 }
3038}
3039
3040inline_size unsigned int
3041ev_linux_version (void)
3042{
3043 struct utsname buf;
3044 unsigned int v;
3045 int i;
3046 char *p = buf.release;
3047
3048 if (uname (&buf))
3049 return 0;
3050
3051 for (i = 3+1; --i; )
3052 {
3053 unsigned int c = 0;
3054
3055 for (;;)
3056 {
3057 if (*p >= '0' && *p <= '9')
3058 c = c * 10 + *p++ - '0';
3059 else
3060 {
3061 p += *p == '.';
3062 break;
3063 }
3064 }
3065
3066 v = (v << 8) | c;
3067 }
3068
3069 return v;
2989} 3070}
2990 3071
2991inline_size void 3072inline_size void
2992check_2625 (EV_P) 3073ev_check_2625 (EV_P)
2993{ 3074{
2994 /* kernels < 2.6.25 are borked 3075 /* kernels < 2.6.25 are borked
2995 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3076 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2996 */ 3077 */
2997 struct utsname buf; 3078 if (ev_linux_version () < 0x020619)
2998 int major, minor, micro;
2999
3000 if (uname (&buf))
3001 return;
3002
3003 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
3004 return;
3005
3006 if (major < 2
3007 || (major == 2 && minor < 6)
3008 || (major == 2 && minor == 6 && micro < 25))
3009 return; 3079 return;
3010 3080
3011 fs_2625 = 1; 3081 fs_2625 = 1;
3012} 3082}
3013 3083
… …
3028 if (fs_fd != -2) 3098 if (fs_fd != -2)
3029 return; 3099 return;
3030 3100
3031 fs_fd = -1; 3101 fs_fd = -1;
3032 3102
3033 check_2625 (EV_A); 3103 ev_check_2625 (EV_A);
3034 3104
3035 fs_fd = infy_newfd (); 3105 fs_fd = infy_newfd ();
3036 3106
3037 if (fs_fd >= 0) 3107 if (fs_fd >= 0)
3038 { 3108 {
… …
3423 3493
3424 ev_io_stop (EV_A_ &w->io); 3494 ev_io_stop (EV_A_ &w->io);
3425 ev_prepare_stop (EV_A_ &w->prepare); 3495 ev_prepare_stop (EV_A_ &w->prepare);
3426 ev_fork_stop (EV_A_ &w->fork); 3496 ev_fork_stop (EV_A_ &w->fork);
3427 3497
3498 ev_stop (EV_A_ (W)w);
3499
3428 EV_FREQUENT_CHECK; 3500 EV_FREQUENT_CHECK;
3429} 3501}
3430#endif 3502#endif
3431 3503
3432#if EV_FORK_ENABLE 3504#if EV_FORK_ENABLE

Diff Legend

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