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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines