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.213 by root, Thu Oct 11 00:40:48 2007 UTC vs.
Revision 1.214 by root, Sat Oct 13 23:19:10 2007 UTC

… …
149static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 150static SV *coro_mortal; /* will be freed after next transfer */
151 151
152static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 153static GV *stdoutgv; /* *STDOUT */
154 154static SV *rv_diehook;
155static SV *rv_warnhook;
155static HV *hv_sig; /* %SIG */ 156static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
158 157
159/* async_pool helper stuff */ 158/* async_pool helper stuff */
160static SV *sv_pool_rss; 159static SV *sv_pool_rss;
161static SV *sv_pool_size; 160static SV *sv_pool_size;
162static AV *av_async_pool; 161static AV *av_async_pool;
… …
345 344
346 /* casting is fun. */ 345 /* casting is fun. */
347 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
348 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
349 348
350 SvREFCNT_dec (av);
351
352 return 0; 349 return 0;
353} 350}
354 351
355#define PERL_MAGIC_coro PERL_MAGIC_ext 352#define CORO_MAGIC_type_cv PERL_MAGIC_ext
353#define CORO_MAGIC_type_state PERL_MAGIC_ext
356 354
357static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 355static MGVTBL coro_cv_vtbl = {
356 0, 0, 0, 0,
357 coro_cv_free
358};
358 359
359#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
360 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
361 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
362 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
363 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
364 : 0 365 : 0
366
367#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
368#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
365 369
366static struct coro * 370static struct coro *
367SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
368{ 372{
369 HV *stash; 373 HV *stash;
… …
381 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
383 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
384 } 388 }
385 389
386 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
387 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
388} 392}
389 393
390#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
391 395
392/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
393static void 397static void
394get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
395{ 399{
396 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
397 AV *av; 401 AV *av;
398 402
399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
401 else 405 else
… …
413} 417}
414 418
415static void 419static void
416put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
417{ 421{
418 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
419 AV *av; 423 AV *av;
420 424
421 if (expect_false (!mg)) 425 if (expect_false (!mg))
422 { 426 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
425 mg->mg_virtual = &vtbl_coro;
426 mg->mg_obj = (SV *)newAV ();
427 }
428 427
429 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
430 429
431 if (expect_false (AvFILLp (av) >= AvMAX (av))) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
432 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
… …
450 GvSV (irsgv) = slot->irsgv; 449 GvSV (irsgv) = slot->irsgv;
451 450
452 #define VAR(name,type) PL_ ## name = slot->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
453 # include "state.h" 452 # include "state.h"
454 #undef VAR 453 #undef VAR
455
456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
458 454
459 { 455 {
460 dSP; 456 dSP;
461 457
462 CV *cv; 458 CV *cv;
… …
668 return rss; 664 return rss;
669} 665}
670 666
671/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
672 668
669static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
670
671/*
672 * This overrides the default magic get method of %SIG elements.
673 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
674 * and instead of tryign to save and restore the hash elements, we just provide
675 * readback here.
676 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
677 * not expecting this to actually change the hook. This is a potential problem
678 * when a schedule happens then, but we ignore this.
679 */
680static int
681coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
682{
683 const char *s = MgPV_nolen_const (mg);
684
685 if (*s == '_')
686 {
687 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
688 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
689 }
690
691 return orig_sigelem_get (aTHX_ sv, mg);
692}
693
673static void 694static void
674coro_setup (pTHX_ struct coro *coro) 695coro_setup (pTHX_ struct coro *coro)
675{ 696{
676 /* 697 /*
677 * emulate part of the perl startup here. 698 * emulate part of the perl startup here.
… …
685 PL_curpm = 0; 706 PL_curpm = 0;
686 PL_curpad = 0; 707 PL_curpad = 0;
687 PL_localizing = 0; 708 PL_localizing = 0;
688 PL_dirty = 0; 709 PL_dirty = 0;
689 PL_restartop = 0; 710 PL_restartop = 0;
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0); 711
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0); 712 /* recreate the die/warn hooks */
713 PL_diehook = 0;
714 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0);
715 PL_diehook = SvREFCNT_inc (rv_diehook);
716
717 PL_warnhook = 0;
718 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
719 PL_warnhook = SvREFCNT_inc (rv_warnhook);
692 720
693 GvSV (PL_defgv) = newSV (0); 721 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0; 722 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0); 723 GvSV (PL_errgv) = newSV (0);
696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 724 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1113 prev->flags &= ~CF_RUNNING; 1141 prev->flags &= ~CF_RUNNING;
1114 next->flags |= CF_RUNNING; 1142 next->flags |= CF_RUNNING;
1115 1143
1116 LOCK; 1144 LOCK;
1117 1145
1146 /* first get rid of the old state */
1147 save_perl (aTHX_ prev);
1148
1118 if (expect_false (next->flags & CF_NEW)) 1149 if (expect_false (next->flags & CF_NEW))
1119 { 1150 {
1120 /* need to start coroutine */ 1151 /* need to start coroutine */
1121 next->flags &= ~CF_NEW; 1152 next->flags &= ~CF_NEW;
1122 /* first get rid of the old state */
1123 save_perl (aTHX_ prev);
1124 /* setup coroutine call */ 1153 /* setup coroutine call */
1125 coro_setup (aTHX_ next); 1154 coro_setup (aTHX_ next);
1126 } 1155 }
1127 else 1156 else
1128 {
1129 /* coroutine already started */
1130 save_perl (aTHX_ prev);
1131 load_perl (aTHX_ next); 1157 load_perl (aTHX_ next);
1132 }
1133 1158
1134 prev__cctx = prev->cctx; 1159 prev__cctx = prev->cctx;
1135 1160
1136 /* possibly "free" the cctx */ 1161 /* possibly "free" the cctx */
1137 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1162 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
… …
1506 BOOT_PAGESIZE; 1531 BOOT_PAGESIZE;
1507 1532
1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1533 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1534 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510 1535
1536 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1537 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1538
1511 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1539 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1512 sv_diehook = coro_get_sv (aTHX_ "Coro::State::DIEHOOK" , TRUE); 1540 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1513 sv_warnhook = coro_get_sv (aTHX_ "Coro::State::WARNHOOK", TRUE); 1541 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1517 1542
1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1543 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1519 1544
1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1545 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1546 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1538SV * 1563SV *
1539new (char *klass, ...) 1564new (char *klass, ...)
1540 CODE: 1565 CODE:
1541{ 1566{
1542 struct coro *coro; 1567 struct coro *coro;
1568 MAGIC *mg;
1543 HV *hv; 1569 HV *hv;
1544 int i; 1570 int i;
1545 1571
1546 Newz (0, coro, 1, struct coro); 1572 Newz (0, coro, 1, struct coro);
1547 coro->args = newAV (); 1573 coro->args = newAV ();
… …
1550 if (coro_first) coro_first->prev = coro; 1576 if (coro_first) coro_first->prev = coro;
1551 coro->next = coro_first; 1577 coro->next = coro_first;
1552 coro_first = coro; 1578 coro_first = coro;
1553 1579
1554 coro->hv = hv = newHV (); 1580 coro->hv = hv = newHV ();
1555 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1581 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1582 mg->mg_flags |= MGf_DUP;
1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1583 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1557 1584
1558 av_extend (coro->args, items - 1); 1585 av_extend (coro->args, items - 1);
1559 for (i = 1; i < items; i++) 1586 for (i = 1; i < items; i++)
1560 av_push (coro->args, newSVsv (ST (i))); 1587 av_push (coro->args, newSVsv (ST (i)));

Diff Legend

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