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

Comparing libev/ev.c (file contents):
Revision 1.350 by root, Sat Oct 16 00:59:56 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
451#endif 437#endif
452 438
453/**/ 439/**/
454 440
455#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
… …
717# define EV_RELEASE_CB (void)0 703# define EV_RELEASE_CB (void)0
718# define EV_ACQUIRE_CB (void)0 704# define EV_ACQUIRE_CB (void)0
719# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 705# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
720#endif 706#endif
721 707
722#define EVUNLOOP_RECURSE 0x80 708#define EVBREAK_RECURSE 0x80
723 709
724/*****************************************************************************/ 710/*****************************************************************************/
725 711
726#ifndef EV_HAVE_EV_TIME 712#ifndef EV_HAVE_EV_TIME
727ev_tstamp 713ev_tstamp
… …
964 anfd->events = 0; 950 anfd->events = 0;
965 951
966 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
967 anfd->events |= (unsigned char)w->events; 953 anfd->events |= (unsigned char)w->events;
968 954
969 if (o_events !=anfd-> events) 955 if (o_events != anfd->events)
970 o_reify = EV__IOFDSET; /* actually |= */ 956 o_reify = EV__IOFDSET; /* actually |= */
971 } 957 }
972 958
973 if (o_reify & EV__IOFDSET) 959 if (o_reify & EV__IOFDSET)
974 backend_modify (EV_A_ fd, o_events, anfd->events); 960 backend_modify (EV_A_ fd, o_events, anfd->events);
… …
2292 mn_now = ev_rt_now; 2278 mn_now = ev_rt_now;
2293 } 2279 }
2294} 2280}
2295 2281
2296void 2282void
2297ev_loop (EV_P_ int flags) 2283ev_run (EV_P_ int flags)
2298{ 2284{
2299#if EV_FEATURE_API 2285#if EV_FEATURE_API
2300 ++loop_depth; 2286 ++loop_depth;
2301#endif 2287#endif
2302 2288
2303 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));
2304 2290
2305 loop_done = EVUNLOOP_CANCEL; 2291 loop_done = EVBREAK_CANCEL;
2306 2292
2307 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 */
2308 2294
2309 do 2295 do
2310 { 2296 {
… …
2353 /* calculate blocking time */ 2339 /* calculate blocking time */
2354 { 2340 {
2355 ev_tstamp waittime = 0.; 2341 ev_tstamp waittime = 0.;
2356 ev_tstamp sleeptime = 0.; 2342 ev_tstamp sleeptime = 0.;
2357 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
2358 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2350 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2359 { 2351 {
2360 /* remember old timestamp for io_blocktime calculation */
2361 ev_tstamp prev_mn_now = mn_now;
2362
2363 /* update time to cancel out callback processing overhead */
2364 time_update (EV_A_ 1e100);
2365
2366 waittime = MAX_BLOCKTIME; 2352 waittime = MAX_BLOCKTIME;
2367 2353
2368 if (timercnt) 2354 if (timercnt)
2369 { 2355 {
2370 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2356 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2400 } 2386 }
2401 2387
2402#if EV_FEATURE_API 2388#if EV_FEATURE_API
2403 ++loop_count; 2389 ++loop_count;
2404#endif 2390#endif
2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2391 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2406 backend_poll (EV_A_ waittime); 2392 backend_poll (EV_A_ waittime);
2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2408 2394
2409 /* update ev_rt_now, do magic */ 2395 /* update ev_rt_now, do magic */
2410 time_update (EV_A_ waittime + sleeptime); 2396 time_update (EV_A_ waittime + sleeptime);
2411 } 2397 }
2412 2398
… …
2430 EV_INVOKE_PENDING; 2416 EV_INVOKE_PENDING;
2431 } 2417 }
2432 while (expect_true ( 2418 while (expect_true (
2433 activecnt 2419 activecnt
2434 && !loop_done 2420 && !loop_done
2435 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2421 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2436 )); 2422 ));
2437 2423
2438 if (loop_done == EVUNLOOP_ONE) 2424 if (loop_done == EVBREAK_ONE)
2439 loop_done = EVUNLOOP_CANCEL; 2425 loop_done = EVBREAK_CANCEL;
2440 2426
2441#if EV_FEATURE_API 2427#if EV_FEATURE_API
2442 --loop_depth; 2428 --loop_depth;
2443#endif 2429#endif
2444} 2430}
2445 2431
2446void 2432void
2447ev_unloop (EV_P_ int how) 2433ev_break (EV_P_ int how)
2448{ 2434{
2449 loop_done = how; 2435 loop_done = how;
2450} 2436}
2451 2437
2452void 2438void
… …
3427 3413
3428#if EV_EMBED_ENABLE 3414#if EV_EMBED_ENABLE
3429void noinline 3415void noinline
3430ev_embed_sweep (EV_P_ ev_embed *w) 3416ev_embed_sweep (EV_P_ ev_embed *w)
3431{ 3417{
3432 ev_loop (w->other, EVLOOP_NONBLOCK); 3418 ev_run (w->other, EVRUN_NOWAIT);
3433} 3419}
3434 3420
3435static void 3421static void
3436embed_io_cb (EV_P_ ev_io *io, int revents) 3422embed_io_cb (EV_P_ ev_io *io, int revents)
3437{ 3423{
3438 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3424 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3439 3425
3440 if (ev_cb (w)) 3426 if (ev_cb (w))
3441 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3427 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3442 else 3428 else
3443 ev_loop (w->other, EVLOOP_NONBLOCK); 3429 ev_run (w->other, EVRUN_NOWAIT);
3444} 3430}
3445 3431
3446static void 3432static void
3447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3433embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3448{ 3434{
… …
3452 EV_P = w->other; 3438 EV_P = w->other;
3453 3439
3454 while (fdchangecnt) 3440 while (fdchangecnt)
3455 { 3441 {
3456 fd_reify (EV_A); 3442 fd_reify (EV_A);
3457 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3443 ev_run (EV_A_ EVRUN_NOWAIT);
3458 } 3444 }
3459 } 3445 }
3460} 3446}
3461 3447
3462static void 3448static void
… …
3468 3454
3469 { 3455 {
3470 EV_P = w->other; 3456 EV_P = w->other;
3471 3457
3472 ev_loop_fork (EV_A); 3458 ev_loop_fork (EV_A);
3473 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3459 ev_run (EV_A_ EVRUN_NOWAIT);
3474 } 3460 }
3475 3461
3476 ev_embed_start (EV_A_ w); 3462 ev_embed_start (EV_A_ w);
3477} 3463}
3478 3464
… …
3576void 3562void
3577ev_async_start (EV_P_ ev_async *w) 3563ev_async_start (EV_P_ ev_async *w)
3578{ 3564{
3579 if (expect_false (ev_is_active (w))) 3565 if (expect_false (ev_is_active (w)))
3580 return; 3566 return;
3567
3568 w->sent = 0;
3581 3569
3582 evpipe_init (EV_A); 3570 evpipe_init (EV_A);
3583 3571
3584 EV_FREQUENT_CHECK; 3572 EV_FREQUENT_CHECK;
3585 3573
… …
3805 3793
3806#if EV_MULTIPLICITY 3794#if EV_MULTIPLICITY
3807 #include "ev_wrap.h" 3795 #include "ev_wrap.h"
3808#endif 3796#endif
3809 3797
3810#ifdef __cplusplus 3798EV_CPP(})
3811}
3812#endif
3813 3799

Diff Legend

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