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.216 by root, Wed Nov 14 10:24:14 2007 UTC vs.
Revision 1.264 by root, Fri Nov 14 02:29:09 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
… …
37# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
38#endif 47#endif
39 48
40#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
41# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
42# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
43#else
44# define REGISTER_STACK(cctx,start,end)
45#endif 51#endif
46 52
47/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
48#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
49 55
50#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
51 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
52 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
53 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
… …
72# ifndef IS_PADCONST 78# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
74# endif 80# endif
75#endif 81#endif
76 82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100
77/* 5.8.7 */ 101/* 5.8.7 */
78#ifndef SvRV_set 102#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 103# 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 104#endif
89 105
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 106#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 107# undef CORO_STACKGUARD
92#endif 108#endif
… …
107 123
108#define IN_DESTRUCT (PL_main_cv == Nullcv) 124#define IN_DESTRUCT (PL_main_cv == Nullcv)
109 125
110#if __GNUC__ >= 3 126#if __GNUC__ >= 3
111# define attribute(x) __attribute__(x) 127# define attribute(x) __attribute__(x)
112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value)) 128# define expect(expr,value) __builtin_expect ((expr),(value))
129# define INLINE static inline
114#else 130#else
115# define attribute(x) 131# define attribute(x)
116# define BARRIER
117# define expect(expr,value) (expr) 132# define expect(expr,value) (expr)
133# define INLINE static
118#endif 134#endif
119 135
120#define expect_false(expr) expect ((expr) != 0, 0) 136#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1) 137#define expect_true(expr) expect ((expr) != 0, 1)
122 138
123#define NOINLINE attribute ((noinline)) 139#define NOINLINE attribute ((noinline))
124 140
125#include "CoroAPI.h" 141#include "CoroAPI.h"
126 142
127#ifdef USE_ITHREADS 143#ifdef USE_ITHREADS
144
128static perl_mutex coro_mutex; 145static perl_mutex coro_lock;
129# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 146# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
130# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 147# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
148# if CORO_PTHREAD
149static void *coro_thx;
150# endif
151
131#else 152#else
153
132# define LOCK (void)0 154# define LOCK (void)0
133# define UNLOCK (void)0 155# define UNLOCK (void)0
156
134#endif 157#endif
158
159# undef LOCK
160# define LOCK (void)0
161# undef UNLOCK
162# define UNLOCK (void)0
135 163
136/* helper storage struct for Coro::AIO */ 164/* helper storage struct for Coro::AIO */
137struct io_state 165struct io_state
138{ 166{
167 AV *res;
139 int errorno; 168 int errorno;
140 I32 laststype; 169 I32 laststype; /* U16 in 5.10.0 */
141 int laststatval; 170 int laststatval;
142 Stat_t statcache; 171 Stat_t statcache;
143}; 172};
144 173
174static double (*nvtime)(); /* so why doesn't it take void? */
175
176static U32 cctx_gen;
145static size_t coro_stacksize = CORO_STACKSIZE; 177static size_t cctx_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 178static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 179static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 180static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 181static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 182static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
183static volatile struct coro *transfer_next;
184
185struct transfer_args
186{
187 struct coro *prev, *next;
188};
151 189
152static GV *irsgv; /* $/ */ 190static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 191static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook; 192static SV *rv_diehook;
155static SV *rv_warnhook; 193static SV *rv_warnhook;
… …
157 195
158/* async_pool helper stuff */ 196/* async_pool helper stuff */
159static SV *sv_pool_rss; 197static SV *sv_pool_rss;
160static SV *sv_pool_size; 198static SV *sv_pool_size;
161static AV *av_async_pool; 199static AV *av_async_pool;
200
201/* Coro::AnyEvent */
202static SV *sv_activity;
162 203
163static struct coro_cctx *cctx_first; 204static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 205static int cctx_count, cctx_idle;
165 206
166enum { 207enum {
… …
184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 225 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 226 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
186 JMPENV *top_env; 227 JMPENV *top_env;
187 coro_context cctx; 228 coro_context cctx;
188 229
230 U32 gen;
189#if CORO_USE_VALGRIND 231#if CORO_USE_VALGRIND
190 int valgrind_id; 232 int valgrind_id;
191#endif 233#endif
192 unsigned char flags; 234 unsigned char flags;
193} coro_cctx; 235} coro_cctx;
… …
252#define PRIO_IDLE -3 294#define PRIO_IDLE -3
253#define PRIO_MIN -4 295#define PRIO_MIN -4
254 296
255/* for Coro.pm */ 297/* for Coro.pm */
256static SV *coro_current; 298static SV *coro_current;
299static SV *coro_readyhook;
257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 300static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
258static int coro_nready; 301static int coro_nready;
259static struct coro *coro_first; 302static struct coro *coro_first;
260 303
261/** lowlevel stuff **********************************************************/ 304/** lowlevel stuff **********************************************************/
262 305
263static SV * 306static SV *
264coro_get_sv (pTHX_ const char *name, int create) 307coro_get_sv (pTHX_ const char *name, int create)
265{ 308{
266#if PERL_VERSION_ATLEAST (5,9,0) 309#if PERL_VERSION_ATLEAST (5,10,0)
267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 310 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
268 get_sv (name, create); 311 get_sv (name, create);
269#endif 312#endif
270 return get_sv (name, create); 313 return get_sv (name, create);
271} 314}
272 315
273static AV * 316static AV *
274coro_get_av (pTHX_ const char *name, int create) 317coro_get_av (pTHX_ const char *name, int create)
275{ 318{
276#if PERL_VERSION_ATLEAST (5,9,0) 319#if PERL_VERSION_ATLEAST (5,10,0)
277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 320 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
278 get_av (name, create); 321 get_av (name, create);
279#endif 322#endif
280 return get_av (name, create); 323 return get_av (name, create);
281} 324}
282 325
283static HV * 326static HV *
284coro_get_hv (pTHX_ const char *name, int create) 327coro_get_hv (pTHX_ const char *name, int create)
285{ 328{
286#if PERL_VERSION_ATLEAST (5,9,0) 329#if PERL_VERSION_ATLEAST (5,10,0)
287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 330 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
288 get_hv (name, create); 331 get_hv (name, create);
289#endif 332#endif
290 return get_hv (name, create); 333 return get_hv (name, create);
291} 334}
… …
296 AV *padlist = CvPADLIST (cv); 339 AV *padlist = CvPADLIST (cv);
297 AV *newpadlist, *newpad; 340 AV *newpadlist, *newpad;
298 341
299 newpadlist = newAV (); 342 newpadlist = newAV ();
300 AvREAL_off (newpadlist); 343 AvREAL_off (newpadlist);
301#if PERL_VERSION_ATLEAST (5,9,0) 344#if PERL_VERSION_ATLEAST (5,10,0)
302 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 345 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
303#else 346#else
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 347 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
305#endif 348#endif
306 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 349 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
307 --AvFILLp (padlist); 350 --AvFILLp (padlist);
308 351
309 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 352 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
310 av_store (newpadlist, 1, (SV *)newpad); 353 av_store (newpadlist, 1, (SV *)newpad);
311 354
312 return newpadlist; 355 return newpadlist;
313} 356}
314 357
… …
344 387
345 /* casting is fun. */ 388 /* casting is fun. */
346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 389 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
347 free_padlist (aTHX_ padlist); 390 free_padlist (aTHX_ padlist);
348 391
392 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
393
349 return 0; 394 return 0;
350} 395}
351 396
352#define CORO_MAGIC_type_cv PERL_MAGIC_ext 397#define CORO_MAGIC_type_cv PERL_MAGIC_ext
353#define CORO_MAGIC_type_state PERL_MAGIC_ext 398#define CORO_MAGIC_type_state PERL_MAGIC_ext
… …
355static MGVTBL coro_cv_vtbl = { 400static MGVTBL coro_cv_vtbl = {
356 0, 0, 0, 0, 401 0, 0, 0, 0,
357 coro_cv_free 402 coro_cv_free
358}; 403};
359 404
360#define CORO_MAGIC(sv,type) \ 405#define CORO_MAGIC(sv, type) \
361 SvMAGIC (sv) \ 406 SvMAGIC (sv) \
362 ? SvMAGIC (sv)->mg_type == type \ 407 ? SvMAGIC (sv)->mg_type == type \
363 ? SvMAGIC (sv) \ 408 ? SvMAGIC (sv) \
364 : mg_find (sv, type) \ 409 : mg_find (sv, type) \
365 : 0 410 : 0
366 411
367#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 412#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
368#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 413#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
369 414
370static struct coro * 415INLINE struct coro *
371SvSTATE_ (pTHX_ SV *coro) 416SvSTATE_ (pTHX_ SV *coro)
372{ 417{
373 HV *stash; 418 HV *stash;
374 MAGIC *mg; 419 MAGIC *mg;
375 420
… …
403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 448 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 449 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
405 else 450 else
406 { 451 {
407#if CORO_PREFER_PERL_FUNCTIONS 452#if CORO_PREFER_PERL_FUNCTIONS
408 /* this is probably cleaner, but also slower? */ 453 /* this is probably cleaner? but also slower! */
454 /* in practise, it seems to be less stable */
409 CV *cp = Perl_cv_clone (cv); 455 CV *cp = Perl_cv_clone (cv);
410 CvPADLIST (cv) = CvPADLIST (cp); 456 CvPADLIST (cv) = CvPADLIST (cp);
411 CvPADLIST (cp) = 0; 457 CvPADLIST (cp) = 0;
412 SvREFCNT_dec (cp); 458 SvREFCNT_dec (cp);
413#else 459#else
… …
497 543
498 if (expect_true (CvDEPTH (cv))) 544 if (expect_true (CvDEPTH (cv)))
499 { 545 {
500 EXTEND (SP, 3); 546 EXTEND (SP, 3);
501 PUSHs ((SV *)CvPADLIST (cv)); 547 PUSHs ((SV *)CvPADLIST (cv));
502 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 548 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
503 PUSHs ((SV *)cv); 549 PUSHs ((SV *)cv);
504 550
505 CvDEPTH (cv) = 0; 551 CvDEPTH (cv) = 0;
506 get_padlist (aTHX_ cv); 552 get_padlist (aTHX_ cv);
507 } 553 }
… …
587 633
588 New(54,PL_savestack,24,ANY); 634 New(54,PL_savestack,24,ANY);
589 PL_savestack_ix = 0; 635 PL_savestack_ix = 0;
590 PL_savestack_max = 24; 636 PL_savestack_max = 24;
591 637
592#if !PERL_VERSION_ATLEAST (5,9,0) 638#if !PERL_VERSION_ATLEAST (5,10,0)
593 New(54,PL_retstack,4,OP*); 639 New(54,PL_retstack,4,OP*);
594 PL_retstack_ix = 0; 640 PL_retstack_ix = 0;
595 PL_retstack_max = 4; 641 PL_retstack_max = 4;
596#endif 642#endif
597} 643}
… …
599 645
600/* 646/*
601 * destroy the stacks, the callchain etc... 647 * destroy the stacks, the callchain etc...
602 */ 648 */
603static void 649static void
604coro_destroy_stacks (pTHX) 650coro_destruct_stacks (pTHX)
605{ 651{
606 while (PL_curstackinfo->si_next) 652 while (PL_curstackinfo->si_next)
607 PL_curstackinfo = PL_curstackinfo->si_next; 653 PL_curstackinfo = PL_curstackinfo->si_next;
608 654
609 while (PL_curstackinfo) 655 while (PL_curstackinfo)
… …
620 666
621 Safefree (PL_tmps_stack); 667 Safefree (PL_tmps_stack);
622 Safefree (PL_markstack); 668 Safefree (PL_markstack);
623 Safefree (PL_scopestack); 669 Safefree (PL_scopestack);
624 Safefree (PL_savestack); 670 Safefree (PL_savestack);
625#if !PERL_VERSION_ATLEAST (5,9,0) 671#if !PERL_VERSION_ATLEAST (5,10,0)
626 Safefree (PL_retstack); 672 Safefree (PL_retstack);
627#endif 673#endif
628} 674}
629 675
630static size_t 676static size_t
… …
646 #undef VAR 692 #undef VAR
647 } 693 }
648 else 694 else
649 slot = coro->slot; 695 slot = coro->slot;
650 696
697 if (slot)
698 {
651 rss += sizeof (slot->curstackinfo); 699 rss += sizeof (slot->curstackinfo);
652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 700 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
653 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 701 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
654 rss += slot->tmps_max * sizeof (SV *); 702 rss += slot->tmps_max * sizeof (SV *);
655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 703 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
656 rss += slot->scopestack_max * sizeof (I32); 704 rss += slot->scopestack_max * sizeof (I32);
657 rss += slot->savestack_max * sizeof (ANY); 705 rss += slot->savestack_max * sizeof (ANY);
658 706
659#if !PERL_VERSION_ATLEAST (5,9,0) 707#if !PERL_VERSION_ATLEAST (5,10,0)
660 rss += slot->retstack_max * sizeof (OP *); 708 rss += slot->retstack_max * sizeof (OP *);
661#endif 709#endif
710 }
662 } 711 }
663 712
664 return rss; 713 return rss;
665} 714}
666 715
667/** coroutine stack handling ************************************************/ 716/** coroutine stack handling ************************************************/
668 717
669#if 0
670static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 718static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
719static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
720static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
721
722/* apparently < 5.8.8 */
723#ifndef MgPV_nolen_const
724#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
725 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
726 (const char*)(mg)->mg_ptr)
727#endif
728
729/* we sometimes need to create the effect of entersub calling us */
730#define SSL_HEAD (void)0
731/* we somtimes need to create the effect of leaving via entersub */
732#define SSL_TAIL (void)0
671 733
672/* 734/*
673 * This overrides the default magic get method of %SIG elements. 735 * This overrides the default magic get method of %SIG elements.
674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 736 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675 * and instead of tryign to save and restore the hash elements, we just provide 737 * and instead of tryign to save and restore the hash elements, we just provide
… …
679 * when a schedule happens then, but we ignore this. 741 * when a schedule happens then, but we ignore this.
680 */ 742 */
681static int 743static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 744coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{ 745{
684 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg); 746 const char *s = MgPV_nolen_const (mg);
686 747
687 if (*s == '_') 748 if (*s == '_')
688 { 749 {
689 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 750 SV **svp = 0;
690 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 751
752 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
753 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
754
755 if (svp)
756 {
757 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
758 return 0;
759 }
760 }
761
762 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
763}
764
765static int
766coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
767{
768 const char *s = MgPV_nolen_const (mg);
769
770 if (*s == '_')
691 } 771 {
772 SV **svp = 0;
692 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 = 0;
781 SvREFCNT_dec (old);
782 return 0;
783 }
784 }
785
786 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
787}
788
789static int
790coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
791{
792 const char *s = MgPV_nolen_const (mg);
793
794 if (*s == '_')
795 {
796 SV **svp = 0;
797
798 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800
801 if (svp)
802 {
803 SV *old = *svp;
804 *svp = newSVsv (sv);
805 SvREFCNT_dec (old);
806 return 0;
807 }
808 }
809
693 return orig_sigelem_get (aTHX_ sv, mg); 810 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
694} 811}
695#endif
696 812
697static void 813static void
698coro_setup (pTHX_ struct coro *coro) 814coro_setup (pTHX_ struct coro *coro)
699{ 815{
700 /* 816 /*
… …
709 PL_curpm = 0; 825 PL_curpm = 0;
710 PL_curpad = 0; 826 PL_curpad = 0;
711 PL_localizing = 0; 827 PL_localizing = 0;
712 PL_dirty = 0; 828 PL_dirty = 0;
713 PL_restartop = 0; 829 PL_restartop = 0;
830#if PERL_VERSION_ATLEAST (5,10,0)
831 PL_parser = 0;
832#endif
714 833
715 /* recreate the die/warn hooks */ 834 /* recreate the die/warn hooks */
716 PL_diehook = 0; 835 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
717 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0); 836 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
718 PL_diehook = SvREFCNT_inc (rv_diehook);
719
720 PL_warnhook = 0;
721 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
722 PL_warnhook = SvREFCNT_inc (rv_warnhook);
723 837
724 GvSV (PL_defgv) = newSV (0); 838 GvSV (PL_defgv) = newSV (0);
725 GvAV (PL_defgv) = coro->args; coro->args = 0; 839 GvAV (PL_defgv) = coro->args; coro->args = 0;
726 GvSV (PL_errgv) = newSV (0); 840 GvSV (PL_errgv) = newSV (0);
727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 841 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
728 PL_rs = newSVsv (GvSV (irsgv)); 842 PL_rs = newSVsv (GvSV (irsgv));
729 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 843 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
730 844
731 { 845 {
732 dSP; 846 dSP;
733 LOGOP myop; 847 UNOP myop;
734 848
735 Zero (&myop, 1, LOGOP); 849 Zero (&myop, 1, UNOP);
736 myop.op_next = Nullop; 850 myop.op_next = Nullop;
737 myop.op_flags = OPf_WANT_VOID; 851 myop.op_flags = OPf_WANT_VOID;
738 852
739 PUSHMARK (SP); 853 PUSHMARK (SP);
740 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 854 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
744 SPAGAIN; 858 SPAGAIN;
745 } 859 }
746 860
747 /* this newly created coroutine might be run on an existing cctx which most 861 /* this newly created coroutine might be run on an existing cctx which most
748 * likely was suspended in set_stacklevel, called from entersub. 862 * likely was suspended in set_stacklevel, called from entersub.
749 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 863 * set_stacklevel doesn't do anything on return, but entersub does LEAVE,
750 * so we ENTER here for symmetry 864 * so we ENTER here for symmetry.
751 */ 865 */
752 ENTER; 866 SSL_HEAD;
753} 867}
754 868
755static void 869static void
756coro_destroy (pTHX_ struct coro *coro) 870coro_destruct (pTHX_ struct coro *coro)
757{ 871{
758 if (!IN_DESTRUCT) 872 if (!IN_DESTRUCT)
759 { 873 {
760 /* restore all saved variables and stuff */ 874 /* restore all saved variables and stuff */
761 LEAVE_SCOPE (0); 875 LEAVE_SCOPE (0);
… …
783 SvREFCNT_dec (PL_warnhook); 897 SvREFCNT_dec (PL_warnhook);
784 898
785 SvREFCNT_dec (coro->saved_deffh); 899 SvREFCNT_dec (coro->saved_deffh);
786 SvREFCNT_dec (coro->throw); 900 SvREFCNT_dec (coro->throw);
787 901
788 coro_destroy_stacks (aTHX); 902 coro_destruct_stacks (aTHX);
789} 903}
790 904
791static void 905INLINE void
792free_coro_mortal (pTHX) 906free_coro_mortal (pTHX)
793{ 907{
794 if (expect_true (coro_mortal)) 908 if (expect_true (coro_mortal))
795 { 909 {
796 SvREFCNT_dec (coro_mortal); 910 SvREFCNT_dec (coro_mortal);
… …
830 : cx->blk_gimme == G_SCALAR ? bot + 1 944 : cx->blk_gimme == G_SCALAR ? bot + 1
831 : bot; 945 : bot;
832 946
833 av_extend (av, top - bot); 947 av_extend (av, top - bot);
834 while (bot < top) 948 while (bot < top)
835 av_push (av, SvREFCNT_inc (*bot++)); 949 av_push (av, SvREFCNT_inc_NN (*bot++));
836 950
837 PL_runops = RUNOPS_DEFAULT; 951 PL_runops = RUNOPS_DEFAULT;
838 ENTER; 952 ENTER;
839 SAVETMPS; 953 SAVETMPS;
840 EXTEND (SP, 3); 954 EXTEND (SP, 3);
… …
878 SAVETMPS; 992 SAVETMPS;
879 EXTEND (SP, 3); 993 EXTEND (SP, 3);
880 PUSHMARK (SP); 994 PUSHMARK (SP);
881 PUSHs (&PL_sv_yes); 995 PUSHs (&PL_sv_yes);
882 PUSHs (fullname); 996 PUSHs (fullname);
883 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 997 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
884 PUTBACK; 998 PUTBACK;
885 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 999 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
886 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);
887 SPAGAIN; 1001 SPAGAIN;
888 FREETMPS; 1002 FREETMPS;
… …
920 1034
921 TAINT_NOT; 1035 TAINT_NOT;
922 return 0; 1036 return 0;
923} 1037}
924 1038
1039static void
1040prepare_set_stacklevel (struct transfer_args *ta, struct coro_cctx *cctx)
1041{
1042 ta->prev = (struct coro *)cctx;
1043 ta->next = 0;
1044}
1045
925/* inject a fake call to Coro::State::_cctx_init into the execution */ 1046/* inject a fake call to Coro::State::_cctx_init into the execution */
926/* _cctx_init should be careful, as it could be called at almost any time */ 1047/* _cctx_init should be careful, as it could be called at almost any time */
927/* during execution of a perl program */ 1048/* during execution of a perl program */
1049/* also initialises PL_top_env */
928static void NOINLINE 1050static void NOINLINE
929cctx_prepare (pTHX_ coro_cctx *cctx) 1051cctx_prepare (pTHX_ coro_cctx *cctx)
930{ 1052{
931 dSP; 1053 dSP;
932 LOGOP myop; 1054 UNOP myop;
933 1055
934 PL_top_env = &PL_start_env; 1056 PL_top_env = &PL_start_env;
935 1057
936 if (cctx->flags & CC_TRACE) 1058 if (cctx->flags & CC_TRACE)
937 PL_runops = runops_trace; 1059 PL_runops = runops_trace;
938 1060
939 Zero (&myop, 1, LOGOP); 1061 Zero (&myop, 1, UNOP);
940 myop.op_next = PL_op; 1062 myop.op_next = PL_op;
941 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1063 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
942 1064
943 PUSHMARK (SP); 1065 PUSHMARK (SP);
944 EXTEND (SP, 2); 1066 EXTEND (SP, 2);
945 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1067 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
946 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1068 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
947 PUTBACK; 1069 PUTBACK;
948 PL_op = (OP *)&myop; 1070 PL_op = (OP *)&myop;
949 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1071 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
950 SPAGAIN; 1072 SPAGAIN;
951} 1073}
952 1074
1075/* the tail of transfer: execute stuff we can only do after a transfer */
1076INLINE void
1077transfer_tail (pTHX)
1078{
1079 struct coro *next = (struct coro *)transfer_next;
1080 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1081 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1082
1083 free_coro_mortal (aTHX);
1084 UNLOCK;
1085
1086 if (expect_false (next->throw))
1087 {
1088 SV *exception = sv_2mortal (next->throw);
1089
1090 next->throw = 0;
1091 sv_setsv (ERRSV, exception);
1092 croak (0);
1093 }
1094}
1095
953/* 1096/*
954 * this is a _very_ stripped down perl interpreter ;) 1097 * this is a _very_ stripped down perl interpreter ;)
955 */ 1098 */
956static void 1099static void
957cctx_run (void *arg) 1100cctx_run (void *arg)
958{ 1101{
1102#ifdef USE_ITHREADS
1103# if CORO_PTHREAD
1104 PERL_SET_CONTEXT (coro_thx);
1105# endif
1106#endif
1107 {
959 dTHX; 1108 dTHX;
960 1109
961 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1110 /* entersub called ENTER, but we never 'returned', undo that here */
962 UNLOCK; 1111 SSL_TAIL;
963 1112
964 /* we now skip the entersub that lead to transfer() */ 1113 /* we now skip the op that did lead to transfer() */
965 PL_op = PL_op->op_next; 1114 PL_op = PL_op->op_next;
966 1115
967 /* inject a fake subroutine call to cctx_init */ 1116 /* inject a fake subroutine call to cctx_init */
968 cctx_prepare (aTHX_ (coro_cctx *)arg); 1117 cctx_prepare (aTHX_ (coro_cctx *)arg);
969 1118
1119 /* cctx_run is the alternative tail of transfer() */
1120 transfer_tail (aTHX);
1121
970 /* somebody or something will hit me for both perl_run and PL_restartop */ 1122 /* somebody or something will hit me for both perl_run and PL_restartop */
971 PL_restartop = PL_op; 1123 PL_restartop = PL_op;
972 perl_run (PL_curinterp); 1124 perl_run (PL_curinterp);
973 1125
974 /* 1126 /*
975 * If perl-run returns we assume exit() was being called or the coro 1127 * If perl-run returns we assume exit() was being called or the coro
976 * fell off the end, which seems to be the only valid (non-bug) 1128 * fell off the end, which seems to be the only valid (non-bug)
977 * reason for perl_run to return. We try to exit by jumping to the 1129 * reason for perl_run to return. We try to exit by jumping to the
978 * bootstrap-time "top" top_env, as we cannot restore the "main" 1130 * bootstrap-time "top" top_env, as we cannot restore the "main"
979 * coroutine as Coro has no such concept 1131 * coroutine as Coro has no such concept
980 */ 1132 */
981 PL_top_env = main_top_env; 1133 PL_top_env = main_top_env;
982 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1134 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1135 }
983} 1136}
984 1137
985static coro_cctx * 1138static coro_cctx *
986cctx_new () 1139cctx_new ()
987{ 1140{
988 coro_cctx *cctx; 1141 coro_cctx *cctx;
1142
1143 ++cctx_count;
1144 New (0, cctx, 1, coro_cctx);
1145
1146 cctx->gen = cctx_gen;
1147 cctx->flags = 0;
1148 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1149
1150 return cctx;
1151}
1152
1153/* create a new cctx only suitable as source */
1154static coro_cctx *
1155cctx_new_empty ()
1156{
1157 coro_cctx *cctx = cctx_new ();
1158
1159 cctx->sptr = 0;
1160 coro_create (&cctx->cctx, 0, 0, 0, 0);
1161
1162 return cctx;
1163}
1164
1165/* create a new cctx suitable as destination/running a perl interpreter */
1166static coro_cctx *
1167cctx_new_run ()
1168{
1169 coro_cctx *cctx = cctx_new ();
989 void *stack_start; 1170 void *stack_start;
990 size_t stack_size; 1171 size_t stack_size;
991 1172
992 ++cctx_count;
993
994 Newz (0, cctx, 1, coro_cctx);
995
996#if HAVE_MMAP 1173#if HAVE_MMAP
997 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1174 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
998 /* mmap supposedly does allocate-on-write for us */ 1175 /* mmap supposedly does allocate-on-write for us */
999 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1176 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1000 1177
1001 if (cctx->sptr != (void *)-1) 1178 if (cctx->sptr != (void *)-1)
1002 { 1179 {
1003# if CORO_STACKGUARD 1180 #if CORO_STACKGUARD
1004 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1181 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1005# endif 1182 #endif
1006 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1183 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1007 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1184 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1008 cctx->flags |= CC_MAPPED; 1185 cctx->flags |= CC_MAPPED;
1009 } 1186 }
1010 else 1187 else
1011#endif 1188#endif
1012 { 1189 {
1013 cctx->ssize = coro_stacksize * (long)sizeof (long); 1190 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1014 New (0, cctx->sptr, coro_stacksize, long); 1191 New (0, cctx->sptr, cctx_stacksize, long);
1015 1192
1016 if (!cctx->sptr) 1193 if (!cctx->sptr)
1017 { 1194 {
1018 perror ("FATAL: unable to allocate stack for coroutine"); 1195 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1019 _exit (EXIT_FAILURE); 1196 _exit (EXIT_FAILURE);
1020 } 1197 }
1021 1198
1022 stack_start = cctx->sptr; 1199 stack_start = cctx->sptr;
1023 stack_size = cctx->ssize; 1200 stack_size = cctx->ssize;
1024 } 1201 }
1025 1202
1026 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1203 #if CORO_USE_VALGRIND
1204 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1205 #endif
1206
1027 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1207 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
1028 1208
1029 return cctx; 1209 return cctx;
1030} 1210}
1031 1211
… …
1034{ 1214{
1035 if (!cctx) 1215 if (!cctx)
1036 return; 1216 return;
1037 1217
1038 --cctx_count; 1218 --cctx_count;
1219 coro_destroy (&cctx->cctx);
1039 1220
1221 /* coro_transfer creates new, empty cctx's */
1222 if (cctx->sptr)
1223 {
1040#if CORO_USE_VALGRIND 1224 #if CORO_USE_VALGRIND
1041 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1225 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1042#endif 1226 #endif
1043 1227
1044#if HAVE_MMAP 1228#if HAVE_MMAP
1045 if (cctx->flags & CC_MAPPED) 1229 if (cctx->flags & CC_MAPPED)
1046 munmap (cctx->sptr, cctx->ssize); 1230 munmap (cctx->sptr, cctx->ssize);
1047 else 1231 else
1048#endif 1232#endif
1049 Safefree (cctx->sptr); 1233 Safefree (cctx->sptr);
1234 }
1050 1235
1051 Safefree (cctx); 1236 Safefree (cctx);
1052} 1237}
1053 1238
1054/* wether this cctx should be destructed */ 1239/* wether this cctx should be destructed */
1055#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1240#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1056 1241
1057static coro_cctx * 1242static coro_cctx *
1058cctx_get (pTHX) 1243cctx_get (pTHX)
1059{ 1244{
1060 while (expect_true (cctx_first)) 1245 while (expect_true (cctx_first))
… …
1067 return cctx; 1252 return cctx;
1068 1253
1069 cctx_destroy (cctx); 1254 cctx_destroy (cctx);
1070 } 1255 }
1071 1256
1072 return cctx_new (); 1257 return cctx_new_run ();
1073} 1258}
1074 1259
1075static void 1260static void
1076cctx_put (coro_cctx *cctx) 1261cctx_put (coro_cctx *cctx)
1077{ 1262{
1263 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1264
1078 /* free another cctx if overlimit */ 1265 /* free another cctx if overlimit */
1079 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1266 if (expect_false (cctx_idle >= cctx_max_idle))
1080 { 1267 {
1081 coro_cctx *first = cctx_first; 1268 coro_cctx *first = cctx_first;
1082 cctx_first = first->next; 1269 cctx_first = first->next;
1083 --cctx_idle; 1270 --cctx_idle;
1084 1271
… …
1104 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1291 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1105 1292
1106 if (expect_false (next->flags & CF_DESTROYED)) 1293 if (expect_false (next->flags & CF_DESTROYED))
1107 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1294 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1108 1295
1109 if (
1110#if PERL_VERSION_ATLEAST (5,9,0) 1296#if !PERL_VERSION_ATLEAST (5,10,0)
1111 expect_false (PL_parser)
1112#else
1113 expect_false (PL_lex_state != LEX_NOTPARSING) 1297 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1114#endif
1115 )
1116 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1298 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1299#endif
1117 } 1300 }
1118} 1301}
1119 1302
1120/* always use the TRANSFER macro */ 1303/* always use the TRANSFER macro */
1121static void NOINLINE 1304static void NOINLINE
1122transfer (pTHX_ struct coro *prev, struct coro *next) 1305transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1123{ 1306{
1124 dSTACKLEVEL; 1307 dSTACKLEVEL;
1125 static volatile int has_throw;
1126 1308
1127 /* sometimes transfer is only called to set idle_sp */ 1309 /* sometimes transfer is only called to set idle_sp */
1128 if (expect_false (!next)) 1310 if (expect_false (!next))
1129 { 1311 {
1130 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1312 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1134 { 1316 {
1135 coro_cctx *prev__cctx; 1317 coro_cctx *prev__cctx;
1136 1318
1137 if (expect_false (prev->flags & CF_NEW)) 1319 if (expect_false (prev->flags & CF_NEW))
1138 { 1320 {
1139 /* create a new empty context */ 1321 /* create a new empty/source context */
1140 Newz (0, prev->cctx, 1, coro_cctx); 1322 prev->cctx = cctx_new_empty ();
1141 prev->flags &= ~CF_NEW; 1323 prev->flags &= ~CF_NEW;
1142 prev->flags |= CF_RUNNING; 1324 prev->flags |= CF_RUNNING;
1143 } 1325 }
1144 1326
1145 prev->flags &= ~CF_RUNNING; 1327 prev->flags &= ~CF_RUNNING;
… …
1160 else 1342 else
1161 load_perl (aTHX_ next); 1343 load_perl (aTHX_ next);
1162 1344
1163 prev__cctx = prev->cctx; 1345 prev__cctx = prev->cctx;
1164 1346
1165 /* possibly "free" the cctx */ 1347 /* possibly untie and reuse the cctx */
1166 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1348 if (expect_true (
1349 prev__cctx->idle_sp == STACKLEVEL
1350 && !(prev__cctx->flags & CC_TRACE)
1351 && !force_cctx
1352 ))
1167 { 1353 {
1168 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1354 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1169 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1355 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1170 1356
1171 prev->cctx = 0; 1357 prev->cctx = 0;
1172 1358
1173 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1359 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1174 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1360 /* without this the next cctx_get might destroy the prev__cctx while still in use */
… …
1182 ++next->usecount; 1368 ++next->usecount;
1183 1369
1184 if (expect_true (!next->cctx)) 1370 if (expect_true (!next->cctx))
1185 next->cctx = cctx_get (aTHX); 1371 next->cctx = cctx_get (aTHX);
1186 1372
1187 has_throw = !!next->throw; 1373 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1374 transfer_next = next;
1188 1375
1189 if (expect_false (prev__cctx != next->cctx)) 1376 if (expect_false (prev__cctx != next->cctx))
1190 { 1377 {
1191 prev__cctx->top_env = PL_top_env; 1378 prev__cctx->top_env = PL_top_env;
1192 PL_top_env = next->cctx->top_env; 1379 PL_top_env = next->cctx->top_env;
1193 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1380 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1194 } 1381 }
1195 1382
1196 free_coro_mortal (aTHX); 1383 transfer_tail (aTHX);
1197 UNLOCK;
1198
1199 if (expect_false (has_throw))
1200 {
1201 struct coro *coro = SvSTATE (coro_current);
1202
1203 if (coro->throw)
1204 {
1205 SV *exception = coro->throw;
1206 coro->throw = 0;
1207 sv_setsv (ERRSV, exception);
1208 croak (0);
1209 }
1210 }
1211 } 1384 }
1212} 1385}
1213 1386
1214struct transfer_args
1215{
1216 struct coro *prev, *next;
1217};
1218
1219#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1387#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1220#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1388#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1221 1389
1222/** high level stuff ********************************************************/ 1390/** high level stuff ********************************************************/
1223 1391
1224static int 1392static int
… …
1248 croak ("FATAL: tried to destroy currently running coroutine"); 1416 croak ("FATAL: tried to destroy currently running coroutine");
1249 1417
1250 save_perl (aTHX_ &temp); 1418 save_perl (aTHX_ &temp);
1251 load_perl (aTHX_ coro); 1419 load_perl (aTHX_ coro);
1252 1420
1253 coro_destroy (aTHX_ coro); 1421 coro_destruct (aTHX_ coro);
1254 1422
1255 load_perl (aTHX_ &temp); 1423 load_perl (aTHX_ &temp);
1256 1424
1257 coro->slot = 0; 1425 coro->slot = 0;
1258 } 1426 }
… …
1318{ 1486{
1319 dTHX; 1487 dTHX;
1320 struct transfer_args ta; 1488 struct transfer_args ta;
1321 1489
1322 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1490 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1323 TRANSFER (ta); 1491 TRANSFER (ta, 1);
1324} 1492}
1325 1493
1326/** Coro ********************************************************************/ 1494/** Coro ********************************************************************/
1327 1495
1328static void 1496static void
… …
1330{ 1498{
1331 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1499 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1332} 1500}
1333 1501
1334static SV * 1502static SV *
1335coro_deq (pTHX_ int min_prio) 1503coro_deq (pTHX)
1336{ 1504{
1337 int prio = PRIO_MAX - PRIO_MIN; 1505 int prio;
1338 1506
1339 min_prio -= PRIO_MIN;
1340 if (min_prio < 0)
1341 min_prio = 0;
1342
1343 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1507 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1344 if (AvFILLp (coro_ready [prio]) >= 0) 1508 if (AvFILLp (coro_ready [prio]) >= 0)
1345 return av_shift (coro_ready [prio]); 1509 return av_shift (coro_ready [prio]);
1346 1510
1347 return 0; 1511 return 0;
1348} 1512}
… …
1350static int 1514static int
1351api_ready (SV *coro_sv) 1515api_ready (SV *coro_sv)
1352{ 1516{
1353 dTHX; 1517 dTHX;
1354 struct coro *coro; 1518 struct coro *coro;
1519 SV *sv_hook;
1520 void (*xs_hook)(void);
1355 1521
1356 if (SvROK (coro_sv)) 1522 if (SvROK (coro_sv))
1357 coro_sv = SvRV (coro_sv); 1523 coro_sv = SvRV (coro_sv);
1358 1524
1359 coro = SvSTATE (coro_sv); 1525 coro = SvSTATE (coro_sv);
… …
1362 return 0; 1528 return 0;
1363 1529
1364 coro->flags |= CF_READY; 1530 coro->flags |= CF_READY;
1365 1531
1366 LOCK; 1532 LOCK;
1533
1534 sv_hook = coro_nready ? 0 : coro_readyhook;
1535 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1536
1367 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1537 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1368 ++coro_nready; 1538 ++coro_nready;
1539
1369 UNLOCK; 1540 UNLOCK;
1541
1542 if (sv_hook)
1543 {
1544 dSP;
1545
1546 ENTER;
1547 SAVETMPS;
1548
1549 PUSHMARK (SP);
1550 PUTBACK;
1551 call_sv (sv_hook, G_DISCARD);
1552 SPAGAIN;
1553
1554 FREETMPS;
1555 LEAVE;
1556 }
1557
1558 if (xs_hook)
1559 xs_hook ();
1370 1560
1371 return 1; 1561 return 1;
1372} 1562}
1373 1563
1374static int 1564static int
1375api_is_ready (SV *coro_sv) 1565api_is_ready (SV *coro_sv)
1376{ 1566{
1377 dTHX; 1567 dTHX;
1568
1378 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1569 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1379} 1570}
1380 1571
1381static void 1572INLINE void
1382prepare_schedule (pTHX_ struct transfer_args *ta) 1573prepare_schedule (pTHX_ struct transfer_args *ta)
1383{ 1574{
1384 SV *prev_sv, *next_sv; 1575 SV *prev_sv, *next_sv;
1385 1576
1386 for (;;) 1577 for (;;)
1387 { 1578 {
1388 LOCK; 1579 LOCK;
1389 next_sv = coro_deq (aTHX_ PRIO_MIN); 1580 next_sv = coro_deq (aTHX);
1390 1581
1391 /* nothing to schedule: call the idle handler */ 1582 /* nothing to schedule: call the idle handler */
1392 if (expect_false (!next_sv)) 1583 if (expect_false (!next_sv))
1393 { 1584 {
1394 dSP; 1585 dSP;
… …
1398 SAVETMPS; 1589 SAVETMPS;
1399 1590
1400 PUSHMARK (SP); 1591 PUSHMARK (SP);
1401 PUTBACK; 1592 PUTBACK;
1402 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1593 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1594 SPAGAIN;
1403 1595
1404 FREETMPS; 1596 FREETMPS;
1405 LEAVE; 1597 LEAVE;
1406 continue; 1598 continue;
1407 } 1599 }
… …
1411 /* cannot transfer to destroyed coros, skip and look for next */ 1603 /* cannot transfer to destroyed coros, skip and look for next */
1412 if (expect_false (ta->next->flags & CF_DESTROYED)) 1604 if (expect_false (ta->next->flags & CF_DESTROYED))
1413 { 1605 {
1414 UNLOCK; 1606 UNLOCK;
1415 SvREFCNT_dec (next_sv); 1607 SvREFCNT_dec (next_sv);
1416 /* coro_nready is already taken care of by destroy */ 1608 /* coro_nready has already been taken care of by destroy */
1417 continue; 1609 continue;
1418 } 1610 }
1419 1611
1420 --coro_nready; 1612 --coro_nready;
1421 UNLOCK; 1613 UNLOCK;
… …
1424 1616
1425 /* free this only after the transfer */ 1617 /* free this only after the transfer */
1426 prev_sv = SvRV (coro_current); 1618 prev_sv = SvRV (coro_current);
1427 ta->prev = SvSTATE (prev_sv); 1619 ta->prev = SvSTATE (prev_sv);
1428 TRANSFER_CHECK (*ta); 1620 TRANSFER_CHECK (*ta);
1429 assert (ta->next->flags & CF_READY); 1621 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1430 ta->next->flags &= ~CF_READY; 1622 ta->next->flags &= ~CF_READY;
1431 SvRV_set (coro_current, next_sv); 1623 SvRV_set (coro_current, next_sv);
1432 1624
1433 LOCK; 1625 LOCK;
1434 free_coro_mortal (aTHX); 1626 free_coro_mortal (aTHX);
1435 coro_mortal = prev_sv; 1627 coro_mortal = prev_sv;
1436 UNLOCK; 1628 UNLOCK;
1437} 1629}
1438 1630
1439static void 1631INLINE void
1440prepare_cede (pTHX_ struct transfer_args *ta) 1632prepare_cede (pTHX_ struct transfer_args *ta)
1441{ 1633{
1442 api_ready (coro_current); 1634 api_ready (coro_current);
1443 prepare_schedule (aTHX_ ta); 1635 prepare_schedule (aTHX_ ta);
1444} 1636}
… …
1462{ 1654{
1463 dTHX; 1655 dTHX;
1464 struct transfer_args ta; 1656 struct transfer_args ta;
1465 1657
1466 prepare_schedule (aTHX_ &ta); 1658 prepare_schedule (aTHX_ &ta);
1467 TRANSFER (ta); 1659 TRANSFER (ta, 1);
1468} 1660}
1469 1661
1470static int 1662static int
1471api_cede (void) 1663api_cede (void)
1472{ 1664{
… …
1475 1667
1476 prepare_cede (aTHX_ &ta); 1668 prepare_cede (aTHX_ &ta);
1477 1669
1478 if (expect_true (ta.prev != ta.next)) 1670 if (expect_true (ta.prev != ta.next))
1479 { 1671 {
1480 TRANSFER (ta); 1672 TRANSFER (ta, 1);
1481 return 1; 1673 return 1;
1482 } 1674 }
1483 else 1675 else
1484 return 0; 1676 return 0;
1485} 1677}
… …
1490 dTHX; 1682 dTHX;
1491 struct transfer_args ta; 1683 struct transfer_args ta;
1492 1684
1493 if (prepare_cede_notself (aTHX_ &ta)) 1685 if (prepare_cede_notself (aTHX_ &ta))
1494 { 1686 {
1495 TRANSFER (ta); 1687 TRANSFER (ta, 1);
1496 return 1; 1688 return 1;
1497 } 1689 }
1498 else 1690 else
1499 return 0; 1691 return 0;
1500} 1692}
… …
1506 struct coro *coro = SvSTATE (coro_sv); 1698 struct coro *coro = SvSTATE (coro_sv);
1507 1699
1508 if (flags & CC_TRACE) 1700 if (flags & CC_TRACE)
1509 { 1701 {
1510 if (!coro->cctx) 1702 if (!coro->cctx)
1511 coro->cctx = cctx_new (); 1703 coro->cctx = cctx_new_run ();
1512 else if (!(coro->cctx->flags & CC_TRACE)) 1704 else if (!(coro->cctx->flags & CC_TRACE))
1513 croak ("cannot enable tracing on coroutine with custom stack"); 1705 croak ("cannot enable tracing on coroutine with custom stack");
1514 1706
1515 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1707 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1516 } 1708 }
… …
1523 else 1715 else
1524 coro->slot->runops = RUNOPS_DEFAULT; 1716 coro->slot->runops = RUNOPS_DEFAULT;
1525 } 1717 }
1526} 1718}
1527 1719
1720#if 0
1721static int
1722coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1723{
1724 AV *padlist;
1725 AV *av = (AV *)mg->mg_obj;
1726
1727 abort ();
1728
1729 return 0;
1730}
1731
1732static MGVTBL coro_gensub_vtbl = {
1733 0, 0, 0, 0,
1734 coro_gensub_free
1735};
1736#endif
1737
1738/*****************************************************************************/
1739/* PerlIO::cede */
1740
1741typedef struct
1742{
1743 PerlIOBuf base;
1744 NV next, every;
1745} PerlIOCede;
1746
1747static IV
1748PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1749{
1750 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1751
1752 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1753 self->next = nvtime () + self->every;
1754
1755 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1756}
1757
1758static SV *
1759PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1760{
1761 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1762
1763 return newSVnv (self->every);
1764}
1765
1766static IV
1767PerlIOCede_flush (pTHX_ PerlIO *f)
1768{
1769 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1770 double now = nvtime ();
1771
1772 if (now >= self->next)
1773 {
1774 api_cede ();
1775 self->next = now + self->every;
1776 }
1777
1778 return PerlIOBuf_flush (aTHX_ f);
1779}
1780
1781static PerlIO_funcs PerlIO_cede =
1782{
1783 sizeof(PerlIO_funcs),
1784 "cede",
1785 sizeof(PerlIOCede),
1786 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1787 PerlIOCede_pushed,
1788 PerlIOBuf_popped,
1789 PerlIOBuf_open,
1790 PerlIOBase_binmode,
1791 PerlIOCede_getarg,
1792 PerlIOBase_fileno,
1793 PerlIOBuf_dup,
1794 PerlIOBuf_read,
1795 PerlIOBuf_unread,
1796 PerlIOBuf_write,
1797 PerlIOBuf_seek,
1798 PerlIOBuf_tell,
1799 PerlIOBuf_close,
1800 PerlIOCede_flush,
1801 PerlIOBuf_fill,
1802 PerlIOBase_eof,
1803 PerlIOBase_error,
1804 PerlIOBase_clearerr,
1805 PerlIOBase_setlinebuf,
1806 PerlIOBuf_get_base,
1807 PerlIOBuf_bufsiz,
1808 PerlIOBuf_get_ptr,
1809 PerlIOBuf_get_cnt,
1810 PerlIOBuf_set_ptrcnt,
1811};
1812
1813/*****************************************************************************/
1814
1815static const CV *ssl_cv; /* for quick consistency check */
1816
1817static UNOP ssl_restore; /* restore stack as entersub did, for first-re-run */
1818static SV *ssl_arg0;
1819static SV *ssl_arg1;
1820
1821/* this restores the stack in the case we patched the entersub, to */
1822/* recreate the stack frame as perl will on following calls */
1823/* since entersub cleared the stack */
1824static OP *
1825pp_restore (pTHX)
1826{
1827 dSP;
1828
1829 PUSHMARK (SP);
1830
1831 EXTEND (SP, 3);
1832 if (ssl_arg0) PUSHs (sv_2mortal (ssl_arg0)), ssl_arg0 = 0;
1833 if (ssl_arg1) PUSHs (sv_2mortal (ssl_arg1)), ssl_arg1 = 0;
1834 PUSHs ((SV *)CvGV (ssl_cv));
1835
1836 RETURNOP (ssl_restore.op_first);
1837}
1838
1839/* declare prototype */
1840XS(XS_Coro__State__set_stacklevel);
1841
1842static OP *
1843pp_set_stacklevel (pTHX)
1844{
1845 dSP;
1846 struct transfer_args ta;
1847 SV **arg = PL_stack_base + TOPMARK + 1;
1848 int items = SP - arg; /* args without function object */
1849
1850 /* do a quick consistency check on the "function" object, and if it isn't */
1851 /* for us, divert to the real entersub */
1852 if (SvTYPE (*sp) != SVt_PVGV || CvXSUB (GvCV (*sp)) != XS_Coro__State__set_stacklevel)
1853 return PL_ppaddr[OP_ENTERSUB](aTHX);
1854
1855 /* pop args */
1856 SP = PL_stack_base + POPMARK;
1857
1858 if (!(PL_op->op_flags & OPf_STACKED))
1859 {
1860 /* ampersand-form of call, use @_ instead of stack */
1861 AV *av = GvAV (PL_defgv);
1862 arg = AvARRAY (av);
1863 items = AvFILLp (av) + 1;
1864 }
1865
1866 PUTBACK;
1867 switch (PL_op->op_private & 7)
1868 {
1869 case 0:
1870 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (arg [0]));
1871 break;
1872
1873 case 1:
1874 if (items != 2)
1875 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d.", items);
1876
1877 prepare_transfer (aTHX_ &ta, arg [0], arg [1]);
1878 break;
1879
1880 case 2:
1881 prepare_schedule (aTHX_ &ta);
1882 break;
1883
1884 case 3:
1885 prepare_cede (aTHX_ &ta);
1886 break;
1887
1888 case 4:
1889 if (!prepare_cede_notself (aTHX_ &ta))
1890 RETURN;
1891
1892 break;
1893 }
1894
1895 TRANSFER (ta, 0);
1896 SPAGAIN;
1897
1898skip:
1899
1900 RETURN;
1901}
1902
1528MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1903MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1529 1904
1530PROTOTYPES: DISABLE 1905PROTOTYPES: DISABLE
1531
1532BOOT:
1533{
1534#ifdef USE_ITHREADS
1535 MUTEX_INIT (&coro_mutex);
1536#endif
1537 BOOT_PAGESIZE;
1538
1539 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1540 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1541#if 0
1542 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1543 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1544#endif
1545 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1546 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1547 rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1548
1549 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1550
1551 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1552 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1553 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1554 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1555
1556 main_mainstack = PL_mainstack;
1557 main_top_env = PL_top_env;
1558
1559 while (main_top_env->je_prev)
1560 main_top_env = main_top_env->je_prev;
1561
1562 coroapi.ver = CORO_API_VERSION;
1563 coroapi.rev = CORO_API_REVISION;
1564 coroapi.transfer = api_transfer;
1565
1566 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1567}
1568
1569SV *
1570new (char *klass, ...)
1571 CODE:
1572{
1573 struct coro *coro;
1574 MAGIC *mg;
1575 HV *hv;
1576 int i;
1577
1578 Newz (0, coro, 1, struct coro);
1579 coro->args = newAV ();
1580 coro->flags = CF_NEW;
1581
1582 if (coro_first) coro_first->prev = coro;
1583 coro->next = coro_first;
1584 coro_first = coro;
1585
1586 coro->hv = hv = newHV ();
1587 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1588 mg->mg_flags |= MGf_DUP;
1589 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1590
1591 av_extend (coro->args, items - 1);
1592 for (i = 1; i < items; i++)
1593 av_push (coro->args, newSVsv (ST (i)));
1594}
1595 OUTPUT:
1596 RETVAL
1597 1906
1598# these not obviously related functions are all rolled into the same xs 1907# these not obviously related functions are all rolled into the same xs
1599# function to increase chances that they all will call transfer with the same 1908# function to increase chances that they all will call transfer with the same
1600# stack offset 1909# stack offset
1601void 1910void
… …
1605 Coro::schedule = 2 1914 Coro::schedule = 2
1606 Coro::cede = 3 1915 Coro::cede = 3
1607 Coro::cede_notself = 4 1916 Coro::cede_notself = 4
1608 CODE: 1917 CODE:
1609{ 1918{
1610 struct transfer_args ta; 1919 assert (("FATAL: ssl call recursion in Coro module (please report)", PL_op->op_ppaddr != pp_set_stacklevel));
1611 1920
1612 switch (ix) 1921 /* we patch the op, and then re-run the whole call */
1922 /* we have to put some dummy argument on the stack for this to work */
1923 /* TODO: walk back the opcode chain (but how?), nuke the pp_gv etc. */
1924 ssl_restore.op_next = (OP *)&ssl_restore;
1925 ssl_restore.op_type = OP_NULL;
1926 ssl_restore.op_ppaddr = pp_restore;
1927 ssl_restore.op_first = PL_op;
1928
1929 ssl_arg0 = items > 0 ? SvREFCNT_inc (ST (0)) : 0;
1930 ssl_arg1 = items > 1 ? SvREFCNT_inc (ST (1)) : 0;
1931
1932 PL_op->op_ppaddr = pp_set_stacklevel;
1933 PL_op->op_private = PL_op->op_private & ~7 | ix; /* we potentially share our private flags with entersub */
1934
1935 PL_op = (OP *)&ssl_restore;
1936}
1937
1938BOOT:
1939{
1940#ifdef USE_ITHREADS
1941 MUTEX_INIT (&coro_lock);
1942# if CORO_PTHREAD
1943 coro_thx = PERL_GET_CONTEXT;
1944# endif
1945#endif
1946 BOOT_PAGESIZE;
1947
1948 ssl_cv = get_cv ("Coro::State::_set_stacklevel", 0);
1949
1950 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1951 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1952
1953 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1954 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1955 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1956
1957 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1958 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1959 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1960
1961 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1962
1963 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1964 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1965 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1966 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1967
1968 main_mainstack = PL_mainstack;
1969 main_top_env = PL_top_env;
1970
1971 while (main_top_env->je_prev)
1972 main_top_env = main_top_env->je_prev;
1973
1974 coroapi.ver = CORO_API_VERSION;
1975 coroapi.rev = CORO_API_REVISION;
1976 coroapi.transfer = api_transfer;
1977
1613 { 1978 {
1614 case 0: 1979 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1615 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1616 ta.next = 0;
1617 break;
1618 1980
1619 case 1: 1981 if (!svp) croak ("Time::HiRes is required");
1620 if (items != 2) 1982 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1621 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1622 1983
1623 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1984 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1624 break;
1625
1626 case 2:
1627 prepare_schedule (aTHX_ &ta);
1628 break;
1629
1630 case 3:
1631 prepare_cede (aTHX_ &ta);
1632 break;
1633
1634 case 4:
1635 if (!prepare_cede_notself (aTHX_ &ta))
1636 XSRETURN_EMPTY;
1637
1638 break;
1639 } 1985 }
1640 1986
1641 BARRIER; 1987 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1642 PUTBACK;
1643 TRANSFER (ta);
1644 SPAGAIN; /* might be the sp of a different coroutine now */
1645 /* be extra careful not to ever do anything after TRANSFER */
1646} 1988}
1989
1990SV *
1991new (char *klass, ...)
1992 CODE:
1993{
1994 struct coro *coro;
1995 MAGIC *mg;
1996 HV *hv;
1997 int i;
1998
1999 Newz (0, coro, 1, struct coro);
2000 coro->args = newAV ();
2001 coro->flags = CF_NEW;
2002
2003 if (coro_first) coro_first->prev = coro;
2004 coro->next = coro_first;
2005 coro_first = coro;
2006
2007 coro->hv = hv = newHV ();
2008 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2009 mg->mg_flags |= MGf_DUP;
2010 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2011
2012 av_extend (coro->args, items - 1);
2013 for (i = 1; i < items; i++)
2014 av_push (coro->args, newSVsv (ST (i)));
2015}
2016 OUTPUT:
2017 RETVAL
1647 2018
1648bool 2019bool
1649_destroy (SV *coro_sv) 2020_destroy (SV *coro_sv)
1650 CODE: 2021 CODE:
1651 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2022 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1652 OUTPUT: 2023 OUTPUT:
1653 RETVAL 2024 RETVAL
1654 2025
1655void 2026void
1656_exit (code) 2027_exit (int code)
1657 int code
1658 PROTOTYPE: $ 2028 PROTOTYPE: $
1659 CODE: 2029 CODE:
1660 _exit (code); 2030 _exit (code);
1661 2031
1662int 2032int
1663cctx_stacksize (int new_stacksize = 0) 2033cctx_stacksize (int new_stacksize = 0)
1664 CODE: 2034 CODE:
1665 RETVAL = coro_stacksize; 2035 RETVAL = cctx_stacksize;
1666 if (new_stacksize) 2036 if (new_stacksize)
2037 {
1667 coro_stacksize = new_stacksize; 2038 cctx_stacksize = new_stacksize;
2039 ++cctx_gen;
2040 }
2041 OUTPUT:
2042 RETVAL
2043
2044int
2045cctx_max_idle (int max_idle = 0)
2046 CODE:
2047 RETVAL = cctx_max_idle;
2048 if (max_idle > 1)
2049 cctx_max_idle = max_idle;
1668 OUTPUT: 2050 OUTPUT:
1669 RETVAL 2051 RETVAL
1670 2052
1671int 2053int
1672cctx_count () 2054cctx_count ()
… …
1696call (Coro::State coro, SV *coderef) 2078call (Coro::State coro, SV *coderef)
1697 ALIAS: 2079 ALIAS:
1698 eval = 1 2080 eval = 1
1699 CODE: 2081 CODE:
1700{ 2082{
1701 if (coro->mainstack) 2083 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1702 { 2084 {
1703 struct coro temp; 2085 struct coro temp;
1704 2086
1705 if (!(coro->flags & CF_RUNNING)) 2087 if (!(coro->flags & CF_RUNNING))
1706 { 2088 {
2089 PUTBACK;
1707 save_perl (aTHX_ &temp); 2090 save_perl (aTHX_ &temp);
1708 load_perl (aTHX_ coro); 2091 load_perl (aTHX_ coro);
1709 } 2092 }
1710 2093
1711 { 2094 {
… …
1730 2113
1731 if (!(coro->flags & CF_RUNNING)) 2114 if (!(coro->flags & CF_RUNNING))
1732 { 2115 {
1733 save_perl (aTHX_ coro); 2116 save_perl (aTHX_ coro);
1734 load_perl (aTHX_ &temp); 2117 load_perl (aTHX_ &temp);
2118 SPAGAIN;
1735 } 2119 }
1736 } 2120 }
1737} 2121}
1738 2122
1739SV * 2123SV *
… …
1748 RETVAL = boolSV (coro->flags & ix); 2132 RETVAL = boolSV (coro->flags & ix);
1749 OUTPUT: 2133 OUTPUT:
1750 RETVAL 2134 RETVAL
1751 2135
1752void 2136void
2137throw (Coro::State self, SV *throw = &PL_sv_undef)
2138 PROTOTYPE: $;$
2139 CODE:
2140 SvREFCNT_dec (self->throw);
2141 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2142
2143void
1753api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2144api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1754 2145
1755SV * 2146SV *
1756has_stack (Coro::State coro) 2147has_cctx (Coro::State coro)
1757 PROTOTYPE: $ 2148 PROTOTYPE: $
1758 CODE: 2149 CODE:
1759 RETVAL = boolSV (!!coro->cctx); 2150 RETVAL = boolSV (!!coro->cctx);
1760 OUTPUT: 2151 OUTPUT:
1761 RETVAL 2152 RETVAL
… …
1766 CODE: 2157 CODE:
1767 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2158 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1768 OUTPUT: 2159 OUTPUT:
1769 RETVAL 2160 RETVAL
1770 2161
1771IV 2162UV
1772rss (Coro::State coro) 2163rss (Coro::State coro)
1773 PROTOTYPE: $ 2164 PROTOTYPE: $
1774 ALIAS: 2165 ALIAS:
1775 usecount = 1 2166 usecount = 1
1776 CODE: 2167 CODE:
… …
1780 case 1: RETVAL = coro->usecount; break; 2171 case 1: RETVAL = coro->usecount; break;
1781 } 2172 }
1782 OUTPUT: 2173 OUTPUT:
1783 RETVAL 2174 RETVAL
1784 2175
2176void
2177force_cctx ()
2178 CODE:
2179 struct coro *coro = SvSTATE (coro_current);
2180 coro->cctx->idle_sp = 0;
2181
2182void
2183swap_defsv (Coro::State self)
2184 PROTOTYPE: $
2185 ALIAS:
2186 swap_defav = 1
2187 CODE:
2188 if (!self->slot)
2189 croak ("cannot swap state with coroutine that has no saved state");
2190 else
2191 {
2192 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2193 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2194
2195 SV *tmp = *src; *src = *dst; *dst = tmp;
2196 }
1785 2197
1786MODULE = Coro::State PACKAGE = Coro 2198MODULE = Coro::State PACKAGE = Coro
1787 2199
1788BOOT: 2200BOOT:
1789{ 2201{
1790 int i; 2202 int i;
1791 2203
2204 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1792 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 2205 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1793 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 2206 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1795 2207
1796 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 2208 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1797 SvREADONLY_on (coro_current); 2209 SvREADONLY_on (coro_current);
1798 2210
1799 coro_stash = gv_stashpv ("Coro", TRUE); 2211 coro_stash = gv_stashpv ("Coro", TRUE);
… …
1807 2219
1808 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2220 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1809 coro_ready[i] = newAV (); 2221 coro_ready[i] = newAV ();
1810 2222
1811 { 2223 {
1812 SV *sv = perl_get_sv ("Coro::API", TRUE); 2224 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1813 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1814 2225
1815 coroapi.schedule = api_schedule; 2226 coroapi.schedule = api_schedule;
1816 coroapi.cede = api_cede; 2227 coroapi.cede = api_cede;
1817 coroapi.cede_notself = api_cede_notself; 2228 coroapi.cede_notself = api_cede_notself;
1818 coroapi.ready = api_ready; 2229 coroapi.ready = api_ready;
… …
1829void 2240void
1830_set_current (SV *current) 2241_set_current (SV *current)
1831 PROTOTYPE: $ 2242 PROTOTYPE: $
1832 CODE: 2243 CODE:
1833 SvREFCNT_dec (SvRV (coro_current)); 2244 SvREFCNT_dec (SvRV (coro_current));
1834 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2245 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2246
2247void
2248_set_readyhook (SV *hook)
2249 PROTOTYPE: $
2250 CODE:
2251 LOCK;
2252 SvREFCNT_dec (coro_readyhook);
2253 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2254 UNLOCK;
1835 2255
1836int 2256int
1837prio (Coro::State coro, int newprio = 0) 2257prio (Coro::State coro, int newprio = 0)
1838 ALIAS: 2258 ALIAS:
1839 nice = 1 2259 nice = 1
… …
1869 CODE: 2289 CODE:
1870 RETVAL = coro_nready; 2290 RETVAL = coro_nready;
1871 OUTPUT: 2291 OUTPUT:
1872 RETVAL 2292 RETVAL
1873 2293
1874void
1875throw (Coro::State self, SV *throw = &PL_sv_undef)
1876 PROTOTYPE: $;$
1877 CODE:
1878 SvREFCNT_dec (self->throw);
1879 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1880
1881# for async_pool speedup 2294# for async_pool speedup
1882void 2295void
1883_pool_1 (SV *cb) 2296_pool_1 (SV *cb)
1884 CODE: 2297 CODE:
1885{ 2298{
… …
1889 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2302 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1890 AV *invoke_av; 2303 AV *invoke_av;
1891 int i, len; 2304 int i, len;
1892 2305
1893 if (!invoke) 2306 if (!invoke)
2307 {
2308 SV *old = PL_diehook;
2309 PL_diehook = 0;
2310 SvREFCNT_dec (old);
1894 croak ("\3async_pool terminate\2\n"); 2311 croak ("\3async_pool terminate\2\n");
2312 }
1895 2313
1896 SvREFCNT_dec (coro->saved_deffh); 2314 SvREFCNT_dec (coro->saved_deffh);
1897 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2315 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1898 2316
1899 hv_store (hv, "desc", sizeof ("desc") - 1, 2317 hv_store (hv, "desc", sizeof ("desc") - 1,
1900 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2318 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1901 2319
1902 invoke_av = (AV *)SvRV (invoke); 2320 invoke_av = (AV *)SvRV (invoke);
… …
1906 2324
1907 if (len > 0) 2325 if (len > 0)
1908 { 2326 {
1909 av_fill (defav, len - 1); 2327 av_fill (defav, len - 1);
1910 for (i = 0; i < len; ++i) 2328 for (i = 0; i < len; ++i)
1911 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2329 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1912 } 2330 }
1913 2331
1914 SvREFCNT_dec (invoke); 2332 SvREFCNT_dec (invoke);
1915} 2333}
1916 2334
… …
1923 sv_setsv (cb, &PL_sv_undef); 2341 sv_setsv (cb, &PL_sv_undef);
1924 2342
1925 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2343 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1926 coro->saved_deffh = 0; 2344 coro->saved_deffh = 0;
1927 2345
1928 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2346 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1929 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2347 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2348 {
2349 SV *old = PL_diehook;
2350 PL_diehook = 0;
2351 SvREFCNT_dec (old);
1930 croak ("\3async_pool terminate\2\n"); 2352 croak ("\3async_pool terminate\2\n");
2353 }
1931 2354
1932 av_clear (GvAV (PL_defgv)); 2355 av_clear (GvAV (PL_defgv));
1933 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2356 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1934 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2357 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1935 2358
… …
1939 api_trace (coro_current, 0); 2362 api_trace (coro_current, 0);
1940 2363
1941 av_push (av_async_pool, newSVsv (coro_current)); 2364 av_push (av_async_pool, newSVsv (coro_current));
1942} 2365}
1943 2366
2367#if 0
2368
2369void
2370_generator_call (...)
2371 PROTOTYPE: @
2372 PPCODE:
2373 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2374 xxxx
2375 abort ();
2376
2377SV *
2378gensub (SV *sub, ...)
2379 PROTOTYPE: &;@
2380 CODE:
2381{
2382 struct coro *coro;
2383 MAGIC *mg;
2384 CV *xcv;
2385 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2386 int i;
2387
2388 CvGV (ncv) = CvGV (cv);
2389 CvFILE (ncv) = CvFILE (cv);
2390
2391 Newz (0, coro, 1, struct coro);
2392 coro->args = newAV ();
2393 coro->flags = CF_NEW;
2394
2395 av_extend (coro->args, items - 1);
2396 for (i = 1; i < items; i++)
2397 av_push (coro->args, newSVsv (ST (i)));
2398
2399 CvISXSUB_on (ncv);
2400 CvXSUBANY (ncv).any_ptr = (void *)coro;
2401
2402 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2403
2404 CvXSUB (ncv) = CvXSUB (xcv);
2405 CvANON_on (ncv);
2406
2407 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2408 RETVAL = newRV_noinc ((SV *)ncv);
2409}
2410 OUTPUT:
2411 RETVAL
2412
2413#endif
2414
1944 2415
1945MODULE = Coro::State PACKAGE = Coro::AIO 2416MODULE = Coro::State PACKAGE = Coro::AIO
1946 2417
1947SV * 2418void
1948_get_state () 2419_get_state (SV *self)
1949 CODE: 2420 PPCODE:
1950{ 2421{
1951 struct io_state *data; 2422 AV *defav = GvAV (PL_defgv);
1952 2423 AV *av = newAV ();
2424 int i;
1953 RETVAL = newSV (sizeof (struct io_state)); 2425 SV *data_sv = newSV (sizeof (struct io_state));
1954 data = (struct io_state *)SvPVX (RETVAL); 2426 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1955 SvCUR_set (RETVAL, sizeof (struct io_state)); 2427 SvCUR_set (data_sv, sizeof (struct io_state));
1956 SvPOK_only (RETVAL); 2428 SvPOK_only (data_sv);
1957 2429
1958 data->errorno = errno; 2430 data->errorno = errno;
1959 data->laststype = PL_laststype; 2431 data->laststype = PL_laststype;
1960 data->laststatval = PL_laststatval; 2432 data->laststatval = PL_laststatval;
1961 data->statcache = PL_statcache; 2433 data->statcache = PL_statcache;
2434
2435 av_extend (av, AvFILLp (defav) + 1 + 1);
2436
2437 for (i = 0; i <= AvFILLp (defav); ++i)
2438 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2439
2440 av_push (av, data_sv);
2441
2442 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2443
2444 api_ready (self);
1962} 2445}
1963 OUTPUT:
1964 RETVAL
1965 2446
1966void 2447void
1967_set_state (char *data_) 2448_set_state (SV *state)
1968 PROTOTYPE: $ 2449 PROTOTYPE: $
1969 CODE: 2450 PPCODE:
1970{ 2451{
1971 struct io_state *data = (void *)data_; 2452 AV *av = (AV *)SvRV (state);
2453 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2454 int i;
1972 2455
1973 errno = data->errorno; 2456 errno = data->errorno;
1974 PL_laststype = data->laststype; 2457 PL_laststype = data->laststype;
1975 PL_laststatval = data->laststatval; 2458 PL_laststatval = data->laststatval;
1976 PL_statcache = data->statcache; 2459 PL_statcache = data->statcache;
1977}
1978 2460
2461 EXTEND (SP, AvFILLp (av));
2462 for (i = 0; i < AvFILLp (av); ++i)
2463 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2464}
2465
2466
2467MODULE = Coro::State PACKAGE = Coro::AnyEvent
2468
2469BOOT:
2470 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2471
2472SV *
2473_schedule (...)
2474 PROTOTYPE: @
2475 CODE:
2476{
2477 static int incede;
2478
2479 api_cede_notself ();
2480
2481 ++incede;
2482 while (coro_nready >= incede && api_cede ())
2483 ;
2484
2485 sv_setsv (sv_activity, &PL_sv_undef);
2486 if (coro_nready >= incede)
2487 {
2488 PUSHMARK (SP);
2489 PUTBACK;
2490 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2491 SPAGAIN;
2492 }
2493
2494 --incede;
2495}
2496
2497
2498MODULE = Coro::State PACKAGE = PerlIO::cede
2499
2500BOOT:
2501 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2502

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines