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

Comparing libev/ev.c (file contents):
Revision 1.344 by root, Fri Jul 9 20:55:14 2010 UTC vs.
Revision 1.354 by root, Fri Oct 22 09:24:11 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)
… …
511#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
512#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
513 501
514#if EV_USE_REALTIME 502#if EV_USE_REALTIME
515/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* sig_atomic_t is used to avoid per-thread variables or locking but still */
516/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
517static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
518#endif 506#endif
519 507
520#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
715# define EV_RELEASE_CB (void)0 703# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0 704# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 705# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif 706#endif
719 707
720#define EVUNLOOP_RECURSE 0x80 708#define EVBREAK_RECURSE 0x80
721 709
722/*****************************************************************************/ 710/*****************************************************************************/
723 711
724#ifndef EV_HAVE_EV_TIME 712#ifndef EV_HAVE_EV_TIME
725ev_tstamp 713ev_tstamp
… …
769 if (delay > 0.) 757 if (delay > 0.)
770 { 758 {
771#if EV_USE_NANOSLEEP 759#if EV_USE_NANOSLEEP
772 struct timespec ts; 760 struct timespec ts;
773 761
774 ts.tv_sec = (time_t)delay; 762 EV_TS_SET (ts, delay);
775 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
776
777 nanosleep (&ts, 0); 763 nanosleep (&ts, 0);
778#elif defined(_WIN32) 764#elif defined(_WIN32)
779 Sleep ((unsigned long)(delay * 1e3)); 765 Sleep ((unsigned long)(delay * 1e3));
780#else 766#else
781 struct timeval tv; 767 struct timeval tv;
782 768
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 */ 769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
787 /* something not guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
788 /* by older ones */ 771 /* by older ones */
772 EV_TV_SET (tv, delay);
789 select (0, 0, 0, 0, &tv); 773 select (0, 0, 0, 0, &tv);
790#endif 774#endif
791 } 775 }
792} 776}
793 777
794/*****************************************************************************/ 778/*****************************************************************************/
795 779
796#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 780#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
797 781
798/* find a suitable new size for the given array, */ 782/* find a suitable new size for the given array, */
799/* hopefully by rounding to a ncie-to-malloc size */ 783/* hopefully by rounding to a nice-to-malloc size */
800inline_size int 784inline_size int
801array_nextsize (int elem, int cur, int cnt) 785array_nextsize (int elem, int cur, int cnt)
802{ 786{
803 int ncur = cur + 1; 787 int ncur = cur + 1;
804 788
… …
945 { 929 {
946 int fd = fdchanges [i]; 930 int fd = fdchanges [i];
947 ANFD *anfd = anfds + fd; 931 ANFD *anfd = anfds + fd;
948 ev_io *w; 932 ev_io *w;
949 933
950 unsigned char events = 0; 934 unsigned char o_events = anfd->events;
935 unsigned char o_reify = anfd->reify;
951 936
952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 937 anfd->reify = 0;
953 events |= (unsigned char)w->events;
954 938
955#if EV_SELECT_IS_WINSOCKET 939#if EV_SELECT_IS_WINSOCKET
956 if (events) 940 if (o_reify & EV__IOFDSET)
957 { 941 {
958 unsigned long arg; 942 unsigned long arg;
959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 943 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 944 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
961 } 945 }
962#endif 946#endif
963 947
948 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
964 { 949 {
965 unsigned char o_events = anfd->events;
966 unsigned char o_reify = anfd->reify;
967
968 anfd->reify = 0;
969 anfd->events = events; 950 anfd->events = 0;
970 951
971 if (o_events != events || o_reify & EV__IOFDSET) 952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
953 anfd->events |= (unsigned char)w->events;
954
955 if (o_events != anfd->events)
956 o_reify = EV__IOFDSET; /* actually |= */
957 }
958
959 if (o_reify & EV__IOFDSET)
972 backend_modify (EV_A_ fd, o_events, events); 960 backend_modify (EV_A_ fd, o_events, anfd->events);
973 }
974 } 961 }
975 962
976 fdchangecnt = 0; 963 fdchangecnt = 0;
977} 964}
978 965
… …
1071} 1058}
1072 1059
1073/*****************************************************************************/ 1060/*****************************************************************************/
1074 1061
1075/* 1062/*
1076 * the heap functions want a real array index. array index 0 uis guaranteed to not 1063 * the heap functions want a real array index. array index 0 is guaranteed to not
1077 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1064 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1078 * the branching factor of the d-tree. 1065 * the branching factor of the d-tree.
1079 */ 1066 */
1080 1067
1081/* 1068/*
… …
1281 uint64_t counter = 1; 1268 uint64_t counter = 1;
1282 write (evfd, &counter, sizeof (uint64_t)); 1269 write (evfd, &counter, sizeof (uint64_t));
1283 } 1270 }
1284 else 1271 else
1285#endif 1272#endif
1273 /* win32 people keep sending patches that change this write() to send() */
1274 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1275 /* so when you think this write should be a send instead, please find out */
1276 /* where your send() is from - it's definitely not the microsoft send, and */
1277 /* tell me. thank you. */
1286 write (evpipe [1], &dummy, 1); 1278 write (evpipe [1], &dummy, 1);
1287 1279
1288 errno = old_errno; 1280 errno = old_errno;
1289 } 1281 }
1290} 1282}
… …
1304 } 1296 }
1305 else 1297 else
1306#endif 1298#endif
1307 { 1299 {
1308 char dummy; 1300 char dummy;
1301 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1309 read (evpipe [0], &dummy, 1); 1302 read (evpipe [0], &dummy, 1);
1310 } 1303 }
1311 1304
1312 if (sig_pending) 1305 if (sig_pending)
1313 { 1306 {
… …
2179 feed_reverse_done (EV_A_ EV_PERIODIC); 2172 feed_reverse_done (EV_A_ EV_PERIODIC);
2180 } 2173 }
2181} 2174}
2182 2175
2183/* simply recalculate all periodics */ 2176/* simply recalculate all periodics */
2184/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2177/* TODO: maybe ensure that at least one event happens when jumping forward? */
2185static void noinline 2178static void noinline
2186periodics_reschedule (EV_P) 2179periodics_reschedule (EV_P)
2187{ 2180{
2188 int i; 2181 int i;
2189 2182
… …
2285 mn_now = ev_rt_now; 2278 mn_now = ev_rt_now;
2286 } 2279 }
2287} 2280}
2288 2281
2289void 2282void
2290ev_loop (EV_P_ int flags) 2283ev_run (EV_P_ int flags)
2291{ 2284{
2292#if EV_FEATURE_API 2285#if EV_FEATURE_API
2293 ++loop_depth; 2286 ++loop_depth;
2294#endif 2287#endif
2295 2288
2296 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2289 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2297 2290
2298 loop_done = EVUNLOOP_CANCEL; 2291 loop_done = EVBREAK_CANCEL;
2299 2292
2300 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2293 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2301 2294
2302 do 2295 do
2303 { 2296 {
… …
2346 /* calculate blocking time */ 2339 /* calculate blocking time */
2347 { 2340 {
2348 ev_tstamp waittime = 0.; 2341 ev_tstamp waittime = 0.;
2349 ev_tstamp sleeptime = 0.; 2342 ev_tstamp sleeptime = 0.;
2350 2343
2344 /* remember old timestamp for io_blocktime calculation */
2345 ev_tstamp prev_mn_now = mn_now;
2346
2347 /* update time to cancel out callback processing overhead */
2348 time_update (EV_A_ 1e100);
2349
2351 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2350 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2352 { 2351 {
2353 /* remember old timestamp for io_blocktime calculation */
2354 ev_tstamp prev_mn_now = mn_now;
2355
2356 /* update time to cancel out callback processing overhead */
2357 time_update (EV_A_ 1e100);
2358
2359 waittime = MAX_BLOCKTIME; 2352 waittime = MAX_BLOCKTIME;
2360 2353
2361 if (timercnt) 2354 if (timercnt)
2362 { 2355 {
2363 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2356 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2393 } 2386 }
2394 2387
2395#if EV_FEATURE_API 2388#if EV_FEATURE_API
2396 ++loop_count; 2389 ++loop_count;
2397#endif 2390#endif
2398 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2391 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2399 backend_poll (EV_A_ waittime); 2392 backend_poll (EV_A_ waittime);
2400 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2401 2394
2402 /* update ev_rt_now, do magic */ 2395 /* update ev_rt_now, do magic */
2403 time_update (EV_A_ waittime + sleeptime); 2396 time_update (EV_A_ waittime + sleeptime);
2404 } 2397 }
2405 2398
… …
2423 EV_INVOKE_PENDING; 2416 EV_INVOKE_PENDING;
2424 } 2417 }
2425 while (expect_true ( 2418 while (expect_true (
2426 activecnt 2419 activecnt
2427 && !loop_done 2420 && !loop_done
2428 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2421 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2429 )); 2422 ));
2430 2423
2431 if (loop_done == EVUNLOOP_ONE) 2424 if (loop_done == EVBREAK_ONE)
2432 loop_done = EVUNLOOP_CANCEL; 2425 loop_done = EVBREAK_CANCEL;
2433 2426
2434#if EV_FEATURE_API 2427#if EV_FEATURE_API
2435 --loop_depth; 2428 --loop_depth;
2436#endif 2429#endif
2437} 2430}
2438 2431
2439void 2432void
2440ev_unloop (EV_P_ int how) 2433ev_break (EV_P_ int how)
2441{ 2434{
2442 loop_done = how; 2435 loop_done = how;
2443} 2436}
2444 2437
2445void 2438void
… …
2593 EV_FREQUENT_CHECK; 2586 EV_FREQUENT_CHECK;
2594 2587
2595 wlist_del (&anfds[w->fd].head, (WL)w); 2588 wlist_del (&anfds[w->fd].head, (WL)w);
2596 ev_stop (EV_A_ (W)w); 2589 ev_stop (EV_A_ (W)w);
2597 2590
2598 fd_change (EV_A_ w->fd, 1); 2591 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2599 2592
2600 EV_FREQUENT_CHECK; 2593 EV_FREQUENT_CHECK;
2601} 2594}
2602 2595
2603void noinline 2596void noinline
… …
3420 3413
3421#if EV_EMBED_ENABLE 3414#if EV_EMBED_ENABLE
3422void noinline 3415void noinline
3423ev_embed_sweep (EV_P_ ev_embed *w) 3416ev_embed_sweep (EV_P_ ev_embed *w)
3424{ 3417{
3425 ev_loop (w->other, EVLOOP_NONBLOCK); 3418 ev_run (w->other, EVRUN_NOWAIT);
3426} 3419}
3427 3420
3428static void 3421static void
3429embed_io_cb (EV_P_ ev_io *io, int revents) 3422embed_io_cb (EV_P_ ev_io *io, int revents)
3430{ 3423{
3431 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3424 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3432 3425
3433 if (ev_cb (w)) 3426 if (ev_cb (w))
3434 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3427 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3435 else 3428 else
3436 ev_loop (w->other, EVLOOP_NONBLOCK); 3429 ev_run (w->other, EVRUN_NOWAIT);
3437} 3430}
3438 3431
3439static void 3432static void
3440embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3433embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3441{ 3434{
… …
3445 EV_P = w->other; 3438 EV_P = w->other;
3446 3439
3447 while (fdchangecnt) 3440 while (fdchangecnt)
3448 { 3441 {
3449 fd_reify (EV_A); 3442 fd_reify (EV_A);
3450 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3443 ev_run (EV_A_ EVRUN_NOWAIT);
3451 } 3444 }
3452 } 3445 }
3453} 3446}
3454 3447
3455static void 3448static void
… …
3461 3454
3462 { 3455 {
3463 EV_P = w->other; 3456 EV_P = w->other;
3464 3457
3465 ev_loop_fork (EV_A); 3458 ev_loop_fork (EV_A);
3466 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3459 ev_run (EV_A_ EVRUN_NOWAIT);
3467 } 3460 }
3468 3461
3469 ev_embed_start (EV_A_ w); 3462 ev_embed_start (EV_A_ w);
3470} 3463}
3471 3464
… …
3569void 3562void
3570ev_async_start (EV_P_ ev_async *w) 3563ev_async_start (EV_P_ ev_async *w)
3571{ 3564{
3572 if (expect_false (ev_is_active (w))) 3565 if (expect_false (ev_is_active (w)))
3573 return; 3566 return;
3567
3568 w->sent = 0;
3574 3569
3575 evpipe_init (EV_A); 3570 evpipe_init (EV_A);
3576 3571
3577 EV_FREQUENT_CHECK; 3572 EV_FREQUENT_CHECK;
3578 3573
… …
3798 3793
3799#if EV_MULTIPLICITY 3794#if EV_MULTIPLICITY
3800 #include "ev_wrap.h" 3795 #include "ev_wrap.h"
3801#endif 3796#endif
3802 3797
3803#ifdef __cplusplus 3798EV_CPP(})
3804}
3805#endif
3806 3799

Diff Legend

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