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.204 by root, Mon Oct 8 03:03:39 2007 UTC vs.
Revision 1.250 by root, Wed Oct 22 16:34:07 2008 UTC

4#define PERL_EXT 4#define PERL_EXT
5 5
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
9 10
10#include "patchlevel.h" 11#include "patchlevel.h"
11 12
12#include <stdio.h> 13#include <stdio.h>
13#include <errno.h> 14#include <errno.h>
14#include <assert.h> 15#include <assert.h>
16
17#ifdef WIN32
18# undef setjmp
19# undef longjmp
20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask
22#else
23# include <inttypes.h> /* most portable stdint.h */
24#endif
15 25
16#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
17# include <unistd.h> 27# include <unistd.h>
18# include <sys/mman.h> 28# include <sys/mman.h>
19# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
71# ifndef IS_PADCONST 81# ifndef IS_PADCONST
72# define IS_PADCONST(v) 0 82# define IS_PADCONST(v) 0
73# endif 83# endif
74#endif 84#endif
75 85
86/* 5.8.8 */
87#ifndef GV_NOTQUAL
88# define GV_NOTQUAL 0
89#endif
90#ifndef newSV
91# define newSV(l) NEWSV(0,l)
92#endif
93#ifndef SvREFCNT_inc_NN
94# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
95#endif
96
97/* 5.11 */
98#ifndef CxHASARGS
99# define CxHASARGS(cx) (cx)->blk_sub.hasargs
100#endif
101
76/* 5.8.7 */ 102/* 5.8.7 */
77#ifndef SvRV_set 103#ifndef SvRV_set
78# define SvRV_set(s,v) SvRV(s) = (v) 104# 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 105#endif
88 106
89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 107#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
90# undef CORO_STACKGUARD 108# undef CORO_STACKGUARD
91#endif 109#endif
130#else 148#else
131# define LOCK (void)0 149# define LOCK (void)0
132# define UNLOCK (void)0 150# define UNLOCK (void)0
133#endif 151#endif
134 152
135#define strpair(const) const, sizeof (const) - 1
136
137/* helper storage struct for Coro::AIO */ 153/* helper storage struct for Coro::AIO */
138struct io_state 154struct io_state
139{ 155{
156 AV *res;
140 int errorno; 157 int errorno;
141 I32 laststype; 158 I32 laststype;
142 int laststatval; 159 int laststatval;
143 Stat_t statcache; 160 Stat_t statcache;
144}; 161};
145 162
163static double (*nvtime)(); /* so why doesn't it take void? */
164
146static size_t coro_stacksize = CORO_STACKSIZE; 165static size_t coro_stacksize = CORO_STACKSIZE;
147static struct CoroAPI coroapi; 166static struct CoroAPI coroapi;
148static AV *main_mainstack; /* used to differentiate between $main and others */ 167static AV *main_mainstack; /* used to differentiate between $main and others */
149static JMPENV *main_top_env; 168static JMPENV *main_top_env;
150static HV *coro_state_stash, *coro_stash; 169static HV *coro_state_stash, *coro_stash;
151static SV *coro_mortal; /* will be freed after next transfer */ 170static volatile SV *coro_mortal; /* will be freed after next transfer */
152 171
153static GV *irsgv; /* $/ */ 172static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */ 173static GV *stdoutgv; /* *STDOUT */
155 174static SV *rv_diehook;
175static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */ 176static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
159 177
160/* async_pool helper stuff */ 178/* async_pool helper stuff */
161static SV *sv_pool_rss; 179static SV *sv_pool_rss;
162static SV *sv_pool_size; 180static SV *sv_pool_size;
163static AV *av_async_pool; 181static AV *av_async_pool;
182
183/* Coro::AnyEvent */
184static SV *sv_activity;
164 185
165static struct coro_cctx *cctx_first; 186static struct coro_cctx *cctx_first;
166static int cctx_count, cctx_idle; 187static int cctx_count, cctx_idle;
167 188
168enum { 189enum {
254#define PRIO_IDLE -3 275#define PRIO_IDLE -3
255#define PRIO_MIN -4 276#define PRIO_MIN -4
256 277
257/* for Coro.pm */ 278/* for Coro.pm */
258static SV *coro_current; 279static SV *coro_current;
280static SV *coro_readyhook;
259static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 281static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
260static int coro_nready; 282static int coro_nready;
261static struct coro *coro_first; 283static struct coro *coro_first;
262 284
263/** lowlevel stuff **********************************************************/ 285/** lowlevel stuff **********************************************************/
264 286
265static SV * 287static SV *
266coro_get_sv (const char *name, int create) 288coro_get_sv (pTHX_ const char *name, int create)
267{ 289{
268#if PERL_VERSION_ATLEAST (5,9,0) 290#if PERL_VERSION_ATLEAST (5,10,0)
269 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 291 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
270 get_sv (name, create); 292 get_sv (name, create);
271#endif 293#endif
272 return get_sv (name, create); 294 return get_sv (name, create);
273} 295}
274 296
275static AV * 297static AV *
276coro_get_av (const char *name, int create) 298coro_get_av (pTHX_ const char *name, int create)
277{ 299{
278#if PERL_VERSION_ATLEAST (5,9,0) 300#if PERL_VERSION_ATLEAST (5,10,0)
279 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 301 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
280 get_av (name, create); 302 get_av (name, create);
281#endif 303#endif
282 return get_av (name, create); 304 return get_av (name, create);
283} 305}
284 306
285static HV * 307static HV *
286coro_get_hv (const char *name, int create) 308coro_get_hv (pTHX_ const char *name, int create)
287{ 309{
288#if PERL_VERSION_ATLEAST (5,9,0) 310#if PERL_VERSION_ATLEAST (5,10,0)
289 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 311 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
290 get_hv (name, create); 312 get_hv (name, create);
291#endif 313#endif
292 return get_hv (name, create); 314 return get_hv (name, create);
293} 315}
298 AV *padlist = CvPADLIST (cv); 320 AV *padlist = CvPADLIST (cv);
299 AV *newpadlist, *newpad; 321 AV *newpadlist, *newpad;
300 322
301 newpadlist = newAV (); 323 newpadlist = newAV ();
302 AvREAL_off (newpadlist); 324 AvREAL_off (newpadlist);
303#if PERL_VERSION_ATLEAST (5,9,0) 325#if PERL_VERSION_ATLEAST (5,10,0)
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 326 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
305#else 327#else
306 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 328 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
307#endif 329#endif
308 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 330 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
309 --AvFILLp (padlist); 331 --AvFILLp (padlist);
310 332
311 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 333 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
312 av_store (newpadlist, 1, (SV *)newpad); 334 av_store (newpadlist, 1, (SV *)newpad);
313 335
314 return newpadlist; 336 return newpadlist;
315} 337}
316 338
346 368
347 /* casting is fun. */ 369 /* casting is fun. */
348 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 370 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
349 free_padlist (aTHX_ padlist); 371 free_padlist (aTHX_ padlist);
350 372
351 SvREFCNT_dec (av); 373 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
352 374
353 return 0; 375 return 0;
354} 376}
355 377
356#define PERL_MAGIC_coro PERL_MAGIC_ext 378#define CORO_MAGIC_type_cv PERL_MAGIC_ext
379#define CORO_MAGIC_type_state PERL_MAGIC_ext
357 380
358static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 381static MGVTBL coro_cv_vtbl = {
382 0, 0, 0, 0,
383 coro_cv_free
384};
359 385
360#define CORO_MAGIC(cv) \ 386#define CORO_MAGIC(sv,type) \
361 SvMAGIC (cv) \ 387 SvMAGIC (sv) \
362 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 388 ? SvMAGIC (sv)->mg_type == type \
363 ? SvMAGIC (cv) \ 389 ? SvMAGIC (sv) \
364 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 390 : mg_find (sv, type) \
365 : 0 391 : 0
392
393#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
394#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
366 395
367static struct coro * 396static struct coro *
368SvSTATE_ (pTHX_ SV *coro) 397SvSTATE_ (pTHX_ SV *coro)
369{ 398{
370 HV *stash; 399 HV *stash;
382 /* very slow, but rare, check */ 411 /* very slow, but rare, check */
383 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 412 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
384 croak ("Coro::State object required"); 413 croak ("Coro::State object required");
385 } 414 }
386 415
387 mg = CORO_MAGIC (coro); 416 mg = CORO_MAGIC_state (coro);
388 return (struct coro *)mg->mg_ptr; 417 return (struct coro *)mg->mg_ptr;
389} 418}
390 419
391#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 420#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
392 421
393/* the next two functions merely cache the padlists */ 422/* the next two functions merely cache the padlists */
394static void 423static void
395get_padlist (pTHX_ CV *cv) 424get_padlist (pTHX_ CV *cv)
396{ 425{
397 MAGIC *mg = CORO_MAGIC (cv); 426 MAGIC *mg = CORO_MAGIC_cv (cv);
398 AV *av; 427 AV *av;
399 428
400 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 429 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
401 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 430 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
402 else 431 else
403 { 432 {
404#if CORO_PREFER_PERL_FUNCTIONS 433#if CORO_PREFER_PERL_FUNCTIONS
405 /* this is probably cleaner, but also slower? */ 434 /* this is probably cleaner? but also slower! */
435 /* in practise, it seems to be less stable */
406 CV *cp = Perl_cv_clone (cv); 436 CV *cp = Perl_cv_clone (cv);
407 CvPADLIST (cv) = CvPADLIST (cp); 437 CvPADLIST (cv) = CvPADLIST (cp);
408 CvPADLIST (cp) = 0; 438 CvPADLIST (cp) = 0;
409 SvREFCNT_dec (cp); 439 SvREFCNT_dec (cp);
410#else 440#else
414} 444}
415 445
416static void 446static void
417put_padlist (pTHX_ CV *cv) 447put_padlist (pTHX_ CV *cv)
418{ 448{
419 MAGIC *mg = CORO_MAGIC (cv); 449 MAGIC *mg = CORO_MAGIC_cv (cv);
420 AV *av; 450 AV *av;
421 451
422 if (expect_false (!mg)) 452 if (expect_false (!mg))
423 { 453 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
424 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
425 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
426 mg->mg_virtual = &vtbl_coro;
427 mg->mg_obj = (SV *)newAV ();
428 }
429 454
430 av = (AV *)mg->mg_obj; 455 av = (AV *)mg->mg_obj;
431 456
432 if (expect_false (AvFILLp (av) >= AvMAX (av))) 457 if (expect_false (AvFILLp (av) >= AvMAX (av)))
433 av_extend (av, AvMAX (av) + 1); 458 av_extend (av, AvMAX (av) + 1);
451 GvSV (irsgv) = slot->irsgv; 476 GvSV (irsgv) = slot->irsgv;
452 477
453 #define VAR(name,type) PL_ ## name = slot->name; 478 #define VAR(name,type) PL_ ## name = slot->name;
454 # include "state.h" 479 # include "state.h"
455 #undef VAR 480 #undef VAR
456
457 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
458 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
459 481
460 { 482 {
461 dSP; 483 dSP;
462 484
463 CV *cv; 485 CV *cv;
502 524
503 if (expect_true (CvDEPTH (cv))) 525 if (expect_true (CvDEPTH (cv)))
504 { 526 {
505 EXTEND (SP, 3); 527 EXTEND (SP, 3);
506 PUSHs ((SV *)CvPADLIST (cv)); 528 PUSHs ((SV *)CvPADLIST (cv));
507 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 529 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
508 PUSHs ((SV *)cv); 530 PUSHs ((SV *)cv);
509 531
510 CvDEPTH (cv) = 0; 532 CvDEPTH (cv) = 0;
511 get_padlist (aTHX_ cv); 533 get_padlist (aTHX_ cv);
512 } 534 }
592 614
593 New(54,PL_savestack,24,ANY); 615 New(54,PL_savestack,24,ANY);
594 PL_savestack_ix = 0; 616 PL_savestack_ix = 0;
595 PL_savestack_max = 24; 617 PL_savestack_max = 24;
596 618
597#if !PERL_VERSION_ATLEAST (5,9,0) 619#if !PERL_VERSION_ATLEAST (5,10,0)
598 New(54,PL_retstack,4,OP*); 620 New(54,PL_retstack,4,OP*);
599 PL_retstack_ix = 0; 621 PL_retstack_ix = 0;
600 PL_retstack_max = 4; 622 PL_retstack_max = 4;
601#endif 623#endif
602} 624}
625 647
626 Safefree (PL_tmps_stack); 648 Safefree (PL_tmps_stack);
627 Safefree (PL_markstack); 649 Safefree (PL_markstack);
628 Safefree (PL_scopestack); 650 Safefree (PL_scopestack);
629 Safefree (PL_savestack); 651 Safefree (PL_savestack);
630#if !PERL_VERSION_ATLEAST (5,9,0) 652#if !PERL_VERSION_ATLEAST (5,10,0)
631 Safefree (PL_retstack); 653 Safefree (PL_retstack);
632#endif 654#endif
633} 655}
634 656
635static size_t 657static size_t
651 #undef VAR 673 #undef VAR
652 } 674 }
653 else 675 else
654 slot = coro->slot; 676 slot = coro->slot;
655 677
678 if (slot)
679 {
656 rss += sizeof (slot->curstackinfo); 680 rss += sizeof (slot->curstackinfo);
657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 681 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
658 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 682 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
659 rss += slot->tmps_max * sizeof (SV *); 683 rss += slot->tmps_max * sizeof (SV *);
660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 684 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
661 rss += slot->scopestack_max * sizeof (I32); 685 rss += slot->scopestack_max * sizeof (I32);
662 rss += slot->savestack_max * sizeof (ANY); 686 rss += slot->savestack_max * sizeof (ANY);
663 687
664#if !PERL_VERSION_ATLEAST (5,9,0) 688#if !PERL_VERSION_ATLEAST (5,10,0)
665 rss += slot->retstack_max * sizeof (OP *); 689 rss += slot->retstack_max * sizeof (OP *);
666#endif 690#endif
691 }
667 } 692 }
668 693
669 return rss; 694 return rss;
670} 695}
671 696
672/** coroutine stack handling ************************************************/ 697/** coroutine stack handling ************************************************/
698
699static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
700static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
701static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
702
703/* apparently < 5.8.8 */
704#ifndef MgPV_nolen_const
705#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
706 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
707 (const char*)(mg)->mg_ptr)
708#endif
709
710/*
711 * This overrides the default magic get method of %SIG elements.
712 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
713 * and instead of tryign to save and restore the hash elements, we just provide
714 * readback here.
715 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
716 * not expecting this to actually change the hook. This is a potential problem
717 * when a schedule happens then, but we ignore this.
718 */
719static int
720coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
721{
722 const char *s = MgPV_nolen_const (mg);
723
724 if (*s == '_')
725 {
726 SV **svp = 0;
727
728 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
729 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
730
731 if (svp)
732 {
733 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
734 return 0;
735 }
736 }
737
738 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
739}
740
741static int
742coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
743{
744 const char *s = MgPV_nolen_const (mg);
745
746 if (*s == '_')
747 {
748 SV **svp = 0;
749
750 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
751 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
752
753 if (svp)
754 {
755 SV *old = *svp;
756 *svp = 0;
757 SvREFCNT_dec (old);
758 return 0;
759 }
760 }
761
762 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
763}
764
765static int
766coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
767{
768 const char *s = MgPV_nolen_const (mg);
769
770 if (*s == '_')
771 {
772 SV **svp = 0;
773
774 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
775 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
776
777 if (svp)
778 {
779 SV *old = *svp;
780 *svp = newSVsv (sv);
781 SvREFCNT_dec (old);
782 return 0;
783 }
784 }
785
786 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
787}
673 788
674static void 789static void
675coro_setup (pTHX_ struct coro *coro) 790coro_setup (pTHX_ struct coro *coro)
676{ 791{
677 /* 792 /*
686 PL_curpm = 0; 801 PL_curpm = 0;
687 PL_curpad = 0; 802 PL_curpad = 0;
688 PL_localizing = 0; 803 PL_localizing = 0;
689 PL_dirty = 0; 804 PL_dirty = 0;
690 PL_restartop = 0; 805 PL_restartop = 0;
691 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 806#if PERL_VERSION_ATLEAST (5,10,0)
692 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 807 PL_parser = 0;
808#endif
809
810 /* recreate the die/warn hooks */
811 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
812 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
693 813
694 GvSV (PL_defgv) = newSV (0); 814 GvSV (PL_defgv) = newSV (0);
695 GvAV (PL_defgv) = coro->args; coro->args = 0; 815 GvAV (PL_defgv) = coro->args; coro->args = 0;
696 GvSV (PL_errgv) = newSV (0); 816 GvSV (PL_errgv) = newSV (0);
697 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 817 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
698 PL_rs = newSVsv (GvSV (irsgv)); 818 PL_rs = newSVsv (GvSV (irsgv));
699 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 819 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
700 820
701 { 821 {
702 dSP; 822 dSP;
703 LOGOP myop; 823 LOGOP myop;
704 824
712 PL_op = (OP *)&myop; 832 PL_op = (OP *)&myop;
713 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 833 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
714 SPAGAIN; 834 SPAGAIN;
715 } 835 }
716 836
717 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 837 /* this newly created coroutine might be run on an existing cctx which most
838 * likely was suspended in set_stacklevel, called from entersub.
839 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
840 * so we ENTER here for symmetry
841 */
842 ENTER;
718} 843}
719 844
720static void 845static void
721coro_destroy (pTHX_ struct coro *coro) 846coro_destroy (pTHX_ struct coro *coro)
722{ 847{
795 : cx->blk_gimme == G_SCALAR ? bot + 1 920 : cx->blk_gimme == G_SCALAR ? bot + 1
796 : bot; 921 : bot;
797 922
798 av_extend (av, top - bot); 923 av_extend (av, top - bot);
799 while (bot < top) 924 while (bot < top)
800 av_push (av, SvREFCNT_inc (*bot++)); 925 av_push (av, SvREFCNT_inc_NN (*bot++));
801 926
802 PL_runops = RUNOPS_DEFAULT; 927 PL_runops = RUNOPS_DEFAULT;
803 ENTER; 928 ENTER;
804 SAVETMPS; 929 SAVETMPS;
805 EXTEND (SP, 3); 930 EXTEND (SP, 3);
806 PUSHMARK (SP); 931 PUSHMARK (SP);
807 PUSHs (&PL_sv_no); 932 PUSHs (&PL_sv_no);
808 PUSHs (fullname); 933 PUSHs (fullname);
809 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 934 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
810 PUTBACK; 935 PUTBACK;
811 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 936 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
812 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 937 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
813 SPAGAIN; 938 SPAGAIN;
814 FREETMPS; 939 FREETMPS;
815 LEAVE; 940 LEAVE;
816 PL_runops = runops_trace; 941 PL_runops = runops_trace;
843 SAVETMPS; 968 SAVETMPS;
844 EXTEND (SP, 3); 969 EXTEND (SP, 3);
845 PUSHMARK (SP); 970 PUSHMARK (SP);
846 PUSHs (&PL_sv_yes); 971 PUSHs (&PL_sv_yes);
847 PUSHs (fullname); 972 PUSHs (fullname);
848 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 973 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
849 PUTBACK; 974 PUTBACK;
850 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 975 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
851 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 976 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
852 SPAGAIN; 977 SPAGAIN;
853 FREETMPS; 978 FREETMPS;
854 LEAVE; 979 LEAVE;
855 PL_runops = runops_trace; 980 PL_runops = runops_trace;
869 PL_runops = RUNOPS_DEFAULT; 994 PL_runops = RUNOPS_DEFAULT;
870 PUSHMARK (SP); 995 PUSHMARK (SP);
871 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 996 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
872 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 997 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
873 PUTBACK; 998 PUTBACK;
874 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 999 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
875 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1000 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
876 SPAGAIN; 1001 SPAGAIN;
877 FREETMPS; 1002 FREETMPS;
878 LEAVE; 1003 LEAVE;
879 PL_runops = runops_trace; 1004 PL_runops = runops_trace;
1069 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1194 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1070 1195
1071 if (expect_false (next->flags & CF_DESTROYED)) 1196 if (expect_false (next->flags & CF_DESTROYED))
1072 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1197 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1073 1198
1074 if (
1075#if PERL_VERSION_ATLEAST (5,9,0) 1199#if !PERL_VERSION_ATLEAST (5,10,0)
1076 expect_false (PL_parser)
1077#else
1078 expect_false (PL_lex_state != LEX_NOTPARSING) 1200 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1079#endif
1080 )
1081 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1201 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1202#endif
1082 } 1203 }
1083} 1204}
1084 1205
1085/* always use the TRANSFER macro */ 1206/* always use the TRANSFER macro */
1086static void NOINLINE 1207static void NOINLINE
1087transfer (pTHX_ struct coro *prev, struct coro *next) 1208transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1088{ 1209{
1089 dSTACKLEVEL; 1210 dSTACKLEVEL;
1211 static volatile int has_throw;
1090 1212
1091 /* sometimes transfer is only called to set idle_sp */ 1213 /* sometimes transfer is only called to set idle_sp */
1092 if (expect_false (!next)) 1214 if (expect_false (!next))
1093 { 1215 {
1094 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1216 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1109 prev->flags &= ~CF_RUNNING; 1231 prev->flags &= ~CF_RUNNING;
1110 next->flags |= CF_RUNNING; 1232 next->flags |= CF_RUNNING;
1111 1233
1112 LOCK; 1234 LOCK;
1113 1235
1236 /* first get rid of the old state */
1237 save_perl (aTHX_ prev);
1238
1114 if (expect_false (next->flags & CF_NEW)) 1239 if (expect_false (next->flags & CF_NEW))
1115 { 1240 {
1116 /* need to start coroutine */ 1241 /* need to start coroutine */
1117 next->flags &= ~CF_NEW; 1242 next->flags &= ~CF_NEW;
1118 /* first get rid of the old state */
1119 save_perl (aTHX_ prev);
1120 /* setup coroutine call */ 1243 /* setup coroutine call */
1121 coro_setup (aTHX_ next); 1244 coro_setup (aTHX_ next);
1122 } 1245 }
1123 else 1246 else
1124 {
1125 /* coroutine already started */
1126 save_perl (aTHX_ prev);
1127 load_perl (aTHX_ next); 1247 load_perl (aTHX_ next);
1128 }
1129 1248
1130 prev__cctx = prev->cctx; 1249 prev__cctx = prev->cctx;
1131 1250
1132 /* possibly "free" the cctx */ 1251 /* possibly "free" the cctx */
1133 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1252 if (expect_true (
1253 prev__cctx->idle_sp == STACKLEVEL
1254 && !(prev__cctx->flags & CC_TRACE)
1255 && !force_cctx
1256 ))
1134 { 1257 {
1135 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1258 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1136 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1259 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1137 1260
1138 prev->cctx = 0; 1261 prev->cctx = 0;
1148 1271
1149 ++next->usecount; 1272 ++next->usecount;
1150 1273
1151 if (expect_true (!next->cctx)) 1274 if (expect_true (!next->cctx))
1152 next->cctx = cctx_get (aTHX); 1275 next->cctx = cctx_get (aTHX);
1276
1277 has_throw = !!next->throw;
1153 1278
1154 if (expect_false (prev__cctx != next->cctx)) 1279 if (expect_false (prev__cctx != next->cctx))
1155 { 1280 {
1156 prev__cctx->top_env = PL_top_env; 1281 prev__cctx->top_env = PL_top_env;
1157 PL_top_env = next->cctx->top_env; 1282 PL_top_env = next->cctx->top_env;
1159 } 1284 }
1160 1285
1161 free_coro_mortal (aTHX); 1286 free_coro_mortal (aTHX);
1162 UNLOCK; 1287 UNLOCK;
1163 1288
1164 if (expect_false (prev->throw || next->throw)) 1289 if (expect_false (has_throw))
1165 { 1290 {
1166 struct coro *coro = SvSTATE (coro_current); 1291 struct coro *coro = SvSTATE (coro_current);
1167 1292
1168 if (coro->throw) 1293 if (coro->throw)
1169 { 1294 {
1179struct transfer_args 1304struct transfer_args
1180{ 1305{
1181 struct coro *prev, *next; 1306 struct coro *prev, *next;
1182}; 1307};
1183 1308
1184#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1309#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1185#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1310#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1186 1311
1187/** high level stuff ********************************************************/ 1312/** high level stuff ********************************************************/
1188 1313
1189static int 1314static int
1283{ 1408{
1284 dTHX; 1409 dTHX;
1285 struct transfer_args ta; 1410 struct transfer_args ta;
1286 1411
1287 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1412 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1288 TRANSFER (ta); 1413 TRANSFER (ta, 1);
1289} 1414}
1290 1415
1291/** Coro ********************************************************************/ 1416/** Coro ********************************************************************/
1292 1417
1293static void 1418static void
1295{ 1420{
1296 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1421 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1297} 1422}
1298 1423
1299static SV * 1424static SV *
1300coro_deq (pTHX_ int min_prio) 1425coro_deq (pTHX)
1301{ 1426{
1302 int prio = PRIO_MAX - PRIO_MIN; 1427 int prio;
1303 1428
1304 min_prio -= PRIO_MIN;
1305 if (min_prio < 0)
1306 min_prio = 0;
1307
1308 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1429 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1309 if (AvFILLp (coro_ready [prio]) >= 0) 1430 if (AvFILLp (coro_ready [prio]) >= 0)
1310 return av_shift (coro_ready [prio]); 1431 return av_shift (coro_ready [prio]);
1311 1432
1312 return 0; 1433 return 0;
1313} 1434}
1315static int 1436static int
1316api_ready (SV *coro_sv) 1437api_ready (SV *coro_sv)
1317{ 1438{
1318 dTHX; 1439 dTHX;
1319 struct coro *coro; 1440 struct coro *coro;
1441 SV *sv_hook;
1442 void (*xs_hook)(void);
1320 1443
1321 if (SvROK (coro_sv)) 1444 if (SvROK (coro_sv))
1322 coro_sv = SvRV (coro_sv); 1445 coro_sv = SvRV (coro_sv);
1323 1446
1324 coro = SvSTATE (coro_sv); 1447 coro = SvSTATE (coro_sv);
1327 return 0; 1450 return 0;
1328 1451
1329 coro->flags |= CF_READY; 1452 coro->flags |= CF_READY;
1330 1453
1331 LOCK; 1454 LOCK;
1455
1456 sv_hook = coro_nready ? 0 : coro_readyhook;
1457 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1458
1332 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1459 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1333 ++coro_nready; 1460 ++coro_nready;
1461
1334 UNLOCK; 1462 UNLOCK;
1463
1464 if (sv_hook)
1465 {
1466 dSP;
1467
1468 ENTER;
1469 SAVETMPS;
1470
1471 PUSHMARK (SP);
1472 PUTBACK;
1473 call_sv (sv_hook, G_DISCARD);
1474 SPAGAIN;
1475
1476 FREETMPS;
1477 LEAVE;
1478 }
1479
1480 if (xs_hook)
1481 xs_hook ();
1335 1482
1336 return 1; 1483 return 1;
1337} 1484}
1338 1485
1339static int 1486static int
1349 SV *prev_sv, *next_sv; 1496 SV *prev_sv, *next_sv;
1350 1497
1351 for (;;) 1498 for (;;)
1352 { 1499 {
1353 LOCK; 1500 LOCK;
1354 next_sv = coro_deq (aTHX_ PRIO_MIN); 1501 next_sv = coro_deq (aTHX);
1355 1502
1356 /* nothing to schedule: call the idle handler */ 1503 /* nothing to schedule: call the idle handler */
1357 if (expect_false (!next_sv)) 1504 if (expect_false (!next_sv))
1358 { 1505 {
1359 dSP; 1506 dSP;
1363 SAVETMPS; 1510 SAVETMPS;
1364 1511
1365 PUSHMARK (SP); 1512 PUSHMARK (SP);
1366 PUTBACK; 1513 PUTBACK;
1367 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1514 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1515 SPAGAIN;
1368 1516
1369 FREETMPS; 1517 FREETMPS;
1370 LEAVE; 1518 LEAVE;
1371 continue; 1519 continue;
1372 } 1520 }
1427{ 1575{
1428 dTHX; 1576 dTHX;
1429 struct transfer_args ta; 1577 struct transfer_args ta;
1430 1578
1431 prepare_schedule (aTHX_ &ta); 1579 prepare_schedule (aTHX_ &ta);
1432 TRANSFER (ta); 1580 TRANSFER (ta, 1);
1433} 1581}
1434 1582
1435static int 1583static int
1436api_cede (void) 1584api_cede (void)
1437{ 1585{
1440 1588
1441 prepare_cede (aTHX_ &ta); 1589 prepare_cede (aTHX_ &ta);
1442 1590
1443 if (expect_true (ta.prev != ta.next)) 1591 if (expect_true (ta.prev != ta.next))
1444 { 1592 {
1445 TRANSFER (ta); 1593 TRANSFER (ta, 1);
1446 return 1; 1594 return 1;
1447 } 1595 }
1448 else 1596 else
1449 return 0; 1597 return 0;
1450} 1598}
1455 dTHX; 1603 dTHX;
1456 struct transfer_args ta; 1604 struct transfer_args ta;
1457 1605
1458 if (prepare_cede_notself (aTHX_ &ta)) 1606 if (prepare_cede_notself (aTHX_ &ta))
1459 { 1607 {
1460 TRANSFER (ta); 1608 TRANSFER (ta, 1);
1461 return 1; 1609 return 1;
1462 } 1610 }
1463 else 1611 else
1464 return 0; 1612 return 0;
1465} 1613}
1488 else 1636 else
1489 coro->slot->runops = RUNOPS_DEFAULT; 1637 coro->slot->runops = RUNOPS_DEFAULT;
1490 } 1638 }
1491} 1639}
1492 1640
1641static int
1642coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1643{
1644 AV *padlist;
1645 AV *av = (AV *)mg->mg_obj;
1646
1647 abort ();
1648
1649 return 0;
1650}
1651
1652static MGVTBL coro_gensub_vtbl = {
1653 0, 0, 0, 0,
1654 coro_gensub_free
1655};
1656
1657/*****************************************************************************/
1658/* PerlIO::cede */
1659
1660typedef struct
1661{
1662 PerlIOBuf base;
1663 NV next, every;
1664} PerlIOCede;
1665
1666static IV
1667PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1668{
1669 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1670
1671 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1672 self->next = nvtime () + self->every;
1673
1674 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1675}
1676
1677static SV *
1678PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1679{
1680 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1681
1682 return newSVnv (self->every);
1683}
1684
1685static IV
1686PerlIOCede_flush (pTHX_ PerlIO *f)
1687{
1688 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1689 double now = nvtime ();
1690
1691 if (now >= self->next)
1692 {
1693 api_cede ();
1694 self->next = now + self->every;
1695 }
1696
1697 return PerlIOBuf_flush (aTHX_ f);
1698}
1699
1700static PerlIO_funcs PerlIO_cede =
1701{
1702 sizeof(PerlIO_funcs),
1703 "cede",
1704 sizeof(PerlIOCede),
1705 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1706 PerlIOCede_pushed,
1707 PerlIOBuf_popped,
1708 PerlIOBuf_open,
1709 PerlIOBase_binmode,
1710 PerlIOCede_getarg,
1711 PerlIOBase_fileno,
1712 PerlIOBuf_dup,
1713 PerlIOBuf_read,
1714 PerlIOBuf_unread,
1715 PerlIOBuf_write,
1716 PerlIOBuf_seek,
1717 PerlIOBuf_tell,
1718 PerlIOBuf_close,
1719 PerlIOCede_flush,
1720 PerlIOBuf_fill,
1721 PerlIOBase_eof,
1722 PerlIOBase_error,
1723 PerlIOBase_clearerr,
1724 PerlIOBase_setlinebuf,
1725 PerlIOBuf_get_base,
1726 PerlIOBuf_bufsiz,
1727 PerlIOBuf_get_ptr,
1728 PerlIOBuf_get_cnt,
1729 PerlIOBuf_set_ptrcnt,
1730};
1731
1732
1493MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1733MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1494 1734
1495PROTOTYPES: DISABLE 1735PROTOTYPES: DISABLE
1496 1736
1497BOOT: 1737BOOT:
1502 BOOT_PAGESIZE; 1742 BOOT_PAGESIZE;
1503 1743
1504 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1744 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1505 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1745 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1506 1746
1747 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1748 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1749 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1750
1507 hv_sig = coro_get_hv ("SIG", TRUE); 1751 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1508 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1752 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1509 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1753 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1510
1511 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1512 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1513 1754
1514 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1755 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1515 1756
1516 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1757 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1517 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1758 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1522 main_top_env = PL_top_env; 1763 main_top_env = PL_top_env;
1523 1764
1524 while (main_top_env->je_prev) 1765 while (main_top_env->je_prev)
1525 main_top_env = main_top_env->je_prev; 1766 main_top_env = main_top_env->je_prev;
1526 1767
1527 coroapi.ver = CORO_API_VERSION; 1768 coroapi.ver = CORO_API_VERSION;
1769 coroapi.rev = CORO_API_REVISION;
1528 coroapi.transfer = api_transfer; 1770 coroapi.transfer = api_transfer;
1771
1772 {
1773 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1774
1775 if (!svp) croak ("Time::HiRes is required");
1776 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1777
1778 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1779 }
1529 1780
1530 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1781 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1531} 1782}
1532 1783
1533SV * 1784SV *
1534new (char *klass, ...) 1785new (char *klass, ...)
1535 CODE: 1786 CODE:
1536{ 1787{
1537 struct coro *coro; 1788 struct coro *coro;
1789 MAGIC *mg;
1538 HV *hv; 1790 HV *hv;
1539 int i; 1791 int i;
1540 1792
1541 Newz (0, coro, 1, struct coro); 1793 Newz (0, coro, 1, struct coro);
1542 coro->args = newAV (); 1794 coro->args = newAV ();
1545 if (coro_first) coro_first->prev = coro; 1797 if (coro_first) coro_first->prev = coro;
1546 coro->next = coro_first; 1798 coro->next = coro_first;
1547 coro_first = coro; 1799 coro_first = coro;
1548 1800
1549 coro->hv = hv = newHV (); 1801 coro->hv = hv = newHV ();
1550 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1802 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1803 mg->mg_flags |= MGf_DUP;
1551 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1804 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1552 1805
1553 av_extend (coro->args, items - 1); 1806 av_extend (coro->args, items - 1);
1554 for (i = 1; i < items; i++) 1807 for (i = 1; i < items; i++)
1555 av_push (coro->args, newSVsv (ST (i))); 1808 av_push (coro->args, newSVsv (ST (i)));
1569 Coro::cede_notself = 4 1822 Coro::cede_notself = 4
1570 CODE: 1823 CODE:
1571{ 1824{
1572 struct transfer_args ta; 1825 struct transfer_args ta;
1573 1826
1827 PUTBACK;
1574 switch (ix) 1828 switch (ix)
1575 { 1829 {
1576 case 0: 1830 case 0:
1577 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1831 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1578 ta.next = 0; 1832 ta.next = 0;
1597 if (!prepare_cede_notself (aTHX_ &ta)) 1851 if (!prepare_cede_notself (aTHX_ &ta))
1598 XSRETURN_EMPTY; 1852 XSRETURN_EMPTY;
1599 1853
1600 break; 1854 break;
1601 } 1855 }
1856 SPAGAIN;
1602 1857
1603 BARRIER; 1858 BARRIER;
1859 PUTBACK;
1604 TRANSFER (ta); 1860 TRANSFER (ta, 0);
1605 1861 SPAGAIN; /* might be the sp of a different coroutine now */
1606 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1862 /* be extra careful not to ever do anything after TRANSFER */
1607 XSRETURN_YES;
1608} 1863}
1609 1864
1610bool 1865bool
1611_destroy (SV *coro_sv) 1866_destroy (SV *coro_sv)
1612 CODE: 1867 CODE:
1613 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1868 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1614 OUTPUT: 1869 OUTPUT:
1615 RETVAL 1870 RETVAL
1616 1871
1617void 1872void
1618_exit (code) 1873_exit (int code)
1619 int code
1620 PROTOTYPE: $ 1874 PROTOTYPE: $
1621 CODE: 1875 CODE:
1622 _exit (code); 1876 _exit (code);
1623 1877
1624int 1878int
1658call (Coro::State coro, SV *coderef) 1912call (Coro::State coro, SV *coderef)
1659 ALIAS: 1913 ALIAS:
1660 eval = 1 1914 eval = 1
1661 CODE: 1915 CODE:
1662{ 1916{
1663 if (coro->mainstack) 1917 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1664 { 1918 {
1665 struct coro temp; 1919 struct coro temp;
1666 1920
1667 if (!(coro->flags & CF_RUNNING)) 1921 if (!(coro->flags & CF_RUNNING))
1668 { 1922 {
1923 PUTBACK;
1669 save_perl (aTHX_ &temp); 1924 save_perl (aTHX_ &temp);
1670 load_perl (aTHX_ coro); 1925 load_perl (aTHX_ coro);
1671 } 1926 }
1672 1927
1673 { 1928 {
1674 dSP; 1929 dSP;
1675 ENTER; 1930 ENTER;
1676 SAVETMPS; 1931 SAVETMPS;
1932 PUTBACK;
1933 PUSHSTACK;
1677 PUSHMARK (SP); 1934 PUSHMARK (SP);
1678 PUTBACK;
1679 1935
1680 if (ix) 1936 if (ix)
1681 eval_sv (coderef, 0); 1937 eval_sv (coderef, 0);
1682 else 1938 else
1683 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1939 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1684 1940
1941 POPSTACK;
1685 SPAGAIN; 1942 SPAGAIN;
1686 FREETMPS; 1943 FREETMPS;
1687 LEAVE; 1944 LEAVE;
1688 PUTBACK; 1945 PUTBACK;
1689 } 1946 }
1690 1947
1691 if (!(coro->flags & CF_RUNNING)) 1948 if (!(coro->flags & CF_RUNNING))
1692 { 1949 {
1693 save_perl (aTHX_ coro); 1950 save_perl (aTHX_ coro);
1694 load_perl (aTHX_ &temp); 1951 load_perl (aTHX_ &temp);
1952 SPAGAIN;
1695 } 1953 }
1696 } 1954 }
1697} 1955}
1698 1956
1699SV * 1957SV *
1711 1969
1712void 1970void
1713api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1971api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1714 1972
1715SV * 1973SV *
1716has_stack (Coro::State coro) 1974has_cctx (Coro::State coro)
1717 PROTOTYPE: $ 1975 PROTOTYPE: $
1718 CODE: 1976 CODE:
1719 RETVAL = boolSV (!!coro->cctx); 1977 RETVAL = boolSV (!!coro->cctx);
1720 OUTPUT: 1978 OUTPUT:
1721 RETVAL 1979 RETVAL
1740 case 1: RETVAL = coro->usecount; break; 1998 case 1: RETVAL = coro->usecount; break;
1741 } 1999 }
1742 OUTPUT: 2000 OUTPUT:
1743 RETVAL 2001 RETVAL
1744 2002
2003void
2004force_cctx ()
2005 CODE:
2006 struct coro *coro = SvSTATE (coro_current);
2007 coro->cctx->idle_sp = 0;
2008
2009void
2010throw (Coro::State self, SV *throw = &PL_sv_undef)
2011 PROTOTYPE: $;$
2012 CODE:
2013 SvREFCNT_dec (self->throw);
2014 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2015
2016void
2017swap_defsv (Coro::State self)
2018 PROTOTYPE: $
2019 ALIAS:
2020 swap_defav = 1
2021 CODE:
2022 if (!self->slot)
2023 croak ("cannot swap state with coroutine that has no saved state");
2024 else
2025 {
2026 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2027 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2028
2029 SV *tmp = *src; *src = *dst; *dst = tmp;
2030 }
1745 2031
1746MODULE = Coro::State PACKAGE = Coro 2032MODULE = Coro::State PACKAGE = Coro
1747 2033
1748BOOT: 2034BOOT:
1749{ 2035{
1750 int i; 2036 int i;
1751 2037
1752 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1753 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1754 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 2038 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2039 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2040 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1755 2041
1756 coro_current = coro_get_sv ("Coro::current", FALSE); 2042 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1757 SvREADONLY_on (coro_current); 2043 SvREADONLY_on (coro_current);
1758 2044
1759 coro_stash = gv_stashpv ("Coro", TRUE); 2045 coro_stash = gv_stashpv ("Coro", TRUE);
1760 2046
1761 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2047 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1789void 2075void
1790_set_current (SV *current) 2076_set_current (SV *current)
1791 PROTOTYPE: $ 2077 PROTOTYPE: $
1792 CODE: 2078 CODE:
1793 SvREFCNT_dec (SvRV (coro_current)); 2079 SvREFCNT_dec (SvRV (coro_current));
1794 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2080 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2081
2082void
2083_set_readyhook (SV *hook)
2084 PROTOTYPE: $
2085 CODE:
2086 LOCK;
2087 SvREFCNT_dec (coro_readyhook);
2088 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2089 UNLOCK;
1795 2090
1796int 2091int
1797prio (Coro::State coro, int newprio = 0) 2092prio (Coro::State coro, int newprio = 0)
1798 ALIAS: 2093 ALIAS:
1799 nice = 1 2094 nice = 1
1829 CODE: 2124 CODE:
1830 RETVAL = coro_nready; 2125 RETVAL = coro_nready;
1831 OUTPUT: 2126 OUTPUT:
1832 RETVAL 2127 RETVAL
1833 2128
1834void
1835throw (Coro::State self, SV *throw = &PL_sv_undef)
1836 PROTOTYPE: $;$
1837 CODE:
1838 SvREFCNT_dec (self->throw);
1839 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1840
1841# for async_pool speedup 2129# for async_pool speedup
1842void 2130void
1843_pool_1 (SV *cb) 2131_pool_1 (SV *cb)
1844 CODE: 2132 CODE:
1845{ 2133{
1846 struct coro *coro = SvSTATE (coro_current); 2134 struct coro *coro = SvSTATE (coro_current);
1847 HV *hv = (HV *)SvRV (coro_current); 2135 HV *hv = (HV *)SvRV (coro_current);
1848 AV *defav = GvAV (PL_defgv); 2136 AV *defav = GvAV (PL_defgv);
1849 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 2137 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1850 AV *invoke_av; 2138 AV *invoke_av;
1851 int i, len; 2139 int i, len;
1852 2140
1853 if (!invoke) 2141 if (!invoke)
2142 {
2143 SV *old = PL_diehook;
2144 PL_diehook = 0;
2145 SvREFCNT_dec (old);
1854 croak ("\3async_pool terminate\2\n"); 2146 croak ("\3async_pool terminate\2\n");
2147 }
1855 2148
1856 SvREFCNT_dec (coro->saved_deffh); 2149 SvREFCNT_dec (coro->saved_deffh);
1857 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2150 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1858 2151
1859 hv_store (hv, "desc", sizeof ("desc") - 1, 2152 hv_store (hv, "desc", sizeof ("desc") - 1,
1860 newSVpvn (strpair ("[async_pool]")), 0); 2153 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1861 2154
1862 invoke_av = (AV *)SvRV (invoke); 2155 invoke_av = (AV *)SvRV (invoke);
1863 len = av_len (invoke_av); 2156 len = av_len (invoke_av);
1864 2157
1865 sv_setsv (cb, AvARRAY (invoke_av)[0]); 2158 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1866 2159
1867 if (len > 0) 2160 if (len > 0)
1868 { 2161 {
1869 av_fill (defav, len - 1); 2162 av_fill (defav, len - 1);
1870 for (i = 0; i < len; ++i) 2163 for (i = 0; i < len; ++i)
1871 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2164 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1872 } 2165 }
1873 2166
1874 SvREFCNT_dec (invoke); 2167 SvREFCNT_dec (invoke);
1875} 2168}
1876 2169
1885 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2178 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1886 coro->saved_deffh = 0; 2179 coro->saved_deffh = 0;
1887 2180
1888 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2181 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1889 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2182 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2183 {
2184 SV *old = PL_diehook;
2185 PL_diehook = 0;
2186 SvREFCNT_dec (old);
1890 croak ("\3async_pool terminate\2\n"); 2187 croak ("\3async_pool terminate\2\n");
2188 }
1891 2189
1892 av_clear (GvAV (PL_defgv)); 2190 av_clear (GvAV (PL_defgv));
1893 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 2191 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1894 newSVpvn (strpair ("[async_pool idle]")), 0); 2192 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1895 2193
1896 coro->prio = 0; 2194 coro->prio = 0;
1897 2195
1898 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2196 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1899 api_trace (coro_current, 0); 2197 api_trace (coro_current, 0);
1900 2198
1901 av_push (av_async_pool, newSVsv (coro_current)); 2199 av_push (av_async_pool, newSVsv (coro_current));
1902} 2200}
1903 2201
2202#if 0
2203
2204void
2205_generator_call (...)
2206 PROTOTYPE: @
2207 PPCODE:
2208 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2209 xxxx
2210 abort ();
2211
2212SV *
2213gensub (SV *sub, ...)
2214 PROTOTYPE: &;@
2215 CODE:
2216{
2217 struct coro *coro;
2218 MAGIC *mg;
2219 CV *xcv;
2220 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2221 int i;
2222
2223 CvGV (ncv) = CvGV (cv);
2224 CvFILE (ncv) = CvFILE (cv);
2225
2226 Newz (0, coro, 1, struct coro);
2227 coro->args = newAV ();
2228 coro->flags = CF_NEW;
2229
2230 av_extend (coro->args, items - 1);
2231 for (i = 1; i < items; i++)
2232 av_push (coro->args, newSVsv (ST (i)));
2233
2234 CvISXSUB_on (ncv);
2235 CvXSUBANY (ncv).any_ptr = (void *)coro;
2236
2237 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2238
2239 CvXSUB (ncv) = CvXSUB (xcv);
2240 CvANON_on (ncv);
2241
2242 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2243 RETVAL = newRV_noinc ((SV *)ncv);
2244}
2245 OUTPUT:
2246 RETVAL
2247
2248#endif
2249
1904 2250
1905MODULE = Coro::State PACKAGE = Coro::AIO 2251MODULE = Coro::State PACKAGE = Coro::AIO
1906 2252
1907SV * 2253void
1908_get_state () 2254_get_state (SV *self)
1909 CODE: 2255 PPCODE:
1910{ 2256{
1911 struct io_state *data; 2257 AV *defav = GvAV (PL_defgv);
1912 2258 AV *av = newAV ();
2259 int i;
1913 RETVAL = newSV (sizeof (struct io_state)); 2260 SV *data_sv = newSV (sizeof (struct io_state));
1914 data = (struct io_state *)SvPVX (RETVAL); 2261 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1915 SvCUR_set (RETVAL, sizeof (struct io_state)); 2262 SvCUR_set (data_sv, sizeof (struct io_state));
1916 SvPOK_only (RETVAL); 2263 SvPOK_only (data_sv);
1917 2264
1918 data->errorno = errno; 2265 data->errorno = errno;
1919 data->laststype = PL_laststype; 2266 data->laststype = PL_laststype;
1920 data->laststatval = PL_laststatval; 2267 data->laststatval = PL_laststatval;
1921 data->statcache = PL_statcache; 2268 data->statcache = PL_statcache;
2269
2270 av_extend (av, AvFILLp (defav) + 1 + 1);
2271
2272 for (i = 0; i <= AvFILLp (defav); ++i)
2273 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2274
2275 av_push (av, data_sv);
2276
2277 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2278
2279 api_ready (self);
1922} 2280}
1923 OUTPUT:
1924 RETVAL
1925 2281
1926void 2282void
1927_set_state (char *data_) 2283_set_state (SV *state)
1928 PROTOTYPE: $ 2284 PROTOTYPE: $
1929 CODE: 2285 PPCODE:
1930{ 2286{
1931 struct io_state *data = (void *)data_; 2287 AV *av = (AV *)SvRV (state);
2288 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2289 int i;
1932 2290
1933 errno = data->errorno; 2291 errno = data->errorno;
1934 PL_laststype = data->laststype; 2292 PL_laststype = data->laststype;
1935 PL_laststatval = data->laststatval; 2293 PL_laststatval = data->laststatval;
1936 PL_statcache = data->statcache; 2294 PL_statcache = data->statcache;
1937}
1938 2295
2296 EXTEND (SP, AvFILLp (av));
2297 for (i = 0; i < AvFILLp (av); ++i)
2298 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2299}
2300
2301
2302MODULE = Coro::State PACKAGE = Coro::AnyEvent
2303
2304BOOT:
2305 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2306
2307SV *
2308_schedule (...)
2309 PROTOTYPE: @
2310 CODE:
2311{
2312 static int incede;
2313
2314 api_cede_notself ();
2315
2316 ++incede;
2317 while (coro_nready >= incede && api_cede ())
2318 ;
2319
2320 sv_setsv (sv_activity, &PL_sv_undef);
2321 if (coro_nready >= incede)
2322 {
2323 PUSHMARK (SP);
2324 PUTBACK;
2325 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2326 SPAGAIN;
2327 }
2328
2329 --incede;
2330}
2331
2332
2333MODULE = Coro::State PACKAGE = PerlIO::cede
2334
2335BOOT:
2336 PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines