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.210 by root, Wed Oct 10 03:24:40 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
… …
131#else 144#else
132# define LOCK (void)0 145# define LOCK (void)0
133# define UNLOCK (void)0 146# define UNLOCK (void)0
134#endif 147#endif
135 148
136#define strpair(const) const, sizeof (const) - 1
137
138/* helper storage struct for Coro::AIO */ 149/* helper storage struct for Coro::AIO */
139struct io_state 150struct io_state
140{ 151{
141 int errorno; 152 int errorno;
142 I32 laststype; 153 I32 laststype;
… …
147static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
148static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
149static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env; 161static JMPENV *main_top_env;
151static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
152static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
153 164
154static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
156 167static SV *rv_diehook;
168static SV *rv_warnhook;
157static HV *hv_sig; /* %SIG */ 169static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160 170
161/* async_pool helper stuff */ 171/* async_pool helper stuff */
162static SV *sv_pool_rss; 172static SV *sv_pool_rss;
163static SV *sv_pool_size; 173static SV *sv_pool_size;
164static AV *av_async_pool; 174static AV *av_async_pool;
165 175
166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */ 176/* Coro::AnyEvent */
177static SV *sv_activity;
178
179static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle[3]; 180static int cctx_count, cctx_idle;
168 181
169enum { 182enum {
170 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
… …
217 230
218/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
219struct coro { 232struct coro {
220 /* the c coroutine allocated to this perl coroutine, if any */ 233 /* the c coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 234 coro_cctx *cctx;
222 int gimme;
223 235
224 /* process data */ 236 /* process data */
225 AV *mainstack; 237 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
227 239
… …
256#define PRIO_IDLE -3 268#define PRIO_IDLE -3
257#define PRIO_MIN -4 269#define PRIO_MIN -4
258 270
259/* for Coro.pm */ 271/* for Coro.pm */
260static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
261static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
262static int coro_nready; 275static int coro_nready;
263static struct coro *coro_first; 276static struct coro *coro_first;
264 277
265/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
266 279
267static SV * 280static SV *
268coro_get_sv (const char *name, int create) 281coro_get_sv (pTHX_ const char *name, int create)
269{ 282{
270#if PERL_VERSION_ATLEAST (5,9,0) 283#if PERL_VERSION_ATLEAST (5,10,0)
271 /* 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 */
272 get_sv (name, create); 285 get_sv (name, create);
273#endif 286#endif
274 return get_sv (name, create); 287 return get_sv (name, create);
275} 288}
276 289
277static AV * 290static AV *
278coro_get_av (const char *name, int create) 291coro_get_av (pTHX_ const char *name, int create)
279{ 292{
280#if PERL_VERSION_ATLEAST (5,9,0) 293#if PERL_VERSION_ATLEAST (5,10,0)
281 /* 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 */
282 get_av (name, create); 295 get_av (name, create);
283#endif 296#endif
284 return get_av (name, create); 297 return get_av (name, create);
285} 298}
286 299
287static HV * 300static HV *
288coro_get_hv (const char *name, int create) 301coro_get_hv (pTHX_ const char *name, int create)
289{ 302{
290#if PERL_VERSION_ATLEAST (5,9,0) 303#if PERL_VERSION_ATLEAST (5,10,0)
291 /* 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 */
292 get_hv (name, create); 305 get_hv (name, create);
293#endif 306#endif
294 return get_hv (name, create); 307 return get_hv (name, create);
295} 308}
… …
300 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
301 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
302 315
303 newpadlist = newAV (); 316 newpadlist = newAV ();
304 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
305#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
306 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
307#else 320#else
308 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
309#endif 322#endif
310 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
… …
348 361
349 /* casting is fun. */ 362 /* casting is fun. */
350 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
351 free_padlist (aTHX_ padlist); 364 free_padlist (aTHX_ padlist);
352 365
353 SvREFCNT_dec (av);
354
355 return 0; 366 return 0;
356} 367}
357 368
358#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
359 371
360static 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};
361 376
362#define CORO_MAGIC(cv) \ 377#define CORO_MAGIC(sv,type) \
363 SvMAGIC (cv) \ 378 SvMAGIC (sv) \
364 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 379 ? SvMAGIC (sv)->mg_type == type \
365 ? SvMAGIC (cv) \ 380 ? SvMAGIC (sv) \
366 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 381 : mg_find (sv, type) \
367 : 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)
368 386
369static struct coro * 387static struct coro *
370SvSTATE_ (pTHX_ SV *coro) 388SvSTATE_ (pTHX_ SV *coro)
371{ 389{
372 HV *stash; 390 HV *stash;
… …
384 /* very slow, but rare, check */ 402 /* very slow, but rare, check */
385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 403 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
386 croak ("Coro::State object required"); 404 croak ("Coro::State object required");
387 } 405 }
388 406
389 mg = CORO_MAGIC (coro); 407 mg = CORO_MAGIC_state (coro);
390 return (struct coro *)mg->mg_ptr; 408 return (struct coro *)mg->mg_ptr;
391} 409}
392 410
393#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 411#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
394 412
395/* the next two functions merely cache the padlists */ 413/* the next two functions merely cache the padlists */
396static void 414static void
397get_padlist (pTHX_ CV *cv) 415get_padlist (pTHX_ CV *cv)
398{ 416{
399 MAGIC *mg = CORO_MAGIC (cv); 417 MAGIC *mg = CORO_MAGIC_cv (cv);
400 AV *av; 418 AV *av;
401 419
402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
404 else 422 else
… …
416} 434}
417 435
418static void 436static void
419put_padlist (pTHX_ CV *cv) 437put_padlist (pTHX_ CV *cv)
420{ 438{
421 MAGIC *mg = CORO_MAGIC (cv); 439 MAGIC *mg = CORO_MAGIC_cv (cv);
422 AV *av; 440 AV *av;
423 441
424 if (expect_false (!mg)) 442 if (expect_false (!mg))
425 { 443 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
428 mg->mg_virtual = &vtbl_coro;
429 mg->mg_obj = (SV *)newAV ();
430 }
431 444
432 av = (AV *)mg->mg_obj; 445 av = (AV *)mg->mg_obj;
433 446
434 if (expect_false (AvFILLp (av) >= AvMAX (av))) 447 if (expect_false (AvFILLp (av) >= AvMAX (av)))
435 av_extend (av, AvMAX (av) + 1); 448 av_extend (av, AvMAX (av) + 1);
… …
453 GvSV (irsgv) = slot->irsgv; 466 GvSV (irsgv) = slot->irsgv;
454 467
455 #define VAR(name,type) PL_ ## name = slot->name; 468 #define VAR(name,type) PL_ ## name = slot->name;
456 # include "state.h" 469 # include "state.h"
457 #undef VAR 470 #undef VAR
458
459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
461 471
462 { 472 {
463 dSP; 473 dSP;
464 474
465 CV *cv; 475 CV *cv;
… …
504 514
505 if (expect_true (CvDEPTH (cv))) 515 if (expect_true (CvDEPTH (cv)))
506 { 516 {
507 EXTEND (SP, 3); 517 EXTEND (SP, 3);
508 PUSHs ((SV *)CvPADLIST (cv)); 518 PUSHs ((SV *)CvPADLIST (cv));
509 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 519 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
510 PUSHs ((SV *)cv); 520 PUSHs ((SV *)cv);
511 521
512 CvDEPTH (cv) = 0; 522 CvDEPTH (cv) = 0;
513 get_padlist (aTHX_ cv); 523 get_padlist (aTHX_ cv);
514 } 524 }
… …
594 604
595 New(54,PL_savestack,24,ANY); 605 New(54,PL_savestack,24,ANY);
596 PL_savestack_ix = 0; 606 PL_savestack_ix = 0;
597 PL_savestack_max = 24; 607 PL_savestack_max = 24;
598 608
599#if !PERL_VERSION_ATLEAST (5,9,0) 609#if !PERL_VERSION_ATLEAST (5,10,0)
600 New(54,PL_retstack,4,OP*); 610 New(54,PL_retstack,4,OP*);
601 PL_retstack_ix = 0; 611 PL_retstack_ix = 0;
602 PL_retstack_max = 4; 612 PL_retstack_max = 4;
603#endif 613#endif
604} 614}
… …
627 637
628 Safefree (PL_tmps_stack); 638 Safefree (PL_tmps_stack);
629 Safefree (PL_markstack); 639 Safefree (PL_markstack);
630 Safefree (PL_scopestack); 640 Safefree (PL_scopestack);
631 Safefree (PL_savestack); 641 Safefree (PL_savestack);
632#if !PERL_VERSION_ATLEAST (5,9,0) 642#if !PERL_VERSION_ATLEAST (5,10,0)
633 Safefree (PL_retstack); 643 Safefree (PL_retstack);
634#endif 644#endif
635} 645}
636 646
637static size_t 647static size_t
… …
661 rss += slot->tmps_max * sizeof (SV *); 671 rss += slot->tmps_max * sizeof (SV *);
662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
663 rss += slot->scopestack_max * sizeof (I32); 673 rss += slot->scopestack_max * sizeof (I32);
664 rss += slot->savestack_max * sizeof (ANY); 674 rss += slot->savestack_max * sizeof (ANY);
665 675
666#if !PERL_VERSION_ATLEAST (5,9,0) 676#if !PERL_VERSION_ATLEAST (5,10,0)
667 rss += slot->retstack_max * sizeof (OP *); 677 rss += slot->retstack_max * sizeof (OP *);
668#endif 678#endif
669 } 679 }
670 680
671 return rss; 681 return rss;
672} 682}
673 683
674/** 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}
675 735
676static void 736static void
677coro_setup (pTHX_ struct coro *coro) 737coro_setup (pTHX_ struct coro *coro)
678{ 738{
679 /* 739 /*
… …
688 PL_curpm = 0; 748 PL_curpm = 0;
689 PL_curpad = 0; 749 PL_curpad = 0;
690 PL_localizing = 0; 750 PL_localizing = 0;
691 PL_dirty = 0; 751 PL_dirty = 0;
692 PL_restartop = 0; 752 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 753#if PERL_VERSION_ATLEAST (5,10,0)
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 754 PL_parser = 0;
755#endif
756
757 /* recreate the die/warn hooks */
758 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
759 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
695 760
696 GvSV (PL_defgv) = newSV (0); 761 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0; 762 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0); 763 GvSV (PL_errgv) = newSV (0);
699 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);
… …
712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 777 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
713 PUTBACK; 778 PUTBACK;
714 PL_op = (OP *)&myop; 779 PL_op = (OP *)&myop;
715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 780 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
716 SPAGAIN; 781 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
731 } 782 }
732 783
733 /* this newly created coroutine might be run on an existing cctx which most 784 /* this newly created coroutine might be run on an existing cctx which most
734 * likely was suspended in set_stacklevel, called from entersub. 785 * likely was suspended in set_stacklevel, called from entersub.
735 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 786 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
… …
827 PUSHMARK (SP); 878 PUSHMARK (SP);
828 PUSHs (&PL_sv_no); 879 PUSHs (&PL_sv_no);
829 PUSHs (fullname); 880 PUSHs (fullname);
830 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 881 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
831 PUTBACK; 882 PUTBACK;
832 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 883 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
833 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 884 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
834 SPAGAIN; 885 SPAGAIN;
835 FREETMPS; 886 FREETMPS;
836 LEAVE; 887 LEAVE;
837 PL_runops = runops_trace; 888 PL_runops = runops_trace;
… …
864 SAVETMPS; 915 SAVETMPS;
865 EXTEND (SP, 3); 916 EXTEND (SP, 3);
866 PUSHMARK (SP); 917 PUSHMARK (SP);
867 PUSHs (&PL_sv_yes); 918 PUSHs (&PL_sv_yes);
868 PUSHs (fullname); 919 PUSHs (fullname);
869 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);
870 PUTBACK; 921 PUTBACK;
871 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 922 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
872 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);
873 SPAGAIN; 924 SPAGAIN;
874 FREETMPS; 925 FREETMPS;
875 LEAVE; 926 LEAVE;
876 PL_runops = runops_trace; 927 PL_runops = runops_trace;
… …
890 PL_runops = RUNOPS_DEFAULT; 941 PL_runops = RUNOPS_DEFAULT;
891 PUSHMARK (SP); 942 PUSHMARK (SP);
892 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 943 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
893 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 944 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
894 PUTBACK; 945 PUTBACK;
895 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 946 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
896 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 947 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
897 SPAGAIN; 948 SPAGAIN;
898 FREETMPS; 949 FREETMPS;
899 LEAVE; 950 LEAVE;
900 PL_runops = runops_trace; 951 PL_runops = runops_trace;
… …
1039 1090
1040/* wether this cctx should be destructed */ 1091/* wether this cctx should be destructed */
1041#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1092#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1042 1093
1043static coro_cctx * 1094static coro_cctx *
1044cctx_get (pTHX_ int gimme) 1095cctx_get (pTHX)
1045{ 1096{
1046 while (expect_true (cctx_first[gimme])) 1097 while (expect_true (cctx_first))
1047 { 1098 {
1048 coro_cctx *cctx = cctx_first[gimme]; 1099 coro_cctx *cctx = cctx_first;
1049 cctx_first[gimme] = cctx->next; 1100 cctx_first = cctx->next;
1050 --cctx_idle[gimme]; 1101 --cctx_idle;
1051 1102
1052 if (expect_true (!CCTX_EXPIRED (cctx))) 1103 if (expect_true (!CCTX_EXPIRED (cctx)))
1053 return cctx; 1104 return cctx;
1054 1105
1055 cctx_destroy (cctx); 1106 cctx_destroy (cctx);
1056 } 1107 }
1057 1108
1058 assert (!gimme);
1059 return cctx_new (); 1109 return cctx_new ();
1060} 1110}
1061 1111
1062static void 1112static void
1063cctx_put (coro_cctx *cctx, int gimme) 1113cctx_put (coro_cctx *cctx)
1064{ 1114{
1065 /* free another cctx if overlimit */ 1115 /* free another cctx if overlimit */
1066 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX)) 1116 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
1067 { 1117 {
1068 coro_cctx *first = cctx_first[gimme]; 1118 coro_cctx *first = cctx_first;
1069 cctx_first[gimme] = first->next; 1119 cctx_first = first->next;
1070 --cctx_idle[gimme]; 1120 --cctx_idle;
1071 1121
1072 cctx_destroy (first); 1122 cctx_destroy (first);
1073 } 1123 }
1074 1124
1075 ++cctx_idle[gimme]; 1125 ++cctx_idle;
1076 cctx->next = cctx_first[gimme]; 1126 cctx->next = cctx_first;
1077 cctx_first[gimme] = cctx; 1127 cctx_first = cctx;
1078} 1128}
1079 1129
1080/** coroutine switching *****************************************************/ 1130/** coroutine switching *****************************************************/
1081 1131
1082static void 1132static void
… …
1091 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");
1092 1142
1093 if (expect_false (next->flags & CF_DESTROYED)) 1143 if (expect_false (next->flags & CF_DESTROYED))
1094 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");
1095 1145
1096 if (
1097#if PERL_VERSION_ATLEAST (5,9,0) 1146#if !PERL_VERSION_ATLEAST (5,10,0)
1098 expect_false (PL_parser)
1099#else
1100 expect_false (PL_lex_state != LEX_NOTPARSING) 1147 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1101#endif
1102 )
1103 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
1104 } 1150 }
1105} 1151}
1106 1152
1107/* always use the TRANSFER macro */ 1153/* always use the TRANSFER macro */
1108static void NOINLINE 1154static void NOINLINE
1109transfer (pTHX_ struct coro *prev, struct coro *next) 1155transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1110{ 1156{
1111 dSTACKLEVEL; 1157 dSTACKLEVEL;
1158 static volatile int has_throw;
1112 1159
1113 /* sometimes transfer is only called to set idle_sp */ 1160 /* sometimes transfer is only called to set idle_sp */
1114 if (expect_false (!next)) 1161 if (expect_false (!next))
1115 { 1162 {
1116 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1163 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1131 prev->flags &= ~CF_RUNNING; 1178 prev->flags &= ~CF_RUNNING;
1132 next->flags |= CF_RUNNING; 1179 next->flags |= CF_RUNNING;
1133 1180
1134 LOCK; 1181 LOCK;
1135 1182
1183 /* first get rid of the old state */
1184 save_perl (aTHX_ prev);
1185
1136 if (expect_false (next->flags & CF_NEW)) 1186 if (expect_false (next->flags & CF_NEW))
1137 { 1187 {
1138 /* need to start coroutine */ 1188 /* need to start coroutine */
1139 next->flags &= ~CF_NEW; 1189 next->flags &= ~CF_NEW;
1140 /* first get rid of the old state */
1141 save_perl (aTHX_ prev);
1142 /* setup coroutine call */ 1190 /* setup coroutine call */
1143 coro_setup (aTHX_ next); 1191 coro_setup (aTHX_ next);
1144 } 1192 }
1145 else 1193 else
1146 {
1147 /* coroutine already started */
1148 save_perl (aTHX_ prev);
1149 load_perl (aTHX_ next); 1194 load_perl (aTHX_ next);
1150 }
1151 1195
1152 prev__cctx = prev->cctx; 1196 prev__cctx = prev->cctx;
1153 1197
1154 /* possibly "free" the cctx */ 1198 /* possibly "free" the cctx */
1155 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 ))
1156 { 1204 {
1157 /* 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 */
1158 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));
1159 1207
1160 prev->cctx = 0; 1208 prev->cctx = 0;
1161 1209
1162 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1210 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1163 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1211 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1164 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1212 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1165 if (!next->cctx) 1213 if (!next->cctx)
1166 next->cctx = cctx_get (aTHX_ next->gimme); 1214 next->cctx = cctx_get (aTHX);
1167 1215
1168 cctx_put (prev__cctx, prev->gimme); 1216 cctx_put (prev__cctx);
1169 } 1217 }
1170 1218
1171 ++next->usecount; 1219 ++next->usecount;
1172 1220
1173 if (expect_true (!next->cctx)) 1221 if (expect_true (!next->cctx))
1174 next->cctx = cctx_get (aTHX_ next->gimme); 1222 next->cctx = cctx_get (aTHX);
1223
1224 has_throw = !!next->throw;
1175 1225
1176 if (expect_false (prev__cctx != next->cctx)) 1226 if (expect_false (prev__cctx != next->cctx))
1177 { 1227 {
1178 prev__cctx->top_env = PL_top_env; 1228 prev__cctx->top_env = PL_top_env;
1179 PL_top_env = next->cctx->top_env; 1229 PL_top_env = next->cctx->top_env;
… …
1181 } 1231 }
1182 1232
1183 free_coro_mortal (aTHX); 1233 free_coro_mortal (aTHX);
1184 UNLOCK; 1234 UNLOCK;
1185 1235
1186 if (expect_false (prev->throw || next->throw)) 1236 if (expect_false (has_throw))
1187 { 1237 {
1188 struct coro *coro = SvSTATE (coro_current); 1238 struct coro *coro = SvSTATE (coro_current);
1189 1239
1190 if (coro->throw) 1240 if (coro->throw)
1191 { 1241 {
… …
1201struct transfer_args 1251struct transfer_args
1202{ 1252{
1203 struct coro *prev, *next; 1253 struct coro *prev, *next;
1204}; 1254};
1205 1255
1206#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1256#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1207#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1257#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1208 1258
1209/** high level stuff ********************************************************/ 1259/** high level stuff ********************************************************/
1210 1260
1211static int 1261static int
… …
1305{ 1355{
1306 dTHX; 1356 dTHX;
1307 struct transfer_args ta; 1357 struct transfer_args ta;
1308 1358
1309 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1359 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1310 TRANSFER (ta); 1360 TRANSFER (ta, 1);
1311} 1361}
1312 1362
1313/** Coro ********************************************************************/ 1363/** Coro ********************************************************************/
1314 1364
1315static void 1365static void
… …
1317{ 1367{
1318 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);
1319} 1369}
1320 1370
1321static SV * 1371static SV *
1322coro_deq (pTHX_ int min_prio) 1372coro_deq (pTHX)
1323{ 1373{
1324 int prio = PRIO_MAX - PRIO_MIN; 1374 int prio;
1325 1375
1326 min_prio -= PRIO_MIN;
1327 if (min_prio < 0)
1328 min_prio = 0;
1329
1330 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1376 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1331 if (AvFILLp (coro_ready [prio]) >= 0) 1377 if (AvFILLp (coro_ready [prio]) >= 0)
1332 return av_shift (coro_ready [prio]); 1378 return av_shift (coro_ready [prio]);
1333 1379
1334 return 0; 1380 return 0;
1335} 1381}
… …
1337static int 1383static int
1338api_ready (SV *coro_sv) 1384api_ready (SV *coro_sv)
1339{ 1385{
1340 dTHX; 1386 dTHX;
1341 struct coro *coro; 1387 struct coro *coro;
1388 SV *hook;
1342 1389
1343 if (SvROK (coro_sv)) 1390 if (SvROK (coro_sv))
1344 coro_sv = SvRV (coro_sv); 1391 coro_sv = SvRV (coro_sv);
1345 1392
1346 coro = SvSTATE (coro_sv); 1393 coro = SvSTATE (coro_sv);
… …
1349 return 0; 1396 return 0;
1350 1397
1351 coro->flags |= CF_READY; 1398 coro->flags |= CF_READY;
1352 1399
1353 LOCK; 1400 LOCK;
1401
1402 hook = coro_nready ? 0 : coro_readyhook;
1403
1354 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1404 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1355 ++coro_nready; 1405 ++coro_nready;
1406
1356 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 }
1357 1424
1358 return 1; 1425 return 1;
1359} 1426}
1360 1427
1361static int 1428static int
… …
1371 SV *prev_sv, *next_sv; 1438 SV *prev_sv, *next_sv;
1372 1439
1373 for (;;) 1440 for (;;)
1374 { 1441 {
1375 LOCK; 1442 LOCK;
1376 next_sv = coro_deq (aTHX_ PRIO_MIN); 1443 next_sv = coro_deq (aTHX);
1377 1444
1378 /* nothing to schedule: call the idle handler */ 1445 /* nothing to schedule: call the idle handler */
1379 if (expect_false (!next_sv)) 1446 if (expect_false (!next_sv))
1380 { 1447 {
1381 dSP; 1448 dSP;
… …
1385 SAVETMPS; 1452 SAVETMPS;
1386 1453
1387 PUSHMARK (SP); 1454 PUSHMARK (SP);
1388 PUTBACK; 1455 PUTBACK;
1389 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1456 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1457 SPAGAIN;
1390 1458
1391 FREETMPS; 1459 FREETMPS;
1392 LEAVE; 1460 LEAVE;
1393 continue; 1461 continue;
1394 } 1462 }
… …
1449{ 1517{
1450 dTHX; 1518 dTHX;
1451 struct transfer_args ta; 1519 struct transfer_args ta;
1452 1520
1453 prepare_schedule (aTHX_ &ta); 1521 prepare_schedule (aTHX_ &ta);
1454 TRANSFER (ta); 1522 TRANSFER (ta, 1);
1455} 1523}
1456 1524
1457static int 1525static int
1458api_cede (void) 1526api_cede (void)
1459{ 1527{
… …
1462 1530
1463 prepare_cede (aTHX_ &ta); 1531 prepare_cede (aTHX_ &ta);
1464 1532
1465 if (expect_true (ta.prev != ta.next)) 1533 if (expect_true (ta.prev != ta.next))
1466 { 1534 {
1467 TRANSFER (ta); 1535 TRANSFER (ta, 1);
1468 return 1; 1536 return 1;
1469 } 1537 }
1470 else 1538 else
1471 return 0; 1539 return 0;
1472} 1540}
… …
1477 dTHX; 1545 dTHX;
1478 struct transfer_args ta; 1546 struct transfer_args ta;
1479 1547
1480 if (prepare_cede_notself (aTHX_ &ta)) 1548 if (prepare_cede_notself (aTHX_ &ta))
1481 { 1549 {
1482 TRANSFER (ta); 1550 TRANSFER (ta, 1);
1483 return 1; 1551 return 1;
1484 } 1552 }
1485 else 1553 else
1486 return 0; 1554 return 0;
1487} 1555}
… …
1524 BOOT_PAGESIZE; 1592 BOOT_PAGESIZE;
1525 1593
1526 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1594 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1527 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1595 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1528 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
1529 hv_sig = coro_get_hv ("SIG", TRUE); 1602 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1530 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1603 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1531 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1604 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1532
1533 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1534 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1535 1605
1536 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1606 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1537 1607
1538 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1608 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1539 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1609 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1556SV * 1626SV *
1557new (char *klass, ...) 1627new (char *klass, ...)
1558 CODE: 1628 CODE:
1559{ 1629{
1560 struct coro *coro; 1630 struct coro *coro;
1631 MAGIC *mg;
1561 HV *hv; 1632 HV *hv;
1562 int i; 1633 int i;
1563 1634
1564 Newz (0, coro, 1, struct coro); 1635 Newz (0, coro, 1, struct coro);
1565 coro->args = newAV (); 1636 coro->args = newAV ();
… …
1568 if (coro_first) coro_first->prev = coro; 1639 if (coro_first) coro_first->prev = coro;
1569 coro->next = coro_first; 1640 coro->next = coro_first;
1570 coro_first = coro; 1641 coro_first = coro;
1571 1642
1572 coro->hv = hv = newHV (); 1643 coro->hv = hv = newHV ();
1573 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;
1574 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1646 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1575 1647
1576 av_extend (coro->args, items - 1); 1648 av_extend (coro->args, items - 1);
1577 for (i = 1; i < items; i++) 1649 for (i = 1; i < items; i++)
1578 av_push (coro->args, newSVsv (ST (i))); 1650 av_push (coro->args, newSVsv (ST (i)));
… …
1592 Coro::cede_notself = 4 1664 Coro::cede_notself = 4
1593 CODE: 1665 CODE:
1594{ 1666{
1595 struct transfer_args ta; 1667 struct transfer_args ta;
1596 1668
1669 PUTBACK;
1597 switch (ix) 1670 switch (ix)
1598 { 1671 {
1599 case 0: 1672 case 0:
1600 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1673 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1601 ta.next = 0; 1674 ta.next = 0;
… …
1620 if (!prepare_cede_notself (aTHX_ &ta)) 1693 if (!prepare_cede_notself (aTHX_ &ta))
1621 XSRETURN_EMPTY; 1694 XSRETURN_EMPTY;
1622 1695
1623 break; 1696 break;
1624 } 1697 }
1698 SPAGAIN;
1625 1699
1626 BARRIER; 1700 BARRIER;
1627 PUTBACK; 1701 PUTBACK;
1628 TRANSFER (ta); 1702 TRANSFER (ta, 0);
1629 SPAGAIN; /* might be the sp of a different coroutine now */ 1703 SPAGAIN; /* might be the sp of a different coroutine now */
1630 /* be extra careful not to ever do anything after TRANSFER */ 1704 /* be extra careful not to ever do anything after TRANSFER */
1631} 1705}
1632 1706
1633bool 1707bool
… …
1636 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1710 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1637 OUTPUT: 1711 OUTPUT:
1638 RETVAL 1712 RETVAL
1639 1713
1640void 1714void
1641_exit (code) 1715_exit (int code)
1642 int code
1643 PROTOTYPE: $ 1716 PROTOTYPE: $
1644 CODE: 1717 CODE:
1645 _exit (code); 1718 _exit (code);
1646 1719
1647int 1720int
… …
1661 RETVAL 1734 RETVAL
1662 1735
1663int 1736int
1664cctx_idle () 1737cctx_idle ()
1665 CODE: 1738 CODE:
1666 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2]; 1739 RETVAL = cctx_idle;
1667 OUTPUT: 1740 OUTPUT:
1668 RETVAL 1741 RETVAL
1669 1742
1670void 1743void
1671list () 1744list ()
… …
1687 { 1760 {
1688 struct coro temp; 1761 struct coro temp;
1689 1762
1690 if (!(coro->flags & CF_RUNNING)) 1763 if (!(coro->flags & CF_RUNNING))
1691 { 1764 {
1765 PUTBACK;
1692 save_perl (aTHX_ &temp); 1766 save_perl (aTHX_ &temp);
1693 load_perl (aTHX_ coro); 1767 load_perl (aTHX_ coro);
1694 } 1768 }
1695 1769
1696 { 1770 {
… …
1705 eval_sv (coderef, 0); 1779 eval_sv (coderef, 0);
1706 else 1780 else
1707 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1781 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1708 1782
1709 POPSTACK; 1783 POPSTACK;
1784 SPAGAIN;
1710 FREETMPS; 1785 FREETMPS;
1711 LEAVE; 1786 LEAVE;
1712 PUTBACK; 1787 PUTBACK;
1713 } 1788 }
1714 1789
1715 if (!(coro->flags & CF_RUNNING)) 1790 if (!(coro->flags & CF_RUNNING))
1716 { 1791 {
1717 save_perl (aTHX_ coro); 1792 save_perl (aTHX_ coro);
1718 load_perl (aTHX_ &temp); 1793 load_perl (aTHX_ &temp);
1794 SPAGAIN;
1719 } 1795 }
1720 } 1796 }
1721} 1797}
1722 1798
1723SV * 1799SV *
… …
1735 1811
1736void 1812void
1737api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1813api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1738 1814
1739SV * 1815SV *
1740has_stack (Coro::State coro) 1816has_cctx (Coro::State coro)
1741 PROTOTYPE: $ 1817 PROTOTYPE: $
1742 CODE: 1818 CODE:
1743 RETVAL = boolSV (!!coro->cctx); 1819 RETVAL = boolSV (!!coro->cctx);
1744 OUTPUT: 1820 OUTPUT:
1745 RETVAL 1821 RETVAL
… …
1764 case 1: RETVAL = coro->usecount; break; 1840 case 1: RETVAL = coro->usecount; break;
1765 } 1841 }
1766 OUTPUT: 1842 OUTPUT:
1767 RETVAL 1843 RETVAL
1768 1844
1845void
1846force_cctx ()
1847 CODE:
1848 struct coro *coro = SvSTATE (coro_current);
1849 coro->cctx->idle_sp = 0;
1769 1850
1770MODULE = Coro::State PACKAGE = Coro 1851MODULE = Coro::State PACKAGE = Coro
1771 1852
1772BOOT: 1853BOOT:
1773{ 1854{
1774 int i; 1855 int i;
1775 1856
1776 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1777 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1778 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);
1779 1860
1780 coro_current = coro_get_sv ("Coro::current", FALSE); 1861 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1781 SvREADONLY_on (coro_current); 1862 SvREADONLY_on (coro_current);
1782 1863
1783 coro_stash = gv_stashpv ("Coro", TRUE); 1864 coro_stash = gv_stashpv ("Coro", TRUE);
1784 1865
1785 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1866 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1815 PROTOTYPE: $ 1896 PROTOTYPE: $
1816 CODE: 1897 CODE:
1817 SvREFCNT_dec (SvRV (coro_current)); 1898 SvREFCNT_dec (SvRV (coro_current));
1818 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1899 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1819 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
1820int 1911int
1821prio (Coro::State coro, int newprio = 0) 1912prio (Coro::State coro, int newprio = 0)
1822 ALIAS: 1913 ALIAS:
1823 nice = 1 1914 nice = 1
1824 CODE: 1915 CODE:
… …
1860 PROTOTYPE: $;$ 1951 PROTOTYPE: $;$
1861 CODE: 1952 CODE:
1862 SvREFCNT_dec (self->throw); 1953 SvREFCNT_dec (self->throw);
1863 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1954 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1864 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
1865# for async_pool speedup 1972# for async_pool speedup
1866void 1973void
1867_pool_1 (SV *cb) 1974_pool_1 (SV *cb)
1868 CODE: 1975 CODE:
1869{ 1976{
1870 struct coro *coro = SvSTATE (coro_current); 1977 struct coro *coro = SvSTATE (coro_current);
1871 HV *hv = (HV *)SvRV (coro_current); 1978 HV *hv = (HV *)SvRV (coro_current);
1872 AV *defav = GvAV (PL_defgv); 1979 AV *defav = GvAV (PL_defgv);
1873 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1980 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1874 AV *invoke_av; 1981 AV *invoke_av;
1875 int i, len; 1982 int i, len;
1876 1983
1877 if (!invoke) 1984 if (!invoke)
1985 {
1986 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1878 croak ("\3async_pool terminate\2\n"); 1987 croak ("\3async_pool terminate\2\n");
1988 }
1879 1989
1880 SvREFCNT_dec (coro->saved_deffh); 1990 SvREFCNT_dec (coro->saved_deffh);
1881 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1991 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1882 1992
1883 hv_store (hv, "desc", sizeof ("desc") - 1, 1993 hv_store (hv, "desc", sizeof ("desc") - 1,
1884 newSVpvn (strpair ("[async_pool]")), 0); 1994 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1885 1995
1886 invoke_av = (AV *)SvRV (invoke); 1996 invoke_av = (AV *)SvRV (invoke);
1887 len = av_len (invoke_av); 1997 len = av_len (invoke_av);
1888 1998
1889 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1999 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1909 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2019 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1910 coro->saved_deffh = 0; 2020 coro->saved_deffh = 0;
1911 2021
1912 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2022 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1913 || 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;
1914 croak ("\3async_pool terminate\2\n"); 2026 croak ("\3async_pool terminate\2\n");
2027 }
1915 2028
1916 av_clear (GvAV (PL_defgv)); 2029 av_clear (GvAV (PL_defgv));
1917 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 2030 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1918 newSVpvn (strpair ("[async_pool idle]")), 0); 2031 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1919 2032
1920 coro->prio = 0; 2033 coro->prio = 0;
1921 2034
1922 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2035 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1923 api_trace (coro_current, 0); 2036 api_trace (coro_current, 0);
… …
1958 PL_laststype = data->laststype; 2071 PL_laststype = data->laststype;
1959 PL_laststatval = data->laststatval; 2072 PL_laststatval = data->laststatval;
1960 PL_statcache = data->statcache; 2073 PL_statcache = data->statcache;
1961} 2074}
1962 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