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

Comparing libev/ev.c (file contents):
Revision 1.321 by root, Thu Dec 31 06:50:17 2009 UTC vs.
Revision 1.329 by root, Tue Feb 16 09:32:39 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
… …
964/* check whether the given fd is atcually valid, for error recovery */ 971/* check whether the given fd is atcually valid, for error recovery */
965inline_size int 972inline_size int
966fd_valid (int fd) 973fd_valid (int fd)
967{ 974{
968#ifdef _WIN32 975#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 977#else
971 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
972#endif 979#endif
973} 980}
974 981
… …
1179inline_speed void 1186inline_speed void
1180fd_intern (int fd) 1187fd_intern (int fd)
1181{ 1188{
1182#ifdef _WIN32 1189#ifdef _WIN32
1183 unsigned long arg = 1; 1190 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185#else 1192#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif 1195#endif
1189} 1196}
… …
1294{ 1301{
1295#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1303 EV_P = signals [signum - 1].loop;
1297#endif 1304#endif
1298 1305
1299#if _WIN32 1306#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1301#endif 1308#endif
1302 1309
1303 signals [signum - 1].pending = 1; 1310 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1311 evpipe_write (EV_A_ &sig_pending);
… …
2157 ANHE_at_cache (*he); 2164 ANHE_at_cache (*he);
2158 } 2165 }
2159} 2166}
2160 2167
2161/* fetch new monotonic and realtime times from the kernel */ 2168/* fetch new monotonic and realtime times from the kernel */
2162/* also detetc if there was a timejump, and act accordingly */ 2169/* also detect if there was a timejump, and act accordingly */
2163inline_speed void 2170inline_speed void
2164time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
2165{ 2172{
2166#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
2167 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
… …
2501 2508
2502 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2503 return; 2510 return;
2504 2511
2505 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2512 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)))); 2513 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2507 2514
2508 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2509 2516
2510 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2581 timers [active] = timers [timercnt + HEAP0]; 2588 timers [active] = timers [timercnt + HEAP0];
2582 adjustheap (timers, timercnt, active); 2589 adjustheap (timers, timercnt, active);
2583 } 2590 }
2584 } 2591 }
2585 2592
2586 EV_FREQUENT_CHECK;
2587
2588 ev_at (w) -= mn_now; 2593 ev_at (w) -= mn_now;
2589 2594
2590 ev_stop (EV_A_ (W)w); 2595 ev_stop (EV_A_ (W)w);
2596
2597 EV_FREQUENT_CHECK;
2591} 2598}
2592 2599
2593void noinline 2600void noinline
2594ev_timer_again (EV_P_ ev_timer *w) 2601ev_timer_again (EV_P_ ev_timer *w)
2595{ 2602{
… …
2674 periodics [active] = periodics [periodiccnt + HEAP0]; 2681 periodics [active] = periodics [periodiccnt + HEAP0];
2675 adjustheap (periodics, periodiccnt, active); 2682 adjustheap (periodics, periodiccnt, active);
2676 } 2683 }
2677 } 2684 }
2678 2685
2679 EV_FREQUENT_CHECK;
2680
2681 ev_stop (EV_A_ (W)w); 2686 ev_stop (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2682} 2689}
2683 2690
2684void noinline 2691void noinline
2685ev_periodic_again (EV_P_ ev_periodic *w) 2692ev_periodic_again (EV_P_ ev_periodic *w)
2686{ 2693{
… …
2747 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD 2755# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/ 2756 if (sigfd < 0) /*TODO*/
2750# endif 2757# endif
2751 { 2758 {
2752# if _WIN32 2759# ifdef _WIN32
2753 evpipe_init (EV_A); 2760 evpipe_init (EV_A);
2754 2761
2755 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2756# else 2763# else
2757 struct sigaction sa; 2764 struct sigaction sa;
… …
2853#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2854 2861
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2862static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 2863
2857#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 2865
2866/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2867# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 2868
2860static void noinline 2869static void noinline
2861infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2862{ 2871{
2863 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); 2872 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);
… …
2972 2981
2973static void 2982static void
2974infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2975{ 2984{
2976 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2977 struct inotify_event *ev = (struct inotify_event *)buf;
2978 int ofs; 2986 int ofs;
2979 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2980 2988
2981 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2989 for (ofs = 0; ofs < len; )
2990 {
2991 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2982 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2992 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len;
2994 }
2983} 2995}
2984 2996
2985inline_size void 2997inline_size void
2986check_2625 (EV_P) 2998check_2625 (EV_P)
2987{ 2999{
… …
3417 3429
3418 ev_io_stop (EV_A_ &w->io); 3430 ev_io_stop (EV_A_ &w->io);
3419 ev_prepare_stop (EV_A_ &w->prepare); 3431 ev_prepare_stop (EV_A_ &w->prepare);
3420 ev_fork_stop (EV_A_ &w->fork); 3432 ev_fork_stop (EV_A_ &w->fork);
3421 3433
3434 ev_stop (EV_A_ (W)w);
3435
3422 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
3423} 3437}
3424#endif 3438#endif
3425 3439
3426#if EV_FORK_ENABLE 3440#if EV_FORK_ENABLE

Diff Legend

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