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.351 by root, Sat Jun 20 08:58:25 2009 UTC

… …
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 **********************************************************/
… …
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);
992 coro_unwind_stacks (aTHX); 1004 coro_unwind_stacks (aTHX);
1005 coro_destruct_stacks (aTHX);
993 1006
994 SvREFCNT_dec (GvSV (PL_defgv)); 1007 // now save some sv's to be free'd later
995 SvREFCNT_dec (GvAV (PL_defgv)); 1008 svf [0] = GvSV (PL_defgv);
996 SvREFCNT_dec (GvSV (PL_errgv)); 1009 svf [1] = (SV *)GvAV (PL_defgv);
997 SvREFCNT_dec (PL_defoutgv); 1010 svf [2] = GvSV (PL_errgv);
998 SvREFCNT_dec (PL_rs); 1011 svf [3] = (SV *)PL_defoutgv;
999 SvREFCNT_dec (GvSV (irsgv)); 1012 svf [4] = PL_rs;
1000 SvREFCNT_dec (GvHV (PL_hintgv)); 1013 svf [5] = GvSV (irsgv);
1014 svf [6] = (SV *)GvHV (PL_hintgv);
1015 svf [7] = PL_diehook;
1016 svf [8] = PL_warnhook;
1017 assert (9 == sizeof (svf) / sizeof (*svf));
1001 1018
1002 SvREFCNT_dec (PL_diehook); 1019 load_perl (aTHX_ current);
1003 SvREFCNT_dec (PL_warnhook);
1004 1020 }
1021
1022 {
1023 int i;
1024
1025 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1026 SvREFCNT_dec (svf [i]);
1027
1005 SvREFCNT_dec (coro->saved_deffh); 1028 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1029 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1030 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1031 SvREFCNT_dec (coro->invoke_av);
1009 1032 }
1010 coro_destruct_stacks (aTHX);
1011} 1033}
1012 1034
1013INLINE void 1035INLINE void
1014free_coro_mortal (pTHX) 1036free_coro_mortal (pTHX)
1015{ 1037{
… …
1502 1524
1503 if (coro->mainstack 1525 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1526 && coro->mainstack != main_mainstack
1505 && coro->slot 1527 && coro->slot
1506 && !PL_dirty) 1528 && !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); 1529 coro_destruct_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1530
1522 cctx_destroy (coro->cctx); 1531 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1532 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1533 SvREFCNT_dec (coro->args);
1525 SvREFCNT_dec (CORO_THROW); 1534 SvREFCNT_dec (CORO_THROW);
… …
1612/** Coro ********************************************************************/ 1621/** Coro ********************************************************************/
1613 1622
1614INLINE void 1623INLINE void
1615coro_enq (pTHX_ struct coro *coro) 1624coro_enq (pTHX_ struct coro *coro)
1616{ 1625{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1626 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1618}
1619 1627
1620INLINE SV * 1628 SvREFCNT_inc_NN (coro->hv);
1629
1630 coro->next_ready = 0;
1631 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1632 ready [1] = coro;
1633}
1634
1635INLINE struct coro *
1621coro_deq (pTHX) 1636coro_deq (pTHX)
1622{ 1637{
1623 int prio; 1638 int prio;
1624 1639
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1640 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1641 {
1627 return av_shift (coro_ready [prio]); 1642 struct coro **ready = coro_ready [prio];
1643
1644 if (ready [0])
1645 {
1646 struct coro *coro = ready [0];
1647 ready [0] = coro->next_ready;
1648 return coro;
1649 }
1650 }
1628 1651
1629 return 0; 1652 return 0;
1630} 1653}
1631 1654
1632static int 1655static int
… …
1696static void 1719static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1720prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1721{
1699 for (;;) 1722 for (;;)
1700 { 1723 {
1701 SV *next_sv = coro_deq (aTHX); 1724 struct coro *next = coro_deq (aTHX);
1702 1725
1703 if (expect_true (next_sv)) 1726 if (expect_true (next))
1704 { 1727 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1728 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1729 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1730 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1731 else
1711 { 1732 {
1712 next->flags &= ~CF_READY; 1733 next->flags &= ~CF_READY;
1713 --coro_nready; 1734 --coro_nready;
1714 1735
… …
3206 3227
3207MODULE = Coro::State PACKAGE = Coro 3228MODULE = Coro::State PACKAGE = Coro
3208 3229
3209BOOT: 3230BOOT:
3210{ 3231{
3211 int i;
3212
3213 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3232 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3214 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3233 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3215 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3234 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3216 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3235 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3217 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3236 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
… …
3232 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3251 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
3233 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3252 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
3234 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3253 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
3235 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3254 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
3236 3255
3237 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3238 coro_ready[i] = newAV ();
3239
3240 { 3256 {
3241 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3257 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3242 3258
3243 coroapi.schedule = api_schedule; 3259 coroapi.schedule = api_schedule;
3244 coroapi.schedule_to = api_schedule_to; 3260 coroapi.schedule_to = api_schedule_to;

Diff Legend

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