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

Comparing libev/ev.c (file contents):
Revision 1.346 by root, Thu Oct 14 05:07:04 2010 UTC vs.
Revision 1.356 by root, Fri Oct 22 11:21:52 2010 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
182# include EV_H 178# include EV_H
183#else 179#else
184# include "ev.h" 180# include "ev.h"
185#endif 181#endif
186 182
183EV_CPP(extern "C" {)
184
187#ifndef _WIN32 185#ifndef _WIN32
188# include <sys/time.h> 186# include <sys/time.h>
189# include <sys/wait.h> 187# include <sys/wait.h>
190# include <unistd.h> 188# include <unistd.h>
191#else 189#else
… …
384# include <sys/select.h> 382# include <sys/select.h>
385# endif 383# endif
386#endif 384#endif
387 385
388#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
389# include <sys/utsname.h>
390# include <sys/statfs.h> 387# include <sys/statfs.h>
391# include <sys/inotify.h> 388# include <sys/inotify.h>
392/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
393# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
394# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
411# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
412# else 409# else
413# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
414# endif 411# endif
415# endif 412# endif
416# ifdef __cplusplus
417extern "C" {
418# endif
419int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
420# ifdef __cplusplus
421}
422# endif
423#endif 414#endif
424 415
425#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h> 418# include <stdint.h>
… …
433# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
434# else 425# else
435# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
436# endif 427# endif
437# endif 428# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
442 430
443struct signalfd_siginfo 431struct signalfd_siginfo
444{ 432{
445 uint32_t ssi_signo; 433 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
447}; 435};
448# ifdef __cplusplus
449}
450# endif 436#endif
451#endif
452
453 437
454/**/ 438/**/
455 439
456#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
457# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
471 455
472#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
473#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
474 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461
475#if __GNUC__ >= 4 462#if __GNUC__ >= 4
476# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
477# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
478#else 465#else
479# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
535# include "ev_win32.c" 522# include "ev_win32.c"
536#endif 523#endif
537 524
538/*****************************************************************************/ 525/*****************************************************************************/
539 526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
540#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
541static void noinline 570static void noinline
542ev_printerr (const char *msg) 571ev_printerr (const char *msg)
543{ 572{
544 write (STDERR_FILENO, msg, strlen (msg)); 573 write (STDERR_FILENO, msg, strlen (msg));
… …
715# define EV_RELEASE_CB (void)0 744# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0 745# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 746# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif 747#endif
719 748
720#define EVUNLOOP_RECURSE 0x80 749#define EVBREAK_RECURSE 0x80
721 750
722/*****************************************************************************/ 751/*****************************************************************************/
723 752
724#ifndef EV_HAVE_EV_TIME 753#ifndef EV_HAVE_EV_TIME
725ev_tstamp 754ev_tstamp
… …
769 if (delay > 0.) 798 if (delay > 0.)
770 { 799 {
771#if EV_USE_NANOSLEEP 800#if EV_USE_NANOSLEEP
772 struct timespec ts; 801 struct timespec ts;
773 802
774 ts.tv_sec = (time_t)delay; 803 EV_TS_SET (ts, delay);
775 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
776
777 nanosleep (&ts, 0); 804 nanosleep (&ts, 0);
778#elif defined(_WIN32) 805#elif defined(_WIN32)
779 Sleep ((unsigned long)(delay * 1e3)); 806 Sleep ((unsigned long)(delay * 1e3));
780#else 807#else
781 struct timeval tv; 808 struct timeval tv;
782 809
783 tv.tv_sec = (time_t)delay;
784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
785
786 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 810 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
787 /* something not guaranteed by newer posix versions, but guaranteed */ 811 /* something not guaranteed by newer posix versions, but guaranteed */
788 /* by older ones */ 812 /* by older ones */
813 EV_TV_SET (tv, delay);
789 select (0, 0, 0, 0, &tv); 814 select (0, 0, 0, 0, &tv);
790#endif 815#endif
791 } 816 }
792} 817}
793 818
… …
945 { 970 {
946 int fd = fdchanges [i]; 971 int fd = fdchanges [i];
947 ANFD *anfd = anfds + fd; 972 ANFD *anfd = anfds + fd;
948 ev_io *w; 973 ev_io *w;
949 974
950 unsigned char events = 0; 975 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify;
951 977
952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 978 anfd->reify = 0;
953 events |= (unsigned char)w->events;
954 979
955#if EV_SELECT_IS_WINSOCKET 980#if EV_SELECT_IS_WINSOCKET
956 if (events) 981 if (o_reify & EV__IOFDSET)
957 { 982 {
958 unsigned long arg; 983 unsigned long arg;
959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 984 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 985 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
961 } 986 }
962#endif 987#endif
963 988
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
964 { 990 {
965 unsigned char o_events = anfd->events;
966 unsigned char o_reify = anfd->reify;
967
968 anfd->reify = 0;
969 anfd->events = events; 991 anfd->events = 0;
970 992
971 if (o_events != events || o_reify & EV__IOFDSET) 993 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
994 anfd->events |= (unsigned char)w->events;
995
996 if (o_events != anfd->events)
997 o_reify = EV__IOFDSET; /* actually |= */
998 }
999
1000 if (o_reify & EV__IOFDSET)
972 backend_modify (EV_A_ fd, o_events, events); 1001 backend_modify (EV_A_ fd, o_events, anfd->events);
973 }
974 } 1002 }
975 1003
976 fdchangecnt = 0; 1004 fdchangecnt = 0;
977} 1005}
978 1006
… …
1543ev_embeddable_backends (void) 1571ev_embeddable_backends (void)
1544{ 1572{
1545 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1573 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1546 1574
1547 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1575 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1548 /* please fix it and tell me how to detect the fix */ 1576 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1549 flags &= ~EVBACKEND_EPOLL; 1577 flags &= ~EVBACKEND_EPOLL;
1550 1578
1551 return flags; 1579 return flags;
1552} 1580}
1553 1581
1554unsigned int 1582unsigned int
… …
2291 mn_now = ev_rt_now; 2319 mn_now = ev_rt_now;
2292 } 2320 }
2293} 2321}
2294 2322
2295void 2323void
2296ev_loop (EV_P_ int flags) 2324ev_run (EV_P_ int flags)
2297{ 2325{
2298#if EV_FEATURE_API 2326#if EV_FEATURE_API
2299 ++loop_depth; 2327 ++loop_depth;
2300#endif 2328#endif
2301 2329
2302 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2330 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2303 2331
2304 loop_done = EVUNLOOP_CANCEL; 2332 loop_done = EVBREAK_CANCEL;
2305 2333
2306 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2334 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2307 2335
2308 do 2336 do
2309 { 2337 {
… …
2352 /* calculate blocking time */ 2380 /* calculate blocking time */
2353 { 2381 {
2354 ev_tstamp waittime = 0.; 2382 ev_tstamp waittime = 0.;
2355 ev_tstamp sleeptime = 0.; 2383 ev_tstamp sleeptime = 0.;
2356 2384
2385 /* remember old timestamp for io_blocktime calculation */
2386 ev_tstamp prev_mn_now = mn_now;
2387
2388 /* update time to cancel out callback processing overhead */
2389 time_update (EV_A_ 1e100);
2390
2357 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2391 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2358 { 2392 {
2359 /* remember old timestamp for io_blocktime calculation */
2360 ev_tstamp prev_mn_now = mn_now;
2361
2362 /* update time to cancel out callback processing overhead */
2363 time_update (EV_A_ 1e100);
2364
2365 waittime = MAX_BLOCKTIME; 2393 waittime = MAX_BLOCKTIME;
2366 2394
2367 if (timercnt) 2395 if (timercnt)
2368 { 2396 {
2369 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2397 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2399 } 2427 }
2400 2428
2401#if EV_FEATURE_API 2429#if EV_FEATURE_API
2402 ++loop_count; 2430 ++loop_count;
2403#endif 2431#endif
2404 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2432 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2405 backend_poll (EV_A_ waittime); 2433 backend_poll (EV_A_ waittime);
2406 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2434 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2407 2435
2408 /* update ev_rt_now, do magic */ 2436 /* update ev_rt_now, do magic */
2409 time_update (EV_A_ waittime + sleeptime); 2437 time_update (EV_A_ waittime + sleeptime);
2410 } 2438 }
2411 2439
… …
2429 EV_INVOKE_PENDING; 2457 EV_INVOKE_PENDING;
2430 } 2458 }
2431 while (expect_true ( 2459 while (expect_true (
2432 activecnt 2460 activecnt
2433 && !loop_done 2461 && !loop_done
2434 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2462 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2435 )); 2463 ));
2436 2464
2437 if (loop_done == EVUNLOOP_ONE) 2465 if (loop_done == EVBREAK_ONE)
2438 loop_done = EVUNLOOP_CANCEL; 2466 loop_done = EVBREAK_CANCEL;
2439 2467
2440#if EV_FEATURE_API 2468#if EV_FEATURE_API
2441 --loop_depth; 2469 --loop_depth;
2442#endif 2470#endif
2443} 2471}
2444 2472
2445void 2473void
2446ev_unloop (EV_P_ int how) 2474ev_break (EV_P_ int how)
2447{ 2475{
2448 loop_done = how; 2476 loop_done = how;
2449} 2477}
2450 2478
2451void 2479void
… …
2599 EV_FREQUENT_CHECK; 2627 EV_FREQUENT_CHECK;
2600 2628
2601 wlist_del (&anfds[w->fd].head, (WL)w); 2629 wlist_del (&anfds[w->fd].head, (WL)w);
2602 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2603 2631
2604 fd_change (EV_A_ w->fd, 1); 2632 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2605 2633
2606 EV_FREQUENT_CHECK; 2634 EV_FREQUENT_CHECK;
2607} 2635}
2608 2636
2609void noinline 2637void noinline
… …
3061 { 3089 {
3062 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3090 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3063 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3091 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3064 ofs += sizeof (struct inotify_event) + ev->len; 3092 ofs += sizeof (struct inotify_event) + ev->len;
3065 } 3093 }
3066}
3067
3068inline_size unsigned int
3069ev_linux_version (void)
3070{
3071 struct utsname buf;
3072 unsigned int v;
3073 int i;
3074 char *p = buf.release;
3075
3076 if (uname (&buf))
3077 return 0;
3078
3079 for (i = 3+1; --i; )
3080 {
3081 unsigned int c = 0;
3082
3083 for (;;)
3084 {
3085 if (*p >= '0' && *p <= '9')
3086 c = c * 10 + *p++ - '0';
3087 else
3088 {
3089 p += *p == '.';
3090 break;
3091 }
3092 }
3093
3094 v = (v << 8) | c;
3095 }
3096
3097 return v;
3098} 3094}
3099 3095
3100inline_size void 3096inline_size void
3101ev_check_2625 (EV_P) 3097ev_check_2625 (EV_P)
3102{ 3098{
… …
3426 3422
3427#if EV_EMBED_ENABLE 3423#if EV_EMBED_ENABLE
3428void noinline 3424void noinline
3429ev_embed_sweep (EV_P_ ev_embed *w) 3425ev_embed_sweep (EV_P_ ev_embed *w)
3430{ 3426{
3431 ev_loop (w->other, EVLOOP_NONBLOCK); 3427 ev_run (w->other, EVRUN_NOWAIT);
3432} 3428}
3433 3429
3434static void 3430static void
3435embed_io_cb (EV_P_ ev_io *io, int revents) 3431embed_io_cb (EV_P_ ev_io *io, int revents)
3436{ 3432{
3437 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3433 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3438 3434
3439 if (ev_cb (w)) 3435 if (ev_cb (w))
3440 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3436 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3441 else 3437 else
3442 ev_loop (w->other, EVLOOP_NONBLOCK); 3438 ev_run (w->other, EVRUN_NOWAIT);
3443} 3439}
3444 3440
3445static void 3441static void
3446embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3442embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3447{ 3443{
… …
3451 EV_P = w->other; 3447 EV_P = w->other;
3452 3448
3453 while (fdchangecnt) 3449 while (fdchangecnt)
3454 { 3450 {
3455 fd_reify (EV_A); 3451 fd_reify (EV_A);
3456 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3452 ev_run (EV_A_ EVRUN_NOWAIT);
3457 } 3453 }
3458 } 3454 }
3459} 3455}
3460 3456
3461static void 3457static void
… …
3467 3463
3468 { 3464 {
3469 EV_P = w->other; 3465 EV_P = w->other;
3470 3466
3471 ev_loop_fork (EV_A); 3467 ev_loop_fork (EV_A);
3472 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3468 ev_run (EV_A_ EVRUN_NOWAIT);
3473 } 3469 }
3474 3470
3475 ev_embed_start (EV_A_ w); 3471 ev_embed_start (EV_A_ w);
3476} 3472}
3477 3473
… …
3575void 3571void
3576ev_async_start (EV_P_ ev_async *w) 3572ev_async_start (EV_P_ ev_async *w)
3577{ 3573{
3578 if (expect_false (ev_is_active (w))) 3574 if (expect_false (ev_is_active (w)))
3579 return; 3575 return;
3576
3577 w->sent = 0;
3580 3578
3581 evpipe_init (EV_A); 3579 evpipe_init (EV_A);
3582 3580
3583 EV_FREQUENT_CHECK; 3581 EV_FREQUENT_CHECK;
3584 3582
… …
3804 3802
3805#if EV_MULTIPLICITY 3803#if EV_MULTIPLICITY
3806 #include "ev_wrap.h" 3804 #include "ev_wrap.h"
3807#endif 3805#endif
3808 3806
3809#ifdef __cplusplus 3807EV_CPP(})
3810}
3811#endif
3812 3808

Diff Legend

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