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

Comparing libev/ev.c (file contents):
Revision 1.255 by root, Mon Jun 9 14:11:30 2008 UTC vs.
Revision 1.274 by root, Thu Nov 20 00:35:10 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
… …
154#ifndef _WIN32 166#ifndef _WIN32
155# include <sys/time.h> 167# include <sys/time.h>
156# include <sys/wait.h> 168# include <sys/wait.h>
157# include <unistd.h> 169# include <unistd.h>
158#else 170#else
171# include <io.h>
159# define WIN32_LEAN_AND_MEAN 172# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 173# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 174# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 175# define EV_SELECT_IS_WINSOCKET 1
163# endif 176# endif
164#endif 177#endif
165 178
166/* 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 */
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
167 188
168#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
169# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
170# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
171# else 192# else
… …
285# include <sys/select.h> 306# include <sys/select.h>
286# endif 307# endif
287#endif 308#endif
288 309
289#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
290# include <sys/inotify.h> 313# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318# endif
291#endif 319#endif
292 320
293#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
294# 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
295#endif 332#endif
296 333
297#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
298/* 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 */
299# include <stdint.h> 336# include <stdint.h>
… …
381{ 418{
382 syserr_cb = cb; 419 syserr_cb = cb;
383} 420}
384 421
385static void noinline 422static void noinline
386syserr (const char *msg) 423ev_syserr (const char *msg)
387{ 424{
388 if (!msg) 425 if (!msg)
389 msg = "(libev) system error"; 426 msg = "(libev) system error";
390 427
391 if (syserr_cb) 428 if (syserr_cb)
… …
442typedef struct 479typedef struct
443{ 480{
444 WL head; 481 WL head;
445 unsigned char events; 482 unsigned char events;
446 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
447#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
448 SOCKET handle; 490 SOCKET handle;
449#endif 491#endif
450} ANFD; 492} ANFD;
451 493
… …
564 struct timeval tv; 606 struct timeval tv;
565 607
566 tv.tv_sec = (time_t)delay; 608 tv.tv_sec = (time_t)delay;
567 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568 610
611 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
612 /* somehting nto guaranteed by newer posix versions, but guaranteed */
613 /* by older ones */
569 select (0, 0, 0, 0, &tv); 614 select (0, 0, 0, 0, &tv);
570#endif 615#endif
571 } 616 }
572} 617}
573 618
… …
600array_realloc (int elem, void *base, int *cur, int cnt) 645array_realloc (int elem, void *base, int *cur, int cnt)
601{ 646{
602 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
603 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
604} 649}
650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
605 653
606#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
607 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
608 { \ 656 { \
609 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
… …
652 for (i = 0; i < eventcnt; ++i) 700 for (i = 0; i < eventcnt; ++i)
653 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
654} 702}
655 703
656/*****************************************************************************/ 704/*****************************************************************************/
657
658void inline_size
659anfds_init (ANFD *base, int count)
660{
661 while (count--)
662 {
663 base->head = 0;
664 base->events = EV_NONE;
665 base->reify = 0;
666
667 ++base;
668 }
669}
670 705
671void inline_speed 706void inline_speed
672fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
673{ 708{
674 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
… …
804 839
805 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
806 if (anfds [fd].events) 841 if (anfds [fd].events)
807 { 842 {
808 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
809 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
810 } 846 }
811} 847}
812 848
813/*****************************************************************************/ 849/*****************************************************************************/
… …
965static ANSIG *signals; 1001static ANSIG *signals;
966static int signalmax; 1002static int signalmax;
967 1003
968static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
969 1005
970void inline_size
971signals_init (ANSIG *base, int count)
972{
973 while (count--)
974 {
975 base->head = 0;
976 base->gotsig = 0;
977
978 ++base;
979 }
980}
981
982/*****************************************************************************/ 1006/*****************************************************************************/
983 1007
984void inline_speed 1008void inline_speed
985fd_intern (int fd) 1009fd_intern (int fd)
986{ 1010{
… …
1007 } 1031 }
1008 else 1032 else
1009#endif 1033#endif
1010 { 1034 {
1011 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1012 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1013 1037
1014 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1015 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1016 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1017 } 1041 }
… …
1507{ 1531{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1532 postfork = 1; /* must be in line with ev_default_fork */
1509} 1533}
1510 1534
1511#if EV_VERIFY 1535#if EV_VERIFY
1512void noinline 1536static void noinline
1513verify_watcher (EV_P_ W w) 1537verify_watcher (EV_P_ W w)
1514{ 1538{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516 1540
1517 if (w->pending) 1541 if (w->pending)
… …
1648{ 1672{
1649#if EV_MULTIPLICITY 1673#if EV_MULTIPLICITY
1650 struct ev_loop *loop = ev_default_loop_ptr; 1674 struct ev_loop *loop = ev_default_loop_ptr;
1651#endif 1675#endif
1652 1676
1677 ev_default_loop_ptr = 0;
1678
1653#ifndef _WIN32 1679#ifndef _WIN32
1654 ev_ref (EV_A); /* child watcher */ 1680 ev_ref (EV_A); /* child watcher */
1655 ev_signal_stop (EV_A_ &childev); 1681 ev_signal_stop (EV_A_ &childev);
1656#endif 1682#endif
1657 1683
… …
1663{ 1689{
1664#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1665 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1666#endif 1692#endif
1667 1693
1668 if (backend)
1669 postfork = 1; /* must be in line with ev_loop_fork */ 1694 postfork = 1; /* must be in line with ev_loop_fork */
1670} 1695}
1671 1696
1672/*****************************************************************************/ 1697/*****************************************************************************/
1673 1698
1674void 1699void
… …
1905ev_unref (EV_P) 1930ev_unref (EV_P)
1906{ 1931{
1907 --activecnt; 1932 --activecnt;
1908} 1933}
1909 1934
1935void
1936ev_now_update (EV_P)
1937{
1938 time_update (EV_A_ 1e100);
1939}
1940
1910static int loop_done; 1941static int loop_done;
1911 1942
1912void 1943void
1913ev_loop (EV_P_ int flags) 1944ev_loop (EV_P_ int flags)
1914{ 1945{
… …
2123 2154
2124 if (expect_false (ev_is_active (w))) 2155 if (expect_false (ev_is_active (w)))
2125 return; 2156 return;
2126 2157
2127 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))));
2128 2160
2129 EV_FREQUENT_CHECK; 2161 EV_FREQUENT_CHECK;
2130 2162
2131 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133 wlist_add (&anfds[fd].head, (WL)w); 2165 wlist_add (&anfds[fd].head, (WL)w);
2134 2166
2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2136 w->events &= ~EV_IOFDSET; 2168 w->events &= ~EV_IOFDSET;
2137 2169
… …
2329 sigset_t full, prev; 2361 sigset_t full, prev;
2330 sigfillset (&full); 2362 sigfillset (&full);
2331 sigprocmask (SIG_SETMASK, &full, &prev); 2363 sigprocmask (SIG_SETMASK, &full, &prev);
2332#endif 2364#endif
2333 2365
2334 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335 2367
2336#ifndef _WIN32 2368#ifndef _WIN32
2337 sigprocmask (SIG_SETMASK, &prev, 0); 2369 sigprocmask (SIG_SETMASK, &prev, 0);
2338#endif 2370#endif
2339 } 2371 }
… …
2412# ifdef _WIN32 2444# ifdef _WIN32
2413# undef lstat 2445# undef lstat
2414# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
2415# endif 2447# endif
2416 2448
2417#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 */
2418#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
2419 2452
2420static 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);
2421 2454
2422#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
2423# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
… …
2427{ 2460{
2428 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);
2429 2462
2430 if (w->wd < 0) 2463 if (w->wd < 0)
2431 { 2464 {
2465 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2432 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 */
2433 2467
2434 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2470 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2472 {
2439 char path [4096]; 2473 char path [4096];
2440 strcpy (path, w->path); 2474 strcpy (path, w->path);
… …
2454 } 2488 }
2455 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2456 } 2490 }
2457 } 2491 }
2458 else 2492 else
2459 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2493 {
2460
2461 if (w->wd >= 0)
2462 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2494 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2495
2496 /* now local changes will be tracked by inotify, but remote changes won't */
2497 /* unless the filesystem it known to be local, we therefore still poll */
2498 /* also do poll on <2.6.25, but with normal frequency */
2499 struct statfs sfs;
2500
2501 if (fs_2625 && !statfs (w->path, &sfs))
2502 if (sfs.f_type == 0x1373 /* devfs */
2503 || sfs.f_type == 0xEF53 /* ext2/3 */
2504 || sfs.f_type == 0x3153464a /* jfs */
2505 || sfs.f_type == 0x52654973 /* reiser3 */
2506 || sfs.f_type == 0x01021994 /* tempfs */
2507 || sfs.f_type == 0x58465342 /* xfs */)
2508 return;
2509
2510 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2511 ev_timer_again (EV_A_ &w->timer);
2512 }
2463} 2513}
2464 2514
2465static void noinline 2515static void noinline
2466infy_del (EV_P_ ev_stat *w) 2516infy_del (EV_P_ ev_stat *w)
2467{ 2517{
… …
2481 2531
2482static void noinline 2532static void noinline
2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2533infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484{ 2534{
2485 if (slot < 0) 2535 if (slot < 0)
2486 /* overflow, need to check for all hahs slots */ 2536 /* overflow, need to check for all hash slots */
2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2537 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488 infy_wd (EV_A_ slot, wd, ev); 2538 infy_wd (EV_A_ slot, wd, ev);
2489 else 2539 else
2490 { 2540 {
2491 WL w_; 2541 WL w_;
… …
2520 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2570 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2521 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2571 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522} 2572}
2523 2573
2524void inline_size 2574void inline_size
2575check_2625 (EV_P)
2576{
2577 /* kernels < 2.6.25 are borked
2578 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2579 */
2580 struct utsname buf;
2581 int major, minor, micro;
2582
2583 if (uname (&buf))
2584 return;
2585
2586 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2587 return;
2588
2589 if (major < 2
2590 || (major == 2 && minor < 6)
2591 || (major == 2 && minor == 6 && micro < 25))
2592 return;
2593
2594 fs_2625 = 1;
2595}
2596
2597void inline_size
2525infy_init (EV_P) 2598infy_init (EV_P)
2526{ 2599{
2527 if (fs_fd != -2) 2600 if (fs_fd != -2)
2528 return; 2601 return;
2602
2603 fs_fd = -1;
2604
2605 check_2625 (EV_A);
2529 2606
2530 fs_fd = inotify_init (); 2607 fs_fd = inotify_init ();
2531 2608
2532 if (fs_fd >= 0) 2609 if (fs_fd >= 0)
2533 { 2610 {
… …
2561 w->wd = -1; 2638 w->wd = -1;
2562 2639
2563 if (fs_fd >= 0) 2640 if (fs_fd >= 0)
2564 infy_add (EV_A_ w); /* re-add, no matter what */ 2641 infy_add (EV_A_ w); /* re-add, no matter what */
2565 else 2642 else
2566 ev_timer_start (EV_A_ &w->timer); 2643 ev_timer_again (EV_A_ &w->timer);
2567 } 2644 }
2568
2569 } 2645 }
2570} 2646}
2571 2647
2572#endif 2648#endif
2573 2649
… …
2609 || w->prev.st_atime != w->attr.st_atime 2685 || w->prev.st_atime != w->attr.st_atime
2610 || w->prev.st_mtime != w->attr.st_mtime 2686 || w->prev.st_mtime != w->attr.st_mtime
2611 || w->prev.st_ctime != w->attr.st_ctime 2687 || w->prev.st_ctime != w->attr.st_ctime
2612 ) { 2688 ) {
2613 #if EV_USE_INOTIFY 2689 #if EV_USE_INOTIFY
2690 if (fs_fd >= 0)
2691 {
2614 infy_del (EV_A_ w); 2692 infy_del (EV_A_ w);
2615 infy_add (EV_A_ w); 2693 infy_add (EV_A_ w);
2616 ev_stat_stat (EV_A_ w); /* avoid race... */ 2694 ev_stat_stat (EV_A_ w); /* avoid race... */
2695 }
2617 #endif 2696 #endif
2618 2697
2619 ev_feed_event (EV_A_ w, EV_STAT); 2698 ev_feed_event (EV_A_ w, EV_STAT);
2620 } 2699 }
2621} 2700}
… …
2624ev_stat_start (EV_P_ ev_stat *w) 2703ev_stat_start (EV_P_ ev_stat *w)
2625{ 2704{
2626 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2627 return; 2706 return;
2628 2707
2629 /* since we use memcmp, we need to clear any padding data etc. */
2630 memset (&w->prev, 0, sizeof (ev_statdata));
2631 memset (&w->attr, 0, sizeof (ev_statdata));
2632
2633 ev_stat_stat (EV_A_ w); 2708 ev_stat_stat (EV_A_ w);
2634 2709
2710 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2635 if (w->interval < MIN_STAT_INTERVAL) 2711 w->interval = MIN_STAT_INTERVAL;
2636 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2637 2712
2638 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2713 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2639 ev_set_priority (&w->timer, ev_priority (w)); 2714 ev_set_priority (&w->timer, ev_priority (w));
2640 2715
2641#if EV_USE_INOTIFY 2716#if EV_USE_INOTIFY
2642 infy_init (EV_A); 2717 infy_init (EV_A);
2643 2718
2644 if (fs_fd >= 0) 2719 if (fs_fd >= 0)
2645 infy_add (EV_A_ w); 2720 infy_add (EV_A_ w);
2646 else 2721 else
2647#endif 2722#endif
2648 ev_timer_start (EV_A_ &w->timer); 2723 ev_timer_again (EV_A_ &w->timer);
2649 2724
2650 ev_start (EV_A_ (W)w, 1); 2725 ev_start (EV_A_ (W)w, 1);
2651 2726
2652 EV_FREQUENT_CHECK; 2727 EV_FREQUENT_CHECK;
2653} 2728}
… …
2823 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2898 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2824 } 2899 }
2825 } 2900 }
2826} 2901}
2827 2902
2903static void
2904embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2905{
2906 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2907
2908 {
2909 struct ev_loop *loop = w->other;
2910
2911 ev_loop_fork (EV_A);
2912 }
2913}
2914
2828#if 0 2915#if 0
2829static void 2916static void
2830embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2917embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2831{ 2918{
2832 ev_idle_stop (EV_A_ idle); 2919 ev_idle_stop (EV_A_ idle);
… …
2852 2939
2853 ev_prepare_init (&w->prepare, embed_prepare_cb); 2940 ev_prepare_init (&w->prepare, embed_prepare_cb);
2854 ev_set_priority (&w->prepare, EV_MINPRI); 2941 ev_set_priority (&w->prepare, EV_MINPRI);
2855 ev_prepare_start (EV_A_ &w->prepare); 2942 ev_prepare_start (EV_A_ &w->prepare);
2856 2943
2944 ev_fork_init (&w->fork, embed_fork_cb);
2945 ev_fork_start (EV_A_ &w->fork);
2946
2857 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2947 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2858 2948
2859 ev_start (EV_A_ (W)w, 1); 2949 ev_start (EV_A_ (W)w, 1);
2860 2950
2861 EV_FREQUENT_CHECK; 2951 EV_FREQUENT_CHECK;
… …
2868 if (expect_false (!ev_is_active (w))) 2958 if (expect_false (!ev_is_active (w)))
2869 return; 2959 return;
2870 2960
2871 EV_FREQUENT_CHECK; 2961 EV_FREQUENT_CHECK;
2872 2962
2873 ev_io_stop (EV_A_ &w->io); 2963 ev_io_stop (EV_A_ &w->io);
2874 ev_prepare_stop (EV_A_ &w->prepare); 2964 ev_prepare_stop (EV_A_ &w->prepare);
2875 2965 ev_fork_stop (EV_A_ &w->fork);
2876 ev_stop (EV_A_ (W)w);
2877 2966
2878 EV_FREQUENT_CHECK; 2967 EV_FREQUENT_CHECK;
2879} 2968}
2880#endif 2969#endif
2881 2970
… …
2978once_cb (EV_P_ struct ev_once *once, int revents) 3067once_cb (EV_P_ struct ev_once *once, int revents)
2979{ 3068{
2980 void (*cb)(int revents, void *arg) = once->cb; 3069 void (*cb)(int revents, void *arg) = once->cb;
2981 void *arg = once->arg; 3070 void *arg = once->arg;
2982 3071
2983 ev_io_stop (EV_A_ &once->io); 3072 ev_io_stop (EV_A_ &once->io);
2984 ev_timer_stop (EV_A_ &once->to); 3073 ev_timer_stop (EV_A_ &once->to);
2985 ev_free (once); 3074 ev_free (once);
2986 3075
2987 cb (revents, arg); 3076 cb (revents, arg);
2988} 3077}
2989 3078
2990static void 3079static void
2991once_cb_io (EV_P_ ev_io *w, int revents) 3080once_cb_io (EV_P_ ev_io *w, int revents)
2992{ 3081{
2993 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3082 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3083
3084 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2994} 3085}
2995 3086
2996static void 3087static void
2997once_cb_to (EV_P_ ev_timer *w, int revents) 3088once_cb_to (EV_P_ ev_timer *w, int revents)
2998{ 3089{
2999 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3090 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3091
3092 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3000} 3093}
3001 3094
3002void 3095void
3003ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3096ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3004{ 3097{

Diff Legend

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