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.198 by root, Sun Oct 7 03:58:37 2007 UTC vs.
Revision 1.226 by root, Fri Apr 4 20:07:35 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
144static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
145static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
146static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
147static JMPENV *main_top_env; 153static JMPENV *main_top_env;
148static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
149static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
150 156
151static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
152static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
159static SV *rv_diehook;
160static SV *rv_warnhook;
161static HV *hv_sig; /* %SIG */
153 162
154/* async_pool helper stuff */ 163/* async_pool helper stuff */
155static SV *sv_pool_rss; 164static SV *sv_pool_rss;
156static SV *sv_pool_size; 165static SV *sv_pool_size;
157static AV *av_async_pool; 166static AV *av_async_pool;
215 224
216 /* process data */ 225 /* process data */
217 AV *mainstack; 226 AV *mainstack;
218 perl_slots *slot; /* basically the saved sp */ 227 perl_slots *slot; /* basically the saved sp */
219 228
220 /* data associated with this coroutine (initial args) */ 229 AV *args; /* data associated with this coroutine (initial args) */
221 AV *args; 230 int refcnt; /* coroutines are refcounted, yes */
222 int refcnt;
223 int flags; /* CF_ flags */ 231 int flags; /* CF_ flags */
232 HV *hv; /* the perl hash associated with this coro, if any */
224 233
225 /* statistics */ 234 /* statistics */
226 int usecount; /* number of transfers to this coro */ 235 int usecount; /* number of transfers to this coro */
227 236
228 /* coro process data */ 237 /* coro process data */
229 int prio; 238 int prio;
230 SV *throw; 239 SV *throw; /* exception to be thrown */
231 240
232 /* async_pool */ 241 /* async_pool */
233 SV *saved_deffh; 242 SV *saved_deffh;
234 243
235 /* linked list */ 244 /* linked list */
236 struct coro *next, *prev; 245 struct coro *next, *prev;
237 HV *hv; /* the perl hash associated with this coro, if any */
238}; 246};
239 247
240typedef struct coro *Coro__State; 248typedef struct coro *Coro__State;
241typedef struct coro *Coro__State_or_hashref; 249typedef struct coro *Coro__State_or_hashref;
242 250
254static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 262static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
255static int coro_nready; 263static int coro_nready;
256static struct coro *coro_first; 264static struct coro *coro_first;
257 265
258/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
267
268static SV *
269coro_get_sv (pTHX_ const char *name, int create)
270{
271#if PERL_VERSION_ATLEAST (5,9,0)
272 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
273 get_sv (name, create);
274#endif
275 return get_sv (name, create);
276}
277
278static AV *
279coro_get_av (pTHX_ const char *name, int create)
280{
281#if PERL_VERSION_ATLEAST (5,9,0)
282 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
283 get_av (name, create);
284#endif
285 return get_av (name, create);
286}
287
288static HV *
289coro_get_hv (pTHX_ const char *name, int create)
290{
291#if PERL_VERSION_ATLEAST (5,9,0)
292 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
293 get_hv (name, create);
294#endif
295 return get_hv (name, create);
296}
259 297
260static AV * 298static AV *
261coro_clone_padlist (pTHX_ CV *cv) 299coro_clone_padlist (pTHX_ CV *cv)
262{ 300{
263 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
311 349
312 /* casting is fun. */ 350 /* casting is fun. */
313 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
314 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
315 353
316 SvREFCNT_dec (av);
317
318 return 0; 354 return 0;
319} 355}
320 356
321#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
322 359
323static 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};
324 364
325#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
326 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
327 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
328 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
329 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
330 : 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)
331 374
332static struct coro * 375static struct coro *
333SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
334{ 377{
335 HV *stash; 378 HV *stash;
347 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
348 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
349 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
350 } 393 }
351 394
352 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
353 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
354} 397}
355 398
356#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
357 400
358/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
359static void 402static void
360get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
361{ 404{
362 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
363 AV *av; 406 AV *av;
364 407
365 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
366 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
367 else 410 else
379} 422}
380 423
381static void 424static void
382put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
383{ 426{
384 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
385 AV *av; 428 AV *av;
386 429
387 if (expect_false (!mg)) 430 if (expect_false (!mg))
388 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
389 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
390 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
391 mg->mg_virtual = &vtbl_coro;
392 mg->mg_obj = (SV *)newAV ();
393 }
394 432
395 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
396 434
397 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
398 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
485 523
486 PUTBACK; 524 PUTBACK;
487 } 525 }
488 526
489 /* allocate some space on the context stack for our purposes */ 527 /* allocate some space on the context stack for our purposes */
528 /* we manually unroll here, as usually 2 slots is enough */
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
490 { 532 {
491 /* we manually unroll here, as usually 2 slots is enough */
492 int i; 533 int i;
493 if (SLOT_COUNT >= 1) CXINC;
494 if (SLOT_COUNT >= 2) CXINC;
495 if (SLOT_COUNT >= 3) CXINC;
496 for (i = 3; i < SLOT_COUNT; ++i) 534 for (i = 3; i < SLOT_COUNT; ++i)
497 CXINC; 535 CXINC;
498
499 cxstack_ix -= SLOT_COUNT; /* undo allocation */
500 } 536 }
537 cxstack_ix -= SLOT_COUNT; /* undo allocation */
501 538
502 c->mainstack = PL_mainstack; 539 c->mainstack = PL_mainstack;
503 540
504 { 541 {
505 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 542 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
632 return rss; 669 return rss;
633} 670}
634 671
635/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
636 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
637static void 724static void
638coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
639{ 726{
640 /* 727 /*
641 * emulate part of the perl startup here. 728 * emulate part of the perl startup here.
649 PL_curpm = 0; 736 PL_curpm = 0;
650 PL_curpad = 0; 737 PL_curpad = 0;
651 PL_localizing = 0; 738 PL_localizing = 0;
652 PL_dirty = 0; 739 PL_dirty = 0;
653 PL_restartop = 0; 740 PL_restartop = 0;
654 PL_diehook = 0; 741
655 PL_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);
656 745
657 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
658 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
659 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
660 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);
675 PL_op = (OP *)&myop; 764 PL_op = (OP *)&myop;
676 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 765 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
677 SPAGAIN; 766 SPAGAIN;
678 } 767 }
679 768
680 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;
681} 775}
682 776
683static void 777static void
684coro_destroy (pTHX_ struct coro *coro) 778coro_destroy (pTHX_ struct coro *coro)
685{ 779{
806 SAVETMPS; 900 SAVETMPS;
807 EXTEND (SP, 3); 901 EXTEND (SP, 3);
808 PUSHMARK (SP); 902 PUSHMARK (SP);
809 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
810 PUSHs (fullname); 904 PUSHs (fullname);
811 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);
812 PUTBACK; 906 PUTBACK;
813 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 907 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
814 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);
815 SPAGAIN; 909 SPAGAIN;
816 FREETMPS; 910 FREETMPS;
852 946
853/* inject a fake call to Coro::State::_cctx_init into the execution */ 947/* inject a fake call to Coro::State::_cctx_init into the execution */
854/* _cctx_init should be careful, as it could be called at almost any time */ 948/* _cctx_init should be careful, as it could be called at almost any time */
855/* during execution of a perl program */ 949/* during execution of a perl program */
856static void NOINLINE 950static void NOINLINE
857prepare_cctx (pTHX_ coro_cctx *cctx) 951cctx_prepare (pTHX_ coro_cctx *cctx)
858{ 952{
859 dSP; 953 dSP;
860 LOGOP myop; 954 LOGOP myop;
861 955
862 PL_top_env = &PL_start_env; 956 PL_top_env = &PL_start_env;
880 974
881/* 975/*
882 * this is a _very_ stripped down perl interpreter ;) 976 * this is a _very_ stripped down perl interpreter ;)
883 */ 977 */
884static void 978static void
885coro_run (void *arg) 979cctx_run (void *arg)
886{ 980{
887 dTHX; 981 dTHX;
888 982
889 /* coro_run is the alternative tail of transfer(), so unlock here. */ 983 /* cctx_run is the alternative tail of transfer(), so unlock here. */
890 UNLOCK; 984 UNLOCK;
891 985
892 /* we now skip the entersub that lead to transfer() */ 986 /* we now skip the entersub that lead to transfer() */
893 PL_op = PL_op->op_next; 987 PL_op = PL_op->op_next;
894 988
895 /* inject a fake subroutine call to cctx_init */ 989 /* inject a fake subroutine call to cctx_init */
896 prepare_cctx (aTHX_ (coro_cctx *)arg); 990 cctx_prepare (aTHX_ (coro_cctx *)arg);
897 991
898 /* somebody or something will hit me for both perl_run and PL_restartop */ 992 /* somebody or something will hit me for both perl_run and PL_restartop */
899 PL_restartop = PL_op; 993 PL_restartop = PL_op;
900 perl_run (PL_curinterp); 994 perl_run (PL_curinterp);
901 995
920 ++cctx_count; 1014 ++cctx_count;
921 1015
922 Newz (0, cctx, 1, coro_cctx); 1016 Newz (0, cctx, 1, coro_cctx);
923 1017
924#if HAVE_MMAP 1018#if HAVE_MMAP
925
926 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1019 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
927 /* mmap supposedly does allocate-on-write for us */ 1020 /* mmap supposedly does allocate-on-write for us */
928 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1021 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
929 1022
930 if (cctx->sptr != (void *)-1) 1023 if (cctx->sptr != (void *)-1)
951 stack_start = cctx->sptr; 1044 stack_start = cctx->sptr;
952 stack_size = cctx->ssize; 1045 stack_size = cctx->ssize;
953 } 1046 }
954 1047
955 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1048 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
956 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1049 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
957 1050
958 return cctx; 1051 return cctx;
959} 1052}
960 1053
961static void 1054static void
1035 if (expect_false (next->flags & CF_DESTROYED)) 1128 if (expect_false (next->flags & CF_DESTROYED))
1036 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");
1037 1130
1038 if ( 1131 if (
1039#if PERL_VERSION_ATLEAST (5,9,0) 1132#if PERL_VERSION_ATLEAST (5,9,0)
1040 expect_false (PL_parser) 1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1041#else 1134#else
1042 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1043#endif 1136#endif
1044 ) 1137 )
1045 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");
1049/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1050static void NOINLINE 1143static void NOINLINE
1051transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
1052{ 1145{
1053 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1054 1148
1055 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1056 if (expect_false (!next)) 1150 if (expect_false (!next))
1057 { 1151 {
1058 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1073 prev->flags &= ~CF_RUNNING; 1167 prev->flags &= ~CF_RUNNING;
1074 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
1075 1169
1076 LOCK; 1170 LOCK;
1077 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
1078 if (expect_false (next->flags & CF_NEW)) 1175 if (expect_false (next->flags & CF_NEW))
1079 { 1176 {
1080 /* need to start coroutine */ 1177 /* need to start coroutine */
1081 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
1082 /* first get rid of the old state */
1083 save_perl (aTHX_ prev);
1084 /* setup coroutine call */ 1179 /* setup coroutine call */
1085 coro_setup (aTHX_ next); 1180 coro_setup (aTHX_ next);
1086 } 1181 }
1087 else 1182 else
1088 {
1089 /* coroutine already started */
1090 save_perl (aTHX_ prev);
1091 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1092 }
1093 1184
1094 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1095 1186
1096 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1097 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)))
1102 prev->cctx = 0; 1193 prev->cctx = 0;
1103 1194
1104 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1195 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1105 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1196 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1106 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1197 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1198 if (!next->cctx)
1107 next->cctx = cctx_get (aTHX); 1199 next->cctx = cctx_get (aTHX);
1108 1200
1109 cctx_put (prev__cctx); 1201 cctx_put (prev__cctx);
1110 } 1202 }
1111 1203
1112 ++next->usecount; 1204 ++next->usecount;
1113 1205
1114 if (expect_true (!next->cctx)) 1206 if (expect_true (!next->cctx))
1115 next->cctx = cctx_get (aTHX); 1207 next->cctx = cctx_get (aTHX);
1208
1209 has_throw = !!next->throw;
1116 1210
1117 if (expect_false (prev__cctx != next->cctx)) 1211 if (expect_false (prev__cctx != next->cctx))
1118 { 1212 {
1119 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1120 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
1122 } 1216 }
1123 1217
1124 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1125 UNLOCK; 1219 UNLOCK;
1126 1220
1127 if (expect_false (prev->throw || next->throw)) 1221 if (expect_false (has_throw))
1128 { 1222 {
1129 struct coro *coro = SvSTATE (coro_current); 1223 struct coro *coro = SvSTATE (coro_current);
1130 1224
1131 if (coro->throw) 1225 if (coro->throw)
1132 { 1226 {
1258{ 1352{
1259 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);
1260} 1354}
1261 1355
1262static SV * 1356static SV *
1263coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1264{ 1358{
1265 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1266 1360
1267 min_prio -= PRIO_MIN;
1268 if (min_prio < 0)
1269 min_prio = 0;
1270
1271 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1272 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1273 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1274 1364
1275 return 0; 1365 return 0;
1276} 1366}
1312 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1313 1403
1314 for (;;) 1404 for (;;)
1315 { 1405 {
1316 LOCK; 1406 LOCK;
1317 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1318 1408
1319 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1320 if (expect_false (!next_sv)) 1410 if (expect_false (!next_sv))
1321 { 1411 {
1322 dSP; 1412 dSP;
1326 SAVETMPS; 1416 SAVETMPS;
1327 1417
1328 PUSHMARK (SP); 1418 PUSHMARK (SP);
1329 PUTBACK; 1419 PUTBACK;
1330 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1331 1422
1332 FREETMPS; 1423 FREETMPS;
1333 LEAVE; 1424 LEAVE;
1334 continue; 1425 continue;
1335 } 1426 }
1465 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1466 1557
1467 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1468 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1469 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
1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1567 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1568 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1569
1470 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1471 1571
1472 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1473 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1474 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1574 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1479 1579
1480 while (main_top_env->je_prev) 1580 while (main_top_env->je_prev)
1481 main_top_env = main_top_env->je_prev; 1581 main_top_env = main_top_env->je_prev;
1482 1582
1483 coroapi.ver = CORO_API_VERSION; 1583 coroapi.ver = CORO_API_VERSION;
1584 coroapi.rev = CORO_API_REVISION;
1484 coroapi.transfer = api_transfer; 1585 coroapi.transfer = api_transfer;
1485 1586
1486 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1587 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1487} 1588}
1488 1589
1489SV * 1590SV *
1490new (char *klass, ...) 1591new (char *klass, ...)
1491 CODE: 1592 CODE:
1492{ 1593{
1493 struct coro *coro; 1594 struct coro *coro;
1595 MAGIC *mg;
1494 HV *hv; 1596 HV *hv;
1495 int i; 1597 int i;
1496 1598
1497 Newz (0, coro, 1, struct coro); 1599 Newz (0, coro, 1, struct coro);
1498 coro->args = newAV (); 1600 coro->args = newAV ();
1501 if (coro_first) coro_first->prev = coro; 1603 if (coro_first) coro_first->prev = coro;
1502 coro->next = coro_first; 1604 coro->next = coro_first;
1503 coro_first = coro; 1605 coro_first = coro;
1504 1606
1505 coro->hv = hv = newHV (); 1607 coro->hv = hv = newHV ();
1506 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;
1507 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1610 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1508 1611
1509 av_extend (coro->args, items - 1); 1612 av_extend (coro->args, items - 1);
1510 for (i = 1; i < items; i++) 1613 for (i = 1; i < items; i++)
1511 av_push (coro->args, newSVsv (ST (i))); 1614 av_push (coro->args, newSVsv (ST (i)));
1525 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1526 CODE: 1629 CODE:
1527{ 1630{
1528 struct transfer_args ta; 1631 struct transfer_args ta;
1529 1632
1633 PUTBACK;
1530 switch (ix) 1634 switch (ix)
1531 { 1635 {
1532 case 0: 1636 case 0:
1533 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1534 ta.next = 0; 1638 ta.next = 0;
1553 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1554 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1555 1659
1556 break; 1660 break;
1557 } 1661 }
1662 SPAGAIN;
1558 1663
1559 BARRIER; 1664 BARRIER;
1665 PUTBACK;
1560 TRANSFER (ta); 1666 TRANSFER (ta);
1561 1667 SPAGAIN; /* might be the sp of a different coroutine now */
1562 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1668 /* be extra careful not to ever do anything after TRANSFER */
1563 XSRETURN_YES;
1564} 1669}
1565 1670
1566bool 1671bool
1567_destroy (SV *coro_sv) 1672_destroy (SV *coro_sv)
1568 CODE: 1673 CODE:
1620 { 1725 {
1621 struct coro temp; 1726 struct coro temp;
1622 1727
1623 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1624 { 1729 {
1730 PUTBACK;
1625 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1626 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1627 } 1733 }
1628 1734
1629 { 1735 {
1630 dSP; 1736 dSP;
1631 ENTER; 1737 ENTER;
1632 SAVETMPS; 1738 SAVETMPS;
1739 PUTBACK;
1740 PUSHSTACK;
1633 PUSHMARK (SP); 1741 PUSHMARK (SP);
1634 PUTBACK;
1635 1742
1636 if (ix) 1743 if (ix)
1637 eval_sv (coderef, 0); 1744 eval_sv (coderef, 0);
1638 else 1745 else
1639 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1746 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1640 1747
1748 POPSTACK;
1641 SPAGAIN; 1749 SPAGAIN;
1642 FREETMPS; 1750 FREETMPS;
1643 LEAVE; 1751 LEAVE;
1644 PUTBACK; 1752 PUTBACK;
1645 } 1753 }
1646 1754
1647 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1648 { 1756 {
1649 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1650 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1651 } 1760 }
1652 } 1761 }
1653} 1762}
1654 1763
1655SV * 1764SV *
1696 case 1: RETVAL = coro->usecount; break; 1805 case 1: RETVAL = coro->usecount; break;
1697 } 1806 }
1698 OUTPUT: 1807 OUTPUT:
1699 RETVAL 1808 RETVAL
1700 1809
1810void
1811force_cctx ()
1812 CODE:
1813 struct coro *coro = SvSTATE (coro_current);
1814 coro->cctx->idle_sp = 0;
1701 1815
1702MODULE = Coro::State PACKAGE = Coro 1816MODULE = Coro::State PACKAGE = Coro
1703 1817
1704BOOT: 1818BOOT:
1705{ 1819{
1706 int i; 1820 int i;
1707 1821
1708 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1822 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1709 get_sv ("Coro::POOL_RSS" , TRUE); /* silence stupid 5.10 warning */
1710 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1823 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1711 get_sv ("Coro::POOL_SIZE" , TRUE); /* silence stupid 5.10 warning */
1712 av_async_pool = get_av ("Coro::async_pool", TRUE); 1824 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1713 get_av ("Coro::async_pool", TRUE); /* silence stupid 5.10 warning */
1714 1825
1715 coro_current = get_sv ("Coro::current", FALSE); 1826 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1716 SvREADONLY_on (coro_current); 1827 SvREADONLY_on (coro_current);
1717 1828
1718 coro_stash = gv_stashpv ("Coro", TRUE); 1829 coro_stash = gv_stashpv ("Coro", TRUE);
1719 1830
1720 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1795 PROTOTYPE: $;$ 1906 PROTOTYPE: $;$
1796 CODE: 1907 CODE:
1797 SvREFCNT_dec (self->throw); 1908 SvREFCNT_dec (self->throw);
1798 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1909 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1799 1910
1911void
1912swap_defsv (Coro::State self)
1913 PROTOTYPE: $
1914 ALIAS:
1915 swap_defav = 1
1916 CODE:
1917 if (!self->slot)
1918 croak ("cannot swap state with coroutine that has no saved state");
1919 else
1920 {
1921 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1922 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1923
1924 SV *tmp = *src; *src = *dst; *dst = tmp;
1925 }
1926
1800# for async_pool speedup 1927# for async_pool speedup
1801void 1928void
1802_pool_1 (SV *cb) 1929_pool_1 (SV *cb)
1803 CODE: 1930 CODE:
1804{ 1931{
1808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1935 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1809 AV *invoke_av; 1936 AV *invoke_av;
1810 int i, len; 1937 int i, len;
1811 1938
1812 if (!invoke) 1939 if (!invoke)
1940 {
1941 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1813 croak ("\3async_pool terminate\2\n"); 1942 croak ("\3async_pool terminate\2\n");
1943 }
1814 1944
1815 SvREFCNT_dec (coro->saved_deffh); 1945 SvREFCNT_dec (coro->saved_deffh);
1816 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1946 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1817 1947
1818 hv_store (hv, "desc", sizeof ("desc") - 1, 1948 hv_store (hv, "desc", sizeof ("desc") - 1,
1844 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1974 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1845 coro->saved_deffh = 0; 1975 coro->saved_deffh = 0;
1846 1976
1847 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1977 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1848 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1978 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1979 {
1980 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1849 croak ("\3async_pool terminate\2\n"); 1981 croak ("\3async_pool terminate\2\n");
1982 }
1850 1983
1851 av_clear (GvAV (PL_defgv)); 1984 av_clear (GvAV (PL_defgv));
1852 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1985 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1853 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1986 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1854 1987

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines