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.212 by root, Wed Oct 10 04:21:33 2007 UTC vs.
Revision 1.234 by root, Fri May 9 22:29:05 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
145static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 161static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
151 164
152static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
154 167static SV *rv_diehook;
168static SV *rv_warnhook;
155static HV *hv_sig; /* %SIG */ 169static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
158 170
159/* async_pool helper stuff */ 171/* async_pool helper stuff */
160static SV *sv_pool_rss; 172static SV *sv_pool_rss;
161static SV *sv_pool_size; 173static SV *sv_pool_size;
162static AV *av_async_pool; 174static AV *av_async_pool;
175
176/* Coro::AnyEvent */
177static SV *sv_activity;
163 178
164static struct coro_cctx *cctx_first; 179static struct coro_cctx *cctx_first;
165static int cctx_count, cctx_idle; 180static int cctx_count, cctx_idle;
166 181
167enum { 182enum {
253#define PRIO_IDLE -3 268#define PRIO_IDLE -3
254#define PRIO_MIN -4 269#define PRIO_MIN -4
255 270
256/* for Coro.pm */ 271/* for Coro.pm */
257static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
258static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
259static int coro_nready; 275static int coro_nready;
260static struct coro *coro_first; 276static struct coro *coro_first;
261 277
262/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
263 279
264static SV * 280static SV *
265coro_get_sv (const char *name, int create) 281coro_get_sv (pTHX_ const char *name, int create)
266{ 282{
267#if PERL_VERSION_ATLEAST (5,9,0) 283#if PERL_VERSION_ATLEAST (5,10,0)
268 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 284 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
269 get_sv (name, create); 285 get_sv (name, create);
270#endif 286#endif
271 return get_sv (name, create); 287 return get_sv (name, create);
272} 288}
273 289
274static AV * 290static AV *
275coro_get_av (const char *name, int create) 291coro_get_av (pTHX_ const char *name, int create)
276{ 292{
277#if PERL_VERSION_ATLEAST (5,9,0) 293#if PERL_VERSION_ATLEAST (5,10,0)
278 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 294 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
279 get_av (name, create); 295 get_av (name, create);
280#endif 296#endif
281 return get_av (name, create); 297 return get_av (name, create);
282} 298}
283 299
284static HV * 300static HV *
285coro_get_hv (const char *name, int create) 301coro_get_hv (pTHX_ const char *name, int create)
286{ 302{
287#if PERL_VERSION_ATLEAST (5,9,0) 303#if PERL_VERSION_ATLEAST (5,10,0)
288 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 304 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
289 get_hv (name, create); 305 get_hv (name, create);
290#endif 306#endif
291 return get_hv (name, create); 307 return get_hv (name, create);
292} 308}
297 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
298 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
299 315
300 newpadlist = newAV (); 316 newpadlist = newAV ();
301 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
302#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
303 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
304#else 320#else
305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
306#endif 322#endif
307 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
345 361
346 /* casting is fun. */ 362 /* casting is fun. */
347 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
348 free_padlist (aTHX_ padlist); 364 free_padlist (aTHX_ padlist);
349 365
350 SvREFCNT_dec (av);
351
352 return 0; 366 return 0;
353} 367}
354 368
355#define PERL_MAGIC_coro PERL_MAGIC_ext 369#define CORO_MAGIC_type_cv PERL_MAGIC_ext
370#define CORO_MAGIC_type_state PERL_MAGIC_ext
356 371
357static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 372static MGVTBL coro_cv_vtbl = {
373 0, 0, 0, 0,
374 coro_cv_free
375};
358 376
359#define CORO_MAGIC(cv) \ 377#define CORO_MAGIC(sv,type) \
360 SvMAGIC (cv) \ 378 SvMAGIC (sv) \
361 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 379 ? SvMAGIC (sv)->mg_type == type \
362 ? SvMAGIC (cv) \ 380 ? SvMAGIC (sv) \
363 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 381 : mg_find (sv, type) \
364 : 0 382 : 0
383
384#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
385#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
365 386
366static struct coro * 387static struct coro *
367SvSTATE_ (pTHX_ SV *coro) 388SvSTATE_ (pTHX_ SV *coro)
368{ 389{
369 HV *stash; 390 HV *stash;
381 /* very slow, but rare, check */ 402 /* very slow, but rare, check */
382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 403 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
383 croak ("Coro::State object required"); 404 croak ("Coro::State object required");
384 } 405 }
385 406
386 mg = CORO_MAGIC (coro); 407 mg = CORO_MAGIC_state (coro);
387 return (struct coro *)mg->mg_ptr; 408 return (struct coro *)mg->mg_ptr;
388} 409}
389 410
390#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 411#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
391 412
392/* the next two functions merely cache the padlists */ 413/* the next two functions merely cache the padlists */
393static void 414static void
394get_padlist (pTHX_ CV *cv) 415get_padlist (pTHX_ CV *cv)
395{ 416{
396 MAGIC *mg = CORO_MAGIC (cv); 417 MAGIC *mg = CORO_MAGIC_cv (cv);
397 AV *av; 418 AV *av;
398 419
399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
401 else 422 else
413} 434}
414 435
415static void 436static void
416put_padlist (pTHX_ CV *cv) 437put_padlist (pTHX_ CV *cv)
417{ 438{
418 MAGIC *mg = CORO_MAGIC (cv); 439 MAGIC *mg = CORO_MAGIC_cv (cv);
419 AV *av; 440 AV *av;
420 441
421 if (expect_false (!mg)) 442 if (expect_false (!mg))
422 { 443 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
425 mg->mg_virtual = &vtbl_coro;
426 mg->mg_obj = (SV *)newAV ();
427 }
428 444
429 av = (AV *)mg->mg_obj; 445 av = (AV *)mg->mg_obj;
430 446
431 if (expect_false (AvFILLp (av) >= AvMAX (av))) 447 if (expect_false (AvFILLp (av) >= AvMAX (av)))
432 av_extend (av, AvMAX (av) + 1); 448 av_extend (av, AvMAX (av) + 1);
450 GvSV (irsgv) = slot->irsgv; 466 GvSV (irsgv) = slot->irsgv;
451 467
452 #define VAR(name,type) PL_ ## name = slot->name; 468 #define VAR(name,type) PL_ ## name = slot->name;
453 # include "state.h" 469 # include "state.h"
454 #undef VAR 470 #undef VAR
455
456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
458 471
459 { 472 {
460 dSP; 473 dSP;
461 474
462 CV *cv; 475 CV *cv;
501 514
502 if (expect_true (CvDEPTH (cv))) 515 if (expect_true (CvDEPTH (cv)))
503 { 516 {
504 EXTEND (SP, 3); 517 EXTEND (SP, 3);
505 PUSHs ((SV *)CvPADLIST (cv)); 518 PUSHs ((SV *)CvPADLIST (cv));
506 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 519 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
507 PUSHs ((SV *)cv); 520 PUSHs ((SV *)cv);
508 521
509 CvDEPTH (cv) = 0; 522 CvDEPTH (cv) = 0;
510 get_padlist (aTHX_ cv); 523 get_padlist (aTHX_ cv);
511 } 524 }
591 604
592 New(54,PL_savestack,24,ANY); 605 New(54,PL_savestack,24,ANY);
593 PL_savestack_ix = 0; 606 PL_savestack_ix = 0;
594 PL_savestack_max = 24; 607 PL_savestack_max = 24;
595 608
596#if !PERL_VERSION_ATLEAST (5,9,0) 609#if !PERL_VERSION_ATLEAST (5,10,0)
597 New(54,PL_retstack,4,OP*); 610 New(54,PL_retstack,4,OP*);
598 PL_retstack_ix = 0; 611 PL_retstack_ix = 0;
599 PL_retstack_max = 4; 612 PL_retstack_max = 4;
600#endif 613#endif
601} 614}
624 637
625 Safefree (PL_tmps_stack); 638 Safefree (PL_tmps_stack);
626 Safefree (PL_markstack); 639 Safefree (PL_markstack);
627 Safefree (PL_scopestack); 640 Safefree (PL_scopestack);
628 Safefree (PL_savestack); 641 Safefree (PL_savestack);
629#if !PERL_VERSION_ATLEAST (5,9,0) 642#if !PERL_VERSION_ATLEAST (5,10,0)
630 Safefree (PL_retstack); 643 Safefree (PL_retstack);
631#endif 644#endif
632} 645}
633 646
634static size_t 647static size_t
658 rss += slot->tmps_max * sizeof (SV *); 671 rss += slot->tmps_max * sizeof (SV *);
659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
660 rss += slot->scopestack_max * sizeof (I32); 673 rss += slot->scopestack_max * sizeof (I32);
661 rss += slot->savestack_max * sizeof (ANY); 674 rss += slot->savestack_max * sizeof (ANY);
662 675
663#if !PERL_VERSION_ATLEAST (5,9,0) 676#if !PERL_VERSION_ATLEAST (5,10,0)
664 rss += slot->retstack_max * sizeof (OP *); 677 rss += slot->retstack_max * sizeof (OP *);
665#endif 678#endif
666 } 679 }
667 680
668 return rss; 681 return rss;
669} 682}
670 683
671/** coroutine stack handling ************************************************/ 684/** coroutine stack handling ************************************************/
685
686static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
687static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
688
689/*
690 * This overrides the default magic get method of %SIG elements.
691 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
692 * and instead of tryign to save and restore the hash elements, we just provide
693 * readback here.
694 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
695 * not expecting this to actually change the hook. This is a potential problem
696 * when a schedule happens then, but we ignore this.
697 */
698static int
699coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
700{
701 const char *s = MgPV_nolen_const (mg);
702
703 if (*s == '_')
704 {
705 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
706 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
707 }
708
709 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
710}
711
712static int
713coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
714{
715 const char *s = MgPV_nolen_const (mg);
716
717 if (*s == '_')
718 {
719 SV **svp = 0;
720
721 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
722 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
723
724 if (svp)
725 {
726 SV *old = *svp;
727 *svp = newSVsv (sv);
728 SvREFCNT_dec (old);
729 return 0;
730 }
731 }
732
733 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
734}
672 735
673static void 736static void
674coro_setup (pTHX_ struct coro *coro) 737coro_setup (pTHX_ struct coro *coro)
675{ 738{
676 /* 739 /*
685 PL_curpm = 0; 748 PL_curpm = 0;
686 PL_curpad = 0; 749 PL_curpad = 0;
687 PL_localizing = 0; 750 PL_localizing = 0;
688 PL_dirty = 0; 751 PL_dirty = 0;
689 PL_restartop = 0; 752 PL_restartop = 0;
753#if PERL_VERSION_ATLEAST (5,10,0)
754 PL_parser = 0;
755#endif
756
757 /* recreate the die/warn hooks */
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0); 758 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0); 759 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
692 760
693 GvSV (PL_defgv) = newSV (0); 761 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0; 762 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0); 763 GvSV (PL_errgv) = newSV (0);
696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 764 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
847 SAVETMPS; 915 SAVETMPS;
848 EXTEND (SP, 3); 916 EXTEND (SP, 3);
849 PUSHMARK (SP); 917 PUSHMARK (SP);
850 PUSHs (&PL_sv_yes); 918 PUSHs (&PL_sv_yes);
851 PUSHs (fullname); 919 PUSHs (fullname);
852 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 920 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
853 PUTBACK; 921 PUTBACK;
854 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 922 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
855 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 923 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
856 SPAGAIN; 924 SPAGAIN;
857 FREETMPS; 925 FREETMPS;
1073 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1141 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1074 1142
1075 if (expect_false (next->flags & CF_DESTROYED)) 1143 if (expect_false (next->flags & CF_DESTROYED))
1076 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1144 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1077 1145
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0) 1146#if !PERL_VERSION_ATLEAST (5,10,0)
1080 expect_false (PL_parser)
1081#else
1082 expect_false (PL_lex_state != LEX_NOTPARSING) 1147 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1083#endif
1084 )
1085 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1148 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1149#endif
1086 } 1150 }
1087} 1151}
1088 1152
1089/* always use the TRANSFER macro */ 1153/* always use the TRANSFER macro */
1090static void NOINLINE 1154static void NOINLINE
1091transfer (pTHX_ struct coro *prev, struct coro *next) 1155transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1092{ 1156{
1093 dSTACKLEVEL; 1157 dSTACKLEVEL;
1158 static volatile int has_throw;
1094 1159
1095 /* sometimes transfer is only called to set idle_sp */ 1160 /* sometimes transfer is only called to set idle_sp */
1096 if (expect_false (!next)) 1161 if (expect_false (!next))
1097 { 1162 {
1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1163 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1113 prev->flags &= ~CF_RUNNING; 1178 prev->flags &= ~CF_RUNNING;
1114 next->flags |= CF_RUNNING; 1179 next->flags |= CF_RUNNING;
1115 1180
1116 LOCK; 1181 LOCK;
1117 1182
1183 /* first get rid of the old state */
1184 save_perl (aTHX_ prev);
1185
1118 if (expect_false (next->flags & CF_NEW)) 1186 if (expect_false (next->flags & CF_NEW))
1119 { 1187 {
1120 /* need to start coroutine */ 1188 /* need to start coroutine */
1121 next->flags &= ~CF_NEW; 1189 next->flags &= ~CF_NEW;
1122 /* first get rid of the old state */
1123 save_perl (aTHX_ prev);
1124 /* setup coroutine call */ 1190 /* setup coroutine call */
1125 coro_setup (aTHX_ next); 1191 coro_setup (aTHX_ next);
1126 } 1192 }
1127 else 1193 else
1128 {
1129 /* coroutine already started */
1130 save_perl (aTHX_ prev);
1131 load_perl (aTHX_ next); 1194 load_perl (aTHX_ next);
1132 }
1133 1195
1134 prev__cctx = prev->cctx; 1196 prev__cctx = prev->cctx;
1135 1197
1136 /* possibly "free" the cctx */ 1198 /* possibly "free" the cctx */
1137 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1199 if (expect_true (
1200 prev__cctx->idle_sp == STACKLEVEL
1201 && !(prev__cctx->flags & CC_TRACE)
1202 && !force_cctx
1203 ))
1138 { 1204 {
1139 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1205 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1140 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1206 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1141 1207
1142 prev->cctx = 0; 1208 prev->cctx = 0;
1152 1218
1153 ++next->usecount; 1219 ++next->usecount;
1154 1220
1155 if (expect_true (!next->cctx)) 1221 if (expect_true (!next->cctx))
1156 next->cctx = cctx_get (aTHX); 1222 next->cctx = cctx_get (aTHX);
1223
1224 has_throw = !!next->throw;
1157 1225
1158 if (expect_false (prev__cctx != next->cctx)) 1226 if (expect_false (prev__cctx != next->cctx))
1159 { 1227 {
1160 prev__cctx->top_env = PL_top_env; 1228 prev__cctx->top_env = PL_top_env;
1161 PL_top_env = next->cctx->top_env; 1229 PL_top_env = next->cctx->top_env;
1163 } 1231 }
1164 1232
1165 free_coro_mortal (aTHX); 1233 free_coro_mortal (aTHX);
1166 UNLOCK; 1234 UNLOCK;
1167 1235
1168 if (expect_false (prev->throw || next->throw)) 1236 if (expect_false (has_throw))
1169 { 1237 {
1170 struct coro *coro = SvSTATE (coro_current); 1238 struct coro *coro = SvSTATE (coro_current);
1171 1239
1172 if (coro->throw) 1240 if (coro->throw)
1173 { 1241 {
1183struct transfer_args 1251struct transfer_args
1184{ 1252{
1185 struct coro *prev, *next; 1253 struct coro *prev, *next;
1186}; 1254};
1187 1255
1188#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1256#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1189#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1257#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1190 1258
1191/** high level stuff ********************************************************/ 1259/** high level stuff ********************************************************/
1192 1260
1193static int 1261static int
1287{ 1355{
1288 dTHX; 1356 dTHX;
1289 struct transfer_args ta; 1357 struct transfer_args ta;
1290 1358
1291 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1359 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1292 TRANSFER (ta); 1360 TRANSFER (ta, 1);
1293} 1361}
1294 1362
1295/** Coro ********************************************************************/ 1363/** Coro ********************************************************************/
1296 1364
1297static void 1365static void
1299{ 1367{
1300 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1368 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1301} 1369}
1302 1370
1303static SV * 1371static SV *
1304coro_deq (pTHX_ int min_prio) 1372coro_deq (pTHX)
1305{ 1373{
1306 int prio = PRIO_MAX - PRIO_MIN; 1374 int prio;
1307 1375
1308 min_prio -= PRIO_MIN;
1309 if (min_prio < 0)
1310 min_prio = 0;
1311
1312 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1376 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1313 if (AvFILLp (coro_ready [prio]) >= 0) 1377 if (AvFILLp (coro_ready [prio]) >= 0)
1314 return av_shift (coro_ready [prio]); 1378 return av_shift (coro_ready [prio]);
1315 1379
1316 return 0; 1380 return 0;
1317} 1381}
1319static int 1383static int
1320api_ready (SV *coro_sv) 1384api_ready (SV *coro_sv)
1321{ 1385{
1322 dTHX; 1386 dTHX;
1323 struct coro *coro; 1387 struct coro *coro;
1388 SV *hook;
1324 1389
1325 if (SvROK (coro_sv)) 1390 if (SvROK (coro_sv))
1326 coro_sv = SvRV (coro_sv); 1391 coro_sv = SvRV (coro_sv);
1327 1392
1328 coro = SvSTATE (coro_sv); 1393 coro = SvSTATE (coro_sv);
1331 return 0; 1396 return 0;
1332 1397
1333 coro->flags |= CF_READY; 1398 coro->flags |= CF_READY;
1334 1399
1335 LOCK; 1400 LOCK;
1401
1402 hook = coro_nready ? 0 : coro_readyhook;
1403
1336 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1404 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1337 ++coro_nready; 1405 ++coro_nready;
1406
1338 UNLOCK; 1407 UNLOCK;
1408
1409 if (hook)
1410 {
1411 dSP;
1412
1413 ENTER;
1414 SAVETMPS;
1415
1416 PUSHMARK (SP);
1417 PUTBACK;
1418 call_sv (hook, G_DISCARD);
1419 SPAGAIN;
1420
1421 FREETMPS;
1422 LEAVE;
1423 }
1339 1424
1340 return 1; 1425 return 1;
1341} 1426}
1342 1427
1343static int 1428static int
1353 SV *prev_sv, *next_sv; 1438 SV *prev_sv, *next_sv;
1354 1439
1355 for (;;) 1440 for (;;)
1356 { 1441 {
1357 LOCK; 1442 LOCK;
1358 next_sv = coro_deq (aTHX_ PRIO_MIN); 1443 next_sv = coro_deq (aTHX);
1359 1444
1360 /* nothing to schedule: call the idle handler */ 1445 /* nothing to schedule: call the idle handler */
1361 if (expect_false (!next_sv)) 1446 if (expect_false (!next_sv))
1362 { 1447 {
1363 dSP; 1448 dSP;
1367 SAVETMPS; 1452 SAVETMPS;
1368 1453
1369 PUSHMARK (SP); 1454 PUSHMARK (SP);
1370 PUTBACK; 1455 PUTBACK;
1371 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1456 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1457 SPAGAIN;
1372 1458
1373 FREETMPS; 1459 FREETMPS;
1374 LEAVE; 1460 LEAVE;
1375 continue; 1461 continue;
1376 } 1462 }
1431{ 1517{
1432 dTHX; 1518 dTHX;
1433 struct transfer_args ta; 1519 struct transfer_args ta;
1434 1520
1435 prepare_schedule (aTHX_ &ta); 1521 prepare_schedule (aTHX_ &ta);
1436 TRANSFER (ta); 1522 TRANSFER (ta, 1);
1437} 1523}
1438 1524
1439static int 1525static int
1440api_cede (void) 1526api_cede (void)
1441{ 1527{
1444 1530
1445 prepare_cede (aTHX_ &ta); 1531 prepare_cede (aTHX_ &ta);
1446 1532
1447 if (expect_true (ta.prev != ta.next)) 1533 if (expect_true (ta.prev != ta.next))
1448 { 1534 {
1449 TRANSFER (ta); 1535 TRANSFER (ta, 1);
1450 return 1; 1536 return 1;
1451 } 1537 }
1452 else 1538 else
1453 return 0; 1539 return 0;
1454} 1540}
1459 dTHX; 1545 dTHX;
1460 struct transfer_args ta; 1546 struct transfer_args ta;
1461 1547
1462 if (prepare_cede_notself (aTHX_ &ta)) 1548 if (prepare_cede_notself (aTHX_ &ta))
1463 { 1549 {
1464 TRANSFER (ta); 1550 TRANSFER (ta, 1);
1465 return 1; 1551 return 1;
1466 } 1552 }
1467 else 1553 else
1468 return 0; 1554 return 0;
1469} 1555}
1506 BOOT_PAGESIZE; 1592 BOOT_PAGESIZE;
1507 1593
1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1594 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1595 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510 1596
1597 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1598 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1599 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1600 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1601
1511 hv_sig = coro_get_hv ("SIG", TRUE); 1602 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1512 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1603 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1513 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1604 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1517 1605
1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1606 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1519 1607
1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1608 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1609 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1538SV * 1626SV *
1539new (char *klass, ...) 1627new (char *klass, ...)
1540 CODE: 1628 CODE:
1541{ 1629{
1542 struct coro *coro; 1630 struct coro *coro;
1631 MAGIC *mg;
1543 HV *hv; 1632 HV *hv;
1544 int i; 1633 int i;
1545 1634
1546 Newz (0, coro, 1, struct coro); 1635 Newz (0, coro, 1, struct coro);
1547 coro->args = newAV (); 1636 coro->args = newAV ();
1550 if (coro_first) coro_first->prev = coro; 1639 if (coro_first) coro_first->prev = coro;
1551 coro->next = coro_first; 1640 coro->next = coro_first;
1552 coro_first = coro; 1641 coro_first = coro;
1553 1642
1554 coro->hv = hv = newHV (); 1643 coro->hv = hv = newHV ();
1555 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1644 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1645 mg->mg_flags |= MGf_DUP;
1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1646 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1557 1647
1558 av_extend (coro->args, items - 1); 1648 av_extend (coro->args, items - 1);
1559 for (i = 1; i < items; i++) 1649 for (i = 1; i < items; i++)
1560 av_push (coro->args, newSVsv (ST (i))); 1650 av_push (coro->args, newSVsv (ST (i)));
1574 Coro::cede_notself = 4 1664 Coro::cede_notself = 4
1575 CODE: 1665 CODE:
1576{ 1666{
1577 struct transfer_args ta; 1667 struct transfer_args ta;
1578 1668
1669 PUTBACK;
1579 switch (ix) 1670 switch (ix)
1580 { 1671 {
1581 case 0: 1672 case 0:
1582 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1673 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1583 ta.next = 0; 1674 ta.next = 0;
1602 if (!prepare_cede_notself (aTHX_ &ta)) 1693 if (!prepare_cede_notself (aTHX_ &ta))
1603 XSRETURN_EMPTY; 1694 XSRETURN_EMPTY;
1604 1695
1605 break; 1696 break;
1606 } 1697 }
1698 SPAGAIN;
1607 1699
1608 BARRIER; 1700 BARRIER;
1609 PUTBACK; 1701 PUTBACK;
1610 TRANSFER (ta); 1702 TRANSFER (ta, 0);
1611 SPAGAIN; /* might be the sp of a different coroutine now */ 1703 SPAGAIN; /* might be the sp of a different coroutine now */
1612 /* be extra careful not to ever do anything after TRANSFER */ 1704 /* be extra careful not to ever do anything after TRANSFER */
1613} 1705}
1614 1706
1615bool 1707bool
1618 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1710 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1619 OUTPUT: 1711 OUTPUT:
1620 RETVAL 1712 RETVAL
1621 1713
1622void 1714void
1623_exit (code) 1715_exit (int code)
1624 int code
1625 PROTOTYPE: $ 1716 PROTOTYPE: $
1626 CODE: 1717 CODE:
1627 _exit (code); 1718 _exit (code);
1628 1719
1629int 1720int
1669 { 1760 {
1670 struct coro temp; 1761 struct coro temp;
1671 1762
1672 if (!(coro->flags & CF_RUNNING)) 1763 if (!(coro->flags & CF_RUNNING))
1673 { 1764 {
1765 PUTBACK;
1674 save_perl (aTHX_ &temp); 1766 save_perl (aTHX_ &temp);
1675 load_perl (aTHX_ coro); 1767 load_perl (aTHX_ coro);
1676 } 1768 }
1677 1769
1678 { 1770 {
1697 1789
1698 if (!(coro->flags & CF_RUNNING)) 1790 if (!(coro->flags & CF_RUNNING))
1699 { 1791 {
1700 save_perl (aTHX_ coro); 1792 save_perl (aTHX_ coro);
1701 load_perl (aTHX_ &temp); 1793 load_perl (aTHX_ &temp);
1794 SPAGAIN;
1702 } 1795 }
1703 } 1796 }
1704} 1797}
1705 1798
1706SV * 1799SV *
1718 1811
1719void 1812void
1720api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1813api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1721 1814
1722SV * 1815SV *
1723has_stack (Coro::State coro) 1816has_cctx (Coro::State coro)
1724 PROTOTYPE: $ 1817 PROTOTYPE: $
1725 CODE: 1818 CODE:
1726 RETVAL = boolSV (!!coro->cctx); 1819 RETVAL = boolSV (!!coro->cctx);
1727 OUTPUT: 1820 OUTPUT:
1728 RETVAL 1821 RETVAL
1747 case 1: RETVAL = coro->usecount; break; 1840 case 1: RETVAL = coro->usecount; break;
1748 } 1841 }
1749 OUTPUT: 1842 OUTPUT:
1750 RETVAL 1843 RETVAL
1751 1844
1845void
1846force_cctx ()
1847 CODE:
1848 struct coro *coro = SvSTATE (coro_current);
1849 coro->cctx->idle_sp = 0;
1752 1850
1753MODULE = Coro::State PACKAGE = Coro 1851MODULE = Coro::State PACKAGE = Coro
1754 1852
1755BOOT: 1853BOOT:
1756{ 1854{
1757 int i; 1855 int i;
1758 1856
1759 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1760 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1761 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1857 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1858 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1859 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1762 1860
1763 coro_current = coro_get_sv ("Coro::current", FALSE); 1861 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1764 SvREADONLY_on (coro_current); 1862 SvREADONLY_on (coro_current);
1765 1863
1766 coro_stash = gv_stashpv ("Coro", TRUE); 1864 coro_stash = gv_stashpv ("Coro", TRUE);
1767 1865
1768 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1866 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1798 PROTOTYPE: $ 1896 PROTOTYPE: $
1799 CODE: 1897 CODE:
1800 SvREFCNT_dec (SvRV (coro_current)); 1898 SvREFCNT_dec (SvRV (coro_current));
1801 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1899 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1802 1900
1901void
1902_set_readyhook (SV *hook)
1903 PROTOTYPE: $
1904 CODE:
1905 LOCK;
1906 if (coro_readyhook)
1907 SvREFCNT_dec (coro_readyhook);
1908 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1909 UNLOCK;
1910
1803int 1911int
1804prio (Coro::State coro, int newprio = 0) 1912prio (Coro::State coro, int newprio = 0)
1805 ALIAS: 1913 ALIAS:
1806 nice = 1 1914 nice = 1
1807 CODE: 1915 CODE:
1843 PROTOTYPE: $;$ 1951 PROTOTYPE: $;$
1844 CODE: 1952 CODE:
1845 SvREFCNT_dec (self->throw); 1953 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1954 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847 1955
1956void
1957swap_defsv (Coro::State self)
1958 PROTOTYPE: $
1959 ALIAS:
1960 swap_defav = 1
1961 CODE:
1962 if (!self->slot)
1963 croak ("cannot swap state with coroutine that has no saved state");
1964 else
1965 {
1966 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1967 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1968
1969 SV *tmp = *src; *src = *dst; *dst = tmp;
1970 }
1971
1848# for async_pool speedup 1972# for async_pool speedup
1849void 1973void
1850_pool_1 (SV *cb) 1974_pool_1 (SV *cb)
1851 CODE: 1975 CODE:
1852{ 1976{
1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1980 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1857 AV *invoke_av; 1981 AV *invoke_av;
1858 int i, len; 1982 int i, len;
1859 1983
1860 if (!invoke) 1984 if (!invoke)
1985 {
1986 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1861 croak ("\3async_pool terminate\2\n"); 1987 croak ("\3async_pool terminate\2\n");
1988 }
1862 1989
1863 SvREFCNT_dec (coro->saved_deffh); 1990 SvREFCNT_dec (coro->saved_deffh);
1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1991 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1865 1992
1866 hv_store (hv, "desc", sizeof ("desc") - 1, 1993 hv_store (hv, "desc", sizeof ("desc") - 1,
1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2019 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1893 coro->saved_deffh = 0; 2020 coro->saved_deffh = 0;
1894 2021
1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2022 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1896 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2023 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2024 {
2025 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1897 croak ("\3async_pool terminate\2\n"); 2026 croak ("\3async_pool terminate\2\n");
2027 }
1898 2028
1899 av_clear (GvAV (PL_defgv)); 2029 av_clear (GvAV (PL_defgv));
1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2030 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2031 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1902 2032
1941 PL_laststype = data->laststype; 2071 PL_laststype = data->laststype;
1942 PL_laststatval = data->laststatval; 2072 PL_laststatval = data->laststatval;
1943 PL_statcache = data->statcache; 2073 PL_statcache = data->statcache;
1944} 2074}
1945 2075
2076
2077MODULE = Coro::State PACKAGE = Coro::AnyEvent
2078
2079BOOT:
2080 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2081
2082SV *
2083_schedule ()
2084 PROTOTYPE: @
2085 CODE:
2086{
2087 static int incede;
2088 fprintf (stderr, "_schedule\n");//D
2089
2090 api_cede_notself ();
2091
2092 ++incede;
2093 while (coro_nready >= incede && api_cede ())
2094 ;
2095
2096 sv_setsv (sv_activity, &PL_sv_undef);
2097 if (coro_nready >= incede)
2098 {
2099 PUSHMARK (SP);
2100 PUTBACK;
2101 fprintf (stderr, "call act %d >= %d\n", coro_nready, incede);//D
2102 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2103 SPAGAIN;
2104 }
2105
2106 --incede;
2107}
2108

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines