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.207 by root, Tue Oct 9 22:29:27 2007 UTC vs.
Revision 1.224 by root, Sun Mar 2 16:10:22 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#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
… …
71# ifndef IS_PADCONST 72# ifndef IS_PADCONST
72# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
73# endif 74# endif
74#endif 75#endif
75 76
77/* 5.8.8 */
78#ifndef GV_NOTQUAL
79# define GV_NOTQUAL 0
80#endif
81#ifndef newSV
82# define newSV(l) NEWSV(0,l)
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
76/* 5.8.7 */ 90/* 5.8.7 */
77#ifndef SvRV_set 91#ifndef SvRV_set
78# define SvRV_set(s,v) SvRV(s) = (v) 92# define SvRV_set(s,v) SvRV(s) = (v)
79#endif
80
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif 93#endif
88 94
89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 95#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
90# undef CORO_STACKGUARD 96# undef CORO_STACKGUARD
91#endif 97#endif
… …
130#else 136#else
131# define LOCK (void)0 137# define LOCK (void)0
132# define UNLOCK (void)0 138# define UNLOCK (void)0
133#endif 139#endif
134 140
135#define strpair(const) const, sizeof (const) - 1
136
137/* helper storage struct for Coro::AIO */ 141/* helper storage struct for Coro::AIO */
138struct io_state 142struct io_state
139{ 143{
140 int errorno; 144 int errorno;
141 I32 laststype; 145 I32 laststype;
… …
146static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
147static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
148static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
149static JMPENV *main_top_env; 153static JMPENV *main_top_env;
150static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
151static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
152 156
153static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
155 159static SV *rv_diehook;
160static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */ 161static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
159 162
160/* async_pool helper stuff */ 163/* async_pool helper stuff */
161static SV *sv_pool_rss; 164static SV *sv_pool_rss;
162static SV *sv_pool_size; 165static SV *sv_pool_size;
163static AV *av_async_pool; 166static AV *av_async_pool;
… …
261static struct coro *coro_first; 264static struct coro *coro_first;
262 265
263/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
264 267
265static SV * 268static SV *
266coro_get_sv (const char *name, int create) 269coro_get_sv (pTHX_ const char *name, int create)
267{ 270{
268#if PERL_VERSION_ATLEAST (5,9,0) 271#if PERL_VERSION_ATLEAST (5,9,0)
269 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 272 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
270 get_sv (name, create); 273 get_sv (name, create);
271#endif 274#endif
272 return get_sv (name, create); 275 return get_sv (name, create);
273} 276}
274 277
275static AV * 278static AV *
276coro_get_av (const char *name, int create) 279coro_get_av (pTHX_ const char *name, int create)
277{ 280{
278#if PERL_VERSION_ATLEAST (5,9,0) 281#if PERL_VERSION_ATLEAST (5,9,0)
279 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 282 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
280 get_av (name, create); 283 get_av (name, create);
281#endif 284#endif
282 return get_av (name, create); 285 return get_av (name, create);
283} 286}
284 287
285static HV * 288static HV *
286coro_get_hv (const char *name, int create) 289coro_get_hv (pTHX_ const char *name, int create)
287{ 290{
288#if PERL_VERSION_ATLEAST (5,9,0) 291#if PERL_VERSION_ATLEAST (5,9,0)
289 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 292 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
290 get_hv (name, create); 293 get_hv (name, create);
291#endif 294#endif
… …
346 349
347 /* casting is fun. */ 350 /* casting is fun. */
348 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
349 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
350 353
351 SvREFCNT_dec (av);
352
353 return 0; 354 return 0;
354} 355}
355 356
356#define PERL_MAGIC_coro PERL_MAGIC_ext 357#define CORO_MAGIC_type_cv PERL_MAGIC_ext
358#define CORO_MAGIC_type_state PERL_MAGIC_ext
357 359
358static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 360static MGVTBL coro_cv_vtbl = {
361 0, 0, 0, 0,
362 coro_cv_free
363};
359 364
360#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
361 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
362 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
363 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
364 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
365 : 0 370 : 0
371
372#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
373#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
366 374
367static struct coro * 375static struct coro *
368SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
369{ 377{
370 HV *stash; 378 HV *stash;
… …
382 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
383 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
384 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
385 } 393 }
386 394
387 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
388 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
389} 397}
390 398
391#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
392 400
393/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
394static void 402static void
395get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
396{ 404{
397 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
398 AV *av; 406 AV *av;
399 407
400 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
401 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
402 else 410 else
… …
414} 422}
415 423
416static void 424static void
417put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
418{ 426{
419 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
420 AV *av; 428 AV *av;
421 429
422 if (expect_false (!mg)) 430 if (expect_false (!mg))
423 { 431 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 432
430 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
431 434
432 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
433 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
… …
451 GvSV (irsgv) = slot->irsgv; 454 GvSV (irsgv) = slot->irsgv;
452 455
453 #define VAR(name,type) PL_ ## name = slot->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
454 # include "state.h" 457 # include "state.h"
455 #undef VAR 458 #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 459
460 { 460 {
461 dSP; 461 dSP;
462 462
463 CV *cv; 463 CV *cv;
… …
669 return rss; 669 return rss;
670} 670}
671 671
672/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
673 673
674static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
675static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
676
677/*
678 * This overrides the default magic get method of %SIG elements.
679 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
680 * and instead of tryign to save and restore the hash elements, we just provide
681 * readback here.
682 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
683 * not expecting this to actually change the hook. This is a potential problem
684 * when a schedule happens then, but we ignore this.
685 */
686static int
687coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
688{
689 const char *s = MgPV_nolen_const (mg);
690
691 if (*s == '_')
692 {
693 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
694 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
695 }
696
697 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
698}
699
700static int
701coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
702{
703 const char *s = MgPV_nolen_const (mg);
704
705 if (*s == '_')
706 {
707 SV **svp = 0;
708
709 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
710 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
711
712 if (svp)
713 {
714 SV *old = *svp;
715 *svp = newSVsv (sv);
716 SvREFCNT_dec (old);
717 return;
718 }
719 }
720
721 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
722}
723
674static void 724static void
675coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
676{ 726{
677 /* 727 /*
678 * emulate part of the perl startup here. 728 * emulate part of the perl startup here.
… …
686 PL_curpm = 0; 736 PL_curpm = 0;
687 PL_curpad = 0; 737 PL_curpad = 0;
688 PL_localizing = 0; 738 PL_localizing = 0;
689 PL_dirty = 0; 739 PL_dirty = 0;
690 PL_restartop = 0; 740 PL_restartop = 0;
691 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 741
692 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 742 /* recreate the die/warn hooks */
743 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
744 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
693 745
694 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
695 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
696 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
697 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 749 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
712 PL_op = (OP *)&myop; 764 PL_op = (OP *)&myop;
713 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 765 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
714 SPAGAIN; 766 SPAGAIN;
715 } 767 }
716 768
717 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 769 /* this newly created coroutine might be run on an existing cctx which most
770 * likely was suspended in set_stacklevel, called from entersub.
771 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
772 * so we ENTER here for symmetry
773 */
774 ENTER;
718} 775}
719 776
720static void 777static void
721coro_destroy (pTHX_ struct coro *coro) 778coro_destroy (pTHX_ struct coro *coro)
722{ 779{
… …
806 PUSHMARK (SP); 863 PUSHMARK (SP);
807 PUSHs (&PL_sv_no); 864 PUSHs (&PL_sv_no);
808 PUSHs (fullname); 865 PUSHs (fullname);
809 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 866 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
810 PUTBACK; 867 PUTBACK;
811 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 868 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); 869 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
813 SPAGAIN; 870 SPAGAIN;
814 FREETMPS; 871 FREETMPS;
815 LEAVE; 872 LEAVE;
816 PL_runops = runops_trace; 873 PL_runops = runops_trace;
… …
843 SAVETMPS; 900 SAVETMPS;
844 EXTEND (SP, 3); 901 EXTEND (SP, 3);
845 PUSHMARK (SP); 902 PUSHMARK (SP);
846 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
847 PUSHs (fullname); 904 PUSHs (fullname);
848 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 905 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
849 PUTBACK; 906 PUTBACK;
850 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 907 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); 908 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
852 SPAGAIN; 909 SPAGAIN;
853 FREETMPS; 910 FREETMPS;
854 LEAVE; 911 LEAVE;
855 PL_runops = runops_trace; 912 PL_runops = runops_trace;
… …
869 PL_runops = RUNOPS_DEFAULT; 926 PL_runops = RUNOPS_DEFAULT;
870 PUSHMARK (SP); 927 PUSHMARK (SP);
871 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 928 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
872 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 929 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
873 PUTBACK; 930 PUTBACK;
874 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 931 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); 932 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
876 SPAGAIN; 933 SPAGAIN;
877 FREETMPS; 934 FREETMPS;
878 LEAVE; 935 LEAVE;
879 PL_runops = runops_trace; 936 PL_runops = runops_trace;
… …
1071 if (expect_false (next->flags & CF_DESTROYED)) 1128 if (expect_false (next->flags & CF_DESTROYED))
1072 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1129 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1073 1130
1074 if ( 1131 if (
1075#if PERL_VERSION_ATLEAST (5,9,0) 1132#if PERL_VERSION_ATLEAST (5,9,0)
1076 expect_false (PL_parser) 1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1077#else 1134#else
1078 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1079#endif 1136#endif
1080 ) 1137 )
1081 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1138 croak ("Coro::State::transfer called while parsing, but this is not supported");
… …
1085/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1086static void NOINLINE 1143static void NOINLINE
1087transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
1088{ 1145{
1089 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1090 1148
1091 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1092 if (expect_false (!next)) 1150 if (expect_false (!next))
1093 { 1151 {
1094 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1109 prev->flags &= ~CF_RUNNING; 1167 prev->flags &= ~CF_RUNNING;
1110 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
1111 1169
1112 LOCK; 1170 LOCK;
1113 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
1114 if (expect_false (next->flags & CF_NEW)) 1175 if (expect_false (next->flags & CF_NEW))
1115 { 1176 {
1116 /* need to start coroutine */ 1177 /* need to start coroutine */
1117 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
1118 /* first get rid of the old state */
1119 save_perl (aTHX_ prev);
1120 /* setup coroutine call */ 1179 /* setup coroutine call */
1121 coro_setup (aTHX_ next); 1180 coro_setup (aTHX_ next);
1122 } 1181 }
1123 else 1182 else
1124 {
1125 /* coroutine already started */
1126 save_perl (aTHX_ prev);
1127 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1128 }
1129 1184
1130 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1131 1186
1132 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1133 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1188 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
… …
1148 1203
1149 ++next->usecount; 1204 ++next->usecount;
1150 1205
1151 if (expect_true (!next->cctx)) 1206 if (expect_true (!next->cctx))
1152 next->cctx = cctx_get (aTHX); 1207 next->cctx = cctx_get (aTHX);
1208
1209 has_throw = !!next->throw;
1153 1210
1154 if (expect_false (prev__cctx != next->cctx)) 1211 if (expect_false (prev__cctx != next->cctx))
1155 { 1212 {
1156 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1157 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
… …
1159 } 1216 }
1160 1217
1161 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1162 UNLOCK; 1219 UNLOCK;
1163 1220
1164 if (expect_false (prev->throw || next->throw)) 1221 if (expect_false (has_throw))
1165 { 1222 {
1166 struct coro *coro = SvSTATE (coro_current); 1223 struct coro *coro = SvSTATE (coro_current);
1167 1224
1168 if (coro->throw) 1225 if (coro->throw)
1169 { 1226 {
… …
1295{ 1352{
1296 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1353 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1297} 1354}
1298 1355
1299static SV * 1356static SV *
1300coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1301{ 1358{
1302 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1303 1360
1304 min_prio -= PRIO_MIN;
1305 if (min_prio < 0)
1306 min_prio = 0;
1307
1308 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1309 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1310 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1311 1364
1312 return 0; 1365 return 0;
1313} 1366}
… …
1349 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1350 1403
1351 for (;;) 1404 for (;;)
1352 { 1405 {
1353 LOCK; 1406 LOCK;
1354 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1355 1408
1356 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1357 if (expect_false (!next_sv)) 1410 if (expect_false (!next_sv))
1358 { 1411 {
1359 dSP; 1412 dSP;
… …
1363 SAVETMPS; 1416 SAVETMPS;
1364 1417
1365 PUSHMARK (SP); 1418 PUSHMARK (SP);
1366 PUTBACK; 1419 PUTBACK;
1367 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1368 1422
1369 FREETMPS; 1423 FREETMPS;
1370 LEAVE; 1424 LEAVE;
1371 continue; 1425 continue;
1372 } 1426 }
… …
1502 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1503 1557
1504 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1505 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1506 1560
1561 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1562 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1563 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1564 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1565
1507 hv_sig = coro_get_hv ("SIG", TRUE); 1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1508 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1567 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1509 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1568 rv_warnhook = newRV_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 1569
1514 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1515 1571
1516 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1517 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1523 1579
1524 while (main_top_env->je_prev) 1580 while (main_top_env->je_prev)
1525 main_top_env = main_top_env->je_prev; 1581 main_top_env = main_top_env->je_prev;
1526 1582
1527 coroapi.ver = CORO_API_VERSION; 1583 coroapi.ver = CORO_API_VERSION;
1584 coroapi.rev = CORO_API_REVISION;
1528 coroapi.transfer = api_transfer; 1585 coroapi.transfer = api_transfer;
1529 1586
1530 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1587 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1531} 1588}
1532 1589
1533SV * 1590SV *
1534new (char *klass, ...) 1591new (char *klass, ...)
1535 CODE: 1592 CODE:
1536{ 1593{
1537 struct coro *coro; 1594 struct coro *coro;
1595 MAGIC *mg;
1538 HV *hv; 1596 HV *hv;
1539 int i; 1597 int i;
1540 1598
1541 Newz (0, coro, 1, struct coro); 1599 Newz (0, coro, 1, struct coro);
1542 coro->args = newAV (); 1600 coro->args = newAV ();
… …
1545 if (coro_first) coro_first->prev = coro; 1603 if (coro_first) coro_first->prev = coro;
1546 coro->next = coro_first; 1604 coro->next = coro_first;
1547 coro_first = coro; 1605 coro_first = coro;
1548 1606
1549 coro->hv = hv = newHV (); 1607 coro->hv = hv = newHV ();
1550 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1608 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1609 mg->mg_flags |= MGf_DUP;
1551 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1610 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1552 1611
1553 av_extend (coro->args, items - 1); 1612 av_extend (coro->args, items - 1);
1554 for (i = 1; i < items; i++) 1613 for (i = 1; i < items; i++)
1555 av_push (coro->args, newSVsv (ST (i))); 1614 av_push (coro->args, newSVsv (ST (i)));
… …
1561# function to increase chances that they all will call transfer with the same 1620# function to increase chances that they all will call transfer with the same
1562# stack offset 1621# stack offset
1563void 1622void
1564_set_stacklevel (...) 1623_set_stacklevel (...)
1565 ALIAS: 1624 ALIAS:
1566 Coro::State::transfer = 1 1625 Coro::State::transfer = 1
1567 Coro::schedule = 2 1626 Coro::schedule = 2
1568 Coro::cede = 3 1627 Coro::cede = 3
1569 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1570 Coro::Event::next = 5
1571 Coro::Event::next_cancel = 6
1572 PPCODE: 1629 CODE:
1573{ 1630{
1574 struct transfer_args ta; 1631 struct transfer_args ta;
1575 int repeat = 0;
1576 1632
1577 do 1633 PUTBACK;
1634 switch (ix)
1578 { 1635 {
1579 switch (ix)
1580 {
1581 case 0: 1636 case 0:
1582 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1583 ta.next = 0; 1638 ta.next = 0;
1584 break; 1639 break;
1585 1640
1586 case 1: 1641 case 1:
1587 if (items != 2) 1642 if (items != 2)
1588 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1643 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1589 1644
1590 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1645 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1591 break; 1646 break;
1592 1647
1593 case 2: 1648 case 2:
1594 prepare_schedule (aTHX_ &ta); 1649 prepare_schedule (aTHX_ &ta);
1595 break; 1650 break;
1596 1651
1597 case 3: 1652 case 3:
1598 prepare_cede (aTHX_ &ta); 1653 prepare_cede (aTHX_ &ta);
1599 break; 1654 break;
1600 1655
1601 case 4: 1656 case 4:
1602 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1603 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1604 1659
1605 break; 1660 break;
1606
1607 case 5:
1608 case 6:
1609 if (items != 1)
1610 croak ("Coro::Event::next (watcher) expects one argument, not %d", items);
1611
1612 {
1613 SV *ev = coroapi.coro_event_next (ST (0), ix == 6, GIMME_V != G_VOID);
1614
1615 if (ev)
1616 {
1617 if (GIMME_V != G_VOID)
1618 {
1619 XPUSHs (ev);
1620 XSRETURN (1);
1621 }
1622 else
1623 XSRETURN_EMPTY;
1624 }
1625 }
1626
1627 prepare_schedule (aTHX_ &ta);
1628 repeat = 1;
1629 break;
1630 }
1631
1632 BARRIER;
1633 TRANSFER (ta);
1634 BARRIER;
1635 } 1661 }
1636 while (repeat); 1662 SPAGAIN;
1637 1663
1638 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1664 BARRIER;
1639 XSRETURN_YES; 1665 PUTBACK;
1666 TRANSFER (ta);
1667 SPAGAIN; /* might be the sp of a different coroutine now */
1668 /* be extra careful not to ever do anything after TRANSFER */
1640} 1669}
1641 1670
1642bool 1671bool
1643_destroy (SV *coro_sv) 1672_destroy (SV *coro_sv)
1644 CODE: 1673 CODE:
… …
1696 { 1725 {
1697 struct coro temp; 1726 struct coro temp;
1698 1727
1699 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1700 { 1729 {
1730 PUTBACK;
1701 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1702 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1703 } 1733 }
1704 1734
1705 { 1735 {
1706 dSP; 1736 dSP;
1707 ENTER; 1737 ENTER;
1708 SAVETMPS; 1738 SAVETMPS;
1739 PUTBACK;
1740 PUSHSTACK;
1709 PUSHMARK (SP); 1741 PUSHMARK (SP);
1710 PUTBACK;
1711 1742
1712 if (ix) 1743 if (ix)
1713 eval_sv (coderef, 0); 1744 eval_sv (coderef, 0);
1714 else 1745 else
1715 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1746 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1716 1747
1748 POPSTACK;
1717 SPAGAIN; 1749 SPAGAIN;
1718 FREETMPS; 1750 FREETMPS;
1719 LEAVE; 1751 LEAVE;
1720 PUTBACK; 1752 PUTBACK;
1721 } 1753 }
1722 1754
1723 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1724 { 1756 {
1725 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1726 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1727 } 1760 }
1728 } 1761 }
1729} 1762}
1730 1763
1731SV * 1764SV *
… …
1779 1812
1780BOOT: 1813BOOT:
1781{ 1814{
1782 int i; 1815 int i;
1783 1816
1784 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1817 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1785 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1818 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1786 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1787 1820
1788 coro_current = coro_get_sv ("Coro::current", FALSE); 1821 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1789 SvREADONLY_on (coro_current); 1822 SvREADONLY_on (coro_current);
1790 1823
1791 coro_stash = gv_stashpv ("Coro", TRUE); 1824 coro_stash = gv_stashpv ("Coro", TRUE);
1792 1825
1793 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1868 PROTOTYPE: $;$ 1901 PROTOTYPE: $;$
1869 CODE: 1902 CODE:
1870 SvREFCNT_dec (self->throw); 1903 SvREFCNT_dec (self->throw);
1871 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1904 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1872 1905
1906void
1907swap_defsv (Coro::State self)
1908 PROTOTYPE: $
1909 ALIAS:
1910 swap_defav = 1
1911 CODE:
1912 if (!self->slot)
1913 croak ("cannot swap state with coroutine that has no saved state");
1914 else
1915 {
1916 SV **src = ix ? (SV *)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1917 SV **dst = ix ? self->slot->defav : self->slot->defsv;
1918
1919 SV *tmp = *src; *src = *dst; *dst = tmp;
1920 }
1921
1873# for async_pool speedup 1922# for async_pool speedup
1874void 1923void
1875_pool_1 (SV *cb) 1924_pool_1 (SV *cb)
1876 CODE: 1925 CODE:
1877{ 1926{
1878 struct coro *coro = SvSTATE (coro_current); 1927 struct coro *coro = SvSTATE (coro_current);
1879 HV *hv = (HV *)SvRV (coro_current); 1928 HV *hv = (HV *)SvRV (coro_current);
1880 AV *defav = GvAV (PL_defgv); 1929 AV *defav = GvAV (PL_defgv);
1881 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1930 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1882 AV *invoke_av; 1931 AV *invoke_av;
1883 int i, len; 1932 int i, len;
1884 1933
1885 if (!invoke) 1934 if (!invoke)
1935 {
1936 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1886 croak ("\3async_pool terminate\2\n"); 1937 croak ("\3async_pool terminate\2\n");
1938 }
1887 1939
1888 SvREFCNT_dec (coro->saved_deffh); 1940 SvREFCNT_dec (coro->saved_deffh);
1889 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1941 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1890 1942
1891 hv_store (hv, "desc", sizeof ("desc") - 1, 1943 hv_store (hv, "desc", sizeof ("desc") - 1,
1892 newSVpvn (strpair ("[async_pool]")), 0); 1944 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1893 1945
1894 invoke_av = (AV *)SvRV (invoke); 1946 invoke_av = (AV *)SvRV (invoke);
1895 len = av_len (invoke_av); 1947 len = av_len (invoke_av);
1896 1948
1897 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1949 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1917 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1969 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1918 coro->saved_deffh = 0; 1970 coro->saved_deffh = 0;
1919 1971
1920 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1972 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1921 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1973 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1974 {
1975 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1922 croak ("\3async_pool terminate\2\n"); 1976 croak ("\3async_pool terminate\2\n");
1977 }
1923 1978
1924 av_clear (GvAV (PL_defgv)); 1979 av_clear (GvAV (PL_defgv));
1925 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1980 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1926 newSVpvn (strpair ("[async_pool idle]")), 0); 1981 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1927 1982
1928 coro->prio = 0; 1983 coro->prio = 0;
1929 1984
1930 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1985 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1931 api_trace (coro_current, 0); 1986 api_trace (coro_current, 0);

Diff Legend

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