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.331 by root, Tue Mar 9 08:55:03 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
… …
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 */
… …
344# endif 346# endif
345#endif 347#endif
346 348
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
356
349#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
352#endif 360#endif
353 361
… …
396# endif 404# endif
397# endif 405# endif
398# ifdef __cplusplus 406# ifdef __cplusplus
399extern "C" { 407extern "C" {
400# endif 408# endif
401int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
402# ifdef __cplusplus 410# ifdef __cplusplus
403} 411}
404# endif 412# endif
405#endif 413#endif
406 414
… …
505 513
506#ifndef EV_FD_TO_WIN32_HANDLE 514#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 516#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 517#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 519#endif
512#ifndef EV_WIN32_CLOSE_FD 520#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 521# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 522#endif
515 523
516#ifdef _WIN32 524#ifdef _WIN32
517# include "ev_win32.c" 525# include "ev_win32.c"
518#endif 526#endif
519 527
520/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
521 537
522static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
523 539
524void 540void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
… …
535 551
536 if (syserr_cb) 552 if (syserr_cb)
537 syserr_cb (msg); 553 syserr_cb (msg);
538 else 554 else
539 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
540 perror (msg); 564 perror (msg);
565#endif
541 abort (); 566 abort ();
542 } 567 }
543} 568}
544 569
545static void * 570static void *
… …
570{ 595{
571 ptr = alloc (ptr, size); 596 ptr = alloc (ptr, size);
572 597
573 if (!ptr && size) 598 if (!ptr && size)
574 { 599 {
600#if EV_AVOID_STDIO
601 ev_printerr ("libev: memory allocation failed, aborting.\n");
602#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 603 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
604#endif
576 abort (); 605 abort ();
577 } 606 }
578 607
579 return ptr; 608 return ptr;
580} 609}
… …
964/* check whether the given fd is atcually valid, for error recovery */ 993/* check whether the given fd is atcually valid, for error recovery */
965inline_size int 994inline_size int
966fd_valid (int fd) 995fd_valid (int fd)
967{ 996{
968#ifdef _WIN32 997#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 998 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 999#else
971 return fcntl (fd, F_GETFD) != -1; 1000 return fcntl (fd, F_GETFD) != -1;
972#endif 1001#endif
973} 1002}
974 1003
… …
1179inline_speed void 1208inline_speed void
1180fd_intern (int fd) 1209fd_intern (int fd)
1181{ 1210{
1182#ifdef _WIN32 1211#ifdef _WIN32
1183 unsigned long arg = 1; 1212 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185#else 1214#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC); 1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK); 1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif 1217#endif
1189} 1218}
… …
1294{ 1323{
1295#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1325 EV_P = signals [signum - 1].loop;
1297#endif 1326#endif
1298 1327
1299#if _WIN32 1328#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1301#endif 1330#endif
1302 1331
1303 signals [signum - 1].pending = 1; 1332 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1333 evpipe_write (EV_A_ &sig_pending);
… …
1605#endif 1634#endif
1606#if EV_USE_INOTIFY 1635#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1636 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1637#endif
1609#if EV_USE_SIGNALFD 1638#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1639 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1640#endif
1612 1641
1613 if (!(flags & 0x0000ffffU)) 1642 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1643 flags |= ev_recommended_backends ();
1615 1644
… …
2157 ANHE_at_cache (*he); 2186 ANHE_at_cache (*he);
2158 } 2187 }
2159} 2188}
2160 2189
2161/* fetch new monotonic and realtime times from the kernel */ 2190/* fetch new monotonic and realtime times from the kernel */
2162/* also detetc if there was a timejump, and act accordingly */ 2191/* also detect if there was a timejump, and act accordingly */
2163inline_speed void 2192inline_speed void
2164time_update (EV_P_ ev_tstamp max_block) 2193time_update (EV_P_ ev_tstamp max_block)
2165{ 2194{
2166#if EV_USE_MONOTONIC 2195#if EV_USE_MONOTONIC
2167 if (expect_true (have_monotonic)) 2196 if (expect_true (have_monotonic))
… …
2501 2530
2502 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
2503 return; 2532 return;
2504 2533
2505 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2534 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)))); 2535 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2507 2536
2508 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2509 2538
2510 ev_start (EV_A_ (W)w, 1); 2539 ev_start (EV_A_ (W)w, 1);
2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2540 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2581 timers [active] = timers [timercnt + HEAP0]; 2610 timers [active] = timers [timercnt + HEAP0];
2582 adjustheap (timers, timercnt, active); 2611 adjustheap (timers, timercnt, active);
2583 } 2612 }
2584 } 2613 }
2585 2614
2586 EV_FREQUENT_CHECK;
2587
2588 ev_at (w) -= mn_now; 2615 ev_at (w) -= mn_now;
2589 2616
2590 ev_stop (EV_A_ (W)w); 2617 ev_stop (EV_A_ (W)w);
2618
2619 EV_FREQUENT_CHECK;
2591} 2620}
2592 2621
2593void noinline 2622void noinline
2594ev_timer_again (EV_P_ ev_timer *w) 2623ev_timer_again (EV_P_ ev_timer *w)
2595{ 2624{
… …
2674 periodics [active] = periodics [periodiccnt + HEAP0]; 2703 periodics [active] = periodics [periodiccnt + HEAP0];
2675 adjustheap (periodics, periodiccnt, active); 2704 adjustheap (periodics, periodiccnt, active);
2676 } 2705 }
2677 } 2706 }
2678 2707
2679 EV_FREQUENT_CHECK;
2680
2681 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2682} 2711}
2683 2712
2684void noinline 2713void noinline
2685ev_periodic_again (EV_P_ ev_periodic *w) 2714ev_periodic_again (EV_P_ ev_periodic *w)
2686{ 2715{
… …
2747 if (!((WL)w)->next) 2776 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD 2777# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/ 2778 if (sigfd < 0) /*TODO*/
2750# endif 2779# endif
2751 { 2780 {
2752# if _WIN32 2781# ifdef _WIN32
2753 evpipe_init (EV_A); 2782 evpipe_init (EV_A);
2754 2783
2755 signal (w->signum, ev_sighandler); 2784 signal (w->signum, ev_sighandler);
2756# else 2785# else
2757 struct sigaction sa; 2786 struct sigaction sa;
… …
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2819 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif 2820#endif
2792#if EV_USE_SIGNALFD 2821#if EV_USE_SIGNALFD
2793 if (sigfd >= 0) 2822 if (sigfd >= 0)
2794 { 2823 {
2795 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2824 sigset_t ss;
2825
2826 sigemptyset (&ss);
2827 sigaddset (&ss, w->signum);
2796 sigdelset (&sigfd_set, w->signum); 2828 sigdelset (&sigfd_set, w->signum);
2829
2797 signalfd (sigfd, &sigfd_set, 0); 2830 signalfd (sigfd, &sigfd_set, 0);
2798 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2831 sigprocmask (SIG_UNBLOCK, &ss, 0);
2799 /*TODO: maybe unblock signal? */
2800 } 2832 }
2801 else 2833 else
2802#endif 2834#endif
2803 signal (w->signum, SIG_DFL); 2835 signal (w->signum, SIG_DFL);
2804 } 2836 }
… …
2850#define MIN_STAT_INTERVAL 0.1074891 2882#define MIN_STAT_INTERVAL 0.1074891
2851 2883
2852static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2884static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2853 2885
2854#if EV_USE_INOTIFY 2886#if EV_USE_INOTIFY
2855# define EV_INOTIFY_BUFSIZE 8192 2887
2888/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2889# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2856 2890
2857static void noinline 2891static void noinline
2858infy_add (EV_P_ ev_stat *w) 2892infy_add (EV_P_ ev_stat *w)
2859{ 2893{
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); 2894 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 3003
2970static void 3004static void
2971infy_cb (EV_P_ ev_io *w, int revents) 3005infy_cb (EV_P_ ev_io *w, int revents)
2972{ 3006{
2973 char buf [EV_INOTIFY_BUFSIZE]; 3007 char buf [EV_INOTIFY_BUFSIZE];
2974 struct inotify_event *ev = (struct inotify_event *)buf;
2975 int ofs; 3008 int ofs;
2976 int len = read (fs_fd, buf, sizeof (buf)); 3009 int len = read (fs_fd, buf, sizeof (buf));
2977 3010
2978 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3011 for (ofs = 0; ofs < len; )
3012 {
3013 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2979 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3014 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3015 ofs += sizeof (struct inotify_event) + ev->len;
3016 }
3017}
3018
3019inline_size unsigned int
3020ev_linux_version (void)
3021{
3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
3028 return 0;
3029
3030 for (i = 3+1; --i; )
3031 {
3032 unsigned int c = 0;
3033
3034 for (;;)
3035 {
3036 if (*p >= '0' && *p <= '9')
3037 c = c * 10 + *p++ - '0';
3038 else
3039 {
3040 p += *p == '.';
3041 break;
3042 }
3043 }
3044
3045 v = (v << 8) | c;
3046 }
3047
3048 return v;
2980} 3049}
2981 3050
2982inline_size void 3051inline_size void
2983check_2625 (EV_P) 3052ev_check_2625 (EV_P)
2984{ 3053{
2985 /* kernels < 2.6.25 are borked 3054 /* kernels < 2.6.25 are borked
2986 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3055 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2987 */ 3056 */
2988 struct utsname buf; 3057 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; 3058 return;
3001 3059
3002 fs_2625 = 1; 3060 fs_2625 = 1;
3003} 3061}
3004 3062
… …
3019 if (fs_fd != -2) 3077 if (fs_fd != -2)
3020 return; 3078 return;
3021 3079
3022 fs_fd = -1; 3080 fs_fd = -1;
3023 3081
3024 check_2625 (EV_A); 3082 ev_check_2625 (EV_A);
3025 3083
3026 fs_fd = infy_newfd (); 3084 fs_fd = infy_newfd ();
3027 3085
3028 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
3029 { 3087 {
… …
3414 3472
3415 ev_io_stop (EV_A_ &w->io); 3473 ev_io_stop (EV_A_ &w->io);
3416 ev_prepare_stop (EV_A_ &w->prepare); 3474 ev_prepare_stop (EV_A_ &w->prepare);
3417 ev_fork_stop (EV_A_ &w->fork); 3475 ev_fork_stop (EV_A_ &w->fork);
3418 3476
3477 ev_stop (EV_A_ (W)w);
3478
3419 EV_FREQUENT_CHECK; 3479 EV_FREQUENT_CHECK;
3420} 3480}
3421#endif 3481#endif
3422 3482
3423#if EV_FORK_ENABLE 3483#if EV_FORK_ENABLE

Diff Legend

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