ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.349 by root, Wed Jun 10 00:47:24 2009 UTC vs.
Revision 1.359 by root, Mon Jun 29 05:07:19 2009 UTC

… …
137 137
138#define IN_DESTRUCT PL_dirty 138#define IN_DESTRUCT PL_dirty
139 139
140#if __GNUC__ >= 3 140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 143# define INLINE static inline
144#else 144#else
145# define attribute(x) 145# define attribute(x)
146# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
147# define INLINE static 147# define INLINE static
… …
156#define GCoroAPI (&coroapi) /* very sneaky */ 156#define GCoroAPI (&coroapi) /* very sneaky */
157 157
158#ifdef USE_ITHREADS 158#ifdef USE_ITHREADS
159# if CORO_PTHREAD 159# if CORO_PTHREAD
160static void *coro_thx; 160static void *coro_thx;
161# endif
162#endif
163
164#ifdef __linux
165# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime
168# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
169# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3
161# endif 171# endif
162#endif 172#endif
163 173
164static double (*nvtime)(); /* so why doesn't it take void? */ 174static double (*nvtime)(); /* so why doesn't it take void? */
165 175
… …
194static CV *cv_pool_handler; 204static CV *cv_pool_handler;
195static CV *cv_coro_state_new; 205static CV *cv_coro_state_new;
196 206
197/* Coro::AnyEvent */ 207/* Coro::AnyEvent */
198static SV *sv_activity; 208static SV *sv_activity;
209
210/* enable processtime/realtime profiling */
211static char profile_times;
212typedef U32 coro_ts[2];
199 213
200static struct coro_cctx *cctx_first; 214static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 215static int cctx_count, cctx_idle;
202 216
203enum { 217enum {
… …
307/* the mainr easonw e don't support windows process emulation */ 321/* the mainr easonw e don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 322static struct CoroSLF slf_frame; /* the current slf frame */
309 323
310/** Coro ********************************************************************/ 324/** Coro ********************************************************************/
311 325
312#define PRIO_MAX 3 326#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 327#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 328#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 329#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 330#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 331#define CORO_PRIO_MIN -4
318 332
319/* for Coro.pm */ 333/* for Coro.pm */
320static SV *coro_current; 334static SV *coro_current;
321static SV *coro_readyhook; 335static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 336static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 337static CV *cv_coro_run, *cv_coro_terminate;
324static struct coro *coro_first; 338static struct coro *coro_first;
325#define coro_nready coroapi.nready 339#define coro_nready coroapi.nready
326 340
327/** lowlevel stuff **********************************************************/ 341/** lowlevel stuff **********************************************************/
… …
475static int 489static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 491{
478 AV *padlist; 492 AV *padlist;
479 AV *av = (AV *)mg->mg_obj; 493 AV *av = (AV *)mg->mg_obj;
494
495 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT)
497 return;
480 498
481 /* casting is fun. */ 499 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
484 502
… …
615 { 633 {
616 while (expect_true (cxix >= 0)) 634 while (expect_true (cxix >= 0))
617 { 635 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 636 PERL_CONTEXT *cx = &ccstk[cxix--];
619 637
620 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 638 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 639 {
622 CV *cv = cx->blk_sub.cv; 640 CV *cv = cx->blk_sub.cv;
623 641
624 if (expect_true (CvDEPTH (cv))) 642 if (expect_true (CvDEPTH (cv)))
625 { 643 {
… …
990} 1008}
991 1009
992static void 1010static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1011coro_destruct_perl (pTHX_ struct coro *coro)
994{ 1012{
1013 SV *svf [9];
1014
1015 {
1016 struct coro *current = SvSTATE_current;
1017
1018 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1019
1020 save_perl (aTHX_ current);
1021 load_perl (aTHX_ coro);
1022
995 coro_unwind_stacks (aTHX); 1023 coro_unwind_stacks (aTHX);
1024 coro_destruct_stacks (aTHX);
996 1025
997 SvREFCNT_dec (GvSV (PL_defgv)); 1026 // now save some sv's to be free'd later
998 SvREFCNT_dec (GvAV (PL_defgv)); 1027 svf [0] = GvSV (PL_defgv);
999 SvREFCNT_dec (GvSV (PL_errgv)); 1028 svf [1] = (SV *)GvAV (PL_defgv);
1000 SvREFCNT_dec (PL_defoutgv); 1029 svf [2] = GvSV (PL_errgv);
1001 SvREFCNT_dec (PL_rs); 1030 svf [3] = (SV *)PL_defoutgv;
1002 SvREFCNT_dec (GvSV (irsgv)); 1031 svf [4] = PL_rs;
1003 SvREFCNT_dec (GvHV (PL_hintgv)); 1032 svf [5] = GvSV (irsgv);
1033 svf [6] = (SV *)GvHV (PL_hintgv);
1034 svf [7] = PL_diehook;
1035 svf [8] = PL_warnhook;
1036 assert (9 == sizeof (svf) / sizeof (*svf));
1004 1037
1005 SvREFCNT_dec (PL_diehook); 1038 load_perl (aTHX_ current);
1006 SvREFCNT_dec (PL_warnhook);
1007 1039 }
1040
1041 {
1042 int i;
1043
1044 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1045 SvREFCNT_dec (svf [i]);
1046
1008 SvREFCNT_dec (coro->saved_deffh); 1047 SvREFCNT_dec (coro->saved_deffh);
1009 SvREFCNT_dec (coro->rouse_cb); 1048 SvREFCNT_dec (coro->rouse_cb);
1010 SvREFCNT_dec (coro->invoke_cb); 1049 SvREFCNT_dec (coro->invoke_cb);
1011 SvREFCNT_dec (coro->invoke_av); 1050 SvREFCNT_dec (coro->invoke_av);
1012 1051 }
1013 coro_destruct_stacks (aTHX);
1014} 1052}
1015 1053
1016INLINE void 1054INLINE void
1017free_coro_mortal (pTHX) 1055free_coro_mortal (pTHX)
1018{ 1056{
… …
1505 1543
1506 if (coro->mainstack 1544 if (coro->mainstack
1507 && coro->mainstack != main_mainstack 1545 && coro->mainstack != main_mainstack
1508 && coro->slot 1546 && coro->slot
1509 && !PL_dirty) 1547 && !PL_dirty)
1510 {
1511 struct coro *current = SvSTATE_current;
1512
1513 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1514
1515 save_perl (aTHX_ current);
1516 load_perl (aTHX_ coro);
1517
1518 coro_destruct_perl (aTHX_ coro); 1548 coro_destruct_perl (aTHX_ coro);
1519
1520 load_perl (aTHX_ current);
1521
1522 coro->slot = 0;
1523 }
1524 1549
1525 cctx_destroy (coro->cctx); 1550 cctx_destroy (coro->cctx);
1526 SvREFCNT_dec (coro->startcv); 1551 SvREFCNT_dec (coro->startcv);
1527 SvREFCNT_dec (coro->args); 1552 SvREFCNT_dec (coro->args);
1528 SvREFCNT_dec (CORO_THROW); 1553 SvREFCNT_dec (CORO_THROW);
… …
1615/** Coro ********************************************************************/ 1640/** Coro ********************************************************************/
1616 1641
1617INLINE void 1642INLINE void
1618coro_enq (pTHX_ struct coro *coro) 1643coro_enq (pTHX_ struct coro *coro)
1619{ 1644{
1620 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1621 1646
1622 SvREFCNT_inc_NN (coro->hv); 1647 SvREFCNT_inc_NN (coro->hv);
1623 1648
1624 coro->next_ready = 0; 1649 coro->next_ready = 0;
1625 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1629INLINE struct coro * 1654INLINE struct coro *
1630coro_deq (pTHX) 1655coro_deq (pTHX)
1631{ 1656{
1632 int prio; 1657 int prio;
1633 1658
1634 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1635 { 1660 {
1636 struct coro **ready = coro_ready [prio]; 1661 struct coro **ready = coro_ready [prio];
1637 1662
1638 if (ready [0]) 1663 if (ready [0])
1639 { 1664 {
… …
2470/* Coro::Semaphore & Coro::Signal */ 2495/* Coro::Semaphore & Coro::Signal */
2471 2496
2472static SV * 2497static SV *
2473coro_waitarray_new (pTHX_ int count) 2498coro_waitarray_new (pTHX_ int count)
2474{ 2499{
2475 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2500 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2476 AV *av = newAV (); 2501 AV *av = newAV ();
2477 SV **ary; 2502 SV **ary;
2478 2503
2479 /* unfortunately, building manually saves memory */ 2504 /* unfortunately, building manually saves memory */
2480 Newx (ary, 2, SV *); 2505 Newx (ary, 2, SV *);
… …
2624 { 2649 {
2625 /* callback form */ 2650 /* callback form */
2626 AV *av = (AV *)SvRV (arg [0]); 2651 AV *av = (AV *)SvRV (arg [0]);
2627 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2652 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2628 2653
2629 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2654 av_push (av, SvREFCNT_inc_NN (cb_cv));
2630 2655
2631 if (SvIVX (AvARRAY (av)[0]) > 0) 2656 if (SvIVX (AvARRAY (av)[0]) > 0)
2632 coro_semaphore_adjust (aTHX_ av, 0); 2657 coro_semaphore_adjust (aTHX_ av, 0);
2633 2658
2634 frame->prepare = prepare_nop; 2659 frame->prepare = prepare_nop;
… …
2658 AvARRAY (av)[0] = AvARRAY (av)[1]; 2683 AvARRAY (av)[0] = AvARRAY (av)[1];
2659 AvARRAY (av)[1] = cb; 2684 AvARRAY (av)[1] = cb;
2660 2685
2661 cb = av_shift (av); 2686 cb = av_shift (av);
2662 2687
2688 if (SvTYPE (cb) == SVt_PVCV)
2689 {
2690 dSP;
2691 PUSHMARK (SP);
2692 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2693 PUTBACK;
2694 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2695 }
2696 else
2697 {
2663 api_ready (aTHX_ cb); 2698 api_ready (aTHX_ cb);
2664 sv_setiv (cb, 0); /* signal waiter */ 2699 sv_setiv (cb, 0); /* signal waiter */
2700 }
2701
2665 SvREFCNT_dec (cb); 2702 SvREFCNT_dec (cb);
2666 2703
2667 --count; 2704 --count;
2668 } 2705 }
2669} 2706}
… …
2678static void 2715static void
2679slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2716slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2680{ 2717{
2681 AV *av = (AV *)SvRV (arg [0]); 2718 AV *av = (AV *)SvRV (arg [0]);
2682 2719
2720 if (items >= 2)
2721 {
2722 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724
2683 if (SvIVX (AvARRAY (av)[0])) 2725 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2727
2728 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop;
2730 }
2731 else if (SvIVX (AvARRAY (av)[0]))
2684 { 2732 {
2685 SvIVX (AvARRAY (av)[0]) = 0; 2733 SvIVX (AvARRAY (av)[0]) = 0;
2686 frame->prepare = prepare_nop; 2734 frame->prepare = prepare_nop;
2687 frame->check = slf_check_nop; 2735 frame->check = slf_check_nop;
2688 } 2736 }
2689 else 2737 else
2690 { 2738 {
2691 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2739 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2692 2740
2693 av_push (av, waiter); 2741 av_push (av, waiter);
2694 2742
2695 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2743 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2696 frame->prepare = prepare_schedule; 2744 frame->prepare = prepare_schedule;
… …
2937 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2985 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2938 2986
2939 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2987 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2940 } 2988 }
2941 2989
2942 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2990 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2943} 2991}
2944 2992
2945SV * 2993SV *
2946new (char *klass, ...) 2994new (char *klass, ...)
2947 ALIAS: 2995 ALIAS:
… …
3149 CODE: 3197 CODE:
3150{ 3198{
3151 struct coro *current = SvSTATE_current; 3199 struct coro *current = SvSTATE_current;
3152 SV **throwp = self == current ? &CORO_THROW : &self->except; 3200 SV **throwp = self == current ? &CORO_THROW : &self->except;
3153 SvREFCNT_dec (*throwp); 3201 SvREFCNT_dec (*throwp);
3202 SvGETMAGIC (throw);
3154 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3203 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3155} 3204}
3156 3205
3157void 3206void
3158api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3207api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3238 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3287 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3239 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3288 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3240 3289
3241 coro_stash = gv_stashpv ("Coro", TRUE); 3290 coro_stash = gv_stashpv ("Coro", TRUE);
3242 3291
3243 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3292 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3244 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3293 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3245 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3294 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3246 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3295 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3247 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3296 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3248 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3297 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3249 3298
3250 { 3299 {
3251 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3300 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3252 3301
3253 coroapi.schedule = api_schedule; 3302 coroapi.schedule = api_schedule;
… …
3305void 3354void
3306_set_readyhook (SV *hook) 3355_set_readyhook (SV *hook)
3307 PROTOTYPE: $ 3356 PROTOTYPE: $
3308 CODE: 3357 CODE:
3309 SvREFCNT_dec (coro_readyhook); 3358 SvREFCNT_dec (coro_readyhook);
3359 SvGETMAGIC (hook);
3310 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3360 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3311 3361
3312int 3362int
3313prio (Coro::State coro, int newprio = 0) 3363prio (Coro::State coro, int newprio = 0)
3314 PROTOTYPE: $;$ 3364 PROTOTYPE: $;$
… …
3321 if (items > 1) 3371 if (items > 1)
3322 { 3372 {
3323 if (ix) 3373 if (ix)
3324 newprio = coro->prio - newprio; 3374 newprio = coro->prio - newprio;
3325 3375
3326 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3376 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3327 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3377 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3328 3378
3329 coro->prio = newprio; 3379 coro->prio = newprio;
3330 } 3380 }
3331} 3381}
3332 OUTPUT: 3382 OUTPUT:
… …
3458MODULE = Coro::State PACKAGE = Coro::Semaphore 3508MODULE = Coro::State PACKAGE = Coro::Semaphore
3459 3509
3460SV * 3510SV *
3461new (SV *klass, SV *count = 0) 3511new (SV *klass, SV *count = 0)
3462 CODE: 3512 CODE:
3513{
3514 int semcnt = 1;
3515
3516 if (count)
3517 {
3518 SvGETMAGIC (count);
3519
3520 if (SvOK (count))
3521 semcnt = SvIV (count);
3522 }
3523
3463 RETVAL = sv_bless ( 3524 RETVAL = sv_bless (
3464 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3525 coro_waitarray_new (aTHX_ semcnt),
3465 GvSTASH (CvGV (cv)) 3526 GvSTASH (CvGV (cv))
3466 ); 3527 );
3528}
3467 OUTPUT: 3529 OUTPUT:
3468 RETVAL 3530 RETVAL
3469 3531
3470# helper for Coro::Channel and others 3532# helper for Coro::Channel and others
3471SV * 3533SV *

Diff Legend

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