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.346 by root, Tue Jun 9 18:56:45 2009 UTC vs.
Revision 1.355 by root, Wed Jun 24 02:52:38 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
… …
261/* this is a structure representing a perl-level coroutine */ 261/* this is a structure representing a perl-level coroutine */
262struct coro { 262struct coro {
263 /* the C coroutine allocated to this perl coroutine, if any */ 263 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 264 coro_cctx *cctx;
265 265
266 /* ready queue */
267 struct coro *next_ready;
268
266 /* state data */ 269 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 270 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 271 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 272 perl_slots *slot; /* basically the saved sp */
270 273
… …
314#define PRIO_MIN -4 317#define PRIO_MIN -4
315 318
316/* for Coro.pm */ 319/* for Coro.pm */
317static SV *coro_current; 320static SV *coro_current;
318static SV *coro_readyhook; 321static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 323static CV *cv_coro_run, *cv_coro_terminate;
321static struct coro *coro_first; 324static struct coro *coro_first;
322#define coro_nready coroapi.nready 325#define coro_nready coroapi.nready
323 326
324/** lowlevel stuff **********************************************************/ 327/** lowlevel stuff **********************************************************/
… …
612 { 615 {
613 while (expect_true (cxix >= 0)) 616 while (expect_true (cxix >= 0))
614 { 617 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 618 PERL_CONTEXT *cx = &ccstk[cxix--];
616 619
617 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 620 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
618 { 621 {
619 CV *cv = cx->blk_sub.cv; 622 CV *cv = cx->blk_sub.cv;
620 623
621 if (expect_true (CvDEPTH (cv))) 624 if (expect_true (CvDEPTH (cv)))
622 { 625 {
… …
987} 990}
988 991
989static void 992static void
990coro_destruct_perl (pTHX_ struct coro *coro) 993coro_destruct_perl (pTHX_ struct coro *coro)
991{ 994{
995 SV *svf [9];
996
997 {
998 struct coro *current = SvSTATE_current;
999
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001
1002 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro);
1004
992 coro_unwind_stacks (aTHX); 1005 coro_unwind_stacks (aTHX);
1006 coro_destruct_stacks (aTHX);
993 1007
994 SvREFCNT_dec (GvSV (PL_defgv)); 1008 // now save some sv's to be free'd later
995 SvREFCNT_dec (GvAV (PL_defgv)); 1009 svf [0] = GvSV (PL_defgv);
996 SvREFCNT_dec (GvSV (PL_errgv)); 1010 svf [1] = (SV *)GvAV (PL_defgv);
997 SvREFCNT_dec (PL_defoutgv); 1011 svf [2] = GvSV (PL_errgv);
998 SvREFCNT_dec (PL_rs); 1012 svf [3] = (SV *)PL_defoutgv;
999 SvREFCNT_dec (GvSV (irsgv)); 1013 svf [4] = PL_rs;
1000 SvREFCNT_dec (GvHV (PL_hintgv)); 1014 svf [5] = GvSV (irsgv);
1015 svf [6] = (SV *)GvHV (PL_hintgv);
1016 svf [7] = PL_diehook;
1017 svf [8] = PL_warnhook;
1018 assert (9 == sizeof (svf) / sizeof (*svf));
1001 1019
1002 SvREFCNT_dec (PL_diehook); 1020 load_perl (aTHX_ current);
1003 SvREFCNT_dec (PL_warnhook);
1004 1021 }
1022
1023 {
1024 int i;
1025
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]);
1028
1005 SvREFCNT_dec (coro->saved_deffh); 1029 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1030 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1031 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1032 SvREFCNT_dec (coro->invoke_av);
1009 1033 }
1010 coro_destruct_stacks (aTHX);
1011} 1034}
1012 1035
1013INLINE void 1036INLINE void
1014free_coro_mortal (pTHX) 1037free_coro_mortal (pTHX)
1015{ 1038{
… …
1502 1525
1503 if (coro->mainstack 1526 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1527 && coro->mainstack != main_mainstack
1505 && coro->slot 1528 && coro->slot
1506 && !PL_dirty) 1529 && !PL_dirty)
1507 {
1508 struct coro *current = SvSTATE_current;
1509
1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1511
1512 save_perl (aTHX_ current);
1513 load_perl (aTHX_ coro);
1514
1515 coro_destruct_perl (aTHX_ coro); 1530 coro_destruct_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1531
1522 cctx_destroy (coro->cctx); 1532 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1533 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1534 SvREFCNT_dec (coro->args);
1525 SvREFCNT_dec (CORO_THROW); 1535 SvREFCNT_dec (CORO_THROW);
… …
1612/** Coro ********************************************************************/ 1622/** Coro ********************************************************************/
1613 1623
1614INLINE void 1624INLINE void
1615coro_enq (pTHX_ struct coro *coro) 1625coro_enq (pTHX_ struct coro *coro)
1616{ 1626{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1618}
1619 1628
1620INLINE SV * 1629 SvREFCNT_inc_NN (coro->hv);
1630
1631 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1633 ready [1] = coro;
1634}
1635
1636INLINE struct coro *
1621coro_deq (pTHX) 1637coro_deq (pTHX)
1622{ 1638{
1623 int prio; 1639 int prio;
1624 1640
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1642 {
1627 return av_shift (coro_ready [prio]); 1643 struct coro **ready = coro_ready [prio];
1644
1645 if (ready [0])
1646 {
1647 struct coro *coro = ready [0];
1648 ready [0] = coro->next_ready;
1649 return coro;
1650 }
1651 }
1628 1652
1629 return 0; 1653 return 0;
1630} 1654}
1631 1655
1632static int 1656static int
… …
1696static void 1720static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1721prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1722{
1699 for (;;) 1723 for (;;)
1700 { 1724 {
1701 SV *next_sv = coro_deq (aTHX); 1725 struct coro *next = coro_deq (aTHX);
1702 1726
1703 if (expect_true (next_sv)) 1727 if (expect_true (next))
1704 { 1728 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1729 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1730 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1731 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1732 else
1711 { 1733 {
1712 next->flags &= ~CF_READY; 1734 next->flags &= ~CF_READY;
1713 --coro_nready; 1735 --coro_nready;
1714 1736
… …
2455/* Coro::Semaphore & Coro::Signal */ 2477/* Coro::Semaphore & Coro::Signal */
2456 2478
2457static SV * 2479static SV *
2458coro_waitarray_new (pTHX_ int count) 2480coro_waitarray_new (pTHX_ int count)
2459{ 2481{
2460 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2482 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2461 AV *av = newAV (); 2483 AV *av = newAV ();
2462 SV **ary; 2484 SV **ary;
2463 2485
2464 /* unfortunately, building manually saves memory */ 2486 /* unfortunately, building manually saves memory */
2465 Newx (ary, 2, SV *); 2487 Newx (ary, 2, SV *);
… …
2609 { 2631 {
2610 /* callback form */ 2632 /* callback form */
2611 AV *av = (AV *)SvRV (arg [0]); 2633 AV *av = (AV *)SvRV (arg [0]);
2612 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2613 2635
2614 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2636 av_push (av, SvREFCNT_inc_NN (cb_cv));
2615 2637
2616 if (SvIVX (AvARRAY (av)[0]) > 0) 2638 if (SvIVX (AvARRAY (av)[0]) > 0)
2617 coro_semaphore_adjust (aTHX_ av, 0); 2639 coro_semaphore_adjust (aTHX_ av, 0);
2618 2640
2619 frame->prepare = prepare_nop; 2641 frame->prepare = prepare_nop;
… …
2643 AvARRAY (av)[0] = AvARRAY (av)[1]; 2665 AvARRAY (av)[0] = AvARRAY (av)[1];
2644 AvARRAY (av)[1] = cb; 2666 AvARRAY (av)[1] = cb;
2645 2667
2646 cb = av_shift (av); 2668 cb = av_shift (av);
2647 2669
2670 if (SvTYPE (cb) == SVt_PVCV)
2671 {
2672 dSP;
2673 PUSHMARK (SP);
2674 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2675 PUTBACK;
2676 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2677 }
2678 else
2679 {
2648 api_ready (aTHX_ cb); 2680 api_ready (aTHX_ cb);
2649 sv_setiv (cb, 0); /* signal waiter */ 2681 sv_setiv (cb, 0); /* signal waiter */
2682 }
2683
2650 SvREFCNT_dec (cb); 2684 SvREFCNT_dec (cb);
2651 2685
2652 --count; 2686 --count;
2653 } 2687 }
2654} 2688}
… …
2663static void 2697static void
2664slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2698slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2665{ 2699{
2666 AV *av = (AV *)SvRV (arg [0]); 2700 AV *av = (AV *)SvRV (arg [0]);
2667 2701
2702 if (items >= 2)
2703 {
2704 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2705 av_push (av, SvREFCNT_inc_NN (cb_cv));
2706
2668 if (SvIVX (AvARRAY (av)[0])) 2707 if (SvIVX (AvARRAY (av)[0]))
2708 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2709
2710 frame->prepare = prepare_nop;
2711 frame->check = slf_check_nop;
2712 }
2713 else if (SvIVX (AvARRAY (av)[0]))
2669 { 2714 {
2670 SvIVX (AvARRAY (av)[0]) = 0; 2715 SvIVX (AvARRAY (av)[0]) = 0;
2671 frame->prepare = prepare_nop; 2716 frame->prepare = prepare_nop;
2672 frame->check = slf_check_nop; 2717 frame->check = slf_check_nop;
2673 } 2718 }
2674 else 2719 else
2675 { 2720 {
2676 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2721 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2677 2722
2678 av_push (av, waiter); 2723 av_push (av, waiter);
2679 2724
2680 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2725 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2681 frame->prepare = prepare_schedule; 2726 frame->prepare = prepare_schedule;
… …
3206 3251
3207MODULE = Coro::State PACKAGE = Coro 3252MODULE = Coro::State PACKAGE = Coro
3208 3253
3209BOOT: 3254BOOT:
3210{ 3255{
3211 int i;
3212
3213 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3256 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3214 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3257 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3215 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3258 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3216 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3259 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3217 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3260 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
… …
3232 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3275 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
3233 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3276 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
3234 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3277 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
3235 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3278 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
3236 3279
3237 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3238 coro_ready[i] = newAV ();
3239
3240 { 3280 {
3241 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3281 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3242 3282
3243 coroapi.schedule = api_schedule; 3283 coroapi.schedule = api_schedule;
3244 coroapi.schedule_to = api_schedule_to; 3284 coroapi.schedule_to = api_schedule_to;

Diff Legend

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