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.203 by root, Mon Oct 8 03:02:00 2007 UTC vs.
Revision 1.217 by root, Wed Nov 14 11:32:56 2007 UTC

… …
10#include "patchlevel.h" 10#include "patchlevel.h"
11 11
12#include <stdio.h> 12#include <stdio.h>
13#include <errno.h> 13#include <errno.h>
14#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
15 16
16#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
17# include <unistd.h> 18# include <unistd.h>
18# include <sys/mman.h> 19# include <sys/mman.h>
19# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
… …
130#else 131#else
131# define LOCK (void)0 132# define LOCK (void)0
132# define UNLOCK (void)0 133# define UNLOCK (void)0
133#endif 134#endif
134 135
135#define strpair(const) const, sizeof (const) - 1
136
137/* helper storage struct for Coro::AIO */ 136/* helper storage struct for Coro::AIO */
138struct io_state 137struct io_state
139{ 138{
140 int errorno; 139 int errorno;
141 I32 laststype; 140 I32 laststype;
… …
146static size_t coro_stacksize = CORO_STACKSIZE; 145static size_t coro_stacksize = CORO_STACKSIZE;
147static struct CoroAPI coroapi; 146static struct CoroAPI coroapi;
148static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
149static JMPENV *main_top_env; 148static JMPENV *main_top_env;
150static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
151static SV *coro_mortal; /* will be freed after next transfer */ 150static volatile SV *coro_mortal; /* will be freed after next transfer */
152 151
153static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */ 153static GV *stdoutgv; /* *STDOUT */
155 154static SV *rv_diehook;
155static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */ 156static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
159 157
160/* async_pool helper stuff */ 158/* async_pool helper stuff */
161static SV *sv_pool_rss; 159static SV *sv_pool_rss;
162static SV *sv_pool_size; 160static SV *sv_pool_size;
163static AV *av_async_pool; 161static AV *av_async_pool;
… …
261static struct coro *coro_first; 259static struct coro *coro_first;
262 260
263/** lowlevel stuff **********************************************************/ 261/** lowlevel stuff **********************************************************/
264 262
265static SV * 263static SV *
266coro_get_sv (const char *name, int create) 264coro_get_sv (pTHX_ const char *name, int create)
267{ 265{
268#if PERL_VERSION_ATLEAST (5,9,0) 266#if PERL_VERSION_ATLEAST (5,9,0)
269 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
270 get_sv (name, create); 268 get_sv (name, create);
271#endif 269#endif
272 return get_sv (name, create); 270 return get_sv (name, create);
273} 271}
274 272
275static AV * 273static AV *
276coro_get_av (const char *name, int create) 274coro_get_av (pTHX_ const char *name, int create)
277{ 275{
278#if PERL_VERSION_ATLEAST (5,9,0) 276#if PERL_VERSION_ATLEAST (5,9,0)
279 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
280 get_av (name, create); 278 get_av (name, create);
281#endif 279#endif
282 return get_av (name, create); 280 return get_av (name, create);
283} 281}
284 282
285static HV * 283static HV *
286coro_get_hv (const char *name, int create) 284coro_get_hv (pTHX_ const char *name, int create)
287{ 285{
288#if PERL_VERSION_ATLEAST (5,9,0) 286#if PERL_VERSION_ATLEAST (5,9,0)
289 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
290 get_hv (name, create); 288 get_hv (name, create);
291#endif 289#endif
… …
346 344
347 /* casting is fun. */ 345 /* casting is fun. */
348 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
349 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
350 348
351 SvREFCNT_dec (av);
352
353 return 0; 349 return 0;
354} 350}
355 351
356#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
357 354
358static 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};
359 359
360#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
361 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
362 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
363 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
364 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
365 : 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)
366 369
367static struct coro * 370static struct coro *
368SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
369{ 372{
370 HV *stash; 373 HV *stash;
… …
382 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
383 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
384 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
385 } 388 }
386 389
387 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
388 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
389} 392}
390 393
391#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
392 395
393/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
394static void 397static void
395get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
396{ 399{
397 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
398 AV *av; 401 AV *av;
399 402
400 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
401 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
402 else 405 else
… …
414} 417}
415 418
416static void 419static void
417put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
418{ 421{
419 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
420 AV *av; 423 AV *av;
421 424
422 if (expect_false (!mg)) 425 if (expect_false (!mg))
423 { 426 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
424 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
425 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
426 mg->mg_virtual = &vtbl_coro;
427 mg->mg_obj = (SV *)newAV ();
428 }
429 427
430 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
431 429
432 if (expect_false (AvFILLp (av) >= AvMAX (av))) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
433 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
… …
451 GvSV (irsgv) = slot->irsgv; 449 GvSV (irsgv) = slot->irsgv;
452 450
453 #define VAR(name,type) PL_ ## name = slot->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
454 # include "state.h" 452 # include "state.h"
455 #undef VAR 453 #undef VAR
456
457 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
458 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
459 454
460 { 455 {
461 dSP; 456 dSP;
462 457
463 CV *cv; 458 CV *cv;
… …
556 * allocate various perl stacks. This is an exact copy 551 * allocate various perl stacks. This is an exact copy
557 * of perl.c:init_stacks, except that it uses less memory 552 * of perl.c:init_stacks, except that it uses less memory
558 * on the (sometimes correct) assumption that coroutines do 553 * on the (sometimes correct) assumption that coroutines do
559 * not usually need a lot of stackspace. 554 * not usually need a lot of stackspace.
560 */ 555 */
561#if 1 556#if CORO_PREFER_PERL_FUNCTIONS
562# define coro_init_stacks init_stacks 557# define coro_init_stacks init_stacks
563#else 558#else
564static void 559static void
565coro_init_stacks (pTHX) 560coro_init_stacks (pTHX)
566{ 561{
… …
668 663
669 return rss; 664 return rss;
670} 665}
671 666
672/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
668
669#if 0
670static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
671
672/*
673 * This overrides the default magic get method of %SIG elements.
674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675 * and instead of tryign to save and restore the hash elements, we just provide
676 * readback here.
677 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
678 * not expecting this to actually change the hook. This is a potential problem
679 * when a schedule happens then, but we ignore this.
680 */
681static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{
684 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg);
686
687 if (*s == '_')
688 {
689 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
690 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691 }
692
693 return orig_sigelem_get (aTHX_ sv, mg);
694}
695#endif
673 696
674static void 697static void
675coro_setup (pTHX_ struct coro *coro) 698coro_setup (pTHX_ struct coro *coro)
676{ 699{
677 /* 700 /*
… …
686 PL_curpm = 0; 709 PL_curpm = 0;
687 PL_curpad = 0; 710 PL_curpad = 0;
688 PL_localizing = 0; 711 PL_localizing = 0;
689 PL_dirty = 0; 712 PL_dirty = 0;
690 PL_restartop = 0; 713 PL_restartop = 0;
691 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 714
692 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 715 /* recreate the die/warn hooks */
716 PL_diehook = 0;
717 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0);
718 PL_diehook = SvREFCNT_inc (rv_diehook);
719
720 PL_warnhook = 0;
721 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
722 PL_warnhook = SvREFCNT_inc (rv_warnhook);
693 723
694 GvSV (PL_defgv) = newSV (0); 724 GvSV (PL_defgv) = newSV (0);
695 GvAV (PL_defgv) = coro->args; coro->args = 0; 725 GvAV (PL_defgv) = coro->args; coro->args = 0;
696 GvSV (PL_errgv) = newSV (0); 726 GvSV (PL_errgv) = newSV (0);
697 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
712 PL_op = (OP *)&myop; 742 PL_op = (OP *)&myop;
713 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 743 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
714 SPAGAIN; 744 SPAGAIN;
715 } 745 }
716 746
717 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 747 /* this newly created coroutine might be run on an existing cctx which most
748 * likely was suspended in set_stacklevel, called from entersub.
749 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
750 * so we ENTER here for symmetry
751 */
752 ENTER;
718} 753}
719 754
720static void 755static void
721coro_destroy (pTHX_ struct coro *coro) 756coro_destroy (pTHX_ struct coro *coro)
722{ 757{
… …
806 PUSHMARK (SP); 841 PUSHMARK (SP);
807 PUSHs (&PL_sv_no); 842 PUSHs (&PL_sv_no);
808 PUSHs (fullname); 843 PUSHs (fullname);
809 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 844 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
810 PUTBACK; 845 PUTBACK;
811 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 846 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
812 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 847 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
813 SPAGAIN; 848 SPAGAIN;
814 FREETMPS; 849 FREETMPS;
815 LEAVE; 850 LEAVE;
816 PL_runops = runops_trace; 851 PL_runops = runops_trace;
… …
845 PUSHMARK (SP); 880 PUSHMARK (SP);
846 PUSHs (&PL_sv_yes); 881 PUSHs (&PL_sv_yes);
847 PUSHs (fullname); 882 PUSHs (fullname);
848 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 883 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
849 PUTBACK; 884 PUTBACK;
850 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 885 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
851 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 886 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
852 SPAGAIN; 887 SPAGAIN;
853 FREETMPS; 888 FREETMPS;
854 LEAVE; 889 LEAVE;
855 PL_runops = runops_trace; 890 PL_runops = runops_trace;
… …
869 PL_runops = RUNOPS_DEFAULT; 904 PL_runops = RUNOPS_DEFAULT;
870 PUSHMARK (SP); 905 PUSHMARK (SP);
871 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 906 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
872 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 907 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
873 PUTBACK; 908 PUTBACK;
874 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 909 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
875 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 910 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
876 SPAGAIN; 911 SPAGAIN;
877 FREETMPS; 912 FREETMPS;
878 LEAVE; 913 LEAVE;
879 PL_runops = runops_trace; 914 PL_runops = runops_trace;
… …
1085/* always use the TRANSFER macro */ 1120/* always use the TRANSFER macro */
1086static void NOINLINE 1121static void NOINLINE
1087transfer (pTHX_ struct coro *prev, struct coro *next) 1122transfer (pTHX_ struct coro *prev, struct coro *next)
1088{ 1123{
1089 dSTACKLEVEL; 1124 dSTACKLEVEL;
1125 static volatile int has_throw;
1090 1126
1091 /* sometimes transfer is only called to set idle_sp */ 1127 /* sometimes transfer is only called to set idle_sp */
1092 if (expect_false (!next)) 1128 if (expect_false (!next))
1093 { 1129 {
1094 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1130 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1109 prev->flags &= ~CF_RUNNING; 1145 prev->flags &= ~CF_RUNNING;
1110 next->flags |= CF_RUNNING; 1146 next->flags |= CF_RUNNING;
1111 1147
1112 LOCK; 1148 LOCK;
1113 1149
1150 /* first get rid of the old state */
1151 save_perl (aTHX_ prev);
1152
1114 if (expect_false (next->flags & CF_NEW)) 1153 if (expect_false (next->flags & CF_NEW))
1115 { 1154 {
1116 /* need to start coroutine */ 1155 /* need to start coroutine */
1117 next->flags &= ~CF_NEW; 1156 next->flags &= ~CF_NEW;
1118 /* first get rid of the old state */
1119 save_perl (aTHX_ prev);
1120 /* setup coroutine call */ 1157 /* setup coroutine call */
1121 coro_setup (aTHX_ next); 1158 coro_setup (aTHX_ next);
1122 } 1159 }
1123 else 1160 else
1124 {
1125 /* coroutine already started */
1126 save_perl (aTHX_ prev);
1127 load_perl (aTHX_ next); 1161 load_perl (aTHX_ next);
1128 }
1129 1162
1130 prev__cctx = prev->cctx; 1163 prev__cctx = prev->cctx;
1131 1164
1132 /* possibly "free" the cctx */ 1165 /* possibly "free" the cctx */
1133 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1166 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
… …
1148 1181
1149 ++next->usecount; 1182 ++next->usecount;
1150 1183
1151 if (expect_true (!next->cctx)) 1184 if (expect_true (!next->cctx))
1152 next->cctx = cctx_get (aTHX); 1185 next->cctx = cctx_get (aTHX);
1186
1187 has_throw = !!next->throw;
1153 1188
1154 if (expect_false (prev__cctx != next->cctx)) 1189 if (expect_false (prev__cctx != next->cctx))
1155 { 1190 {
1156 prev__cctx->top_env = PL_top_env; 1191 prev__cctx->top_env = PL_top_env;
1157 PL_top_env = next->cctx->top_env; 1192 PL_top_env = next->cctx->top_env;
… …
1159 } 1194 }
1160 1195
1161 free_coro_mortal (aTHX); 1196 free_coro_mortal (aTHX);
1162 UNLOCK; 1197 UNLOCK;
1163 1198
1164 if (expect_false (prev->throw || next->throw)) 1199 if (expect_false (has_throw))
1165 { 1200 {
1166 struct coro *coro = SvSTATE (coro_current); 1201 struct coro *coro = SvSTATE (coro_current);
1167 1202
1168 if (coro->throw) 1203 if (coro->throw)
1169 { 1204 {
… …
1501#endif 1536#endif
1502 BOOT_PAGESIZE; 1537 BOOT_PAGESIZE;
1503 1538
1504 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1539 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1505 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1540 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1506 1541#if 0
1542 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1543 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1544#endif
1507 hv_sig = coro_get_hv ("SIG", TRUE); 1545 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1508 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1546 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1509 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1547 rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1510
1511 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1512 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1513 1548
1514 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1549 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1515 1550
1516 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1551 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1517 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1552 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1523 1558
1524 while (main_top_env->je_prev) 1559 while (main_top_env->je_prev)
1525 main_top_env = main_top_env->je_prev; 1560 main_top_env = main_top_env->je_prev;
1526 1561
1527 coroapi.ver = CORO_API_VERSION; 1562 coroapi.ver = CORO_API_VERSION;
1563 coroapi.rev = CORO_API_REVISION;
1528 coroapi.transfer = api_transfer; 1564 coroapi.transfer = api_transfer;
1529 1565
1530 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1566 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1531} 1567}
1532 1568
1533SV * 1569SV *
1534new (char *klass, ...) 1570new (char *klass, ...)
1535 CODE: 1571 CODE:
1536{ 1572{
1537 struct coro *coro; 1573 struct coro *coro;
1574 MAGIC *mg;
1538 HV *hv; 1575 HV *hv;
1539 int i; 1576 int i;
1540 1577
1541 Newz (0, coro, 1, struct coro); 1578 Newz (0, coro, 1, struct coro);
1542 coro->args = newAV (); 1579 coro->args = newAV ();
… …
1545 if (coro_first) coro_first->prev = coro; 1582 if (coro_first) coro_first->prev = coro;
1546 coro->next = coro_first; 1583 coro->next = coro_first;
1547 coro_first = coro; 1584 coro_first = coro;
1548 1585
1549 coro->hv = hv = newHV (); 1586 coro->hv = hv = newHV ();
1550 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1587 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1588 mg->mg_flags |= MGf_DUP;
1551 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1589 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1552 1590
1553 av_extend (coro->args, items - 1); 1591 av_extend (coro->args, items - 1);
1554 for (i = 1; i < items; i++) 1592 for (i = 1; i < items; i++)
1555 av_push (coro->args, newSVsv (ST (i))); 1593 av_push (coro->args, newSVsv (ST (i)));
… …
1599 1637
1600 break; 1638 break;
1601 } 1639 }
1602 1640
1603 BARRIER; 1641 BARRIER;
1642 PUTBACK;
1604 TRANSFER (ta); 1643 TRANSFER (ta);
1605 1644 SPAGAIN; /* might be the sp of a different coroutine now */
1606 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1645 /* be extra careful not to ever do anything after TRANSFER */
1607 XSRETURN_YES;
1608} 1646}
1609 1647
1610bool 1648bool
1611_destroy (SV *coro_sv) 1649_destroy (SV *coro_sv)
1612 CODE: 1650 CODE:
… …
1672 1710
1673 { 1711 {
1674 dSP; 1712 dSP;
1675 ENTER; 1713 ENTER;
1676 SAVETMPS; 1714 SAVETMPS;
1715 PUTBACK;
1716 PUSHSTACK;
1677 PUSHMARK (SP); 1717 PUSHMARK (SP);
1678 PUTBACK;
1679 1718
1680 if (ix) 1719 if (ix)
1681 eval_sv (coderef, 0); 1720 eval_sv (coderef, 0);
1682 else 1721 else
1683 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1722 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1684 1723
1724 POPSTACK;
1685 SPAGAIN; 1725 SPAGAIN;
1686 FREETMPS; 1726 FREETMPS;
1687 LEAVE; 1727 LEAVE;
1688 PUTBACK; 1728 PUTBACK;
1689 } 1729 }
… …
1747 1787
1748BOOT: 1788BOOT:
1749{ 1789{
1750 int i; 1790 int i;
1751 1791
1752 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1792 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1753 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1793 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1754 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1755 1795
1756 coro_current = coro_get_sv ("Coro::current", FALSE); 1796 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1757 SvREADONLY_on (coro_current); 1797 SvREADONLY_on (coro_current);
1758 1798
1759 coro_stash = gv_stashpv ("Coro", TRUE); 1799 coro_stash = gv_stashpv ("Coro", TRUE);
1760 1800
1761 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1801 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1844 CODE: 1884 CODE:
1845{ 1885{
1846 struct coro *coro = SvSTATE (coro_current); 1886 struct coro *coro = SvSTATE (coro_current);
1847 HV *hv = (HV *)SvRV (coro_current); 1887 HV *hv = (HV *)SvRV (coro_current);
1848 AV *defav = GvAV (PL_defgv); 1888 AV *defav = GvAV (PL_defgv);
1849 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1889 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1850 AV *invoke_av; 1890 AV *invoke_av;
1851 int i, len; 1891 int i, len;
1852 1892
1853 if (!invoke) 1893 if (!invoke)
1854 croak ("\3async_pool terminate\2\n"); 1894 croak ("\3async_pool terminate\2\n");
1855 1895
1856 SvREFCNT_dec (coro->saved_deffh); 1896 SvREFCNT_dec (coro->saved_deffh);
1857 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1897 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1858 1898
1859 hv_store (hv, "desc", sizeof ("desc") - 1, 1899 hv_store (hv, "desc", sizeof ("desc") - 1,
1860 newSVpvn (strpair ("[async_pool]")), 0); 1900 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1861 1901
1862 invoke_av = (AV *)SvRV (invoke); 1902 invoke_av = (AV *)SvRV (invoke);
1863 len = av_len (invoke_av); 1903 len = av_len (invoke_av);
1864 1904
1865 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1905 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1888 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1928 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1889 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1929 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1890 croak ("\3async_pool terminate\2\n"); 1930 croak ("\3async_pool terminate\2\n");
1891 1931
1892 av_clear (GvAV (PL_defgv)); 1932 av_clear (GvAV (PL_defgv));
1893 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1933 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1894 newSVpvn (strpair ("[async_pool idle]")), 0); 1934 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1895 1935
1896 coro->prio = 0; 1936 coro->prio = 0;
1897 1937
1898 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1938 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1899 api_trace (coro_current, 0); 1939 api_trace (coro_current, 0);

Diff Legend

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