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

Comparing libev/ev.c (file contents):
Revision 1.320 by root, Fri Dec 4 20:25:06 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46: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 *
… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
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
… …
344# endif 345# endif
345#endif 346#endif
346 347
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
355
349#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
352#endif 359#endif
353 360
… …
396# endif 403# endif
397# endif 404# endif
398# ifdef __cplusplus 405# ifdef __cplusplus
399extern "C" { 406extern "C" {
400# endif 407# endif
401int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
402# ifdef __cplusplus 409# ifdef __cplusplus
403} 410}
404# endif 411# endif
405#endif 412#endif
406 413
… …
505 512
506#ifndef EV_FD_TO_WIN32_HANDLE 513#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 515#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 516#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 518#endif
512#ifndef EV_WIN32_CLOSE_FD 519#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 520# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 521#endif
515 522
… …
535 542
536 if (syserr_cb) 543 if (syserr_cb)
537 syserr_cb (msg); 544 syserr_cb (msg);
538 else 545 else
539 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
540 perror (msg); 554 perror (msg);
555#endif
541 abort (); 556 abort ();
542 } 557 }
543} 558}
544 559
545static void * 560static void *
… …
570{ 585{
571 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
572 587
573 if (!ptr && size) 588 if (!ptr && size)
574 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
576 abort (); 596 abort ();
577 } 597 }
578 598
579 return ptr; 599 return ptr;
580} 600}
… …
964/* check whether the given fd is atcually valid, for error recovery */ 984/* check whether the given fd is atcually valid, for error recovery */
965inline_size int 985inline_size int
966fd_valid (int fd) 986fd_valid (int fd)
967{ 987{
968#ifdef _WIN32 988#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 990#else
971 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
972#endif 992#endif
973} 993}
974 994
… …
1179inline_speed void 1199inline_speed void
1180fd_intern (int fd) 1200fd_intern (int fd)
1181{ 1201{
1182#ifdef _WIN32 1202#ifdef _WIN32
1183 unsigned long arg = 1; 1203 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185#else 1205#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif 1208#endif
1189} 1209}
… …
1294{ 1314{
1295#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1316 EV_P = signals [signum - 1].loop;
1297#endif 1317#endif
1298 1318
1299#if _WIN32 1319#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1301#endif 1321#endif
1302 1322
1303 signals [signum - 1].pending = 1; 1323 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1324 evpipe_write (EV_A_ &sig_pending);
… …
1605#endif 1625#endif
1606#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1628#endif
1609#if EV_USE_SIGNALFD 1629#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1631#endif
1612 1632
1613 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1615 1635
… …
2157 ANHE_at_cache (*he); 2177 ANHE_at_cache (*he);
2158 } 2178 }
2159} 2179}
2160 2180
2161/* fetch new monotonic and realtime times from the kernel */ 2181/* fetch new monotonic and realtime times from the kernel */
2162/* also detetc if there was a timejump, and act accordingly */ 2182/* also detect if there was a timejump, and act accordingly */
2163inline_speed void 2183inline_speed void
2164time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
2165{ 2185{
2166#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
2167 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
… …
2501 2521
2502 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2503 return; 2523 return;
2504 2524
2505 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 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)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2507 2527
2508 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2509 2529
2510 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2581 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2582 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2583 } 2603 }
2584 } 2604 }
2585 2605
2586 EV_FREQUENT_CHECK;
2587
2588 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2589 2607
2590 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2591} 2611}
2592 2612
2593void noinline 2613void noinline
2594ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2595{ 2615{
… …
2674 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2675 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2676 } 2696 }
2677 } 2697 }
2678 2698
2679 EV_FREQUENT_CHECK;
2680
2681 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2682} 2702}
2683 2703
2684void noinline 2704void noinline
2685ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2686{ 2706{
… …
2747 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD 2768# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/ 2769 if (sigfd < 0) /*TODO*/
2750# endif 2770# endif
2751 { 2771 {
2752# if _WIN32 2772# ifdef _WIN32
2753 evpipe_init (EV_A); 2773 evpipe_init (EV_A);
2754 2774
2755 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2756# else 2776# else
2757 struct sigaction sa; 2777 struct sigaction sa;
… …
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2810 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif 2811#endif
2792#if EV_USE_SIGNALFD 2812#if EV_USE_SIGNALFD
2793 if (sigfd >= 0) 2813 if (sigfd >= 0)
2794 { 2814 {
2795 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2815 sigset_t ss;
2816
2817 sigemptyset (&ss);
2818 sigaddset (&ss, w->signum);
2796 sigdelset (&sigfd_set, w->signum); 2819 sigdelset (&sigfd_set, w->signum);
2820
2797 signalfd (sigfd, &sigfd_set, 0); 2821 signalfd (sigfd, &sigfd_set, 0);
2798 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2822 sigprocmask (SIG_UNBLOCK, &ss, 0);
2799 /*TODO: maybe unblock signal? */
2800 } 2823 }
2801 else 2824 else
2802#endif 2825#endif
2803 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2804 } 2827 }
… …
2850#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2851 2874
2852static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2853 2876
2854#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2855# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2856 2881
2857static void noinline 2882static void noinline
2858infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2859{ 2884{
2860 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); 2885 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);
… …
2969 2994
2970static void 2995static void
2971infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2972{ 2997{
2973 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2974 struct inotify_event *ev = (struct inotify_event *)buf;
2975 int ofs; 2999 int ofs;
2976 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2977 3001
2978 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2979 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
3008}
3009
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
2980} 3040}
2981 3041
2982inline_size void 3042inline_size void
2983check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2984{ 3044{
2985 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2986 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2987 */ 3047 */
2988 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2989 int major, minor, micro;
2990
2991 if (uname (&buf))
2992 return;
2993
2994 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2995 return;
2996
2997 if (major < 2
2998 || (major == 2 && minor < 6)
2999 || (major == 2 && minor == 6 && micro < 25))
3000 return; 3049 return;
3001 3050
3002 fs_2625 = 1; 3051 fs_2625 = 1;
3003} 3052}
3004 3053
… …
3019 if (fs_fd != -2) 3068 if (fs_fd != -2)
3020 return; 3069 return;
3021 3070
3022 fs_fd = -1; 3071 fs_fd = -1;
3023 3072
3024 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
3025 3074
3026 fs_fd = infy_newfd (); 3075 fs_fd = infy_newfd ();
3027 3076
3028 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
3029 { 3078 {
… …
3414 3463
3415 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
3416 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3417 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
3418 3467
3468 ev_stop (EV_A_ (W)w);
3469
3419 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3420} 3471}
3421#endif 3472#endif
3422 3473
3423#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE

Diff Legend

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