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.209 by root, Wed Oct 10 02:58:17 2007 UTC vs.
Revision 1.232 by root, Thu Apr 24 12:40:38 2008 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
16#ifdef WIN32
17# undef setjmp
18# undef longjmp
19# undef _exit
20# define setjmp _setjmp // deep magic, don't ask
21#else
15#include <inttypes.h> /* portable stdint.h */ 22# include <inttypes.h> /* most portable stdint.h */
23#endif
16 24
17#ifdef HAVE_MMAP 25#ifdef HAVE_MMAP
18# include <unistd.h> 26# include <unistd.h>
19# include <sys/mman.h> 27# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS 28# ifndef MAP_ANONYMOUS
… …
72# ifndef IS_PADCONST 80# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 81# define IS_PADCONST(v) 0
74# endif 82# endif
75#endif 83#endif
76 84
85/* 5.8.8 */
86#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0
88#endif
89#ifndef newSV
90# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
77/* 5.8.7 */ 98/* 5.8.7 */
78#ifndef SvRV_set 99#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 100# define SvRV_set(s,v) SvRV(s) = (v)
80#endif
81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif 101#endif
89 102
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 103#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 104# undef CORO_STACKGUARD
92#endif 105#endif
… …
131#else 144#else
132# define LOCK (void)0 145# define LOCK (void)0
133# define UNLOCK (void)0 146# define UNLOCK (void)0
134#endif 147#endif
135 148
136#define strpair(const) const, sizeof (const) - 1
137
138/* helper storage struct for Coro::AIO */ 149/* helper storage struct for Coro::AIO */
139struct io_state 150struct io_state
140{ 151{
141 int errorno; 152 int errorno;
142 I32 laststype; 153 I32 laststype;
… …
147static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
148static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
149static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env; 161static JMPENV *main_top_env;
151static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
152static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
153 164
154static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
156 167static SV *rv_diehook;
168static SV *rv_warnhook;
157static HV *hv_sig; /* %SIG */ 169static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160 170
161/* async_pool helper stuff */ 171/* async_pool helper stuff */
162static SV *sv_pool_rss; 172static SV *sv_pool_rss;
163static SV *sv_pool_size; 173static SV *sv_pool_size;
164static AV *av_async_pool; 174static AV *av_async_pool;
165 175
166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */ 176static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle[3]; 177static int cctx_count, cctx_idle;
168 178
169enum { 179enum {
170 CC_MAPPED = 0x01, 180 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 181 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 182 CC_TRACE = 0x04,
… …
217 227
218/* this is a structure representing a perl-level coroutine */ 228/* this is a structure representing a perl-level coroutine */
219struct coro { 229struct coro {
220 /* the c coroutine allocated to this perl coroutine, if any */ 230 /* the c coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 231 coro_cctx *cctx;
222 int gimme;
223 232
224 /* process data */ 233 /* process data */
225 AV *mainstack; 234 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */ 235 perl_slots *slot; /* basically the saved sp */
227 236
… …
263static struct coro *coro_first; 272static struct coro *coro_first;
264 273
265/** lowlevel stuff **********************************************************/ 274/** lowlevel stuff **********************************************************/
266 275
267static SV * 276static SV *
268coro_get_sv (const char *name, int create) 277coro_get_sv (pTHX_ const char *name, int create)
269{ 278{
270#if PERL_VERSION_ATLEAST (5,9,0) 279#if PERL_VERSION_ATLEAST (5,10,0)
271 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
272 get_sv (name, create); 281 get_sv (name, create);
273#endif 282#endif
274 return get_sv (name, create); 283 return get_sv (name, create);
275} 284}
276 285
277static AV * 286static AV *
278coro_get_av (const char *name, int create) 287coro_get_av (pTHX_ const char *name, int create)
279{ 288{
280#if PERL_VERSION_ATLEAST (5,9,0) 289#if PERL_VERSION_ATLEAST (5,10,0)
281 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
282 get_av (name, create); 291 get_av (name, create);
283#endif 292#endif
284 return get_av (name, create); 293 return get_av (name, create);
285} 294}
286 295
287static HV * 296static HV *
288coro_get_hv (const char *name, int create) 297coro_get_hv (pTHX_ const char *name, int create)
289{ 298{
290#if PERL_VERSION_ATLEAST (5,9,0) 299#if PERL_VERSION_ATLEAST (5,10,0)
291 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 300 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
292 get_hv (name, create); 301 get_hv (name, create);
293#endif 302#endif
294 return get_hv (name, create); 303 return get_hv (name, create);
295} 304}
… …
300 AV *padlist = CvPADLIST (cv); 309 AV *padlist = CvPADLIST (cv);
301 AV *newpadlist, *newpad; 310 AV *newpadlist, *newpad;
302 311
303 newpadlist = newAV (); 312 newpadlist = newAV ();
304 AvREAL_off (newpadlist); 313 AvREAL_off (newpadlist);
305#if PERL_VERSION_ATLEAST (5,9,0) 314#if PERL_VERSION_ATLEAST (5,10,0)
306 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 315 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
307#else 316#else
308 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 317 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
309#endif 318#endif
310 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 319 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
… …
348 357
349 /* casting is fun. */ 358 /* casting is fun. */
350 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 359 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
351 free_padlist (aTHX_ padlist); 360 free_padlist (aTHX_ padlist);
352 361
353 SvREFCNT_dec (av);
354
355 return 0; 362 return 0;
356} 363}
357 364
358#define PERL_MAGIC_coro PERL_MAGIC_ext 365#define CORO_MAGIC_type_cv PERL_MAGIC_ext
366#define CORO_MAGIC_type_state PERL_MAGIC_ext
359 367
360static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 368static MGVTBL coro_cv_vtbl = {
369 0, 0, 0, 0,
370 coro_cv_free
371};
361 372
362#define CORO_MAGIC(cv) \ 373#define CORO_MAGIC(sv,type) \
363 SvMAGIC (cv) \ 374 SvMAGIC (sv) \
364 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 375 ? SvMAGIC (sv)->mg_type == type \
365 ? SvMAGIC (cv) \ 376 ? SvMAGIC (sv) \
366 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 377 : mg_find (sv, type) \
367 : 0 378 : 0
379
380#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
381#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
368 382
369static struct coro * 383static struct coro *
370SvSTATE_ (pTHX_ SV *coro) 384SvSTATE_ (pTHX_ SV *coro)
371{ 385{
372 HV *stash; 386 HV *stash;
… …
384 /* very slow, but rare, check */ 398 /* very slow, but rare, check */
385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 399 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
386 croak ("Coro::State object required"); 400 croak ("Coro::State object required");
387 } 401 }
388 402
389 mg = CORO_MAGIC (coro); 403 mg = CORO_MAGIC_state (coro);
390 return (struct coro *)mg->mg_ptr; 404 return (struct coro *)mg->mg_ptr;
391} 405}
392 406
393#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 407#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
394 408
395/* the next two functions merely cache the padlists */ 409/* the next two functions merely cache the padlists */
396static void 410static void
397get_padlist (pTHX_ CV *cv) 411get_padlist (pTHX_ CV *cv)
398{ 412{
399 MAGIC *mg = CORO_MAGIC (cv); 413 MAGIC *mg = CORO_MAGIC_cv (cv);
400 AV *av; 414 AV *av;
401 415
402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 416 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 417 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
404 else 418 else
… …
416} 430}
417 431
418static void 432static void
419put_padlist (pTHX_ CV *cv) 433put_padlist (pTHX_ CV *cv)
420{ 434{
421 MAGIC *mg = CORO_MAGIC (cv); 435 MAGIC *mg = CORO_MAGIC_cv (cv);
422 AV *av; 436 AV *av;
423 437
424 if (expect_false (!mg)) 438 if (expect_false (!mg))
425 { 439 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
428 mg->mg_virtual = &vtbl_coro;
429 mg->mg_obj = (SV *)newAV ();
430 }
431 440
432 av = (AV *)mg->mg_obj; 441 av = (AV *)mg->mg_obj;
433 442
434 if (expect_false (AvFILLp (av) >= AvMAX (av))) 443 if (expect_false (AvFILLp (av) >= AvMAX (av)))
435 av_extend (av, AvMAX (av) + 1); 444 av_extend (av, AvMAX (av) + 1);
… …
453 GvSV (irsgv) = slot->irsgv; 462 GvSV (irsgv) = slot->irsgv;
454 463
455 #define VAR(name,type) PL_ ## name = slot->name; 464 #define VAR(name,type) PL_ ## name = slot->name;
456 # include "state.h" 465 # include "state.h"
457 #undef VAR 466 #undef VAR
458
459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
461 467
462 { 468 {
463 dSP; 469 dSP;
464 470
465 CV *cv; 471 CV *cv;
… …
594 600
595 New(54,PL_savestack,24,ANY); 601 New(54,PL_savestack,24,ANY);
596 PL_savestack_ix = 0; 602 PL_savestack_ix = 0;
597 PL_savestack_max = 24; 603 PL_savestack_max = 24;
598 604
599#if !PERL_VERSION_ATLEAST (5,9,0) 605#if !PERL_VERSION_ATLEAST (5,10,0)
600 New(54,PL_retstack,4,OP*); 606 New(54,PL_retstack,4,OP*);
601 PL_retstack_ix = 0; 607 PL_retstack_ix = 0;
602 PL_retstack_max = 4; 608 PL_retstack_max = 4;
603#endif 609#endif
604} 610}
… …
627 633
628 Safefree (PL_tmps_stack); 634 Safefree (PL_tmps_stack);
629 Safefree (PL_markstack); 635 Safefree (PL_markstack);
630 Safefree (PL_scopestack); 636 Safefree (PL_scopestack);
631 Safefree (PL_savestack); 637 Safefree (PL_savestack);
632#if !PERL_VERSION_ATLEAST (5,9,0) 638#if !PERL_VERSION_ATLEAST (5,10,0)
633 Safefree (PL_retstack); 639 Safefree (PL_retstack);
634#endif 640#endif
635} 641}
636 642
637static size_t 643static size_t
… …
661 rss += slot->tmps_max * sizeof (SV *); 667 rss += slot->tmps_max * sizeof (SV *);
662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 668 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
663 rss += slot->scopestack_max * sizeof (I32); 669 rss += slot->scopestack_max * sizeof (I32);
664 rss += slot->savestack_max * sizeof (ANY); 670 rss += slot->savestack_max * sizeof (ANY);
665 671
666#if !PERL_VERSION_ATLEAST (5,9,0) 672#if !PERL_VERSION_ATLEAST (5,10,0)
667 rss += slot->retstack_max * sizeof (OP *); 673 rss += slot->retstack_max * sizeof (OP *);
668#endif 674#endif
669 } 675 }
670 676
671 return rss; 677 return rss;
672} 678}
673 679
674/** coroutine stack handling ************************************************/ 680/** coroutine stack handling ************************************************/
681
682static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
683static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
684
685/*
686 * This overrides the default magic get method of %SIG elements.
687 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
688 * and instead of tryign to save and restore the hash elements, we just provide
689 * readback here.
690 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
691 * not expecting this to actually change the hook. This is a potential problem
692 * when a schedule happens then, but we ignore this.
693 */
694static int
695coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
696{
697 const char *s = MgPV_nolen_const (mg);
698
699 if (*s == '_')
700 {
701 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
702 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
703 }
704
705 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
706}
707
708static int
709coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
710{
711 const char *s = MgPV_nolen_const (mg);
712
713 if (*s == '_')
714 {
715 SV **svp = 0;
716
717 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
718 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
719
720 if (svp)
721 {
722 SV *old = *svp;
723 *svp = newSVsv (sv);
724 SvREFCNT_dec (old);
725 return 0;
726 }
727 }
728
729 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
730}
675 731
676static void 732static void
677coro_setup (pTHX_ struct coro *coro) 733coro_setup (pTHX_ struct coro *coro)
678{ 734{
679 /* 735 /*
… …
688 PL_curpm = 0; 744 PL_curpm = 0;
689 PL_curpad = 0; 745 PL_curpad = 0;
690 PL_localizing = 0; 746 PL_localizing = 0;
691 PL_dirty = 0; 747 PL_dirty = 0;
692 PL_restartop = 0; 748 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 749#if PERL_VERSION_ATLEAST (5,10,0)
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 750 PL_parser = 0;
751#endif
752
753 /* recreate the die/warn hooks */
754 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
755 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
695 756
696 GvSV (PL_defgv) = newSV (0); 757 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0; 758 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0); 759 GvSV (PL_errgv) = newSV (0);
699 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 760 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 773 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
713 PUTBACK; 774 PUTBACK;
714 PL_op = (OP *)&myop; 775 PL_op = (OP *)&myop;
715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 776 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
716 SPAGAIN; 777 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
731 } 778 }
779
780 /* this newly created coroutine might be run on an existing cctx which most
781 * likely was suspended in set_stacklevel, called from entersub.
782 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
783 * so we ENTER here for symmetry
784 */
785 ENTER;
732} 786}
733 787
734static void 788static void
735coro_destroy (pTHX_ struct coro *coro) 789coro_destroy (pTHX_ struct coro *coro)
736{ 790{
… …
820 PUSHMARK (SP); 874 PUSHMARK (SP);
821 PUSHs (&PL_sv_no); 875 PUSHs (&PL_sv_no);
822 PUSHs (fullname); 876 PUSHs (fullname);
823 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 877 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
824 PUTBACK; 878 PUTBACK;
825 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 879 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
826 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 880 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
827 SPAGAIN; 881 SPAGAIN;
828 FREETMPS; 882 FREETMPS;
829 LEAVE; 883 LEAVE;
830 PL_runops = runops_trace; 884 PL_runops = runops_trace;
… …
857 SAVETMPS; 911 SAVETMPS;
858 EXTEND (SP, 3); 912 EXTEND (SP, 3);
859 PUSHMARK (SP); 913 PUSHMARK (SP);
860 PUSHs (&PL_sv_yes); 914 PUSHs (&PL_sv_yes);
861 PUSHs (fullname); 915 PUSHs (fullname);
862 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 916 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
863 PUTBACK; 917 PUTBACK;
864 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 918 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
865 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 919 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
866 SPAGAIN; 920 SPAGAIN;
867 FREETMPS; 921 FREETMPS;
868 LEAVE; 922 LEAVE;
869 PL_runops = runops_trace; 923 PL_runops = runops_trace;
… …
883 PL_runops = RUNOPS_DEFAULT; 937 PL_runops = RUNOPS_DEFAULT;
884 PUSHMARK (SP); 938 PUSHMARK (SP);
885 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 939 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
886 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 940 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
887 PUTBACK; 941 PUTBACK;
888 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 942 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
889 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 943 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
890 SPAGAIN; 944 SPAGAIN;
891 FREETMPS; 945 FREETMPS;
892 LEAVE; 946 LEAVE;
893 PL_runops = runops_trace; 947 PL_runops = runops_trace;
… …
1032 1086
1033/* wether this cctx should be destructed */ 1087/* wether this cctx should be destructed */
1034#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1088#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1035 1089
1036static coro_cctx * 1090static coro_cctx *
1037cctx_get (pTHX_ int gimme) 1091cctx_get (pTHX)
1038{ 1092{
1039 while (expect_true (cctx_first[gimme])) 1093 while (expect_true (cctx_first))
1040 { 1094 {
1041 coro_cctx *cctx = cctx_first[gimme]; 1095 coro_cctx *cctx = cctx_first;
1042 cctx_first[gimme] = cctx->next; 1096 cctx_first = cctx->next;
1043 --cctx_idle[gimme]; 1097 --cctx_idle;
1044 1098
1045 if (expect_true (!CCTX_EXPIRED (cctx))) 1099 if (expect_true (!CCTX_EXPIRED (cctx)))
1046 return cctx; 1100 return cctx;
1047 1101
1048 cctx_destroy (cctx); 1102 cctx_destroy (cctx);
1049 } 1103 }
1050 1104
1051 assert (!gimme);
1052 return cctx_new (); 1105 return cctx_new ();
1053} 1106}
1054 1107
1055static void 1108static void
1056cctx_put (coro_cctx *cctx, int gimme) 1109cctx_put (coro_cctx *cctx)
1057{ 1110{
1058 /* free another cctx if overlimit */ 1111 /* free another cctx if overlimit */
1059 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX)) 1112 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
1060 { 1113 {
1061 coro_cctx *first = cctx_first[gimme]; 1114 coro_cctx *first = cctx_first;
1062 cctx_first[gimme] = first->next; 1115 cctx_first = first->next;
1063 --cctx_idle[gimme]; 1116 --cctx_idle;
1064 1117
1065 cctx_destroy (first); 1118 cctx_destroy (first);
1066 } 1119 }
1067 1120
1068 ++cctx_idle[gimme]; 1121 ++cctx_idle;
1069 cctx->next = cctx_first[gimme]; 1122 cctx->next = cctx_first;
1070 cctx_first[gimme] = cctx; 1123 cctx_first = cctx;
1071} 1124}
1072 1125
1073/** coroutine switching *****************************************************/ 1126/** coroutine switching *****************************************************/
1074 1127
1075static void 1128static void
… …
1084 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1137 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1085 1138
1086 if (expect_false (next->flags & CF_DESTROYED)) 1139 if (expect_false (next->flags & CF_DESTROYED))
1087 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1140 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1088 1141
1089 if (
1090#if PERL_VERSION_ATLEAST (5,9,0) 1142#if !PERL_VERSION_ATLEAST (5,10,0)
1091 expect_false (PL_parser)
1092#else
1093 expect_false (PL_lex_state != LEX_NOTPARSING) 1143 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1094#endif
1095 )
1096 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1144 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1145#endif
1097 } 1146 }
1098} 1147}
1099 1148
1100/* always use the TRANSFER macro */ 1149/* always use the TRANSFER macro */
1101static void NOINLINE 1150static void NOINLINE
1102transfer (pTHX_ struct coro *prev, struct coro *next) 1151transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1103{ 1152{
1104 dSTACKLEVEL; 1153 dSTACKLEVEL;
1154 static volatile int has_throw;
1105 1155
1106 /* sometimes transfer is only called to set idle_sp */ 1156 /* sometimes transfer is only called to set idle_sp */
1107 if (expect_false (!next)) 1157 if (expect_false (!next))
1108 { 1158 {
1109 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1159 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1124 prev->flags &= ~CF_RUNNING; 1174 prev->flags &= ~CF_RUNNING;
1125 next->flags |= CF_RUNNING; 1175 next->flags |= CF_RUNNING;
1126 1176
1127 LOCK; 1177 LOCK;
1128 1178
1179 /* first get rid of the old state */
1180 save_perl (aTHX_ prev);
1181
1129 if (expect_false (next->flags & CF_NEW)) 1182 if (expect_false (next->flags & CF_NEW))
1130 { 1183 {
1131 /* need to start coroutine */ 1184 /* need to start coroutine */
1132 next->flags &= ~CF_NEW; 1185 next->flags &= ~CF_NEW;
1133 /* first get rid of the old state */
1134 save_perl (aTHX_ prev);
1135 /* setup coroutine call */ 1186 /* setup coroutine call */
1136 coro_setup (aTHX_ next); 1187 coro_setup (aTHX_ next);
1137 } 1188 }
1138 else 1189 else
1139 {
1140 /* coroutine already started */
1141 save_perl (aTHX_ prev);
1142 load_perl (aTHX_ next); 1190 load_perl (aTHX_ next);
1143 }
1144 1191
1145 prev__cctx = prev->cctx; 1192 prev__cctx = prev->cctx;
1146 1193
1147 /* possibly "free" the cctx */ 1194 /* possibly "free" the cctx */
1148 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1195 if (expect_true (
1196 prev__cctx->idle_sp == STACKLEVEL
1197 && !(prev__cctx->flags & CC_TRACE)
1198 && !force_cctx
1199 ))
1149 { 1200 {
1150 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1201 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1151 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1202 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1152 1203
1153 prev->cctx = 0; 1204 prev->cctx = 0;
1154 1205
1155 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1206 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1156 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1207 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1157 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1208 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1158 if (!next->cctx) 1209 if (!next->cctx)
1159 next->cctx = cctx_get (aTHX_ next->gimme); 1210 next->cctx = cctx_get (aTHX);
1160 1211
1161 cctx_put (prev__cctx, prev->gimme); 1212 cctx_put (prev__cctx);
1162 } 1213 }
1163 1214
1164 ++next->usecount; 1215 ++next->usecount;
1165 1216
1166 if (expect_true (!next->cctx)) 1217 if (expect_true (!next->cctx))
1167 next->cctx = cctx_get (aTHX_ next->gimme); 1218 next->cctx = cctx_get (aTHX);
1219
1220 has_throw = !!next->throw;
1168 1221
1169 if (expect_false (prev__cctx != next->cctx)) 1222 if (expect_false (prev__cctx != next->cctx))
1170 { 1223 {
1171 prev__cctx->top_env = PL_top_env; 1224 prev__cctx->top_env = PL_top_env;
1172 PL_top_env = next->cctx->top_env; 1225 PL_top_env = next->cctx->top_env;
… …
1174 } 1227 }
1175 1228
1176 free_coro_mortal (aTHX); 1229 free_coro_mortal (aTHX);
1177 UNLOCK; 1230 UNLOCK;
1178 1231
1179 if (expect_false (prev->throw || next->throw)) 1232 if (expect_false (has_throw))
1180 { 1233 {
1181 struct coro *coro = SvSTATE (coro_current); 1234 struct coro *coro = SvSTATE (coro_current);
1182 1235
1183 if (coro->throw) 1236 if (coro->throw)
1184 { 1237 {
… …
1194struct transfer_args 1247struct transfer_args
1195{ 1248{
1196 struct coro *prev, *next; 1249 struct coro *prev, *next;
1197}; 1250};
1198 1251
1199#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1252#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1200#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1253#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1201 1254
1202/** high level stuff ********************************************************/ 1255/** high level stuff ********************************************************/
1203 1256
1204static int 1257static int
… …
1298{ 1351{
1299 dTHX; 1352 dTHX;
1300 struct transfer_args ta; 1353 struct transfer_args ta;
1301 1354
1302 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1355 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1303 TRANSFER (ta); 1356 TRANSFER (ta, 1);
1304} 1357}
1305 1358
1306/** Coro ********************************************************************/ 1359/** Coro ********************************************************************/
1307 1360
1308static void 1361static void
… …
1310{ 1363{
1311 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1364 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1312} 1365}
1313 1366
1314static SV * 1367static SV *
1315coro_deq (pTHX_ int min_prio) 1368coro_deq (pTHX)
1316{ 1369{
1317 int prio = PRIO_MAX - PRIO_MIN; 1370 int prio;
1318 1371
1319 min_prio -= PRIO_MIN;
1320 if (min_prio < 0)
1321 min_prio = 0;
1322
1323 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1372 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1324 if (AvFILLp (coro_ready [prio]) >= 0) 1373 if (AvFILLp (coro_ready [prio]) >= 0)
1325 return av_shift (coro_ready [prio]); 1374 return av_shift (coro_ready [prio]);
1326 1375
1327 return 0; 1376 return 0;
1328} 1377}
… …
1364 SV *prev_sv, *next_sv; 1413 SV *prev_sv, *next_sv;
1365 1414
1366 for (;;) 1415 for (;;)
1367 { 1416 {
1368 LOCK; 1417 LOCK;
1369 next_sv = coro_deq (aTHX_ PRIO_MIN); 1418 next_sv = coro_deq (aTHX);
1370 1419
1371 /* nothing to schedule: call the idle handler */ 1420 /* nothing to schedule: call the idle handler */
1372 if (expect_false (!next_sv)) 1421 if (expect_false (!next_sv))
1373 { 1422 {
1374 dSP; 1423 dSP;
… …
1378 SAVETMPS; 1427 SAVETMPS;
1379 1428
1380 PUSHMARK (SP); 1429 PUSHMARK (SP);
1381 PUTBACK; 1430 PUTBACK;
1382 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1431 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1432 SPAGAIN;
1383 1433
1384 FREETMPS; 1434 FREETMPS;
1385 LEAVE; 1435 LEAVE;
1386 continue; 1436 continue;
1387 } 1437 }
… …
1442{ 1492{
1443 dTHX; 1493 dTHX;
1444 struct transfer_args ta; 1494 struct transfer_args ta;
1445 1495
1446 prepare_schedule (aTHX_ &ta); 1496 prepare_schedule (aTHX_ &ta);
1447 TRANSFER (ta); 1497 TRANSFER (ta, 1);
1448} 1498}
1449 1499
1450static int 1500static int
1451api_cede (void) 1501api_cede (void)
1452{ 1502{
… …
1455 1505
1456 prepare_cede (aTHX_ &ta); 1506 prepare_cede (aTHX_ &ta);
1457 1507
1458 if (expect_true (ta.prev != ta.next)) 1508 if (expect_true (ta.prev != ta.next))
1459 { 1509 {
1460 TRANSFER (ta); 1510 TRANSFER (ta, 1);
1461 return 1; 1511 return 1;
1462 } 1512 }
1463 else 1513 else
1464 return 0; 1514 return 0;
1465} 1515}
… …
1470 dTHX; 1520 dTHX;
1471 struct transfer_args ta; 1521 struct transfer_args ta;
1472 1522
1473 if (prepare_cede_notself (aTHX_ &ta)) 1523 if (prepare_cede_notself (aTHX_ &ta))
1474 { 1524 {
1475 TRANSFER (ta); 1525 TRANSFER (ta, 1);
1476 return 1; 1526 return 1;
1477 } 1527 }
1478 else 1528 else
1479 return 0; 1529 return 0;
1480} 1530}
… …
1517 BOOT_PAGESIZE; 1567 BOOT_PAGESIZE;
1518 1568
1519 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1569 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1520 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1570 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1521 1571
1572 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1573 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1574 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1575 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1576
1522 hv_sig = coro_get_hv ("SIG", TRUE); 1577 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1523 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1578 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1524 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1579 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1525
1526 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1527 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1528 1580
1529 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1581 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1530 1582
1531 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1583 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1532 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1584 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1538 1590
1539 while (main_top_env->je_prev) 1591 while (main_top_env->je_prev)
1540 main_top_env = main_top_env->je_prev; 1592 main_top_env = main_top_env->je_prev;
1541 1593
1542 coroapi.ver = CORO_API_VERSION; 1594 coroapi.ver = CORO_API_VERSION;
1595 coroapi.rev = CORO_API_REVISION;
1543 coroapi.transfer = api_transfer; 1596 coroapi.transfer = api_transfer;
1544 1597
1545 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1598 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1546} 1599}
1547 1600
1548SV * 1601SV *
1549new (char *klass, ...) 1602new (char *klass, ...)
1550 CODE: 1603 CODE:
1551{ 1604{
1552 struct coro *coro; 1605 struct coro *coro;
1606 MAGIC *mg;
1553 HV *hv; 1607 HV *hv;
1554 int i; 1608 int i;
1555 1609
1556 Newz (0, coro, 1, struct coro); 1610 Newz (0, coro, 1, struct coro);
1557 coro->args = newAV (); 1611 coro->args = newAV ();
… …
1560 if (coro_first) coro_first->prev = coro; 1614 if (coro_first) coro_first->prev = coro;
1561 coro->next = coro_first; 1615 coro->next = coro_first;
1562 coro_first = coro; 1616 coro_first = coro;
1563 1617
1564 coro->hv = hv = newHV (); 1618 coro->hv = hv = newHV ();
1565 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1619 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1620 mg->mg_flags |= MGf_DUP;
1566 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1621 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1567 1622
1568 av_extend (coro->args, items - 1); 1623 av_extend (coro->args, items - 1);
1569 for (i = 1; i < items; i++) 1624 for (i = 1; i < items; i++)
1570 av_push (coro->args, newSVsv (ST (i))); 1625 av_push (coro->args, newSVsv (ST (i)));
… …
1576# function to increase chances that they all will call transfer with the same 1631# function to increase chances that they all will call transfer with the same
1577# stack offset 1632# stack offset
1578void 1633void
1579_set_stacklevel (...) 1634_set_stacklevel (...)
1580 ALIAS: 1635 ALIAS:
1581 Coro::State::transfer = 1 1636 Coro::State::transfer = 1
1582 Coro::schedule = 2 1637 Coro::schedule = 2
1583 Coro::cede = 3 1638 Coro::cede = 3
1584 Coro::cede_notself = 4 1639 Coro::cede_notself = 4
1585 Coro::Event::next = 5
1586 Coro::Event::next_cancel = 6
1587 PPCODE: 1640 CODE:
1588{ 1641{
1589 struct transfer_args ta; 1642 struct transfer_args ta;
1590 int again = 0;
1591 1643
1592 do 1644 PUTBACK;
1645 switch (ix)
1593 { 1646 {
1594 switch (ix)
1595 {
1596 case 0: 1647 case 0:
1597 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1648 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1598 ta.next = 0; 1649 ta.next = 0;
1599 break; 1650 break;
1600 1651
1601 case 1: 1652 case 1:
1602 if (items != 2) 1653 if (items != 2)
1603 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1654 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1604 1655
1605 prepare_transfer (aTHX_ &ta, ST(0), ST(1)); 1656 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1606 break; 1657 break;
1607 1658
1608 case 2: 1659 case 2:
1609 prepare_schedule (aTHX_ &ta); 1660 prepare_schedule (aTHX_ &ta);
1610 break; 1661 break;
1611 1662
1612 case 3: 1663 case 3:
1613 prepare_cede (aTHX_ &ta); 1664 prepare_cede (aTHX_ &ta);
1614 break; 1665 break;
1615 1666
1616 case 4: 1667 case 4:
1617 if (!prepare_cede_notself (aTHX_ &ta)) 1668 if (!prepare_cede_notself (aTHX_ &ta))
1618 XSRETURN_EMPTY; 1669 XSRETURN_EMPTY;
1619 1670
1620 break; 1671 break;
1621
1622 case 5:
1623 case 6:
1624 if (items != 1)
1625 croak ("Coro::Event::next (watcher) expects one argument, not %d", items);
1626
1627 {
1628 SV *ev = coroapi.coro_event_next (ST (0), ix == 6, GIMME_V != G_VOID);
1629
1630 if (ev)
1631 {
1632 if (GIMME_V != G_VOID)
1633 {
1634 XPUSHs (ev);
1635 XSRETURN (1);
1636 }
1637 else
1638 XSRETURN_EMPTY;
1639 }
1640 }
1641
1642 prepare_schedule (aTHX_ &ta);
1643 again = 1;
1644 break;
1645 }
1646
1647 /* our caller, entersub, caches *only* this value */
1648 ta.prev->gimme = GIMME_V == G_VOID ? 0
1649 : GIMME_V == G_SCALAR ? 1
1650 : 2;
1651
1652 /* we need to save all local variables, as we might execute a different coroutine when transfer returns */
1653 sp += 2; /* save args */
1654 EXTEND (SP, 4);
1655 PUSHs ((SV *)(intptr_t)items);
1656 PUSHs ((SV *)(intptr_t)ix);
1657 PUSHs ((SV *)(intptr_t)ax);
1658 PUSHs ((SV *)(intptr_t)again);
1659 PUTBACK;
1660 BARRIER;
1661 TRANSFER (ta);
1662 BARRIER;
1663 SPAGAIN;
1664 again = (intptr_t)POPs;
1665 ax = (intptr_t)POPs;
1666 ix = (intptr_t)POPs;
1667 items = (intptr_t)POPs;
1668 sp -= 2; /* restore args */
1669 } 1672 }
1670 while (again); 1673 SPAGAIN;
1671 1674
1672 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1675 BARRIER;
1673 XSRETURN_YES; 1676 PUTBACK;
1674 1677 TRANSFER (ta, 0);
1675 XSRETURN_EMPTY; /* not understood why this is necessary, likely some stack handling bug */ 1678 SPAGAIN; /* might be the sp of a different coroutine now */
1679 /* be extra careful not to ever do anything after TRANSFER */
1676} 1680}
1677 1681
1678bool 1682bool
1679_destroy (SV *coro_sv) 1683_destroy (SV *coro_sv)
1680 CODE: 1684 CODE:
… …
1706 RETVAL 1710 RETVAL
1707 1711
1708int 1712int
1709cctx_idle () 1713cctx_idle ()
1710 CODE: 1714 CODE:
1711 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2]; 1715 RETVAL = cctx_idle;
1712 OUTPUT: 1716 OUTPUT:
1713 RETVAL 1717 RETVAL
1714 1718
1715void 1719void
1716list () 1720list ()
… …
1732 { 1736 {
1733 struct coro temp; 1737 struct coro temp;
1734 1738
1735 if (!(coro->flags & CF_RUNNING)) 1739 if (!(coro->flags & CF_RUNNING))
1736 { 1740 {
1741 PUTBACK;
1737 save_perl (aTHX_ &temp); 1742 save_perl (aTHX_ &temp);
1738 load_perl (aTHX_ coro); 1743 load_perl (aTHX_ coro);
1739 } 1744 }
1740 1745
1741 { 1746 {
… …
1750 eval_sv (coderef, 0); 1755 eval_sv (coderef, 0);
1751 else 1756 else
1752 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1757 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1753 1758
1754 POPSTACK; 1759 POPSTACK;
1760 SPAGAIN;
1755 FREETMPS; 1761 FREETMPS;
1756 LEAVE; 1762 LEAVE;
1763 PUTBACK;
1757 } 1764 }
1758 1765
1759 if (!(coro->flags & CF_RUNNING)) 1766 if (!(coro->flags & CF_RUNNING))
1760 { 1767 {
1761 save_perl (aTHX_ coro); 1768 save_perl (aTHX_ coro);
1762 load_perl (aTHX_ &temp); 1769 load_perl (aTHX_ &temp);
1770 SPAGAIN;
1763 } 1771 }
1764 } 1772 }
1765} 1773}
1766 1774
1767SV * 1775SV *
… …
1808 case 1: RETVAL = coro->usecount; break; 1816 case 1: RETVAL = coro->usecount; break;
1809 } 1817 }
1810 OUTPUT: 1818 OUTPUT:
1811 RETVAL 1819 RETVAL
1812 1820
1821void
1822force_cctx ()
1823 CODE:
1824 struct coro *coro = SvSTATE (coro_current);
1825 coro->cctx->idle_sp = 0;
1813 1826
1814MODULE = Coro::State PACKAGE = Coro 1827MODULE = Coro::State PACKAGE = Coro
1815 1828
1816BOOT: 1829BOOT:
1817{ 1830{
1818 int i; 1831 int i;
1819 1832
1820 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1833 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1821 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1834 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1822 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1835 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1823 1836
1824 coro_current = coro_get_sv ("Coro::current", FALSE); 1837 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1825 SvREADONLY_on (coro_current); 1838 SvREADONLY_on (coro_current);
1826 1839
1827 coro_stash = gv_stashpv ("Coro", TRUE); 1840 coro_stash = gv_stashpv ("Coro", TRUE);
1828 1841
1829 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1904 PROTOTYPE: $;$ 1917 PROTOTYPE: $;$
1905 CODE: 1918 CODE:
1906 SvREFCNT_dec (self->throw); 1919 SvREFCNT_dec (self->throw);
1907 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1920 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1908 1921
1922void
1923swap_defsv (Coro::State self)
1924 PROTOTYPE: $
1925 ALIAS:
1926 swap_defav = 1
1927 CODE:
1928 if (!self->slot)
1929 croak ("cannot swap state with coroutine that has no saved state");
1930 else
1931 {
1932 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1933 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1934
1935 SV *tmp = *src; *src = *dst; *dst = tmp;
1936 }
1937
1909# for async_pool speedup 1938# for async_pool speedup
1910void 1939void
1911_pool_1 (SV *cb) 1940_pool_1 (SV *cb)
1912 CODE: 1941 CODE:
1913{ 1942{
1914 struct coro *coro = SvSTATE (coro_current); 1943 struct coro *coro = SvSTATE (coro_current);
1915 HV *hv = (HV *)SvRV (coro_current); 1944 HV *hv = (HV *)SvRV (coro_current);
1916 AV *defav = GvAV (PL_defgv); 1945 AV *defav = GvAV (PL_defgv);
1917 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1946 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1918 AV *invoke_av; 1947 AV *invoke_av;
1919 int i, len; 1948 int i, len;
1920 1949
1921 if (!invoke) 1950 if (!invoke)
1951 {
1952 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1922 croak ("\3async_pool terminate\2\n"); 1953 croak ("\3async_pool terminate\2\n");
1954 }
1923 1955
1924 SvREFCNT_dec (coro->saved_deffh); 1956 SvREFCNT_dec (coro->saved_deffh);
1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1957 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1926 1958
1927 hv_store (hv, "desc", sizeof ("desc") - 1, 1959 hv_store (hv, "desc", sizeof ("desc") - 1,
1928 newSVpvn (strpair ("[async_pool]")), 0); 1960 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1929 1961
1930 invoke_av = (AV *)SvRV (invoke); 1962 invoke_av = (AV *)SvRV (invoke);
1931 len = av_len (invoke_av); 1963 len = av_len (invoke_av);
1932 1964
1933 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1965 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1953 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1985 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1954 coro->saved_deffh = 0; 1986 coro->saved_deffh = 0;
1955 1987
1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1988 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1957 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1989 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1990 {
1991 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1958 croak ("\3async_pool terminate\2\n"); 1992 croak ("\3async_pool terminate\2\n");
1993 }
1959 1994
1960 av_clear (GvAV (PL_defgv)); 1995 av_clear (GvAV (PL_defgv));
1961 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1996 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1962 newSVpvn (strpair ("[async_pool idle]")), 0); 1997 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1963 1998
1964 coro->prio = 0; 1999 coro->prio = 0;
1965 2000
1966 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2001 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1967 api_trace (coro_current, 0); 2002 api_trace (coro_current, 0);

Diff Legend

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