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.211 by root, Wed Oct 10 03:37:58 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
15#include <inttypes.h> /* portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif
16 25
17#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
18# include <unistd.h> 27# include <unistd.h>
19# include <sys/mman.h> 28# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
… …
72# ifndef IS_PADCONST 81# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 82# define IS_PADCONST(v) 0
74# endif 83# endif
75#endif 84#endif
76 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
77/* 5.8.7 */ 102/* 5.8.7 */
78#ifndef SvRV_set 103#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 104# 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 105#endif
89 106
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 107#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 108# undef CORO_STACKGUARD
92#endif 109#endif
… …
131#else 148#else
132# define LOCK (void)0 149# define LOCK (void)0
133# define UNLOCK (void)0 150# define UNLOCK (void)0
134#endif 151#endif
135 152
136#define strpair(const) const, sizeof (const) - 1
137
138/* helper storage struct for Coro::AIO */ 153/* helper storage struct for Coro::AIO */
139struct io_state 154struct io_state
140{ 155{
156 AV *res;
141 int errorno; 157 int errorno;
142 I32 laststype; 158 I32 laststype;
143 int laststatval; 159 int laststatval;
144 Stat_t statcache; 160 Stat_t statcache;
145}; 161};
146 162
163static double (*nvtime)(); /* so why doesn't it take void? */
164
147static size_t coro_stacksize = CORO_STACKSIZE; 165static size_t coro_stacksize = CORO_STACKSIZE;
148static struct CoroAPI coroapi; 166static struct CoroAPI coroapi;
149static AV *main_mainstack; /* used to differentiate between $main and others */ 167static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env; 168static JMPENV *main_top_env;
151static HV *coro_state_stash, *coro_stash; 169static HV *coro_state_stash, *coro_stash;
152static SV *coro_mortal; /* will be freed after next transfer */ 170static volatile SV *coro_mortal; /* will be freed after next transfer */
153 171
154static GV *irsgv; /* $/ */ 172static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */ 173static GV *stdoutgv; /* *STDOUT */
156 174static SV *rv_diehook;
175static SV *rv_warnhook;
157static HV *hv_sig; /* %SIG */ 176static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160 177
161/* async_pool helper stuff */ 178/* async_pool helper stuff */
162static SV *sv_pool_rss; 179static SV *sv_pool_rss;
163static SV *sv_pool_size; 180static SV *sv_pool_size;
164static AV *av_async_pool; 181static AV *av_async_pool;
182
183/* Coro::AnyEvent */
184static SV *sv_activity;
165 185
166static struct coro_cctx *cctx_first; 186static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 187static int cctx_count, cctx_idle;
168 188
169enum { 189enum {
… …
255#define PRIO_IDLE -3 275#define PRIO_IDLE -3
256#define PRIO_MIN -4 276#define PRIO_MIN -4
257 277
258/* for Coro.pm */ 278/* for Coro.pm */
259static SV *coro_current; 279static SV *coro_current;
280static SV *coro_readyhook;
260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 281static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
261static int coro_nready; 282static int coro_nready;
262static struct coro *coro_first; 283static struct coro *coro_first;
263 284
264/** lowlevel stuff **********************************************************/ 285/** lowlevel stuff **********************************************************/
265 286
266static SV * 287static SV *
267coro_get_sv (const char *name, int create) 288coro_get_sv (pTHX_ const char *name, int create)
268{ 289{
269#if PERL_VERSION_ATLEAST (5,9,0) 290#if PERL_VERSION_ATLEAST (5,10,0)
270 /* 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 */
271 get_sv (name, create); 292 get_sv (name, create);
272#endif 293#endif
273 return get_sv (name, create); 294 return get_sv (name, create);
274} 295}
275 296
276static AV * 297static AV *
277coro_get_av (const char *name, int create) 298coro_get_av (pTHX_ const char *name, int create)
278{ 299{
279#if PERL_VERSION_ATLEAST (5,9,0) 300#if PERL_VERSION_ATLEAST (5,10,0)
280 /* 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 */
281 get_av (name, create); 302 get_av (name, create);
282#endif 303#endif
283 return get_av (name, create); 304 return get_av (name, create);
284} 305}
285 306
286static HV * 307static HV *
287coro_get_hv (const char *name, int create) 308coro_get_hv (pTHX_ const char *name, int create)
288{ 309{
289#if PERL_VERSION_ATLEAST (5,9,0) 310#if PERL_VERSION_ATLEAST (5,10,0)
290 /* 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 */
291 get_hv (name, create); 312 get_hv (name, create);
292#endif 313#endif
293 return get_hv (name, create); 314 return get_hv (name, create);
294} 315}
… …
299 AV *padlist = CvPADLIST (cv); 320 AV *padlist = CvPADLIST (cv);
300 AV *newpadlist, *newpad; 321 AV *newpadlist, *newpad;
301 322
302 newpadlist = newAV (); 323 newpadlist = newAV ();
303 AvREAL_off (newpadlist); 324 AvREAL_off (newpadlist);
304#if PERL_VERSION_ATLEAST (5,9,0) 325#if PERL_VERSION_ATLEAST (5,10,0)
305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 326 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
306#else 327#else
307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 328 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
308#endif 329#endif
309 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 330 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
310 --AvFILLp (padlist); 331 --AvFILLp (padlist);
311 332
312 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 333 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
313 av_store (newpadlist, 1, (SV *)newpad); 334 av_store (newpadlist, 1, (SV *)newpad);
314 335
315 return newpadlist; 336 return newpadlist;
316} 337}
317 338
… …
347 368
348 /* casting is fun. */ 369 /* casting is fun. */
349 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 370 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
350 free_padlist (aTHX_ padlist); 371 free_padlist (aTHX_ padlist);
351 372
352 SvREFCNT_dec (av); 373 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
353 374
354 return 0; 375 return 0;
355} 376}
356 377
357#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
358 380
359static 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};
360 385
361#define CORO_MAGIC(cv) \ 386#define CORO_MAGIC(sv,type) \
362 SvMAGIC (cv) \ 387 SvMAGIC (sv) \
363 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 388 ? SvMAGIC (sv)->mg_type == type \
364 ? SvMAGIC (cv) \ 389 ? SvMAGIC (sv) \
365 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 390 : mg_find (sv, type) \
366 : 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)
367 395
368static struct coro * 396static struct coro *
369SvSTATE_ (pTHX_ SV *coro) 397SvSTATE_ (pTHX_ SV *coro)
370{ 398{
371 HV *stash; 399 HV *stash;
… …
383 /* very slow, but rare, check */ 411 /* very slow, but rare, check */
384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 412 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
385 croak ("Coro::State object required"); 413 croak ("Coro::State object required");
386 } 414 }
387 415
388 mg = CORO_MAGIC (coro); 416 mg = CORO_MAGIC_state (coro);
389 return (struct coro *)mg->mg_ptr; 417 return (struct coro *)mg->mg_ptr;
390} 418}
391 419
392#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 420#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
393 421
394/* the next two functions merely cache the padlists */ 422/* the next two functions merely cache the padlists */
395static void 423static void
396get_padlist (pTHX_ CV *cv) 424get_padlist (pTHX_ CV *cv)
397{ 425{
398 MAGIC *mg = CORO_MAGIC (cv); 426 MAGIC *mg = CORO_MAGIC_cv (cv);
399 AV *av; 427 AV *av;
400 428
401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 429 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 430 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
403 else 431 else
404 { 432 {
405#if CORO_PREFER_PERL_FUNCTIONS 433#if CORO_PREFER_PERL_FUNCTIONS
406 /* this is probably cleaner, but also slower? */ 434 /* this is probably cleaner? but also slower! */
435 /* in practise, it seems to be less stable */
407 CV *cp = Perl_cv_clone (cv); 436 CV *cp = Perl_cv_clone (cv);
408 CvPADLIST (cv) = CvPADLIST (cp); 437 CvPADLIST (cv) = CvPADLIST (cp);
409 CvPADLIST (cp) = 0; 438 CvPADLIST (cp) = 0;
410 SvREFCNT_dec (cp); 439 SvREFCNT_dec (cp);
411#else 440#else
… …
415} 444}
416 445
417static void 446static void
418put_padlist (pTHX_ CV *cv) 447put_padlist (pTHX_ CV *cv)
419{ 448{
420 MAGIC *mg = CORO_MAGIC (cv); 449 MAGIC *mg = CORO_MAGIC_cv (cv);
421 AV *av; 450 AV *av;
422 451
423 if (expect_false (!mg)) 452 if (expect_false (!mg))
424 { 453 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
427 mg->mg_virtual = &vtbl_coro;
428 mg->mg_obj = (SV *)newAV ();
429 }
430 454
431 av = (AV *)mg->mg_obj; 455 av = (AV *)mg->mg_obj;
432 456
433 if (expect_false (AvFILLp (av) >= AvMAX (av))) 457 if (expect_false (AvFILLp (av) >= AvMAX (av)))
434 av_extend (av, AvMAX (av) + 1); 458 av_extend (av, AvMAX (av) + 1);
… …
452 GvSV (irsgv) = slot->irsgv; 476 GvSV (irsgv) = slot->irsgv;
453 477
454 #define VAR(name,type) PL_ ## name = slot->name; 478 #define VAR(name,type) PL_ ## name = slot->name;
455 # include "state.h" 479 # include "state.h"
456 #undef VAR 480 #undef VAR
457
458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
460 481
461 { 482 {
462 dSP; 483 dSP;
463 484
464 CV *cv; 485 CV *cv;
… …
503 524
504 if (expect_true (CvDEPTH (cv))) 525 if (expect_true (CvDEPTH (cv)))
505 { 526 {
506 EXTEND (SP, 3); 527 EXTEND (SP, 3);
507 PUSHs ((SV *)CvPADLIST (cv)); 528 PUSHs ((SV *)CvPADLIST (cv));
508 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 529 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
509 PUSHs ((SV *)cv); 530 PUSHs ((SV *)cv);
510 531
511 CvDEPTH (cv) = 0; 532 CvDEPTH (cv) = 0;
512 get_padlist (aTHX_ cv); 533 get_padlist (aTHX_ cv);
513 } 534 }
… …
593 614
594 New(54,PL_savestack,24,ANY); 615 New(54,PL_savestack,24,ANY);
595 PL_savestack_ix = 0; 616 PL_savestack_ix = 0;
596 PL_savestack_max = 24; 617 PL_savestack_max = 24;
597 618
598#if !PERL_VERSION_ATLEAST (5,9,0) 619#if !PERL_VERSION_ATLEAST (5,10,0)
599 New(54,PL_retstack,4,OP*); 620 New(54,PL_retstack,4,OP*);
600 PL_retstack_ix = 0; 621 PL_retstack_ix = 0;
601 PL_retstack_max = 4; 622 PL_retstack_max = 4;
602#endif 623#endif
603} 624}
… …
626 647
627 Safefree (PL_tmps_stack); 648 Safefree (PL_tmps_stack);
628 Safefree (PL_markstack); 649 Safefree (PL_markstack);
629 Safefree (PL_scopestack); 650 Safefree (PL_scopestack);
630 Safefree (PL_savestack); 651 Safefree (PL_savestack);
631#if !PERL_VERSION_ATLEAST (5,9,0) 652#if !PERL_VERSION_ATLEAST (5,10,0)
632 Safefree (PL_retstack); 653 Safefree (PL_retstack);
633#endif 654#endif
634} 655}
635 656
636static size_t 657static size_t
… …
652 #undef VAR 673 #undef VAR
653 } 674 }
654 else 675 else
655 slot = coro->slot; 676 slot = coro->slot;
656 677
678 if (slot)
679 {
657 rss += sizeof (slot->curstackinfo); 680 rss += sizeof (slot->curstackinfo);
658 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 681 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
659 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 *);
660 rss += slot->tmps_max * sizeof (SV *); 683 rss += slot->tmps_max * sizeof (SV *);
661 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 684 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
662 rss += slot->scopestack_max * sizeof (I32); 685 rss += slot->scopestack_max * sizeof (I32);
663 rss += slot->savestack_max * sizeof (ANY); 686 rss += slot->savestack_max * sizeof (ANY);
664 687
665#if !PERL_VERSION_ATLEAST (5,9,0) 688#if !PERL_VERSION_ATLEAST (5,10,0)
666 rss += slot->retstack_max * sizeof (OP *); 689 rss += slot->retstack_max * sizeof (OP *);
667#endif 690#endif
691 }
668 } 692 }
669 693
670 return rss; 694 return rss;
671} 695}
672 696
673/** 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}
674 788
675static void 789static void
676coro_setup (pTHX_ struct coro *coro) 790coro_setup (pTHX_ struct coro *coro)
677{ 791{
678 /* 792 /*
… …
687 PL_curpm = 0; 801 PL_curpm = 0;
688 PL_curpad = 0; 802 PL_curpad = 0;
689 PL_localizing = 0; 803 PL_localizing = 0;
690 PL_dirty = 0; 804 PL_dirty = 0;
691 PL_restartop = 0; 805 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 806#if PERL_VERSION_ATLEAST (5,10,0)
693 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);
694 813
695 GvSV (PL_defgv) = newSV (0); 814 GvSV (PL_defgv) = newSV (0);
696 GvAV (PL_defgv) = coro->args; coro->args = 0; 815 GvAV (PL_defgv) = coro->args; coro->args = 0;
697 GvSV (PL_errgv) = newSV (0); 816 GvSV (PL_errgv) = newSV (0);
698 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);
699 PL_rs = newSVsv (GvSV (irsgv)); 818 PL_rs = newSVsv (GvSV (irsgv));
700 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 819 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
701 820
702 { 821 {
703 dSP; 822 dSP;
704 LOGOP myop; 823 LOGOP myop;
705 824
… …
801 : cx->blk_gimme == G_SCALAR ? bot + 1 920 : cx->blk_gimme == G_SCALAR ? bot + 1
802 : bot; 921 : bot;
803 922
804 av_extend (av, top - bot); 923 av_extend (av, top - bot);
805 while (bot < top) 924 while (bot < top)
806 av_push (av, SvREFCNT_inc (*bot++)); 925 av_push (av, SvREFCNT_inc_NN (*bot++));
807 926
808 PL_runops = RUNOPS_DEFAULT; 927 PL_runops = RUNOPS_DEFAULT;
809 ENTER; 928 ENTER;
810 SAVETMPS; 929 SAVETMPS;
811 EXTEND (SP, 3); 930 EXTEND (SP, 3);
812 PUSHMARK (SP); 931 PUSHMARK (SP);
813 PUSHs (&PL_sv_no); 932 PUSHs (&PL_sv_no);
814 PUSHs (fullname); 933 PUSHs (fullname);
815 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 934 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
816 PUTBACK; 935 PUTBACK;
817 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);
818 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);
819 SPAGAIN; 938 SPAGAIN;
820 FREETMPS; 939 FREETMPS;
821 LEAVE; 940 LEAVE;
822 PL_runops = runops_trace; 941 PL_runops = runops_trace;
… …
849 SAVETMPS; 968 SAVETMPS;
850 EXTEND (SP, 3); 969 EXTEND (SP, 3);
851 PUSHMARK (SP); 970 PUSHMARK (SP);
852 PUSHs (&PL_sv_yes); 971 PUSHs (&PL_sv_yes);
853 PUSHs (fullname); 972 PUSHs (fullname);
854 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);
855 PUTBACK; 974 PUTBACK;
856 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);
857 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);
858 SPAGAIN; 977 SPAGAIN;
859 FREETMPS; 978 FREETMPS;
860 LEAVE; 979 LEAVE;
861 PL_runops = runops_trace; 980 PL_runops = runops_trace;
… …
875 PL_runops = RUNOPS_DEFAULT; 994 PL_runops = RUNOPS_DEFAULT;
876 PUSHMARK (SP); 995 PUSHMARK (SP);
877 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 996 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
878 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 997 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
879 PUTBACK; 998 PUTBACK;
880 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);
881 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);
882 SPAGAIN; 1001 SPAGAIN;
883 FREETMPS; 1002 FREETMPS;
884 LEAVE; 1003 LEAVE;
885 PL_runops = runops_trace; 1004 PL_runops = runops_trace;
… …
1075 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");
1076 1195
1077 if (expect_false (next->flags & CF_DESTROYED)) 1196 if (expect_false (next->flags & CF_DESTROYED))
1078 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");
1079 1198
1080 if (
1081#if PERL_VERSION_ATLEAST (5,9,0) 1199#if !PERL_VERSION_ATLEAST (5,10,0)
1082 expect_false (PL_parser)
1083#else
1084 expect_false (PL_lex_state != LEX_NOTPARSING) 1200 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1085#endif
1086 )
1087 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
1088 } 1203 }
1089} 1204}
1090 1205
1091/* always use the TRANSFER macro */ 1206/* always use the TRANSFER macro */
1092static void NOINLINE 1207static void NOINLINE
1093transfer (pTHX_ struct coro *prev, struct coro *next) 1208transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1094{ 1209{
1095 dSTACKLEVEL; 1210 dSTACKLEVEL;
1211 static volatile int has_throw;
1096 1212
1097 /* sometimes transfer is only called to set idle_sp */ 1213 /* sometimes transfer is only called to set idle_sp */
1098 if (expect_false (!next)) 1214 if (expect_false (!next))
1099 { 1215 {
1100 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1216 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1115 prev->flags &= ~CF_RUNNING; 1231 prev->flags &= ~CF_RUNNING;
1116 next->flags |= CF_RUNNING; 1232 next->flags |= CF_RUNNING;
1117 1233
1118 LOCK; 1234 LOCK;
1119 1235
1236 /* first get rid of the old state */
1237 save_perl (aTHX_ prev);
1238
1120 if (expect_false (next->flags & CF_NEW)) 1239 if (expect_false (next->flags & CF_NEW))
1121 { 1240 {
1122 /* need to start coroutine */ 1241 /* need to start coroutine */
1123 next->flags &= ~CF_NEW; 1242 next->flags &= ~CF_NEW;
1124 /* first get rid of the old state */
1125 save_perl (aTHX_ prev);
1126 /* setup coroutine call */ 1243 /* setup coroutine call */
1127 coro_setup (aTHX_ next); 1244 coro_setup (aTHX_ next);
1128 } 1245 }
1129 else 1246 else
1130 {
1131 /* coroutine already started */
1132 save_perl (aTHX_ prev);
1133 load_perl (aTHX_ next); 1247 load_perl (aTHX_ next);
1134 }
1135 1248
1136 prev__cctx = prev->cctx; 1249 prev__cctx = prev->cctx;
1137 1250
1138 /* possibly "free" the cctx */ 1251 /* possibly "free" the cctx */
1139 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 ))
1140 { 1257 {
1141 /* 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 */
1142 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));
1143 1260
1144 prev->cctx = 0; 1261 prev->cctx = 0;
… …
1154 1271
1155 ++next->usecount; 1272 ++next->usecount;
1156 1273
1157 if (expect_true (!next->cctx)) 1274 if (expect_true (!next->cctx))
1158 next->cctx = cctx_get (aTHX); 1275 next->cctx = cctx_get (aTHX);
1276
1277 has_throw = !!next->throw;
1159 1278
1160 if (expect_false (prev__cctx != next->cctx)) 1279 if (expect_false (prev__cctx != next->cctx))
1161 { 1280 {
1162 prev__cctx->top_env = PL_top_env; 1281 prev__cctx->top_env = PL_top_env;
1163 PL_top_env = next->cctx->top_env; 1282 PL_top_env = next->cctx->top_env;
… …
1165 } 1284 }
1166 1285
1167 free_coro_mortal (aTHX); 1286 free_coro_mortal (aTHX);
1168 UNLOCK; 1287 UNLOCK;
1169 1288
1170 if (expect_false (prev->throw || next->throw)) 1289 if (expect_false (has_throw))
1171 { 1290 {
1172 struct coro *coro = SvSTATE (coro_current); 1291 struct coro *coro = SvSTATE (coro_current);
1173 1292
1174 if (coro->throw) 1293 if (coro->throw)
1175 { 1294 {
… …
1185struct transfer_args 1304struct transfer_args
1186{ 1305{
1187 struct coro *prev, *next; 1306 struct coro *prev, *next;
1188}; 1307};
1189 1308
1190#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1309#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1191#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1310#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1192 1311
1193/** high level stuff ********************************************************/ 1312/** high level stuff ********************************************************/
1194 1313
1195static int 1314static int
… …
1289{ 1408{
1290 dTHX; 1409 dTHX;
1291 struct transfer_args ta; 1410 struct transfer_args ta;
1292 1411
1293 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1412 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1294 TRANSFER (ta); 1413 TRANSFER (ta, 1);
1295} 1414}
1296 1415
1297/** Coro ********************************************************************/ 1416/** Coro ********************************************************************/
1298 1417
1299static void 1418static void
… …
1301{ 1420{
1302 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);
1303} 1422}
1304 1423
1305static SV * 1424static SV *
1306coro_deq (pTHX_ int min_prio) 1425coro_deq (pTHX)
1307{ 1426{
1308 int prio = PRIO_MAX - PRIO_MIN; 1427 int prio;
1309 1428
1310 min_prio -= PRIO_MIN;
1311 if (min_prio < 0)
1312 min_prio = 0;
1313
1314 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1429 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1315 if (AvFILLp (coro_ready [prio]) >= 0) 1430 if (AvFILLp (coro_ready [prio]) >= 0)
1316 return av_shift (coro_ready [prio]); 1431 return av_shift (coro_ready [prio]);
1317 1432
1318 return 0; 1433 return 0;
1319} 1434}
… …
1321static int 1436static int
1322api_ready (SV *coro_sv) 1437api_ready (SV *coro_sv)
1323{ 1438{
1324 dTHX; 1439 dTHX;
1325 struct coro *coro; 1440 struct coro *coro;
1441 SV *sv_hook;
1442 void (*xs_hook)(void);
1326 1443
1327 if (SvROK (coro_sv)) 1444 if (SvROK (coro_sv))
1328 coro_sv = SvRV (coro_sv); 1445 coro_sv = SvRV (coro_sv);
1329 1446
1330 coro = SvSTATE (coro_sv); 1447 coro = SvSTATE (coro_sv);
… …
1333 return 0; 1450 return 0;
1334 1451
1335 coro->flags |= CF_READY; 1452 coro->flags |= CF_READY;
1336 1453
1337 LOCK; 1454 LOCK;
1455
1456 sv_hook = coro_nready ? 0 : coro_readyhook;
1457 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1458
1338 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1459 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1339 ++coro_nready; 1460 ++coro_nready;
1461
1340 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 ();
1341 1482
1342 return 1; 1483 return 1;
1343} 1484}
1344 1485
1345static int 1486static int
… …
1355 SV *prev_sv, *next_sv; 1496 SV *prev_sv, *next_sv;
1356 1497
1357 for (;;) 1498 for (;;)
1358 { 1499 {
1359 LOCK; 1500 LOCK;
1360 next_sv = coro_deq (aTHX_ PRIO_MIN); 1501 next_sv = coro_deq (aTHX);
1361 1502
1362 /* nothing to schedule: call the idle handler */ 1503 /* nothing to schedule: call the idle handler */
1363 if (expect_false (!next_sv)) 1504 if (expect_false (!next_sv))
1364 { 1505 {
1365 dSP; 1506 dSP;
… …
1369 SAVETMPS; 1510 SAVETMPS;
1370 1511
1371 PUSHMARK (SP); 1512 PUSHMARK (SP);
1372 PUTBACK; 1513 PUTBACK;
1373 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1514 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1515 SPAGAIN;
1374 1516
1375 FREETMPS; 1517 FREETMPS;
1376 LEAVE; 1518 LEAVE;
1377 continue; 1519 continue;
1378 } 1520 }
… …
1433{ 1575{
1434 dTHX; 1576 dTHX;
1435 struct transfer_args ta; 1577 struct transfer_args ta;
1436 1578
1437 prepare_schedule (aTHX_ &ta); 1579 prepare_schedule (aTHX_ &ta);
1438 TRANSFER (ta); 1580 TRANSFER (ta, 1);
1439} 1581}
1440 1582
1441static int 1583static int
1442api_cede (void) 1584api_cede (void)
1443{ 1585{
… …
1446 1588
1447 prepare_cede (aTHX_ &ta); 1589 prepare_cede (aTHX_ &ta);
1448 1590
1449 if (expect_true (ta.prev != ta.next)) 1591 if (expect_true (ta.prev != ta.next))
1450 { 1592 {
1451 TRANSFER (ta); 1593 TRANSFER (ta, 1);
1452 return 1; 1594 return 1;
1453 } 1595 }
1454 else 1596 else
1455 return 0; 1597 return 0;
1456} 1598}
… …
1461 dTHX; 1603 dTHX;
1462 struct transfer_args ta; 1604 struct transfer_args ta;
1463 1605
1464 if (prepare_cede_notself (aTHX_ &ta)) 1606 if (prepare_cede_notself (aTHX_ &ta))
1465 { 1607 {
1466 TRANSFER (ta); 1608 TRANSFER (ta, 1);
1467 return 1; 1609 return 1;
1468 } 1610 }
1469 else 1611 else
1470 return 0; 1612 return 0;
1471} 1613}
… …
1494 else 1636 else
1495 coro->slot->runops = RUNOPS_DEFAULT; 1637 coro->slot->runops = RUNOPS_DEFAULT;
1496 } 1638 }
1497} 1639}
1498 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
1499MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1733MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1500 1734
1501PROTOTYPES: DISABLE 1735PROTOTYPES: DISABLE
1502 1736
1503BOOT: 1737BOOT:
… …
1508 BOOT_PAGESIZE; 1742 BOOT_PAGESIZE;
1509 1743
1510 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1744 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1511 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1745 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1512 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
1513 hv_sig = coro_get_hv ("SIG", TRUE); 1751 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1514 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1752 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1515 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1753 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1516
1517 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1518 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1519 1754
1520 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1755 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1521 1756
1522 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1757 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1523 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1758 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1528 main_top_env = PL_top_env; 1763 main_top_env = PL_top_env;
1529 1764
1530 while (main_top_env->je_prev) 1765 while (main_top_env->je_prev)
1531 main_top_env = main_top_env->je_prev; 1766 main_top_env = main_top_env->je_prev;
1532 1767
1533 coroapi.ver = CORO_API_VERSION; 1768 coroapi.ver = CORO_API_VERSION;
1534 coroapi.rev = CORO_API_REVISION; 1769 coroapi.rev = CORO_API_REVISION;
1535 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 }
1536 1780
1537 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1781 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1538} 1782}
1539 1783
1540SV * 1784SV *
1541new (char *klass, ...) 1785new (char *klass, ...)
1542 CODE: 1786 CODE:
1543{ 1787{
1544 struct coro *coro; 1788 struct coro *coro;
1789 MAGIC *mg;
1545 HV *hv; 1790 HV *hv;
1546 int i; 1791 int i;
1547 1792
1548 Newz (0, coro, 1, struct coro); 1793 Newz (0, coro, 1, struct coro);
1549 coro->args = newAV (); 1794 coro->args = newAV ();
… …
1552 if (coro_first) coro_first->prev = coro; 1797 if (coro_first) coro_first->prev = coro;
1553 coro->next = coro_first; 1798 coro->next = coro_first;
1554 coro_first = coro; 1799 coro_first = coro;
1555 1800
1556 coro->hv = hv = newHV (); 1801 coro->hv = hv = newHV ();
1557 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;
1558 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1804 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1559 1805
1560 av_extend (coro->args, items - 1); 1806 av_extend (coro->args, items - 1);
1561 for (i = 1; i < items; i++) 1807 for (i = 1; i < items; i++)
1562 av_push (coro->args, newSVsv (ST (i))); 1808 av_push (coro->args, newSVsv (ST (i)));
… …
1576 Coro::cede_notself = 4 1822 Coro::cede_notself = 4
1577 CODE: 1823 CODE:
1578{ 1824{
1579 struct transfer_args ta; 1825 struct transfer_args ta;
1580 1826
1827 PUTBACK;
1581 switch (ix) 1828 switch (ix)
1582 { 1829 {
1583 case 0: 1830 case 0:
1584 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1831 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1585 ta.next = 0; 1832 ta.next = 0;
… …
1604 if (!prepare_cede_notself (aTHX_ &ta)) 1851 if (!prepare_cede_notself (aTHX_ &ta))
1605 XSRETURN_EMPTY; 1852 XSRETURN_EMPTY;
1606 1853
1607 break; 1854 break;
1608 } 1855 }
1856 SPAGAIN;
1609 1857
1610 BARRIER; 1858 BARRIER;
1611 PUTBACK; 1859 PUTBACK;
1612 TRANSFER (ta); 1860 TRANSFER (ta, 0);
1613 SPAGAIN; /* might be the sp of a different coroutine now */ 1861 SPAGAIN; /* might be the sp of a different coroutine now */
1614 /* be extra careful not to ever do anything after TRANSFER */ 1862 /* be extra careful not to ever do anything after TRANSFER */
1615} 1863}
1616 1864
1617bool 1865bool
… …
1620 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1868 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1621 OUTPUT: 1869 OUTPUT:
1622 RETVAL 1870 RETVAL
1623 1871
1624void 1872void
1625_exit (code) 1873_exit (int code)
1626 int code
1627 PROTOTYPE: $ 1874 PROTOTYPE: $
1628 CODE: 1875 CODE:
1629 _exit (code); 1876 _exit (code);
1630 1877
1631int 1878int
… …
1665call (Coro::State coro, SV *coderef) 1912call (Coro::State coro, SV *coderef)
1666 ALIAS: 1913 ALIAS:
1667 eval = 1 1914 eval = 1
1668 CODE: 1915 CODE:
1669{ 1916{
1670 if (coro->mainstack) 1917 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1671 { 1918 {
1672 struct coro temp; 1919 struct coro temp;
1673 1920
1674 if (!(coro->flags & CF_RUNNING)) 1921 if (!(coro->flags & CF_RUNNING))
1675 { 1922 {
1923 PUTBACK;
1676 save_perl (aTHX_ &temp); 1924 save_perl (aTHX_ &temp);
1677 load_perl (aTHX_ coro); 1925 load_perl (aTHX_ coro);
1678 } 1926 }
1679 1927
1680 { 1928 {
… …
1699 1947
1700 if (!(coro->flags & CF_RUNNING)) 1948 if (!(coro->flags & CF_RUNNING))
1701 { 1949 {
1702 save_perl (aTHX_ coro); 1950 save_perl (aTHX_ coro);
1703 load_perl (aTHX_ &temp); 1951 load_perl (aTHX_ &temp);
1952 SPAGAIN;
1704 } 1953 }
1705 } 1954 }
1706} 1955}
1707 1956
1708SV * 1957SV *
… …
1720 1969
1721void 1970void
1722api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1971api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1723 1972
1724SV * 1973SV *
1725has_stack (Coro::State coro) 1974has_cctx (Coro::State coro)
1726 PROTOTYPE: $ 1975 PROTOTYPE: $
1727 CODE: 1976 CODE:
1728 RETVAL = boolSV (!!coro->cctx); 1977 RETVAL = boolSV (!!coro->cctx);
1729 OUTPUT: 1978 OUTPUT:
1730 RETVAL 1979 RETVAL
… …
1749 case 1: RETVAL = coro->usecount; break; 1998 case 1: RETVAL = coro->usecount; break;
1750 } 1999 }
1751 OUTPUT: 2000 OUTPUT:
1752 RETVAL 2001 RETVAL
1753 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 }
1754 2031
1755MODULE = Coro::State PACKAGE = Coro 2032MODULE = Coro::State PACKAGE = Coro
1756 2033
1757BOOT: 2034BOOT:
1758{ 2035{
1759 int i; 2036 int i;
1760 2037
1761 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1762 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1763 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);
1764 2041
1765 coro_current = coro_get_sv ("Coro::current", FALSE); 2042 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1766 SvREADONLY_on (coro_current); 2043 SvREADONLY_on (coro_current);
1767 2044
1768 coro_stash = gv_stashpv ("Coro", TRUE); 2045 coro_stash = gv_stashpv ("Coro", TRUE);
1769 2046
1770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2047 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1798void 2075void
1799_set_current (SV *current) 2076_set_current (SV *current)
1800 PROTOTYPE: $ 2077 PROTOTYPE: $
1801 CODE: 2078 CODE:
1802 SvREFCNT_dec (SvRV (coro_current)); 2079 SvREFCNT_dec (SvRV (coro_current));
1803 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;
1804 2090
1805int 2091int
1806prio (Coro::State coro, int newprio = 0) 2092prio (Coro::State coro, int newprio = 0)
1807 ALIAS: 2093 ALIAS:
1808 nice = 1 2094 nice = 1
… …
1838 CODE: 2124 CODE:
1839 RETVAL = coro_nready; 2125 RETVAL = coro_nready;
1840 OUTPUT: 2126 OUTPUT:
1841 RETVAL 2127 RETVAL
1842 2128
1843void
1844throw (Coro::State self, SV *throw = &PL_sv_undef)
1845 PROTOTYPE: $;$
1846 CODE:
1847 SvREFCNT_dec (self->throw);
1848 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1849
1850# for async_pool speedup 2129# for async_pool speedup
1851void 2130void
1852_pool_1 (SV *cb) 2131_pool_1 (SV *cb)
1853 CODE: 2132 CODE:
1854{ 2133{
1855 struct coro *coro = SvSTATE (coro_current); 2134 struct coro *coro = SvSTATE (coro_current);
1856 HV *hv = (HV *)SvRV (coro_current); 2135 HV *hv = (HV *)SvRV (coro_current);
1857 AV *defav = GvAV (PL_defgv); 2136 AV *defav = GvAV (PL_defgv);
1858 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 2137 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1859 AV *invoke_av; 2138 AV *invoke_av;
1860 int i, len; 2139 int i, len;
1861 2140
1862 if (!invoke) 2141 if (!invoke)
2142 {
2143 SV *old = PL_diehook;
2144 PL_diehook = 0;
2145 SvREFCNT_dec (old);
1863 croak ("\3async_pool terminate\2\n"); 2146 croak ("\3async_pool terminate\2\n");
2147 }
1864 2148
1865 SvREFCNT_dec (coro->saved_deffh); 2149 SvREFCNT_dec (coro->saved_deffh);
1866 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2150 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1867 2151
1868 hv_store (hv, "desc", sizeof ("desc") - 1, 2152 hv_store (hv, "desc", sizeof ("desc") - 1,
1869 newSVpvn (strpair ("[async_pool]")), 0); 2153 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1870 2154
1871 invoke_av = (AV *)SvRV (invoke); 2155 invoke_av = (AV *)SvRV (invoke);
1872 len = av_len (invoke_av); 2156 len = av_len (invoke_av);
1873 2157
1874 sv_setsv (cb, AvARRAY (invoke_av)[0]); 2158 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1875 2159
1876 if (len > 0) 2160 if (len > 0)
1877 { 2161 {
1878 av_fill (defav, len - 1); 2162 av_fill (defav, len - 1);
1879 for (i = 0; i < len; ++i) 2163 for (i = 0; i < len; ++i)
1880 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2164 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1881 } 2165 }
1882 2166
1883 SvREFCNT_dec (invoke); 2167 SvREFCNT_dec (invoke);
1884} 2168}
1885 2169
… …
1894 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2178 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1895 coro->saved_deffh = 0; 2179 coro->saved_deffh = 0;
1896 2180
1897 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2181 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1898 || 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);
1899 croak ("\3async_pool terminate\2\n"); 2187 croak ("\3async_pool terminate\2\n");
2188 }
1900 2189
1901 av_clear (GvAV (PL_defgv)); 2190 av_clear (GvAV (PL_defgv));
1902 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 2191 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1903 newSVpvn (strpair ("[async_pool idle]")), 0); 2192 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1904 2193
1905 coro->prio = 0; 2194 coro->prio = 0;
1906 2195
1907 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2196 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1908 api_trace (coro_current, 0); 2197 api_trace (coro_current, 0);
1909 2198
1910 av_push (av_async_pool, newSVsv (coro_current)); 2199 av_push (av_async_pool, newSVsv (coro_current));
1911} 2200}
1912 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
1913 2250
1914MODULE = Coro::State PACKAGE = Coro::AIO 2251MODULE = Coro::State PACKAGE = Coro::AIO
1915 2252
1916SV * 2253void
1917_get_state () 2254_get_state (SV *self)
1918 CODE: 2255 PPCODE:
1919{ 2256{
1920 struct io_state *data; 2257 AV *defav = GvAV (PL_defgv);
1921 2258 AV *av = newAV ();
2259 int i;
1922 RETVAL = newSV (sizeof (struct io_state)); 2260 SV *data_sv = newSV (sizeof (struct io_state));
1923 data = (struct io_state *)SvPVX (RETVAL); 2261 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1924 SvCUR_set (RETVAL, sizeof (struct io_state)); 2262 SvCUR_set (data_sv, sizeof (struct io_state));
1925 SvPOK_only (RETVAL); 2263 SvPOK_only (data_sv);
1926 2264
1927 data->errorno = errno; 2265 data->errorno = errno;
1928 data->laststype = PL_laststype; 2266 data->laststype = PL_laststype;
1929 data->laststatval = PL_laststatval; 2267 data->laststatval = PL_laststatval;
1930 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);
1931} 2280}
1932 OUTPUT:
1933 RETVAL
1934 2281
1935void 2282void
1936_set_state (char *data_) 2283_set_state (SV *state)
1937 PROTOTYPE: $ 2284 PROTOTYPE: $
1938 CODE: 2285 PPCODE:
1939{ 2286{
1940 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;
1941 2290
1942 errno = data->errorno; 2291 errno = data->errorno;
1943 PL_laststype = data->laststype; 2292 PL_laststype = data->laststype;
1944 PL_laststatval = data->laststatval; 2293 PL_laststatval = data->laststatval;
1945 PL_statcache = data->statcache; 2294 PL_statcache = data->statcache;
1946}
1947 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