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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines