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

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.277 by root, Sun Dec 14 21:58:08 2008 UTC

… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
… …
164# endif 176# endif
165#endif 177#endif
166 178
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
168 180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
188
169#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
172# else 192# else
173# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 306# include <sys/select.h>
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
291# include <sys/inotify.h> 313# include <sys/inotify.h>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW 315# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY 316# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0 317# define EV_USE_INOTIFY 0
296# endif 318# endif
297#endif 319#endif
298 320
299#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
300# include <winsock.h> 322# include <winsock.h>
323#endif
324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
301#endif 332#endif
302 333
303#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
304/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
305# include <stdint.h> 336# include <stdint.h>
… …
387{ 418{
388 syserr_cb = cb; 419 syserr_cb = cb;
389} 420}
390 421
391static void noinline 422static void noinline
392syserr (const char *msg) 423ev_syserr (const char *msg)
393{ 424{
394 if (!msg) 425 if (!msg)
395 msg = "(libev) system error"; 426 msg = "(libev) system error";
396 427
397 if (syserr_cb) 428 if (syserr_cb)
… …
448typedef struct 479typedef struct
449{ 480{
450 WL head; 481 WL head;
451 unsigned char events; 482 unsigned char events;
452 unsigned char reify; 483 unsigned char reify;
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
453#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
454 SOCKET handle; 490 SOCKET handle;
455#endif 491#endif
456} ANFD; 492} ANFD;
457 493
… …
610{ 646{
611 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
612 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
613} 649}
614 650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
653
615#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
616 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
617 { \ 656 { \
618 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
619 (base) = (type *)array_realloc \ 658 (base) = (type *)array_realloc \
… …
661 for (i = 0; i < eventcnt; ++i) 700 for (i = 0; i < eventcnt; ++i)
662 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
663} 702}
664 703
665/*****************************************************************************/ 704/*****************************************************************************/
666
667void inline_size
668anfds_init (ANFD *base, int count)
669{
670 while (count--)
671 {
672 base->head = 0;
673 base->events = EV_NONE;
674 base->reify = 0;
675
676 ++base;
677 }
678}
679 705
680void inline_speed 706void inline_speed
681fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
682{ 708{
683 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
… …
813 839
814 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
815 if (anfds [fd].events) 841 if (anfds [fd].events)
816 { 842 {
817 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
818 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
819 } 846 }
820} 847}
821 848
822/*****************************************************************************/ 849/*****************************************************************************/
… …
974static ANSIG *signals; 1001static ANSIG *signals;
975static int signalmax; 1002static int signalmax;
976 1003
977static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
978 1005
979void inline_size
980signals_init (ANSIG *base, int count)
981{
982 while (count--)
983 {
984 base->head = 0;
985 base->gotsig = 0;
986
987 ++base;
988 }
989}
990
991/*****************************************************************************/ 1006/*****************************************************************************/
992 1007
993void inline_speed 1008void inline_speed
994fd_intern (int fd) 1009fd_intern (int fd)
995{ 1010{
… …
1016 } 1031 }
1017 else 1032 else
1018#endif 1033#endif
1019 { 1034 {
1020 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1021 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1022 1037
1023 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1024 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1025 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1026 } 1041 }
… …
1255 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1256 /* it usually doesn't work correctly on anything but sockets and pipes */ 1271 /* it usually doesn't work correctly on anything but sockets and pipes */
1257 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1258#endif 1273#endif
1259#ifdef __APPLE__ 1274#ifdef __APPLE__
1260 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 // flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation
1261 flags &= ~EVBACKEND_POLL; 1276 flags &= ~EVBACKEND_SELECT;
1262#endif 1277#endif
1263 1278
1264 return flags; 1279 return flags;
1265} 1280}
1266 1281
… …
1657{ 1672{
1658#if EV_MULTIPLICITY 1673#if EV_MULTIPLICITY
1659 struct ev_loop *loop = ev_default_loop_ptr; 1674 struct ev_loop *loop = ev_default_loop_ptr;
1660#endif 1675#endif
1661 1676
1677 ev_default_loop_ptr = 0;
1678
1662#ifndef _WIN32 1679#ifndef _WIN32
1663 ev_ref (EV_A); /* child watcher */ 1680 ev_ref (EV_A); /* child watcher */
1664 ev_signal_stop (EV_A_ &childev); 1681 ev_signal_stop (EV_A_ &childev);
1665#endif 1682#endif
1666 1683
… …
1672{ 1689{
1673#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1675#endif 1692#endif
1676 1693
1677 if (backend)
1678 postfork = 1; /* must be in line with ev_loop_fork */ 1694 postfork = 1; /* must be in line with ev_loop_fork */
1679} 1695}
1680 1696
1681/*****************************************************************************/ 1697/*****************************************************************************/
1682 1698
1683void 1699void
… …
2138 2154
2139 if (expect_false (ev_is_active (w))) 2155 if (expect_false (ev_is_active (w)))
2140 return; 2156 return;
2141 2157
2142 assert (("ev_io_start called with negative fd", fd >= 0)); 2158 assert (("ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2143 2160
2144 EV_FREQUENT_CHECK; 2161 EV_FREQUENT_CHECK;
2145 2162
2146 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2165 wlist_add (&anfds[fd].head, (WL)w);
2149 2166
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2151 w->events &= ~EV_IOFDSET; 2168 w->events &= ~EV_IOFDSET;
2152 2169
… …
2344 sigset_t full, prev; 2361 sigset_t full, prev;
2345 sigfillset (&full); 2362 sigfillset (&full);
2346 sigprocmask (SIG_SETMASK, &full, &prev); 2363 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif 2364#endif
2348 2365
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2350 2367
2351#ifndef _WIN32 2368#ifndef _WIN32
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2369 sigprocmask (SIG_SETMASK, &prev, 0);
2353#endif 2370#endif
2354 } 2371 }
… …
2427# ifdef _WIN32 2444# ifdef _WIN32
2428# undef lstat 2445# undef lstat
2429# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
2430# endif 2447# endif
2431 2448
2432#define DEF_STAT_INTERVAL 5.0074891 2449#define DEF_STAT_INTERVAL 5.0074891
2450#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2433#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
2434 2452
2435static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2453static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2436 2454
2437#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
2438# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
… …
2442{ 2460{
2443 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); 2461 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);
2444 2462
2445 if (w->wd < 0) 2463 if (w->wd < 0)
2446 { 2464 {
2465 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2447 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2466 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2448 2467
2449 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2450 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2451 /* but an efficiency issue only */ 2470 /* but an efficiency issue only */
2452 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2453 { 2472 {
2454 char path [4096]; 2473 char path [4096];
2455 strcpy (path, w->path); 2474 strcpy (path, w->path);
… …
2459 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2478 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2460 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2479 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2461 2480
2462 char *pend = strrchr (path, '/'); 2481 char *pend = strrchr (path, '/');
2463 2482
2464 if (!pend) 2483 if (!pend || pend == path)
2465 break; /* whoops, no '/', complain to your admin */ 2484 break;
2466 2485
2467 *pend = 0; 2486 *pend = 0;
2468 w->wd = inotify_add_watch (fs_fd, path, mask); 2487 w->wd = inotify_add_watch (fs_fd, path, mask);
2469 } 2488 }
2470 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2471 } 2490 }
2472 } 2491 }
2473 else
2474 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2475 2492
2476 if (w->wd >= 0) 2493 if (w->wd >= 0)
2494 {
2477 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2495 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2496
2497 /* now local changes will be tracked by inotify, but remote changes won't */
2498 /* unless the filesystem it known to be local, we therefore still poll */
2499 /* also do poll on <2.6.25, but with normal frequency */
2500 struct statfs sfs;
2501
2502 if (fs_2625 && !statfs (w->path, &sfs))
2503 if (sfs.f_type == 0x1373 /* devfs */
2504 || sfs.f_type == 0xEF53 /* ext2/3 */
2505 || sfs.f_type == 0x3153464a /* jfs */
2506 || sfs.f_type == 0x52654973 /* reiser3 */
2507 || sfs.f_type == 0x01021994 /* tempfs */
2508 || sfs.f_type == 0x58465342 /* xfs */)
2509 return;
2510
2511 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2512 ev_timer_again (EV_A_ &w->timer);
2513 }
2478} 2514}
2479 2515
2480static void noinline 2516static void noinline
2481infy_del (EV_P_ ev_stat *w) 2517infy_del (EV_P_ ev_stat *w)
2482{ 2518{
… …
2496 2532
2497static void noinline 2533static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2534infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2535{
2500 if (slot < 0) 2536 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2537 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2538 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2539 infy_wd (EV_A_ slot, wd, ev);
2504 else 2540 else
2505 { 2541 {
2506 WL w_; 2542 WL w_;
… …
2512 2548
2513 if (w->wd == wd || wd == -1) 2549 if (w->wd == wd || wd == -1)
2514 { 2550 {
2515 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2551 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2516 { 2552 {
2553 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2517 w->wd = -1; 2554 w->wd = -1;
2518 infy_add (EV_A_ w); /* re-add, no matter what */ 2555 infy_add (EV_A_ w); /* re-add, no matter what */
2519 } 2556 }
2520 2557
2521 stat_timer_cb (EV_A_ &w->timer, 0); 2558 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2535 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2572 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2536 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2573 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2537} 2574}
2538 2575
2539void inline_size 2576void inline_size
2577check_2625 (EV_P)
2578{
2579 /* kernels < 2.6.25 are borked
2580 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2581 */
2582 struct utsname buf;
2583 int major, minor, micro;
2584
2585 if (uname (&buf))
2586 return;
2587
2588 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2589 return;
2590
2591 if (major < 2
2592 || (major == 2 && minor < 6)
2593 || (major == 2 && minor == 6 && micro < 25))
2594 return;
2595
2596 fs_2625 = 1;
2597}
2598
2599void inline_size
2540infy_init (EV_P) 2600infy_init (EV_P)
2541{ 2601{
2542 if (fs_fd != -2) 2602 if (fs_fd != -2)
2543 return; 2603 return;
2604
2605 fs_fd = -1;
2606
2607 check_2625 (EV_A);
2544 2608
2545 fs_fd = inotify_init (); 2609 fs_fd = inotify_init ();
2546 2610
2547 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2548 { 2612 {
… …
2576 w->wd = -1; 2640 w->wd = -1;
2577 2641
2578 if (fs_fd >= 0) 2642 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 2643 infy_add (EV_A_ w); /* re-add, no matter what */
2580 else 2644 else
2581 ev_timer_start (EV_A_ &w->timer); 2645 ev_timer_again (EV_A_ &w->timer);
2582 } 2646 }
2583
2584 } 2647 }
2585} 2648}
2586 2649
2587#endif 2650#endif
2588 2651
… …
2624 || w->prev.st_atime != w->attr.st_atime 2687 || w->prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 2688 || w->prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 2689 || w->prev.st_ctime != w->attr.st_ctime
2627 ) { 2690 ) {
2628 #if EV_USE_INOTIFY 2691 #if EV_USE_INOTIFY
2692 if (fs_fd >= 0)
2693 {
2629 infy_del (EV_A_ w); 2694 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 2695 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 2696 ev_stat_stat (EV_A_ w); /* avoid race... */
2697 }
2632 #endif 2698 #endif
2633 2699
2634 ev_feed_event (EV_A_ w, EV_STAT); 2700 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 2701 }
2636} 2702}
… …
2639ev_stat_start (EV_P_ ev_stat *w) 2705ev_stat_start (EV_P_ ev_stat *w)
2640{ 2706{
2641 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2642 return; 2708 return;
2643 2709
2644 /* since we use memcmp, we need to clear any padding data etc. */
2645 memset (&w->prev, 0, sizeof (ev_statdata));
2646 memset (&w->attr, 0, sizeof (ev_statdata));
2647
2648 ev_stat_stat (EV_A_ w); 2710 ev_stat_stat (EV_A_ w);
2649 2711
2712 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2650 if (w->interval < MIN_STAT_INTERVAL) 2713 w->interval = MIN_STAT_INTERVAL;
2651 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2652 2714
2653 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2715 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2654 ev_set_priority (&w->timer, ev_priority (w)); 2716 ev_set_priority (&w->timer, ev_priority (w));
2655 2717
2656#if EV_USE_INOTIFY 2718#if EV_USE_INOTIFY
2657 infy_init (EV_A); 2719 infy_init (EV_A);
2658 2720
2659 if (fs_fd >= 0) 2721 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); 2722 infy_add (EV_A_ w);
2661 else 2723 else
2662#endif 2724#endif
2663 ev_timer_start (EV_A_ &w->timer); 2725 ev_timer_again (EV_A_ &w->timer);
2664 2726
2665 ev_start (EV_A_ (W)w, 1); 2727 ev_start (EV_A_ (W)w, 1);
2666 2728
2667 EV_FREQUENT_CHECK; 2729 EV_FREQUENT_CHECK;
2668} 2730}
… …
2843static void 2905static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2906embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{ 2907{
2846 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2908 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2847 2909
2910 ev_embed_stop (EV_A_ w);
2911
2848 { 2912 {
2849 struct ev_loop *loop = w->other; 2913 struct ev_loop *loop = w->other;
2850 2914
2851 ev_loop_fork (EV_A); 2915 ev_loop_fork (EV_A);
2916 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2852 } 2917 }
2918
2919 ev_embed_start (EV_A_ w);
2853} 2920}
2854 2921
2855#if 0 2922#if 0
2856static void 2923static void
2857embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2924embed_idle_cb (EV_P_ ev_idle *idle, int revents)

Diff Legend

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