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

Diff Legend

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