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.169 by root, Thu Sep 27 16:25:10 2007 UTC vs.
Revision 1.210 by root, Wed Oct 10 03:24:40 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
… …
75/* 5.8.7 */ 77/* 5.8.7 */
76#ifndef SvRV_set 78#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 79# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 80#endif
79 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
89
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 91# undef CORO_STACKGUARD
82#endif 92#endif
83 93
84#ifndef CORO_STACKGUARD 94#ifndef CORO_STACKGUARD
… …
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 109
100#if __GNUC__ >= 3 110#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 111# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 114#else
104# define attribute(x) 115# define attribute(x)
105# define BARRIER 116# define BARRIER
117# define expect(expr,value) (expr)
106#endif 118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
107 122
108#define NOINLINE attribute ((noinline)) 123#define NOINLINE attribute ((noinline))
109 124
110#include "CoroAPI.h" 125#include "CoroAPI.h"
111 126
… …
116#else 131#else
117# define LOCK (void)0 132# define LOCK (void)0
118# define UNLOCK (void)0 133# define UNLOCK (void)0
119#endif 134#endif
120 135
136#define strpair(const) const, sizeof (const) - 1
137
121/* helper storage struct for Coro::AIO */ 138/* helper storage struct for Coro::AIO */
122struct io_state 139struct io_state
123{ 140{
124 int errorno; 141 int errorno;
125 I32 laststype; 142 I32 laststype;
… …
132static AV *main_mainstack; /* used to differentiate between $main and others */ 149static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 150static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 151static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 152static SV *coro_mortal; /* will be freed after next transfer */
136 153
154static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */
156
157static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160
137/* async_pool helper stuff */ 161/* async_pool helper stuff */
138static SV *sv_pool_rss; 162static SV *sv_pool_rss;
139static SV *sv_pool_size; 163static SV *sv_pool_size;
140static AV *av_async_pool; 164static AV *av_async_pool;
141 165
142static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */
143static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle[3];
144 168
145enum { 169enum {
146 CC_MAPPED = 0x01, 170 CC_MAPPED = 0x01,
147 CC_NOREUSE = 0x02, /* throw this away after tracing */ 171 CC_NOREUSE = 0x02, /* throw this away after tracing */
148 CC_TRACE = 0x04, 172 CC_TRACE = 0x04,
… …
176 CF_READY = 0x0002, /* coroutine is ready */ 200 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 201 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 202 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 203};
180 204
205/* the structure where most of the perl state is stored, overlaid on the cxstack */
206typedef struct {
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211#define VAR(name,type) type name;
212# include "state.h"
213#undef VAR
214} perl_slots;
215
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217
181/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
182struct coro { 219struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 220 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 221 coro_cctx *cctx;
222 int gimme;
185 223
224 /* process data */
225 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */
227
186 /* data associated with this coroutine (initial args) */ 228 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 229 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 230 int flags; /* CF_ flags */
231 HV *hv; /* the perl hash associated with this coro, if any */
191 232
192 /* optionally saved, might be zero */ 233 /* statistics */
193 AV *defav; /* @_ */ 234 int usecount; /* number of transfers to this coro */
194 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */
199
200#define VAR(name,type) type name;
201# include "state.h"
202#undef VAR
203 235
204 /* coro process data */ 236 /* coro process data */
205 int prio; 237 int prio;
238 SV *throw; /* exception to be thrown */
239
240 /* async_pool */
241 SV *saved_deffh;
206 242
207 /* linked list */ 243 /* linked list */
208 struct coro *next, *prev; 244 struct coro *next, *prev;
209 HV *hv; /* the perl hash associated with this coro, if any */
210}; 245};
211 246
212typedef struct coro *Coro__State; 247typedef struct coro *Coro__State;
213typedef struct coro *Coro__State_or_hashref; 248typedef struct coro *Coro__State_or_hashref;
214 249
… …
226static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 261static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
227static int coro_nready; 262static int coro_nready;
228static struct coro *coro_first; 263static struct coro *coro_first;
229 264
230/** lowlevel stuff **********************************************************/ 265/** lowlevel stuff **********************************************************/
266
267static SV *
268coro_get_sv (const char *name, int create)
269{
270#if PERL_VERSION_ATLEAST (5,9,0)
271 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
272 get_sv (name, create);
273#endif
274 return get_sv (name, create);
275}
276
277static AV *
278coro_get_av (const char *name, int create)
279{
280#if PERL_VERSION_ATLEAST (5,9,0)
281 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
282 get_av (name, create);
283#endif
284 return get_av (name, create);
285}
286
287static HV *
288coro_get_hv (const char *name, int create)
289{
290#if PERL_VERSION_ATLEAST (5,9,0)
291 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
292 get_hv (name, create);
293#endif
294 return get_hv (name, create);
295}
231 296
232static AV * 297static AV *
233coro_clone_padlist (pTHX_ CV *cv) 298coro_clone_padlist (pTHX_ CV *cv)
234{ 299{
235 AV *padlist = CvPADLIST (cv); 300 AV *padlist = CvPADLIST (cv);
… …
308 MAGIC *mg; 373 MAGIC *mg;
309 374
310 if (SvROK (coro)) 375 if (SvROK (coro))
311 coro = SvRV (coro); 376 coro = SvRV (coro);
312 377
378 if (expect_false (SvTYPE (coro) != SVt_PVHV))
379 croak ("Coro::State object required");
380
313 stash = SvSTASH (coro); 381 stash = SvSTASH (coro);
314 if (stash != coro_stash && stash != coro_state_stash) 382 if (expect_false (stash != coro_stash && stash != coro_state_stash))
315 { 383 {
316 /* very slow, but rare, check */ 384 /* very slow, but rare, check */
317 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
318 croak ("Coro::State object required"); 386 croak ("Coro::State object required");
319 } 387 }
… …
329get_padlist (pTHX_ CV *cv) 397get_padlist (pTHX_ CV *cv)
330{ 398{
331 MAGIC *mg = CORO_MAGIC (cv); 399 MAGIC *mg = CORO_MAGIC (cv);
332 AV *av; 400 AV *av;
333 401
334 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
335 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
336 else 404 else
337 { 405 {
338#if CORO_PREFER_PERL_FUNCTIONS 406#if CORO_PREFER_PERL_FUNCTIONS
339 /* this is probably cleaner, but also slower? */ 407 /* this is probably cleaner, but also slower? */
… …
351put_padlist (pTHX_ CV *cv) 419put_padlist (pTHX_ CV *cv)
352{ 420{
353 MAGIC *mg = CORO_MAGIC (cv); 421 MAGIC *mg = CORO_MAGIC (cv);
354 AV *av; 422 AV *av;
355 423
356 if (!mg) 424 if (expect_false (!mg))
357 { 425 {
358 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
359 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
360 mg->mg_virtual = &vtbl_coro; 428 mg->mg_virtual = &vtbl_coro;
361 mg->mg_obj = (SV *)newAV (); 429 mg->mg_obj = (SV *)newAV ();
362 } 430 }
363 431
364 av = (AV *)mg->mg_obj; 432 av = (AV *)mg->mg_obj;
365 433
366 if (AvFILLp (av) >= AvMAX (av)) 434 if (expect_false (AvFILLp (av) >= AvMAX (av)))
367 av_extend (av, AvMAX (av) + 1); 435 av_extend (av, AvMAX (av) + 1);
368 436
369 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 437 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
370} 438}
371 439
372/** load & save, init *******************************************************/ 440/** load & save, init *******************************************************/
373 441
374#define SB do {
375#define SE } while (0)
376
377#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
378
379static void 442static void
380load_perl (pTHX_ Coro__State c) 443load_perl (pTHX_ Coro__State c)
381{ 444{
445 perl_slots *slot = c->slot;
446 c->slot = 0;
447
448 PL_mainstack = c->mainstack;
449
450 GvSV (PL_defgv) = slot->defsv;
451 GvAV (PL_defgv) = slot->defav;
452 GvSV (PL_errgv) = slot->errsv;
453 GvSV (irsgv) = slot->irsgv;
454
382#define VAR(name,type) PL_ ## name = c->name; 455 #define VAR(name,type) PL_ ## name = slot->name;
383# include "state.h" 456 # include "state.h"
384#undef VAR 457 #undef VAR
385 458
386 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
387 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
388 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
389 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
390
391 if (c->irssv)
392 {
393 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
394 {
395 SvREFCNT_dec (c->irssv);
396 c->irssv = 0;
397 }
398 else
399 {
400 REPLACE_SV (PL_rs, c->irssv);
401 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
402 sv_setsv (c->irssv_sv, PL_rs);
403 }
404 }
405 461
406 { 462 {
407 dSP; 463 dSP;
464
408 CV *cv; 465 CV *cv;
409 466
410 /* now do the ugly restore mess */ 467 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 468 while (expect_true (cv = (CV *)POPs))
412 { 469 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 470 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 471 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 472 CvPADLIST (cv) = (AV *)POPs;
416 } 473 }
… …
435 492
436 XPUSHs (Nullsv); 493 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 494 /* this loop was inspired by pp_caller */
438 for (;;) 495 for (;;)
439 { 496 {
440 while (cxix >= 0) 497 while (expect_true (cxix >= 0))
441 { 498 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 499 PERL_CONTEXT *cx = &ccstk[cxix--];
443 500
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 501 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 502 {
446 CV *cv = cx->blk_sub.cv; 503 CV *cv = cx->blk_sub.cv;
447 504
448 if (CvDEPTH (cv)) 505 if (expect_true (CvDEPTH (cv)))
449 { 506 {
450 EXTEND (SP, 3); 507 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 508 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 509 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 510 PUSHs ((SV *)cv);
… …
456 get_padlist (aTHX_ cv); 513 get_padlist (aTHX_ cv);
457 } 514 }
458 } 515 }
459 } 516 }
460 517
461 if (top_si->si_type == PERLSI_MAIN) 518 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 519 break;
463 520
464 top_si = top_si->si_prev; 521 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 522 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 523 cxix = top_si->si_cxix;
467 } 524 }
468 525
469 PUTBACK; 526 PUTBACK;
470 } 527 }
471 528
472 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 529 /* allocate some space on the context stack for our purposes */
473 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 530 /* we manually unroll here, as usually 2 slots is enough */
474 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 531 if (SLOT_COUNT >= 1) CXINC;
475 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 532 if (SLOT_COUNT >= 2) CXINC;
476 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 533 if (SLOT_COUNT >= 3) CXINC;
534 {
535 int i;
536 for (i = 3; i < SLOT_COUNT; ++i)
537 CXINC;
538 }
539 cxstack_ix -= SLOT_COUNT; /* undo allocation */
477 540
541 c->mainstack = PL_mainstack;
542
543 {
544 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
545
546 slot->defav = GvAV (PL_defgv);
547 slot->defsv = DEFSV;
548 slot->errsv = ERRSV;
549 slot->irsgv = GvSV (irsgv);
550
478#define VAR(name,type)c->name = PL_ ## name; 551 #define VAR(name,type) slot->name = PL_ ## name;
479# include "state.h" 552 # include "state.h"
480#undef VAR 553 #undef VAR
554 }
481} 555}
482 556
483/* 557/*
484 * allocate various perl stacks. This is an exact copy 558 * allocate various perl stacks. This is an exact copy
485 * of perl.c:init_stacks, except that it uses less memory 559 * of perl.c:init_stacks, except that it uses less memory
… …
490# define coro_init_stacks init_stacks 564# define coro_init_stacks init_stacks
491#else 565#else
492static void 566static void
493coro_init_stacks (pTHX) 567coro_init_stacks (pTHX)
494{ 568{
495 PL_curstackinfo = new_stackinfo(64, 6); 569 PL_curstackinfo = new_stackinfo(32, 8);
496 PL_curstackinfo->si_type = PERLSI_MAIN; 570 PL_curstackinfo->si_type = PERLSI_MAIN;
497 PL_curstack = PL_curstackinfo->si_stack; 571 PL_curstack = PL_curstackinfo->si_stack;
498 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 572 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
499 573
500 PL_stack_base = AvARRAY(PL_curstack); 574 PL_stack_base = AvARRAY(PL_curstack);
501 PL_stack_sp = PL_stack_base; 575 PL_stack_sp = PL_stack_base;
502 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 576 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
503 577
504 New(50,PL_tmps_stack,64,SV*); 578 New(50,PL_tmps_stack,32,SV*);
505 PL_tmps_floor = -1; 579 PL_tmps_floor = -1;
506 PL_tmps_ix = -1; 580 PL_tmps_ix = -1;
507 PL_tmps_max = 64; 581 PL_tmps_max = 32;
508 582
509 New(54,PL_markstack,16,I32); 583 New(54,PL_markstack,16,I32);
510 PL_markstack_ptr = PL_markstack; 584 PL_markstack_ptr = PL_markstack;
511 PL_markstack_max = PL_markstack + 16; 585 PL_markstack_max = PL_markstack + 16;
512 586
513#ifdef SET_MARK_OFFSET 587#ifdef SET_MARK_OFFSET
514 SET_MARK_OFFSET; 588 SET_MARK_OFFSET;
515#endif 589#endif
516 590
517 New(54,PL_scopestack,16,I32); 591 New(54,PL_scopestack,8,I32);
518 PL_scopestack_ix = 0; 592 PL_scopestack_ix = 0;
519 PL_scopestack_max = 16; 593 PL_scopestack_max = 8;
520 594
521 New(54,PL_savestack,64,ANY); 595 New(54,PL_savestack,24,ANY);
522 PL_savestack_ix = 0; 596 PL_savestack_ix = 0;
523 PL_savestack_max = 64; 597 PL_savestack_max = 24;
524 598
525#if !PERL_VERSION_ATLEAST (5,9,0) 599#if !PERL_VERSION_ATLEAST (5,9,0)
526 New(54,PL_retstack,4,OP*); 600 New(54,PL_retstack,4,OP*);
527 PL_retstack_ix = 0; 601 PL_retstack_ix = 0;
528 PL_retstack_max = 4; 602 PL_retstack_max = 4;
… …
534 * destroy the stacks, the callchain etc... 608 * destroy the stacks, the callchain etc...
535 */ 609 */
536static void 610static void
537coro_destroy_stacks (pTHX) 611coro_destroy_stacks (pTHX)
538{ 612{
539 if (!IN_DESTRUCT)
540 {
541 /* restore all saved variables and stuff */
542 LEAVE_SCOPE (0);
543 assert (PL_tmps_floor == -1);
544
545 /* free all temporaries */
546 FREETMPS;
547 assert (PL_tmps_ix == -1);
548
549 /* unwind all extra stacks */
550 POPSTACK_TO (PL_mainstack);
551
552 /* unwind main stack */
553 dounwind (-1);
554 }
555
556 while (PL_curstackinfo->si_next) 613 while (PL_curstackinfo->si_next)
557 PL_curstackinfo = PL_curstackinfo->si_next; 614 PL_curstackinfo = PL_curstackinfo->si_next;
558 615
559 while (PL_curstackinfo) 616 while (PL_curstackinfo)
560 { 617 {
… …
576 Safefree (PL_retstack); 633 Safefree (PL_retstack);
577#endif 634#endif
578} 635}
579 636
580static size_t 637static size_t
581coro_rss (struct coro *coro) 638coro_rss (pTHX_ struct coro *coro)
582{ 639{
583 size_t rss = sizeof (coro); 640 size_t rss = sizeof (*coro);
584 641
585 if (coro->mainstack) 642 if (coro->mainstack)
586 { 643 {
644 perl_slots tmp_slot;
645 perl_slots *slot;
646
587 if (coro->flags & CF_RUNNING) 647 if (coro->flags & CF_RUNNING)
588 { 648 {
649 slot = &tmp_slot;
650
589 #define VAR(name,type)coro->name = PL_ ## name; 651 #define VAR(name,type) slot->name = PL_ ## name;
590 # include "state.h" 652 # include "state.h"
591 #undef VAR 653 #undef VAR
592 } 654 }
655 else
656 slot = coro->slot;
593 657
594 rss += sizeof (coro->curstackinfo); 658 rss += sizeof (slot->curstackinfo);
595 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
596 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 659 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
597 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 660 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
598 rss += coro->tmps_max * sizeof (SV *); 661 rss += slot->tmps_max * sizeof (SV *);
599 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
600 rss += coro->scopestack_max * sizeof (I32); 663 rss += slot->scopestack_max * sizeof (I32);
601 rss += coro->savestack_max * sizeof (ANY); 664 rss += slot->savestack_max * sizeof (ANY);
602 665
603#if !PERL_VERSION_ATLEAST (5,9,0) 666#if !PERL_VERSION_ATLEAST (5,9,0)
604 rss += coro->retstack_max * sizeof (OP *); 667 rss += slot->retstack_max * sizeof (OP *);
605#endif 668#endif
606 } 669 }
607 670
608 return rss; 671 return rss;
609} 672}
610 673
611/** coroutine stack handling ************************************************/ 674/** coroutine stack handling ************************************************/
612 675
613static void 676static void
614setup_coro (pTHX_ struct coro *coro) 677coro_setup (pTHX_ struct coro *coro)
615{ 678{
616 /* 679 /*
617 * emulate part of the perl startup here. 680 * emulate part of the perl startup here.
618 */ 681 */
619 coro_init_stacks (aTHX); 682 coro_init_stacks (aTHX);
… …
621 PL_runops = RUNOPS_DEFAULT; 684 PL_runops = RUNOPS_DEFAULT;
622 PL_curcop = &PL_compiling; 685 PL_curcop = &PL_compiling;
623 PL_in_eval = EVAL_NULL; 686 PL_in_eval = EVAL_NULL;
624 PL_comppad = 0; 687 PL_comppad = 0;
625 PL_curpm = 0; 688 PL_curpm = 0;
689 PL_curpad = 0;
626 PL_localizing = 0; 690 PL_localizing = 0;
627 PL_dirty = 0; 691 PL_dirty = 0;
628 PL_restartop = 0; 692 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
695
696 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0);
699 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
700 PL_rs = newSVsv (GvSV (irsgv));
701 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
629 702
630 { 703 {
631 dSP; 704 dSP;
632 LOGOP myop; 705 LOGOP myop;
633 706
634 SvREFCNT_dec (GvAV (PL_defgv));
635 GvAV (PL_defgv) = coro->args; coro->args = 0;
636
637 Zero (&myop, 1, LOGOP); 707 Zero (&myop, 1, LOGOP);
638 myop.op_next = Nullop; 708 myop.op_next = Nullop;
639 myop.op_flags = OPf_WANT_VOID; 709 myop.op_flags = OPf_WANT_VOID;
640 710
641 PUSHMARK (SP); 711 PUSHMARK (SP);
642 XPUSHs (av_shift (GvAV (PL_defgv))); 712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
643 PUTBACK; 713 PUTBACK;
644 PL_op = (OP *)&myop; 714 PL_op = (OP *)&myop;
645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
646 SPAGAIN; 716 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
647 } 731 }
648 732
649 ENTER; /* necessary e.g. for dounwind */ 733 /* this newly created coroutine might be run on an existing cctx which most
734 * likely was suspended in set_stacklevel, called from entersub.
735 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
736 * so we ENTER here for symmetry
737 */
738 ENTER;
739}
740
741static void
742coro_destroy (pTHX_ struct coro *coro)
743{
744 if (!IN_DESTRUCT)
745 {
746 /* restore all saved variables and stuff */
747 LEAVE_SCOPE (0);
748 assert (PL_tmps_floor == -1);
749
750 /* free all temporaries */
751 FREETMPS;
752 assert (PL_tmps_ix == -1);
753
754 /* unwind all extra stacks */
755 POPSTACK_TO (PL_mainstack);
756
757 /* unwind main stack */
758 dounwind (-1);
759 }
760
761 SvREFCNT_dec (GvSV (PL_defgv));
762 SvREFCNT_dec (GvAV (PL_defgv));
763 SvREFCNT_dec (GvSV (PL_errgv));
764 SvREFCNT_dec (PL_defoutgv);
765 SvREFCNT_dec (PL_rs);
766 SvREFCNT_dec (GvSV (irsgv));
767
768 SvREFCNT_dec (PL_diehook);
769 SvREFCNT_dec (PL_warnhook);
770
771 SvREFCNT_dec (coro->saved_deffh);
772 SvREFCNT_dec (coro->throw);
773
774 coro_destroy_stacks (aTHX);
650} 775}
651 776
652static void 777static void
653free_coro_mortal (pTHX) 778free_coro_mortal (pTHX)
654{ 779{
655 if (coro_mortal) 780 if (expect_true (coro_mortal))
656 { 781 {
657 SvREFCNT_dec (coro_mortal); 782 SvREFCNT_dec (coro_mortal);
658 coro_mortal = 0; 783 coro_mortal = 0;
659 } 784 }
660} 785}
… …
669 794
670 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 795 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
671 { 796 {
672 PERL_ASYNC_CHECK (); 797 PERL_ASYNC_CHECK ();
673 798
674 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 799 if (cctx->flags & CC_TRACE_ALL)
675 { 800 {
676 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 801 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
677 SV **bot, **top;
678 AV *av = newAV (); /* return values */
679 SV **cb;
680 runops_proc_t old_runops = PL_runops;
681 dSP;
682 ENTER;
683 SAVETMPS;
684 EXTEND (SP, 3);
685 PL_runops = RUNOPS_DEFAULT;
686
687 GV *gv = CvGV (cx->blk_sub.cv);
688 SV *fullname = sv_2mortal (newSV (0));
689 if (isGV (gv))
690 gv_efullname3 (fullname, gv, 0);
691
692 bot = PL_stack_base + cx->blk_oldsp + 1;
693 top = cx->blk_gimme == G_ARRAY ? SP + 1
694 : cx->blk_gimme == G_SCALAR ? bot + 1
695 : bot;
696
697 while (bot < top)
698 av_push (av, SvREFCNT_inc (*bot++));
699
700 PUSHMARK (SP);
701 PUSHs (&PL_sv_no);
702 PUSHs (fullname);
703 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
704 PUTBACK;
705 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
706 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
707 SPAGAIN;
708
709 FREETMPS;
710 LEAVE;
711 PL_runops = old_runops;
712 }
713
714 if (oldcop != PL_curcop)
715 {
716 oldcop = PL_curcop;
717
718 if (PL_curcop != &PL_compiling)
719 { 802 {
803 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
804 SV **bot, **top;
805 AV *av = newAV (); /* return values */
720 SV **cb; 806 SV **cb;
721 runops_proc_t old_runops = PL_runops;
722 dSP; 807 dSP;
808
809 GV *gv = CvGV (cx->blk_sub.cv);
810 SV *fullname = sv_2mortal (newSV (0));
811 if (isGV (gv))
812 gv_efullname3 (fullname, gv, 0);
813
814 bot = PL_stack_base + cx->blk_oldsp + 1;
815 top = cx->blk_gimme == G_ARRAY ? SP + 1
816 : cx->blk_gimme == G_SCALAR ? bot + 1
817 : bot;
818
819 av_extend (av, top - bot);
820 while (bot < top)
821 av_push (av, SvREFCNT_inc (*bot++));
822
823 PL_runops = RUNOPS_DEFAULT;
723 ENTER; 824 ENTER;
724 SAVETMPS; 825 SAVETMPS;
725 EXTEND (SP, 3); 826 EXTEND (SP, 3);
726 PL_runops = RUNOPS_DEFAULT; 827 PUSHMARK (SP);
828 PUSHs (&PL_sv_no);
829 PUSHs (fullname);
830 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
831 PUTBACK;
832 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
833 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
834 SPAGAIN;
835 FREETMPS;
836 LEAVE;
837 PL_runops = runops_trace;
838 }
727 839
728 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 840 if (oldcop != PL_curcop)
841 {
842 oldcop = PL_curcop;
843
844 if (PL_curcop != &PL_compiling)
729 { 845 {
730 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 846 SV **cb;
731 847
732 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 848 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
733 { 849 {
850 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
851
852 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
853 {
854 runops_proc_t old_runops = PL_runops;
855 dSP;
734 GV *gv = CvGV (cx->blk_sub.cv); 856 GV *gv = CvGV (cx->blk_sub.cv);
735 SV *fullname = sv_2mortal (newSV (0)); 857 SV *fullname = sv_2mortal (newSV (0));
858
736 if (isGV (gv)) 859 if (isGV (gv))
737 gv_efullname3 (fullname, gv, 0); 860 gv_efullname3 (fullname, gv, 0);
738 861
862 PL_runops = RUNOPS_DEFAULT;
863 ENTER;
864 SAVETMPS;
865 EXTEND (SP, 3);
866 PUSHMARK (SP);
867 PUSHs (&PL_sv_yes);
868 PUSHs (fullname);
869 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
870 PUTBACK;
871 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
872 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
873 SPAGAIN;
874 FREETMPS;
875 LEAVE;
876 PL_runops = runops_trace;
877 }
878
879 oldcxix = cxstack_ix;
880 }
881
882 if (cctx->flags & CC_TRACE_LINE)
883 {
884 dSP;
885
886 PL_runops = RUNOPS_DEFAULT;
887 ENTER;
888 SAVETMPS;
889 EXTEND (SP, 3);
890 PL_runops = RUNOPS_DEFAULT;
739 PUSHMARK (SP); 891 PUSHMARK (SP);
740 PUSHs (&PL_sv_yes); 892 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
741 PUSHs (fullname); 893 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
742 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
743 PUTBACK; 894 PUTBACK;
744 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 895 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
745 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 896 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
746 SPAGAIN; 897 SPAGAIN;
898 FREETMPS;
899 LEAVE;
900 PL_runops = runops_trace;
747 } 901 }
748
749 oldcxix = cxstack_ix;
750 } 902 }
751
752 if (cctx->flags & CC_TRACE_LINE)
753 {
754 PUSHMARK (SP);
755 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
756 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
757 PUTBACK;
758 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
759 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
760 SPAGAIN;
761 }
762
763 FREETMPS;
764 LEAVE;
765 PL_runops = old_runops;
766 } 903 }
767 } 904 }
768 } 905 }
769 906
770 TAINT_NOT; 907 TAINT_NOT;
… …
773 910
774/* inject a fake call to Coro::State::_cctx_init into the execution */ 911/* inject a fake call to Coro::State::_cctx_init into the execution */
775/* _cctx_init should be careful, as it could be called at almost any time */ 912/* _cctx_init should be careful, as it could be called at almost any time */
776/* during execution of a perl program */ 913/* during execution of a perl program */
777static void NOINLINE 914static void NOINLINE
778prepare_cctx (pTHX_ coro_cctx *cctx) 915cctx_prepare (pTHX_ coro_cctx *cctx)
779{ 916{
780 dSP; 917 dSP;
781 LOGOP myop; 918 LOGOP myop;
782 919
783 PL_top_env = &PL_start_env; 920 PL_top_env = &PL_start_env;
… …
801 938
802/* 939/*
803 * this is a _very_ stripped down perl interpreter ;) 940 * this is a _very_ stripped down perl interpreter ;)
804 */ 941 */
805static void 942static void
806coro_run (void *arg) 943cctx_run (void *arg)
807{ 944{
808 dTHX; 945 dTHX;
809 946
810 /* coro_run is the alternative tail of transfer(), so unlock here. */ 947 /* cctx_run is the alternative tail of transfer(), so unlock here. */
811 UNLOCK; 948 UNLOCK;
812 949
813 /* we now skip the entersub that lead to transfer() */ 950 /* we now skip the entersub that lead to transfer() */
814 PL_op = PL_op->op_next; 951 PL_op = PL_op->op_next;
815 952
816 /* inject a fake subroutine call to cctx_init */ 953 /* inject a fake subroutine call to cctx_init */
817 prepare_cctx (aTHX_ (coro_cctx *)arg); 954 cctx_prepare (aTHX_ (coro_cctx *)arg);
818 955
819 /* somebody or something will hit me for both perl_run and PL_restartop */ 956 /* somebody or something will hit me for both perl_run and PL_restartop */
820 PL_restartop = PL_op; 957 PL_restartop = PL_op;
821 perl_run (PL_curinterp); 958 perl_run (PL_curinterp);
822 959
… …
841 ++cctx_count; 978 ++cctx_count;
842 979
843 Newz (0, cctx, 1, coro_cctx); 980 Newz (0, cctx, 1, coro_cctx);
844 981
845#if HAVE_MMAP 982#if HAVE_MMAP
846
847 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 983 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
848 /* mmap supposedly does allocate-on-write for us */ 984 /* mmap supposedly does allocate-on-write for us */
849 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 985 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
850 986
851 if (cctx->sptr != (void *)-1) 987 if (cctx->sptr != (void *)-1)
… …
872 stack_start = cctx->sptr; 1008 stack_start = cctx->sptr;
873 stack_size = cctx->ssize; 1009 stack_size = cctx->ssize;
874 } 1010 }
875 1011
876 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1012 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
877 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1013 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
878 1014
879 return cctx; 1015 return cctx;
880} 1016}
881 1017
882static void 1018static void
… …
899 Safefree (cctx->sptr); 1035 Safefree (cctx->sptr);
900 1036
901 Safefree (cctx); 1037 Safefree (cctx);
902} 1038}
903 1039
1040/* wether this cctx should be destructed */
1041#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1042
904static coro_cctx * 1043static coro_cctx *
905cctx_get (pTHX) 1044cctx_get (pTHX_ int gimme)
906{ 1045{
907 while (cctx_first) 1046 while (expect_true (cctx_first[gimme]))
908 { 1047 {
909 coro_cctx *cctx = cctx_first; 1048 coro_cctx *cctx = cctx_first[gimme];
910 cctx_first = cctx->next; 1049 cctx_first[gimme] = cctx->next;
911 --cctx_idle; 1050 --cctx_idle[gimme];
912 1051
913 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1052 if (expect_true (!CCTX_EXPIRED (cctx)))
914 return cctx; 1053 return cctx;
915 1054
916 cctx_destroy (cctx); 1055 cctx_destroy (cctx);
917 } 1056 }
918 1057
1058 assert (!gimme);
919 return cctx_new (); 1059 return cctx_new ();
920} 1060}
921 1061
922static void 1062static void
923cctx_put (coro_cctx *cctx) 1063cctx_put (coro_cctx *cctx, int gimme)
924{ 1064{
925 /* free another cctx if overlimit */ 1065 /* free another cctx if overlimit */
926 if (cctx_idle >= MAX_IDLE_CCTX) 1066 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX))
927 { 1067 {
928 coro_cctx *first = cctx_first; 1068 coro_cctx *first = cctx_first[gimme];
929 cctx_first = first->next; 1069 cctx_first[gimme] = first->next;
930 --cctx_idle; 1070 --cctx_idle[gimme];
931 1071
932 cctx_destroy (first); 1072 cctx_destroy (first);
933 } 1073 }
934 1074
935 ++cctx_idle; 1075 ++cctx_idle[gimme];
936 cctx->next = cctx_first; 1076 cctx->next = cctx_first[gimme];
937 cctx_first = cctx; 1077 cctx_first[gimme] = cctx;
938} 1078}
939 1079
940/** coroutine switching *****************************************************/ 1080/** coroutine switching *****************************************************/
941 1081
942/* never call directly, always through the coro_state_transfer global variable */ 1082static void
1083transfer_check (pTHX_ struct coro *prev, struct coro *next)
1084{
1085 if (expect_true (prev != next))
1086 {
1087 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1088 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
1089
1090 if (expect_false (next->flags & CF_RUNNING))
1091 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1092
1093 if (expect_false (next->flags & CF_DESTROYED))
1094 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1095
1096 if (
1097#if PERL_VERSION_ATLEAST (5,9,0)
1098 expect_false (PL_parser)
1099#else
1100 expect_false (PL_lex_state != LEX_NOTPARSING)
1101#endif
1102 )
1103 croak ("Coro::State::transfer called while parsing, but this is not supported");
1104 }
1105}
1106
1107/* always use the TRANSFER macro */
943static void NOINLINE 1108static void NOINLINE
944transfer (pTHX_ struct coro *prev, struct coro *next) 1109transfer (pTHX_ struct coro *prev, struct coro *next)
945{ 1110{
946 dSTACKLEVEL; 1111 dSTACKLEVEL;
947 1112
948 /* sometimes transfer is only called to set idle_sp */ 1113 /* sometimes transfer is only called to set idle_sp */
949 if (!next) 1114 if (expect_false (!next))
950 { 1115 {
951 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1116 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
952 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1117 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
953 } 1118 }
954 else if (prev != next) 1119 else if (expect_true (prev != next))
955 { 1120 {
956 coro_cctx *prev__cctx; 1121 coro_cctx *prev__cctx;
957 1122
958 if (prev->flags & CF_NEW) 1123 if (expect_false (prev->flags & CF_NEW))
959 { 1124 {
960 /* create a new empty context */ 1125 /* create a new empty context */
961 Newz (0, prev->cctx, 1, coro_cctx); 1126 Newz (0, prev->cctx, 1, coro_cctx);
962 prev->flags &= ~CF_NEW; 1127 prev->flags &= ~CF_NEW;
963 prev->flags |= CF_RUNNING; 1128 prev->flags |= CF_RUNNING;
964 } 1129 }
965 1130
966 /*TODO: must not croak here */
967 if (!prev->flags & CF_RUNNING)
968 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
969
970 if (next->flags & CF_RUNNING)
971 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
972
973 if (next->flags & CF_DESTROYED)
974 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
975
976 prev->flags &= ~CF_RUNNING; 1131 prev->flags &= ~CF_RUNNING;
977 next->flags |= CF_RUNNING; 1132 next->flags |= CF_RUNNING;
978 1133
979 LOCK; 1134 LOCK;
980 1135
981 if (next->flags & CF_NEW) 1136 if (expect_false (next->flags & CF_NEW))
982 { 1137 {
983 /* need to start coroutine */ 1138 /* need to start coroutine */
984 next->flags &= ~CF_NEW; 1139 next->flags &= ~CF_NEW;
985 /* first get rid of the old state */ 1140 /* first get rid of the old state */
986 save_perl (aTHX_ prev); 1141 save_perl (aTHX_ prev);
987 /* setup coroutine call */ 1142 /* setup coroutine call */
988 setup_coro (aTHX_ next); 1143 coro_setup (aTHX_ next);
989 } 1144 }
990 else 1145 else
991 { 1146 {
992 /* coroutine already started */ 1147 /* coroutine already started */
993 save_perl (aTHX_ prev); 1148 save_perl (aTHX_ prev);
… …
995 } 1150 }
996 1151
997 prev__cctx = prev->cctx; 1152 prev__cctx = prev->cctx;
998 1153
999 /* possibly "free" the cctx */ 1154 /* possibly "free" the cctx */
1000 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1155 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1001 { 1156 {
1002 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1157 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1003 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1158 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1004 1159
1005 prev->cctx = 0; 1160 prev->cctx = 0;
1006 1161
1162 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1163 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1164 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1165 if (!next->cctx)
1166 next->cctx = cctx_get (aTHX_ next->gimme);
1167
1007 cctx_put (prev__cctx); 1168 cctx_put (prev__cctx, prev->gimme);
1008 } 1169 }
1009 1170
1171 ++next->usecount;
1172
1010 if (!next->cctx) 1173 if (expect_true (!next->cctx))
1011 next->cctx = cctx_get (aTHX); 1174 next->cctx = cctx_get (aTHX_ next->gimme);
1012 1175
1013 if (prev__cctx != next->cctx) 1176 if (expect_false (prev__cctx != next->cctx))
1014 { 1177 {
1015 prev__cctx->top_env = PL_top_env; 1178 prev__cctx->top_env = PL_top_env;
1016 PL_top_env = next->cctx->top_env; 1179 PL_top_env = next->cctx->top_env;
1017 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1180 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1018 } 1181 }
1019 1182
1020 free_coro_mortal (aTHX); 1183 free_coro_mortal (aTHX);
1021 UNLOCK; 1184 UNLOCK;
1185
1186 if (expect_false (prev->throw || next->throw))
1187 {
1188 struct coro *coro = SvSTATE (coro_current);
1189
1190 if (coro->throw)
1191 {
1192 SV *exception = coro->throw;
1193 coro->throw = 0;
1194 sv_setsv (ERRSV, exception);
1195 croak (0);
1196 }
1197 }
1022 } 1198 }
1023} 1199}
1024 1200
1025struct transfer_args 1201struct transfer_args
1026{ 1202{
1027 struct coro *prev, *next; 1203 struct coro *prev, *next;
1028}; 1204};
1029 1205
1030#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1206#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1207#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1031 1208
1032/** high level stuff ********************************************************/ 1209/** high level stuff ********************************************************/
1033 1210
1034static int 1211static int
1035coro_state_destroy (pTHX_ struct coro *coro) 1212coro_state_destroy (pTHX_ struct coro *coro)
… …
1052 1229
1053 if (coro->mainstack && coro->mainstack != main_mainstack) 1230 if (coro->mainstack && coro->mainstack != main_mainstack)
1054 { 1231 {
1055 struct coro temp; 1232 struct coro temp;
1056 1233
1057 assert (!(coro->flags & CF_RUNNING));
1058
1059 Zero (&temp, 1, struct coro);
1060 temp.save = CORO_SAVE_ALL;
1061
1062 if (coro->flags & CF_RUNNING) 1234 if (coro->flags & CF_RUNNING)
1063 croak ("FATAL: tried to destroy currently running coroutine"); 1235 croak ("FATAL: tried to destroy currently running coroutine");
1064 1236
1065 save_perl (aTHX_ &temp); 1237 save_perl (aTHX_ &temp);
1066 load_perl (aTHX_ coro); 1238 load_perl (aTHX_ coro);
1067 1239
1068 coro_destroy_stacks (aTHX); 1240 coro_destroy (aTHX_ coro);
1069 1241
1070 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1242 load_perl (aTHX_ &temp);
1071 1243
1072 coro->mainstack = 0; 1244 coro->slot = 0;
1073 } 1245 }
1074 1246
1075 cctx_destroy (coro->cctx); 1247 cctx_destroy (coro->cctx);
1076 SvREFCNT_dec (coro->args); 1248 SvREFCNT_dec (coro->args);
1077 1249
… …
1123static void 1295static void
1124prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1296prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1125{ 1297{
1126 ta->prev = SvSTATE (prev_sv); 1298 ta->prev = SvSTATE (prev_sv);
1127 ta->next = SvSTATE (next_sv); 1299 ta->next = SvSTATE (next_sv);
1300 TRANSFER_CHECK (*ta);
1128} 1301}
1129 1302
1130static void 1303static void
1131api_transfer (SV *prev_sv, SV *next_sv) 1304api_transfer (SV *prev_sv, SV *next_sv)
1132{ 1305{
1133 dTHX; 1306 dTHX;
1134 struct transfer_args ta; 1307 struct transfer_args ta;
1135 1308
1136 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1309 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1137 TRANSFER (ta); 1310 TRANSFER (ta);
1138}
1139
1140static int
1141api_save (SV *coro_sv, int new_save)
1142{
1143 dTHX;
1144 struct coro *coro = SvSTATE (coro_sv);
1145 int old_save = coro->save;
1146
1147 if (new_save >= 0)
1148 coro->save = new_save;
1149
1150 return old_save;
1151} 1311}
1152 1312
1153/** Coro ********************************************************************/ 1313/** Coro ********************************************************************/
1154 1314
1155static void 1315static void
… …
1214 { 1374 {
1215 LOCK; 1375 LOCK;
1216 next_sv = coro_deq (aTHX_ PRIO_MIN); 1376 next_sv = coro_deq (aTHX_ PRIO_MIN);
1217 1377
1218 /* nothing to schedule: call the idle handler */ 1378 /* nothing to schedule: call the idle handler */
1219 if (!next_sv) 1379 if (expect_false (!next_sv))
1220 { 1380 {
1221 dSP; 1381 dSP;
1222 UNLOCK; 1382 UNLOCK;
1223 1383
1224 ENTER; 1384 ENTER;
… …
1234 } 1394 }
1235 1395
1236 ta->next = SvSTATE (next_sv); 1396 ta->next = SvSTATE (next_sv);
1237 1397
1238 /* cannot transfer to destroyed coros, skip and look for next */ 1398 /* cannot transfer to destroyed coros, skip and look for next */
1239 if (ta->next->flags & CF_DESTROYED) 1399 if (expect_false (ta->next->flags & CF_DESTROYED))
1240 { 1400 {
1241 UNLOCK; 1401 UNLOCK;
1242 SvREFCNT_dec (next_sv); 1402 SvREFCNT_dec (next_sv);
1243 /* coro_nready is already taken care of by destroy */ 1403 /* coro_nready is already taken care of by destroy */
1244 continue; 1404 continue;
… …
1249 break; 1409 break;
1250 } 1410 }
1251 1411
1252 /* free this only after the transfer */ 1412 /* free this only after the transfer */
1253 prev_sv = SvRV (coro_current); 1413 prev_sv = SvRV (coro_current);
1254 SvRV_set (coro_current, next_sv);
1255 ta->prev = SvSTATE (prev_sv); 1414 ta->prev = SvSTATE (prev_sv);
1256 1415 TRANSFER_CHECK (*ta);
1257 assert (ta->next->flags & CF_READY); 1416 assert (ta->next->flags & CF_READY);
1258 ta->next->flags &= ~CF_READY; 1417 ta->next->flags &= ~CF_READY;
1418 SvRV_set (coro_current, next_sv);
1259 1419
1260 LOCK; 1420 LOCK;
1261 free_coro_mortal (aTHX); 1421 free_coro_mortal (aTHX);
1262 coro_mortal = prev_sv; 1422 coro_mortal = prev_sv;
1263 UNLOCK; 1423 UNLOCK;
… …
1300 dTHX; 1460 dTHX;
1301 struct transfer_args ta; 1461 struct transfer_args ta;
1302 1462
1303 prepare_cede (aTHX_ &ta); 1463 prepare_cede (aTHX_ &ta);
1304 1464
1305 if (ta.prev != ta.next) 1465 if (expect_true (ta.prev != ta.next))
1306 { 1466 {
1307 TRANSFER (ta); 1467 TRANSFER (ta);
1308 return 1; 1468 return 1;
1309 } 1469 }
1310 else 1470 else
… …
1324 } 1484 }
1325 else 1485 else
1326 return 0; 1486 return 0;
1327} 1487}
1328 1488
1489static void
1490api_trace (SV *coro_sv, int flags)
1491{
1492 dTHX;
1493 struct coro *coro = SvSTATE (coro_sv);
1494
1495 if (flags & CC_TRACE)
1496 {
1497 if (!coro->cctx)
1498 coro->cctx = cctx_new ();
1499 else if (!(coro->cctx->flags & CC_TRACE))
1500 croak ("cannot enable tracing on coroutine with custom stack");
1501
1502 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1503 }
1504 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1505 {
1506 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1507
1508 if (coro->flags & CF_RUNNING)
1509 PL_runops = RUNOPS_DEFAULT;
1510 else
1511 coro->slot->runops = RUNOPS_DEFAULT;
1512 }
1513}
1514
1329MODULE = Coro::State PACKAGE = Coro::State 1515MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1330 1516
1331PROTOTYPES: DISABLE 1517PROTOTYPES: DISABLE
1332 1518
1333BOOT: 1519BOOT:
1334{ 1520{
1335#ifdef USE_ITHREADS 1521#ifdef USE_ITHREADS
1336 MUTEX_INIT (&coro_mutex); 1522 MUTEX_INIT (&coro_mutex);
1337#endif 1523#endif
1338 BOOT_PAGESIZE; 1524 BOOT_PAGESIZE;
1525
1526 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1527 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1528
1529 hv_sig = coro_get_hv ("SIG", TRUE);
1530 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1531 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1532
1533 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1534 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1339 1535
1340 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1536 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1341 1537
1342 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1538 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1343 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1539 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1344 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1540 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1345 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1541 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1346 1542
1347 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1348 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1349 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1350 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1351 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1352 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1353 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1354
1355 main_mainstack = PL_mainstack; 1543 main_mainstack = PL_mainstack;
1356 main_top_env = PL_top_env; 1544 main_top_env = PL_top_env;
1357 1545
1358 while (main_top_env->je_prev) 1546 while (main_top_env->je_prev)
1359 main_top_env = main_top_env->je_prev; 1547 main_top_env = main_top_env->je_prev;
1360 1548
1361 coroapi.ver = CORO_API_VERSION; 1549 coroapi.ver = CORO_API_VERSION;
1550 coroapi.rev = CORO_API_REVISION;
1362 coroapi.transfer = api_transfer; 1551 coroapi.transfer = api_transfer;
1363 1552
1364 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1553 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1365} 1554}
1366 1555
… …
1371 struct coro *coro; 1560 struct coro *coro;
1372 HV *hv; 1561 HV *hv;
1373 int i; 1562 int i;
1374 1563
1375 Newz (0, coro, 1, struct coro); 1564 Newz (0, coro, 1, struct coro);
1376 coro->args = newAV (); 1565 coro->args = newAV ();
1377 coro->save = CORO_SAVE_DEF;
1378 coro->flags = CF_NEW; 1566 coro->flags = CF_NEW;
1379 1567
1380 if (coro_first) coro_first->prev = coro; 1568 if (coro_first) coro_first->prev = coro;
1381 coro->next = coro_first; 1569 coro->next = coro_first;
1382 coro_first = coro; 1570 coro_first = coro;
1383 1571
1384 coro->hv = hv = newHV (); 1572 coro->hv = hv = newHV ();
1385 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1573 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1386 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1574 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1387 1575
1576 av_extend (coro->args, items - 1);
1388 for (i = 1; i < items; i++) 1577 for (i = 1; i < items; i++)
1389 av_push (coro->args, newSVsv (ST (i))); 1578 av_push (coro->args, newSVsv (ST (i)));
1390} 1579}
1391 OUTPUT: 1580 OUTPUT:
1392 RETVAL 1581 RETVAL
1393 1582
1394int 1583# these not obviously related functions are all rolled into the same xs
1395save (SV *coro, int new_save = -1) 1584# function to increase chances that they all will call transfer with the same
1396 CODE: 1585# stack offset
1397 RETVAL = api_save (coro, new_save);
1398 OUTPUT:
1399 RETVAL
1400
1401int
1402save_also (SV *coro_sv, int save_also)
1403 CODE:
1404{
1405 struct coro *coro = SvSTATE (coro_sv);
1406 RETVAL = coro->save;
1407 coro->save |= save_also;
1408}
1409 OUTPUT:
1410 RETVAL
1411
1412void 1586void
1413_set_stacklevel (...) 1587_set_stacklevel (...)
1414 ALIAS: 1588 ALIAS:
1415 Coro::State::transfer = 1 1589 Coro::State::transfer = 1
1416 Coro::schedule = 2 1590 Coro::schedule = 2
… …
1448 1622
1449 break; 1623 break;
1450 } 1624 }
1451 1625
1452 BARRIER; 1626 BARRIER;
1627 PUTBACK;
1453 TRANSFER (ta); 1628 TRANSFER (ta);
1454 1629 SPAGAIN; /* might be the sp of a different coroutine now */
1455 if (GIMME_V != G_VOID && ta.next != ta.prev) 1630 /* be extra careful not to ever do anything after TRANSFER */
1456 XSRETURN_YES;
1457} 1631}
1458 1632
1459bool 1633bool
1460_destroy (SV *coro_sv) 1634_destroy (SV *coro_sv)
1461 CODE: 1635 CODE:
… …
1487 RETVAL 1661 RETVAL
1488 1662
1489int 1663int
1490cctx_idle () 1664cctx_idle ()
1491 CODE: 1665 CODE:
1492 RETVAL = cctx_idle; 1666 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2];
1493 OUTPUT: 1667 OUTPUT:
1494 RETVAL 1668 RETVAL
1495 1669
1496void 1670void
1497list () 1671list ()
… …
1510 CODE: 1684 CODE:
1511{ 1685{
1512 if (coro->mainstack) 1686 if (coro->mainstack)
1513 { 1687 {
1514 struct coro temp; 1688 struct coro temp;
1515 Zero (&temp, 1, struct coro);
1516 temp.save = CORO_SAVE_ALL;
1517 1689
1518 if (!(coro->flags & CF_RUNNING)) 1690 if (!(coro->flags & CF_RUNNING))
1519 { 1691 {
1520 save_perl (aTHX_ &temp); 1692 save_perl (aTHX_ &temp);
1521 load_perl (aTHX_ coro); 1693 load_perl (aTHX_ coro);
… …
1523 1695
1524 { 1696 {
1525 dSP; 1697 dSP;
1526 ENTER; 1698 ENTER;
1527 SAVETMPS; 1699 SAVETMPS;
1700 PUTBACK;
1701 PUSHSTACK;
1528 PUSHMARK (SP); 1702 PUSHMARK (SP);
1529 PUTBACK; 1703
1530 if (ix) 1704 if (ix)
1531 eval_sv (coderef, 0); 1705 eval_sv (coderef, 0);
1532 else 1706 else
1533 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1707 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1708
1534 SPAGAIN; 1709 POPSTACK;
1535 FREETMPS; 1710 FREETMPS;
1536 LEAVE; 1711 LEAVE;
1537 PUTBACK; 1712 PUTBACK;
1538 } 1713 }
1539 1714
… …
1542 save_perl (aTHX_ coro); 1717 save_perl (aTHX_ coro);
1543 load_perl (aTHX_ &temp); 1718 load_perl (aTHX_ &temp);
1544 } 1719 }
1545 } 1720 }
1546} 1721}
1547 1722
1548SV * 1723SV *
1549is_ready (Coro::State coro) 1724is_ready (Coro::State coro)
1550 PROTOTYPE: $ 1725 PROTOTYPE: $
1551 ALIAS: 1726 ALIAS:
1552 is_ready = CF_READY 1727 is_ready = CF_READY
… …
1557 RETVAL = boolSV (coro->flags & ix); 1732 RETVAL = boolSV (coro->flags & ix);
1558 OUTPUT: 1733 OUTPUT:
1559 RETVAL 1734 RETVAL
1560 1735
1561void 1736void
1562trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1737api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1563 CODE:
1564 if (flags & CC_TRACE)
1565 {
1566 if (!coro->cctx)
1567 coro->cctx = cctx_new ();
1568 else if (!(coro->cctx->flags & CC_TRACE))
1569 croak ("cannot enable tracing on coroutine with custom stack");
1570
1571 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1572 }
1573 else
1574 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1575 {
1576 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1577 coro->cctx->flags |= CC_NOREUSE;
1578
1579 if (coro->flags & CF_RUNNING)
1580 PL_runops = RUNOPS_DEFAULT;
1581 else
1582 coro->runops = RUNOPS_DEFAULT;
1583 }
1584 1738
1585SV * 1739SV *
1586has_stack (Coro::State coro) 1740has_stack (Coro::State coro)
1587 PROTOTYPE: $ 1741 PROTOTYPE: $
1588 CODE: 1742 CODE:
… …
1599 RETVAL 1753 RETVAL
1600 1754
1601IV 1755IV
1602rss (Coro::State coro) 1756rss (Coro::State coro)
1603 PROTOTYPE: $ 1757 PROTOTYPE: $
1758 ALIAS:
1759 usecount = 1
1604 CODE: 1760 CODE:
1605 RETVAL = coro_rss (coro); 1761 switch (ix)
1762 {
1763 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1764 case 1: RETVAL = coro->usecount; break;
1765 }
1606 OUTPUT: 1766 OUTPUT:
1607 RETVAL 1767 RETVAL
1608 1768
1609 1769
1610MODULE = Coro::State PACKAGE = Coro 1770MODULE = Coro::State PACKAGE = Coro
1611 1771
1612BOOT: 1772BOOT:
1613{ 1773{
1614 int i; 1774 int i;
1615 1775
1616 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1776 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1617 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1777 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1618 av_async_pool = get_av ("Coro::async_pool", TRUE); 1778 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1619 1779
1620 coro_current = get_sv ("Coro::current", FALSE); 1780 coro_current = coro_get_sv ("Coro::current", FALSE);
1621 SvREADONLY_on (coro_current); 1781 SvREADONLY_on (coro_current);
1622 1782
1623 coro_stash = gv_stashpv ("Coro", TRUE); 1783 coro_stash = gv_stashpv ("Coro", TRUE);
1624 1784
1625 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1785 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1626 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1786 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1627 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1787 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1628 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1788 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1631 1791
1632 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1792 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1633 coro_ready[i] = newAV (); 1793 coro_ready[i] = newAV ();
1634 1794
1635 { 1795 {
1636 SV *sv = perl_get_sv("Coro::API", 1); 1796 SV *sv = perl_get_sv ("Coro::API", TRUE);
1797 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1637 1798
1638 coroapi.schedule = api_schedule; 1799 coroapi.schedule = api_schedule;
1639 coroapi.save = api_save;
1640 coroapi.cede = api_cede; 1800 coroapi.cede = api_cede;
1641 coroapi.cede_notself = api_cede_notself; 1801 coroapi.cede_notself = api_cede_notself;
1642 coroapi.ready = api_ready; 1802 coroapi.ready = api_ready;
1643 coroapi.is_ready = api_is_ready; 1803 coroapi.is_ready = api_is_ready;
1644 coroapi.nready = &coro_nready; 1804 coroapi.nready = &coro_nready;
… …
1693 CODE: 1853 CODE:
1694 RETVAL = coro_nready; 1854 RETVAL = coro_nready;
1695 OUTPUT: 1855 OUTPUT:
1696 RETVAL 1856 RETVAL
1697 1857
1858void
1859throw (Coro::State self, SV *throw = &PL_sv_undef)
1860 PROTOTYPE: $;$
1861 CODE:
1862 SvREFCNT_dec (self->throw);
1863 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1864
1698# for async_pool speedup 1865# for async_pool speedup
1699void 1866void
1700_pool_1 (SV *cb) 1867_pool_1 (SV *cb)
1701 CODE: 1868 CODE:
1702{ 1869{
1703 int i, len; 1870 struct coro *coro = SvSTATE (coro_current);
1704 HV *hv = (HV *)SvRV (coro_current); 1871 HV *hv = (HV *)SvRV (coro_current);
1705 AV *defav = GvAV (PL_defgv); 1872 AV *defav = GvAV (PL_defgv);
1706 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1873 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1707 AV *invoke_av; 1874 AV *invoke_av;
1875 int i, len;
1708 1876
1709 if (!invoke) 1877 if (!invoke)
1710 croak ("\3terminate\2\n"); 1878 croak ("\3async_pool terminate\2\n");
1879
1880 SvREFCNT_dec (coro->saved_deffh);
1881 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1711 1882
1712 hv_store (hv, "desc", sizeof ("desc") - 1, 1883 hv_store (hv, "desc", sizeof ("desc") - 1,
1713 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1884 newSVpvn (strpair ("[async_pool]")), 0);
1714 1885
1715 invoke_av = (AV *)SvRV (invoke); 1886 invoke_av = (AV *)SvRV (invoke);
1716 len = av_len (invoke_av); 1887 len = av_len (invoke_av);
1717 1888
1718 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1889 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1733{ 1904{
1734 struct coro *coro = SvSTATE (coro_current); 1905 struct coro *coro = SvSTATE (coro_current);
1735 1906
1736 sv_setsv (cb, &PL_sv_undef); 1907 sv_setsv (cb, &PL_sv_undef);
1737 1908
1909 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1910 coro->saved_deffh = 0;
1911
1738 if (coro_rss (coro) > SvIV (sv_pool_rss) 1912 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1739 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1913 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1740 croak ("\3terminate\2\n"); 1914 croak ("\3async_pool terminate\2\n");
1741 1915
1742 av_clear (GvAV (PL_defgv)); 1916 av_clear (GvAV (PL_defgv));
1743 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1917 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1744 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1918 newSVpvn (strpair ("[async_pool idle]")), 0);
1745 coro->save = CORO_SAVE_DEF; 1919
1746 coro->prio = 0; 1920 coro->prio = 0;
1921
1922 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1923 api_trace (coro_current, 0);
1924
1747 av_push (av_async_pool, newSVsv (coro_current)); 1925 av_push (av_async_pool, newSVsv (coro_current));
1748} 1926}
1749 1927
1750 1928
1751MODULE = Coro::State PACKAGE = Coro::AIO 1929MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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