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.177 by root, Tue Oct 2 10:24:44 2007 UTC vs.
Revision 1.178 by root, Wed Oct 3 01:48:06 2007 UTC

… …
132static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 133static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 134static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 135static SV *coro_mortal; /* will be freed after next transfer */
136 136
137static GV *irsgv; /* $/ */
138
137/* async_pool helper stuff */ 139/* async_pool helper stuff */
138static SV *sv_pool_rss; 140static SV *sv_pool_rss;
139static SV *sv_pool_size; 141static SV *sv_pool_size;
140static AV *av_async_pool; 142static AV *av_async_pool;
141 143
… …
184 coro_cctx *cctx; 186 coro_cctx *cctx;
185 187
186 /* data associated with this coroutine (initial args) */ 188 /* data associated with this coroutine (initial args) */
187 AV *args; 189 AV *args;
188 int refcnt; 190 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 191 int flags; /* CF_ flags */
191 192
192 /* optionally saved, might be zero */ 193 /* optionally saved, might be zero */
193 AV *defav; /* @_ */ 194 AV *defav; /* @_ */
194 SV *defsv; /* $_ */ 195 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */ 196 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */ 197 IO *deffh; /* default filehandle */
197 SV *irssv; /* $/ */ 198 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */ 199 SV *irssv_sv; /* real $/ cache */
199 200
200#define VAR(name,type) type name; 201#define VAR(name,type) type name;
201# include "state.h" 202# include "state.h"
… …
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 376 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 377}
377 378
378/** load & save, init *******************************************************/ 379/** load & save, init *******************************************************/
379 380
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384
385static void 381static void
386load_perl (pTHX_ Coro__State c) 382load_perl (pTHX_ Coro__State c)
387{ 383{
388#define VAR(name,type) PL_ ## name = c->name; 384#define VAR(name,type) PL_ ## name = c->name;
389# include "state.h" 385# include "state.h"
390#undef VAR 386#undef VAR
391 387
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 388 GvSV (PL_defgv) = c->defsv;
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 389 GvAV (PL_defgv) = c->defav;
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 390 GvSV (PL_errgv) = c->errsv;
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 391 GvIOp(PL_defoutgv) = c->deffh;
396 392 PL_rs = c->irssv;
397 if (c->irssv) 393 GvSV (irsgv) = c->irssv_sv;
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 394
412 { 395 {
413 dSP; 396 dSP;
414 CV *cv; 397 CV *cv;
415 398
… …
473 } 456 }
474 457
475 PUTBACK; 458 PUTBACK;
476 } 459 }
477 460
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 461 c->defav = GvAV (PL_defgv);
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 462 c->defsv = DEFSV;
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 463 c->errsv = ERRSV;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 464 c->deffh = GvIOp (PL_defoutgv);
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 465 c->irssv = PL_rs;
466 c->irssv_sv = GvSV (irsgv);
483 467
484#define VAR(name,type)c->name = PL_ ## name; 468#define VAR(name,type)c->name = PL_ ## name;
485# include "state.h" 469# include "state.h"
486#undef VAR 470#undef VAR
487} 471}
… …
540 * destroy the stacks, the callchain etc... 524 * destroy the stacks, the callchain etc...
541 */ 525 */
542static void 526static void
543coro_destroy_stacks (pTHX) 527coro_destroy_stacks (pTHX)
544{ 528{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 529 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 530 PL_curstackinfo = PL_curstackinfo->si_next;
564 531
565 while (PL_curstackinfo) 532 while (PL_curstackinfo)
566 { 533 {
… …
630 PL_comppad = 0; 597 PL_comppad = 0;
631 PL_curpm = 0; 598 PL_curpm = 0;
632 PL_localizing = 0; 599 PL_localizing = 0;
633 PL_dirty = 0; 600 PL_dirty = 0;
634 PL_restartop = 0; 601 PL_restartop = 0;
602
603 GvSV (PL_defgv) = NEWSV (0, 0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0);
606 GvSV (irsgv) = newSVsv (PL_rs);
607 PL_rs = newSVpvn ("\n", 1);
608
609 {
610 IO *io = newIO ();
611 GvIOp(PL_defoutgv) = io;
612 IoTYPE (io) = IoTYPE_WRONLY;
613 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
614 IoFLAGS (io) |= IOf_FLUSH;
615 }
635 616
636 { 617 {
637 dSP; 618 dSP;
638 LOGOP myop; 619 LOGOP myop;
639
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642 620
643 Zero (&myop, 1, LOGOP); 621 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 622 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 623 myop.op_flags = OPf_WANT_VOID;
646 624
… …
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 629 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 630 SPAGAIN;
653 } 631 }
654 632
655 ENTER; /* necessary e.g. for dounwind */ 633 ENTER; /* necessary e.g. for dounwind */
634}
635
636static void
637destroy_coro (pTHX_ struct coro *coro)
638{
639 if (!IN_DESTRUCT)
640 {
641 /* restore all saved variables and stuff */
642 LEAVE_SCOPE (0);
643 assert (PL_tmps_floor == -1);
644
645 /* free all temporaries */
646 FREETMPS;
647 assert (PL_tmps_ix == -1);
648
649 /* unwind all extra stacks */
650 POPSTACK_TO (PL_mainstack);
651
652 /* unwind main stack */
653 dounwind (-1);
654 }
655
656 SvREFCNT_dec (GvSV (PL_defgv));
657 SvREFCNT_dec (GvAV (PL_defgv));
658 SvREFCNT_dec (GvSV (PL_errgv));
659 SvREFCNT_dec (GvIOp(PL_defoutgv));
660 SvREFCNT_dec (PL_rs);
661 SvREFCNT_dec (GvSV (irsgv));
662
663 coro_destroy_stacks (aTHX);
656} 664}
657 665
658static void 666static void
659free_coro_mortal (pTHX) 667free_coro_mortal (pTHX)
660{ 668{
… …
1084 struct coro temp; 1092 struct coro temp;
1085 1093
1086 if (coro->flags & CF_RUNNING) 1094 if (coro->flags & CF_RUNNING)
1087 croak ("FATAL: tried to destroy currently running coroutine"); 1095 croak ("FATAL: tried to destroy currently running coroutine");
1088 1096
1089 Zero (&temp, 1, struct coro);
1090 temp.save = CORO_SAVE_ALL;
1091
1092 save_perl (aTHX_ &temp); 1097 save_perl (aTHX_ &temp);
1093 load_perl (aTHX_ coro); 1098 load_perl (aTHX_ coro);
1094 1099
1095 coro_destroy_stacks (aTHX); 1100 destroy_coro (aTHX_ coro);
1096 1101
1097 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1102 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1098 1103
1099 coro->mainstack = 0; 1104 coro->mainstack = 0;
1100 } 1105 }
… …
1163 1168
1164 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1169 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1165 TRANSFER (ta); 1170 TRANSFER (ta);
1166} 1171}
1167 1172
1168static int
1169api_save (SV *coro_sv, int new_save)
1170{
1171 dTHX;
1172 struct coro *coro = SvSTATE (coro_sv);
1173 int old_save = coro->save;
1174
1175 if (new_save >= 0)
1176 coro->save = new_save;
1177
1178 return old_save;
1179}
1180
1181/** Coro ********************************************************************/ 1173/** Coro ********************************************************************/
1182 1174
1183static void 1175static void
1184coro_enq (pTHX_ SV *coro_sv) 1176coro_enq (pTHX_ SV *coro_sv)
1185{ 1177{
… …
1389#ifdef USE_ITHREADS 1381#ifdef USE_ITHREADS
1390 MUTEX_INIT (&coro_mutex); 1382 MUTEX_INIT (&coro_mutex);
1391#endif 1383#endif
1392 BOOT_PAGESIZE; 1384 BOOT_PAGESIZE;
1393 1385
1386 irsgv = gv_fetchpv ("/", 1, SVt_PV);
1387
1394 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1388 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1395 1389
1396 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1390 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1397 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1391 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1398 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1392 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1393 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1400 1394
1401 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1402 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1403 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1404 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1406 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1407 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1408
1409 main_mainstack = PL_mainstack; 1395 main_mainstack = PL_mainstack;
1410 main_top_env = PL_top_env; 1396 main_top_env = PL_top_env;
1411 1397
1412 while (main_top_env->je_prev) 1398 while (main_top_env->je_prev)
1413 main_top_env = main_top_env->je_prev; 1399 main_top_env = main_top_env->je_prev;
… …
1425 struct coro *coro; 1411 struct coro *coro;
1426 HV *hv; 1412 HV *hv;
1427 int i; 1413 int i;
1428 1414
1429 Newz (0, coro, 1, struct coro); 1415 Newz (0, coro, 1, struct coro);
1430 coro->args = newAV (); 1416 coro->args = newAV ();
1431 coro->save = CORO_SAVE_DEF;
1432 coro->flags = CF_NEW; 1417 coro->flags = CF_NEW;
1433 1418
1434 if (coro_first) coro_first->prev = coro; 1419 if (coro_first) coro_first->prev = coro;
1435 coro->next = coro_first; 1420 coro->next = coro_first;
1436 coro_first = coro; 1421 coro_first = coro;
… …
1441 1426
1442 for (i = 1; i < items; i++) 1427 for (i = 1; i < items; i++)
1443 av_push (coro->args, newSVsv (ST (i))); 1428 av_push (coro->args, newSVsv (ST (i)));
1444} 1429}
1445 OUTPUT: 1430 OUTPUT:
1446 RETVAL
1447
1448int
1449save (SV *coro, int new_save = -1)
1450 CODE:
1451 RETVAL = api_save (coro, new_save);
1452 OUTPUT:
1453 RETVAL
1454
1455int
1456save_also (SV *coro_sv, int save_also)
1457 CODE:
1458{
1459 struct coro *coro = SvSTATE (coro_sv);
1460 RETVAL = coro->save;
1461 coro->save |= save_also;
1462}
1463 OUTPUT:
1464 RETVAL 1431 RETVAL
1465 1432
1466# these not obviously related functions are all rolled into the same xs 1433# these not obviously related functions are all rolled into the same xs
1467# function to increase chances that they all will call transfer with the same 1434# function to increase chances that they all will call transfer with the same
1468# stack offset 1435# stack offset
… …
1568{ 1535{
1569 if (coro->mainstack) 1536 if (coro->mainstack)
1570 { 1537 {
1571 struct coro temp; 1538 struct coro temp;
1572 Zero (&temp, 1, struct coro); 1539 Zero (&temp, 1, struct coro);
1573 temp.save = CORO_SAVE_ALL;
1574 1540
1575 if (!(coro->flags & CF_RUNNING)) 1541 if (!(coro->flags & CF_RUNNING))
1576 { 1542 {
1577 save_perl (aTHX_ &temp); 1543 save_perl (aTHX_ &temp);
1578 load_perl (aTHX_ coro); 1544 load_perl (aTHX_ coro);
… …
1676 1642
1677 { 1643 {
1678 SV *sv = perl_get_sv("Coro::API", 1); 1644 SV *sv = perl_get_sv("Coro::API", 1);
1679 1645
1680 coroapi.schedule = api_schedule; 1646 coroapi.schedule = api_schedule;
1681 coroapi.save = api_save;
1682 coroapi.cede = api_cede; 1647 coroapi.cede = api_cede;
1683 coroapi.cede_notself = api_cede_notself; 1648 coroapi.cede_notself = api_cede_notself;
1684 coroapi.ready = api_ready; 1649 coroapi.ready = api_ready;
1685 coroapi.is_ready = api_is_ready; 1650 coroapi.is_ready = api_is_ready;
1686 coroapi.nready = &coro_nready; 1651 coroapi.nready = &coro_nready;
… …
1783 1748
1784 av_clear (GvAV (PL_defgv)); 1749 av_clear (GvAV (PL_defgv));
1785 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1750 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1786 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1751 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1787 1752
1788 coro->save = CORO_SAVE_DEF;
1789 coro->prio = 0; 1753 coro->prio = 0;
1790 1754
1791 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1755 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1792 api_trace (coro_current, 0); 1756 api_trace (coro_current, 0);
1793 1757

Diff Legend

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